tweaks

Show runtime bindings as a single summary to avoid duplicated overlapping text in deployment details.\n\nEnable build-push workflow runs for the 4-27-app-deploy branch so app deploy images can be built from this branch.

.agents/skills/component-refactoring/SKILL.md

@@ -190,7 +190,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.
 

.agents/skills/component-refactoring/references/hook-extraction.md

@@ -160,7 +160,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.
 

.agents/skills/frontend-query-mutation/SKILL.md

@@ -1,46 +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()/mutationOptions() directly or extract a helper or use-* hook, configuring oRPC experimental_defaults/default options, handling conditional queries, cache updates/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 default cache behavior with `consoleQuery`/`marketplaceQuery` setup, and keep business orchestration in feature vertical hooks when direct contract calls are not enough.
-- Treat `web/service/use-*` query or mutation wrappers as legacy migration targets, not the preferred destination.
-- 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, default options, cache updates/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 or keep feature hooks only for real orchestration or shared domain behavior.
-   - When touching thin `web/service/use-*` wrappers, migrate them away when feasible.
-3. Preserve Dify conventions.
-   - Keep contract inputs in `{ params, query?, body? }` shape.
-   - Bind default cache updates/invalidation in `createTanstackQueryUtils(...experimental_defaults...)`; use feature hooks only for workflows that cannot be expressed as default operation behavior.
-   - 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`
-- legacy `web/service/use-*.ts` files when migrating wrappers away
-- 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.

.agents/skills/frontend-query-mutation/agents/openai.yaml

@@ -1,4 +0,0 @@
-interface:
-  display_name: "Frontend Query & Mutation"
-  short_description: "Dify TanStack Query, oRPC, and default option patterns"
-  default_prompt: "Use this skill when implementing or reviewing Dify frontend contracts, query and mutation call sites, oRPC default options, conditional queries, cache updates/invalidation, or legacy query/mutation migrations."

.agents/skills/frontend-query-mutation/references/contract-patterns.md

@@ -1,129 +0,0 @@
-# Contract Patterns
-
-## Table of Contents
-
-- Intent
-- Minimal structure
-- Core workflow
-- Query usage decision rule
-- Mutation usage decision rule
-- Thin hook 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 or keep feature hooks only for orchestration.
-   - Combine multiple queries or mutations.
-   - Share domain-level derived state or invalidation helpers.
-   - Prefer `web/features/{domain}/hooks/*` for feature-owned workflows.
-4. Treat `web/service/use-{domain}.ts` as legacy.
-   - Do not create new thin service wrappers for oRPC contracts.
-   - When touching existing wrappers, inline direct `consoleQuery` or `marketplaceQuery` consumption when the wrapper is only a passthrough.
-
-```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.
-
-```typescript
-const createTagMutation = useMutation(consoleQuery.tags.create.mutationOptions())
-```
-
-## Thin Hook Decision Rule
-
-Remove thin hooks when they only rename a single oRPC query or mutation helper.
-Keep hooks when they orchestrate business behavior across multiple operations, own local workflow state, or normalize a feature-specific API.
-Prefer feature vertical hooks for kept orchestration. Do not move new contract-first wrappers into `web/service/use-*`.
-
-Use:
-
-```typescript
-const deleteTagMutation = useMutation(consoleQuery.tags.delete.mutationOptions())
-```
-
-Keep:
-
-```typescript
-const applyTagBindingsMutation = useApplyTagBindingsMutation()
-```
-
-`useApplyTagBindingsMutation` is acceptable because it coordinates bind and unbind requests, computes deltas, and exposes a feature-level workflow rather than a single endpoint passthrough.
-
-## 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.
-- Do not create business-layer helpers whose only purpose is to call `consoleQuery.xxx.mutationOptions()` or `queryOptions()`.
-- Do not introduce new `web/service/use-*` files for oRPC contract passthroughs.
-- 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>
-```

.agents/skills/frontend-query-mutation/references/runtime-rules.md

@@ -1,172 +0,0 @@
-# Runtime Rules
-
-## Table of Contents
-
-- Conditional queries
-- oRPC default options
-- 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,
-  }))
-}
-```
-
-## oRPC Default Options
-
-Use `experimental_defaults` in `createTanstackQueryUtils` when a contract operation should always carry shared TanStack Query behavior, such as default stale time, mutation cache writes, or invalidation.
-
-Place defaults at the query utility creation point in `web/service/client.ts`:
-
-```typescript
-export const consoleQuery = createTanstackQueryUtils(consoleClient, {
-  path: ['console'],
-  experimental_defaults: {
-    tags: {
-      create: {
-        mutationOptions: {
-          onSuccess: (tag, _variables, _result, context) => {
-            context.client.setQueryData(
-              consoleQuery.tags.list.queryKey({
-                input: {
-                  query: {
-                    type: tag.type,
-                  },
-                },
-              }),
-              (oldTags: Tag[] | undefined) => oldTags ? [tag, ...oldTags] : oldTags,
-            )
-          },
-        },
-      },
-    },
-  },
-})
-```
-
-Rules:
-
-- Keep defaults inline in the `consoleQuery` or `marketplaceQuery` initialization when they need sibling oRPC key builders.
-- Do not create a wrapper function solely to host `createTanstackQueryUtils`.
-- Do not split defaults into a vertical feature file if that forces handwritten operation paths such as `generateOperationKey(['console', ...])`.
-- Keep feature-level orchestration in the feature vertical; keep query utility lifecycle defaults with the query utility.
-- Prefer call-site callbacks for UI feedback only; shared cache behavior belongs in oRPC defaults when it is tied to a contract operation.
-
-## Cache Invalidation
-
-Bind shared invalidation in oRPC defaults when it is tied to a contract operation.
-Use feature vertical hooks only for multi-operation workflows or domain orchestration that cannot live in a single operation default.
-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
-// Feature orchestration owns cache invalidation only when defaults are not enough.
-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 wrappers | oRPC defaults, or a feature vertical hook for real orchestration |
-| component-triggered invalidation after mutation | move invalidation into oRPC defaults or a feature vertical hook |
-| imperative fetch plus manual invalidation | wrap it in `useMutation(...mutationOptions(...))` |
-| `await mutateAsync()` without `try/catch` | switch to `mutate(...)` or add `try/catch` |

.agents/skills/how-to-write-component/SKILL.md

@@ -0,0 +1,75 @@
+---
+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
+
+Do not copy existing code patterns blindly. Existing implementations are reference material, not automatic precedent; when existing code conflicts with these rules, follow this skill and adapt the approach instead of reproducing the violation.
+
+## Reuse Existing Implementations
+
+- Before creating new UI, hooks, helpers, or styling patterns, search for and reuse existing base components, feature components, shared hooks, utilities, and established design styles. Add new implementations only when the existing ones cannot express the required behavior cleanly.
+
+## Feature Verticals And Local Ownership
+
+- Group code by what it does, not by whether it is a component, hook, type, utility, or constant.
+- Keep code that changes together in the same feature vertical: UI pieces, feature hooks, local types, query helpers, state, constants, and small utilities should stay near the workflow that owns them.
+- Choose vertical boundaries from route, page, product workflow, or team ownership. Split a nested vertical only when it is reused across surfaces or has an independent lifecycle.
+- Expose a small public surface for each vertical. Avoid deep-importing another vertical's private components, hooks, local helpers, or component-specific utilities.
+- Promote code to shared only when multiple verticals need the same stable primitive. Otherwise, keep it local and compose existing shared primitives inside the owning component or feature.
+
+## Component Declaration And Exports
+
+- 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.
+
+## Props, Naming, And API Types
+
+- 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 such as `appInstanceId`. Normalize framework or route params at the boundary instead of passing aliased names through components.
+- Keep fallback and invariant checks at the lowest component that already handles that state; callers should pass raw values through instead of duplicating checks.
+
+## State, Queries, And Callbacks
+
+- Keep local state, queries, mutations, handlers, and derived UI data at the lowest component that uses them. Extract a purpose-built owner component when the logic has no natural home.
+- Avoid prop drilling. One pass-through layer is acceptable; repeated forwarding means ownership should move down or into shared UI state.
+- Keep callbacks in a parent only when it coordinates workflow, such as form submission, shared selection, batch behavior, or navigation. Otherwise, let the child or row own its action.
+- Use colocated, feature-scoped Jotai `atom`s for UI state shared across siblings or distant children. Keep server/cache state in query or API data flow.
+- Prefer uncontrolled components for DOM-owned state. Use CSS variables for visual customization before adding controlled props.
+
+## Query And Mutation Contracts
+
+- 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 that only wrap `useQuery` and contract `queryOptions()`, such as `useAccessEnvironmentScope`.
+- Do not create new thin `web/service/use-*` wrappers for oRPC contract calls; inline legacy wrappers when they only rename one `queryOptions()` or `mutationOptions()` call.
+- 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
+
+- Prefer using the first level below a page or tab to organize and lay out independent page sections. This layer is optional when the page has only one main section or extracting it would only add a shallow wrapper.
+- Split deeper components by the data and state each layer actually needs. Each component should access only necessary data, and state should be pushed down to the lowest owner.
+- 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 that branch obscures the parent flow.
+- Avoid shallow wrappers and prop renaming. Call the original function directly unless the wrapper adds validation, orchestration, error handling, state ownership, or a real semantic boundary.
+
+## Navigation
+
+- Prefer `Link` for normal navigation. Use router APIs only for command-flow side effects such as mutation success, guarded redirects, or form submission.
+
+## Effects
+
+- Treat `useEffect` as a last resort. First try deriving values during render, moving event-driven work into handlers, or using existing hooks/APIs for persistence, subscriptions, media queries, timers, and DOM sync.
+- Do not use `useEffect` directly in components. If unavoidable, encapsulate it in a purpose-built hook so the component consumes a declarative API.
+
+## Performance
+
+- Avoid `memo`, `useMemo`, and `useCallback` unless there is a clear performance reason.

.github/workflows/api-tests.yml

@@ -98,7 +98,7 @@ jobs:
 
       - name: Set up dotenvs
         run: |
-          ./docker/init-env.sh
+          cp docker/.env.example docker/.env
           cp docker/middleware.env.example docker/middleware.env
 
       - name: Expose Service Ports

.github/workflows/build-push.yml

@@ -9,6 +9,7 @@ on:
       - "release/e-*"
       - "hotfix/**"
       - "feat/hitl-backend"
+      - "4-27-app-deploy"
     tags:
       - "*"
 

.github/workflows/main-ci.yml

@@ -56,9 +56,7 @@ jobs:
               - 'api/**'
               - '.github/workflows/api-tests.yml'
               - '.github/workflows/expose_service_ports.sh'
-              - 'docker/.env.all'
               - 'docker/.env.example'
-              - 'docker/init-env.sh'
               - 'docker/middleware.env.example'
               - 'docker/docker-compose.middleware.yaml'
               - 'docker/docker-compose-template.yaml'
@@ -95,9 +93,7 @@ jobs:
               - 'api/providers/vdb/*/tests/**'
               - '.github/workflows/vdb-tests.yml'
               - '.github/workflows/expose_service_ports.sh'
-              - 'docker/.env.all'
               - 'docker/.env.example'
-              - 'docker/init-env.sh'
               - 'docker/middleware.env.example'
               - 'docker/docker-compose.yaml'
               - 'docker/docker-compose-template.yaml'

.github/workflows/vdb-tests-full.yml

@@ -50,7 +50,7 @@ jobs:
 
       - name: Set up dotenvs
         run: |
-          ./docker/init-env.sh
+          cp docker/.env.example docker/.env
           cp docker/middleware.env.example docker/middleware.env
 
       - name: Expose Service Ports

.github/workflows/vdb-tests.yml

@@ -47,7 +47,7 @@ jobs:
 
       - name: Set up dotenvs
         run: |
-          ./docker/init-env.sh
+          cp docker/.env.example docker/.env
           cp docker/middleware.env.example docker/middleware.env
 
       - name: Expose Service Ports

README.md

@@ -76,16 +76,10 @@ The easiest way to start the Dify server is through [Docker Compose](docker/dock
 ```bash
 cd dify
 cd docker
-./init-env.sh
-docker compose up -d
+./dify-compose up -d
 ```
 
-On Windows PowerShell, initialize `.env`, then run `docker compose up -d` from the `docker` directory.
-
-```powershell
-.\init-env.ps1
-docker compose up -d
-```
+On Windows PowerShell, run `.\dify-compose.ps1 up -d` from the `docker` directory.
 
 After running, you can access the Dify dashboard in your browser at [http://localhost/install](http://localhost/install) and start the initialization process.
 
@@ -144,7 +138,7 @@ Star Dify on GitHub and be instantly notified of new releases.
 
 ### Custom configurations
 
-If you need to customize the configuration, edit `docker/.env` after running the initialization script. The full reference remains in [`docker/.env.all`](docker/.env.all). 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).
+If you need to customize the configuration, add only the values you want to override to `docker/.env`. The default values live in [`docker/.env.default`](docker/.env.default), and the full reference remains in [`docker/.env.example`](docker/.env.example). After making any changes, re-run `./dify-compose up -d` or `.\dify-compose.ps1 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
 

api/constants/recommended_apps.json

@@ -19,7 +19,7 @@
                         "name": "Website Generator"
                     },
                     "app_id": "b53545b1-79ea-4da3-b31a-c39391c6f041",
-                    "categories": ["Programming"],
+                    "category": "Programming",
                     "copyright": null,
                     "description": null,
                     "is_listed": true,
@@ -35,7 +35,7 @@
                         "name": "Investment Analysis Report Copilot"
                     },
                     "app_id": "a23b57fa-85da-49c0-a571-3aff375976c1",
-                    "categories": ["Agent"],
+                    "category": "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",
-                    "categories": ["Workflow"],
+                    "category": "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",
-                    "categories": ["Workflow"],
+                    "category": "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",
-                    "categories": ["Workflow"],
+                    "category": "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",
-                    "categories": ["Programming"],
+                    "category": "Programming",
                     "copyright": null,
                     "description": null,
                     "is_listed": true,
@@ -115,7 +115,7 @@
                         "name": "Code Interpreter"
                     },
                     "app_id": "d077d587-b072-4f2c-b631-69ed1e7cdc0f",
-                    "categories": ["Programming"],
+                    "category": "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",
-                    "categories": ["Agent"],
+                    "category": "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",
-                    "categories": ["Workflow"],
+                    "category": "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",
-                    "categories": ["Workflow"],
+                    "category": "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",
-                    "categories": ["Agent"],
+                    "category": "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",
-                    "categories": ["Writing"],
+                    "category": "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",
-                    "categories": ["Workflow"],
+                    "category": "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",
-                    "categories": ["Programming"],
+                    "category": "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",
-                    "categories": ["Workflow"],
+                    "category": "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",
-                    "categories": ["Assistant"],
+                    "category": "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",
-                    "categories": ["Programming"],
+                    "category": "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",
-                    "categories": ["Workflow"],
+                    "category": "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",
-                    "categories": ["HR"],
+                    "category": "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",
-                    "categories": ["Workflow"],
+                    "category": "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",
-                    "categories": ["Workflow"],
+                    "category": "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",
-                    "categories": ["Workflow"],
+                    "category": "Workflow",
                     "copyright": null,
                     "description": "Utilize LLM (Large Language Models) to classify customer reviews and forward them to the internal system.",
                     "is_listed": true,

api/controllers/console/explore/recommended_app.py

@@ -52,7 +52,7 @@ class RecommendedAppResponse(ResponseModel):
     copyright: str | None = None
     privacy_policy: str | None = None
     custom_disclaimer: str | None = None
-    categories: list[str] = Field(default_factory=list)
+    category: str | None = None
     position: int | None = None
     is_listed: bool | None = None
     can_trial: bool | None = None

api/controllers/console/workspace/tool_providers.py

@@ -876,10 +876,10 @@ class ToolBuiltinProviderSetDefaultApi(Resource):
     @login_required
     @account_initialization_required
     def post(self, provider):
-        _, current_tenant_id = current_account_with_tenant()
+        current_user, 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, provider=provider, id=payload.id
+            tenant_id=current_tenant_id, user_id=current_user.id, provider=provider, id=payload.id
         )
 
 

api/controllers/inner_api/__init__.py

@@ -16,6 +16,7 @@ api = ExternalApi(
 inner_api_ns = Namespace("inner_api", description="Internal API operations", path="/")
 
 from . import mail as _mail
+from . import runtime_credentials as _runtime_credentials
 from .app import dsl as _app_dsl
 from .plugin import plugin as _plugin
 from .workspace import workspace as _workspace
@@ -26,6 +27,7 @@ __all__ = [
     "_app_dsl",
     "_mail",
     "_plugin",
+    "_runtime_credentials",
     "_workspace",
     "api",
     "bp",

api/controllers/inner_api/runtime_credentials.py

@@ -0,0 +1,129 @@
+"""Inner API endpoints for runtime credential resolution.
+
+Called by Enterprise while resolving AppRunner runtime artifacts. The endpoint
+returns decrypted model credentials for in-memory runtime use only.
+"""
+
+import json
+import logging
+from json import JSONDecodeError
+from typing import Any
+
+from flask_restx import Resource
+from pydantic import BaseModel, Field
+from sqlalchemy import select
+from sqlalchemy.orm import Session
+
+from controllers.common.schema import register_schema_model
+from controllers.console.wraps import setup_required
+from controllers.inner_api import inner_api_ns
+from controllers.inner_api.wraps import enterprise_inner_api_only
+from core.helper import encrypter
+from core.plugin.impl.model_runtime_factory import create_plugin_provider_manager
+from extensions.ext_database import db
+from models.provider import ProviderCredential
+
+logger = logging.getLogger(__name__)
+
+
+class InnerRuntimeModelCredentialResolveItem(BaseModel):
+    credential_id: str = Field(description="Provider credential id")
+    provider: str = Field(description="Runtime provider identifier, for example langgenius/openai/openai")
+    vendor: str | None = Field(default=None, description="Model vendor, for example openai")
+    plugin_unique_identifier: str | None = Field(default=None, description="Runtime plugin identifier")
+
+
+class InnerRuntimeModelCredentialsResolvePayload(BaseModel):
+    tenant_id: str = Field(description="Workspace id")
+    credentials: list[InnerRuntimeModelCredentialResolveItem] = Field(default_factory=list)
+
+
+register_schema_model(inner_api_ns, InnerRuntimeModelCredentialsResolvePayload)
+
+
+@inner_api_ns.route("/enterprise/runtime/model-credentials:resolve")
+class EnterpriseRuntimeModelCredentialsResolve(Resource):
+    @setup_required
+    @enterprise_inner_api_only
+    @inner_api_ns.doc(
+        "enterprise_runtime_model_credentials_resolve",
+        responses={
+            200: "Credentials resolved",
+            400: "Invalid request or credential config",
+            404: "Provider or credential not found",
+        },
+    )
+    @inner_api_ns.expect(inner_api_ns.models[InnerRuntimeModelCredentialsResolvePayload.__name__])
+    def post(self):
+        args = InnerRuntimeModelCredentialsResolvePayload.model_validate(inner_api_ns.payload or {})
+        if not args.credentials:
+            return {"model_credentials": []}, 200
+
+        provider_manager = create_plugin_provider_manager(tenant_id=args.tenant_id)
+        provider_configurations = provider_manager.get_configurations(args.tenant_id)
+
+        resolved: list[dict[str, Any]] = []
+        for item in args.credentials:
+            provider_configuration = provider_configurations.get(item.provider)
+            if provider_configuration is None:
+                return {"message": f"provider '{item.provider}' not found"}, 404
+
+            provider_schema = provider_configuration.provider.provider_credential_schema
+            secret_variables = provider_configuration.extract_secret_variables(
+                provider_schema.credential_form_schemas if provider_schema else []
+            )
+
+            with Session(db.engine) as session:
+                stmt = select(ProviderCredential).where(
+                    ProviderCredential.id == item.credential_id,
+                    ProviderCredential.tenant_id == args.tenant_id,
+                    ProviderCredential.provider_name.in_(provider_configuration._get_provider_names()),
+                )
+                credential = session.execute(stmt).scalar_one_or_none()
+
+            if credential is None or not credential.encrypted_config:
+                return {"message": f"credential '{item.credential_id}' not found"}, 404
+
+            try:
+                values = json.loads(credential.encrypted_config)
+            except JSONDecodeError:
+                return {"message": f"credential '{item.credential_id}' has invalid config"}, 400
+            if not isinstance(values, dict):
+                return {"message": f"credential '{item.credential_id}' has invalid config"}, 400
+
+            for key in secret_variables:
+                value = values.get(key)
+                if value is None:
+                    continue
+                try:
+                    values[key] = encrypter.decrypt_token(tenant_id=args.tenant_id, token=value)
+                except Exception as exc:
+                    logger.warning(
+                        "failed to resolve runtime model credential",
+                        extra={
+                            "credential_id": item.credential_id,
+                            "provider": item.provider,
+                            "tenant_id": args.tenant_id,
+                            "error": type(exc).__name__,
+                        },
+                    )
+                    return {"message": f"credential '{item.credential_id}' decrypt failed"}, 400
+
+            resolved.append(
+                {
+                    "credential_id": item.credential_id,
+                    "provider": item.provider,
+                    "vendor": item.vendor or _vendor_from_provider(item.provider),
+                    "plugin_unique_identifier": item.plugin_unique_identifier,
+                    "values": values,
+                }
+            )
+
+        return {"model_credentials": resolved}, 200
+
+
+def _vendor_from_provider(provider: str) -> str:
+    provider = provider.strip("/")
+    if not provider:
+        return ""
+    return provider.rsplit("/", 1)[-1]

api/migrations/versions/2026_04_29_1200-a4f2d8c9b731_add_recommended_app_categories.py

@@ -1,26 +0,0 @@
-"""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")

api/models/model.py

@@ -878,7 +878,6 @@ 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)

api/services/recommend_app/category_order.py

@@ -1,49 +0,0 @@
-"""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)

api/services/recommend_app/database/database_retrieval.py

@@ -6,7 +6,6 @@ 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
 
@@ -19,7 +18,7 @@ class RecommendedAppItemDict(TypedDict):
     copyright: Any
     privacy_policy: Any
     custom_disclaimer: str
-    categories: list[str]
+    category: str
     position: int
     is_listed: bool
 
@@ -81,7 +80,6 @@ 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,
@@ -90,18 +88,15 @@ class DatabaseRecommendAppRetrieval(RecommendAppRetrievalBase):
                 "copyright": site.copyright,
                 "privacy_policy": site.privacy_policy,
                 "custom_disclaimer": site.custom_disclaimer,
-                "categories": app_categories,
+                "category": recommended_app.category,
                 "position": recommended_app.position,
                 "is_listed": recommended_app.is_listed,
             }
             recommended_apps_result.append(recommended_app_result)
 
-            categories.update(app_categories)
+            categories.add(recommended_app.category)
 
-        return RecommendedAppsResultDict(
-            recommended_apps=recommended_apps_result,
-            categories=order_categories(categories, language),
-        )
+        return RecommendedAppsResultDict(recommended_apps=recommended_apps_result, categories=sorted(categories))
 
     @classmethod
     def fetch_recommended_app_detail_from_db(cls, app_id: str) -> RecommendedAppDetailDict | None:

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, provider: str, id: str):
+    def set_default_provider(tenant_id: str, user_id: str, provider: str, id: str):
         """
         set default provider
         """
@@ -422,11 +422,12 @@ class BuiltinToolManageService:
             if target_provider is None:
                 raise ValueError("provider not found")
 
-            # clear default provider (tenant-scoped: only one default per provider per workspace)
+            # clear default provider
             session.execute(
                 update(BuiltinToolProvider)
                 .where(
                     BuiltinToolProvider.tenant_id == tenant_id,
+                    BuiltinToolProvider.user_id == user_id,
                     BuiltinToolProvider.provider == provider,
                     BuiltinToolProvider.is_default.is_(True),
                 )

api/tests/test_containers_integration_tests/services/recommend_app/test_database_retrieval.py

@@ -47,7 +47,6 @@ 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,
@@ -58,7 +57,6 @@ 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,
@@ -115,53 +113,6 @@ class TestFetchRecommendedAppsFromDb:
         assert "assistant" in result["categories"]
         assert "writing" in result["categories"]
 
-    def test_returns_multiple_categories_for_one_app(
-        self, flask_app_with_containers, 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,
-        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, db_session_with_containers: Session
     ):

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

@@ -126,7 +126,7 @@ class TestRecommendedAppResponseModels:
                         },
                         "app_id": "app-1",
                         "description": "desc",
-                        "categories": ["cat", "other"],
+                        "category": "cat",
                         "position": 1,
                         "is_listed": True,
                         "can_trial": False,
@@ -137,5 +137,4 @@ 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"]

api/tests/unit_tests/controllers/inner_api/test_runtime_credentials.py

@@ -0,0 +1,105 @@
+"""Unit tests for runtime credential inner API."""
+
+import inspect
+from unittest.mock import MagicMock, patch
+
+from flask import Flask
+
+from controllers.inner_api.runtime_credentials import (
+    EnterpriseRuntimeModelCredentialsResolve,
+    InnerRuntimeModelCredentialsResolvePayload,
+)
+
+
+def test_runtime_model_credentials_payload_accepts_items():
+    payload = InnerRuntimeModelCredentialsResolvePayload.model_validate(
+        {
+            "tenant_id": "tenant-1",
+            "credentials": [
+                {
+                    "credential_id": "credential-1",
+                    "provider": "langgenius/openai/openai",
+                    "vendor": "openai",
+                }
+            ],
+        }
+    )
+
+    assert payload.tenant_id == "tenant-1"
+    assert payload.credentials[0].provider == "langgenius/openai/openai"
+
+
+@patch("controllers.inner_api.runtime_credentials.encrypter.decrypt_token")
+@patch("controllers.inner_api.runtime_credentials.db")
+@patch("controllers.inner_api.runtime_credentials.Session")
+@patch("controllers.inner_api.runtime_credentials.create_plugin_provider_manager")
+def test_runtime_model_credentials_resolve_returns_decrypted_values(
+    mock_provider_manager_factory,
+    mock_session_cls,
+    mock_db,
+    mock_decrypt_token,
+    app: Flask,
+):
+    provider_configuration = MagicMock()
+    provider_configuration.provider.provider_credential_schema.credential_form_schemas = []
+    provider_configuration.extract_secret_variables.return_value = ["openai_api_key"]
+    provider_configuration._get_provider_names.return_value = ["langgenius/openai/openai", "openai"]
+
+    provider_configurations = MagicMock()
+    provider_configurations.get.return_value = provider_configuration
+    provider_manager = MagicMock()
+    provider_manager.get_configurations.return_value = provider_configurations
+    mock_provider_manager_factory.return_value = provider_manager
+
+    credential = MagicMock()
+    credential.encrypted_config = '{"openai_api_key":"encrypted","api_base":"https://api.openai.com/v1"}'
+    session = MagicMock()
+    session.__enter__.return_value = session
+    session.__exit__.return_value = False
+    session.execute.return_value.scalar_one_or_none.return_value = credential
+    mock_session_cls.return_value = session
+    mock_db.engine = MagicMock()
+    mock_decrypt_token.return_value = "sk-test"
+
+    handler = EnterpriseRuntimeModelCredentialsResolve()
+    unwrapped = inspect.unwrap(handler.post)
+    with app.test_request_context():
+        with patch("controllers.inner_api.runtime_credentials.inner_api_ns") as mock_ns:
+            mock_ns.payload = {
+                "tenant_id": "tenant-1",
+                "credentials": [
+                    {
+                        "credential_id": "credential-1",
+                        "provider": "langgenius/openai/openai",
+                        "vendor": "openai",
+                    }
+                ],
+            }
+            body, status_code = unwrapped(handler)
+
+    assert status_code == 200
+    assert body["model_credentials"][0]["values"]["openai_api_key"] == "sk-test"
+    assert body["model_credentials"][0]["values"]["api_base"] == "https://api.openai.com/v1"
+    mock_decrypt_token.assert_called_once_with(tenant_id="tenant-1", token="encrypted")
+
+
+@patch("controllers.inner_api.runtime_credentials.create_plugin_provider_manager")
+def test_runtime_model_credentials_resolve_rejects_unknown_provider(mock_provider_manager_factory, app: Flask):
+    provider_configurations = MagicMock()
+    provider_configurations.get.return_value = None
+    provider_manager = MagicMock()
+    provider_manager.get_configurations.return_value = provider_configurations
+    mock_provider_manager_factory.return_value = provider_manager
+
+    handler = EnterpriseRuntimeModelCredentialsResolve()
+    unwrapped = inspect.unwrap(handler.post)
+    with app.test_request_context():
+        with patch("controllers.inner_api.runtime_credentials.inner_api_ns") as mock_ns:
+            mock_ns.payload = {
+                "tenant_id": "tenant-1",
+                "credentials": [{"credential_id": "credential-1", "provider": "missing"}],
+            }
+            body, status_code = unwrapped(handler)
+
+    assert status_code == 404
+    assert "provider" in body["message"]

api/tests/unit_tests/services/recommend_app/test_category_order.py

@@ -1,26 +0,0 @@
-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"]

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", "p", "id")
+            BuiltinToolManageService.set_default_provider("t", "u", "p", "id")
 
     @patch(f"{MODULE}.sessionmaker")
     @patch(f"{MODULE}.db")
@@ -189,29 +189,11 @@ class TestSetDefaultProvider:
         target = MagicMock()
         session.scalar.return_value = target
 
-        result = BuiltinToolManageService.set_default_provider("t", "p", "id")
+        result = BuiltinToolManageService.set_default_provider("t", "u", "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")

dev/pytest/pytest_config_tests.py

@@ -92,7 +92,7 @@ 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.all")).keys())
+DOCKER_CONFIG_SET = set(dotenv_values(Path("docker") / Path(".env.example")).keys())
 DOCKER_COMPOSE_CONFIG_SET = set()
 
 with open(Path("docker") / Path("docker-compose.yaml")) as f:
@@ -101,23 +101,15 @@ with open(Path("docker") / Path("docker-compose.yaml")) as f:
 
 def test_yaml_config():
     # python set == operator is used to compare two sets
-    DIFF_API_WITH_DOCKER = (
-        API_CONFIG_SET - DOCKER_CONFIG_SET - BASE_API_AND_DOCKER_CONFIG_SET_DIFF
-    )
+    DIFF_API_WITH_DOCKER = API_CONFIG_SET - DOCKER_CONFIG_SET - BASE_API_AND_DOCKER_CONFIG_SET_DIFF
     if DIFF_API_WITH_DOCKER:
-        print(
-            f"API and Docker config sets are different with key: {DIFF_API_WITH_DOCKER}"
-        )
+        print(f"API and Docker config sets are different with key: {DIFF_API_WITH_DOCKER}")
         raise Exception("API and Docker config sets are different")
     DIFF_API_WITH_DOCKER_COMPOSE = (
-        API_CONFIG_SET
-        - DOCKER_COMPOSE_CONFIG_SET
-        - BASE_API_AND_DOCKER_COMPOSE_CONFIG_SET_DIFF
+        API_CONFIG_SET - DOCKER_COMPOSE_CONFIG_SET - BASE_API_AND_DOCKER_COMPOSE_CONFIG_SET_DIFF
     )
     if DIFF_API_WITH_DOCKER_COMPOSE:
-        print(
-            f"API and Docker Compose config sets are different with key: {DIFF_API_WITH_DOCKER_COMPOSE}"
-        )
+        print(f"API and Docker Compose config sets are different with key: {DIFF_API_WITH_DOCKER_COMPOSE}")
         raise Exception("API and Docker Compose config sets are different")
     print("All tests passed!")
 

dev/pytest/pytest_full.sh

@@ -14,7 +14,7 @@ export OPENDAL_FS_ROOT=${OPENDAL_FS_ROOT:-/tmp/dify-storage}
 mkdir -p "${OPENDAL_FS_ROOT}"
 
 # Prepare env files like CI
-./docker/init-env.sh
+cp -n docker/.env.example docker/.env || true
 cp -n docker/middleware.env.example docker/middleware.env || true
 cp -n api/tests/integration_tests/.env.example api/tests/integration_tests/.env || true
 

docker/.env.default

@@ -0,0 +1,51 @@
+# ------------------------------------------------------------------
+# Minimal defaults for Docker Compose deployments.
+#
+# Keep local changes in .env. Use .env.example as the full reference
+# for advanced and service-specific settings.
+# ------------------------------------------------------------------
+
+# Public URLs used when Dify generates links. Change these together when
+# exposing Dify under another hostname, IP address, or port.
+CONSOLE_WEB_URL=http://localhost
+SERVICE_API_URL=http://localhost
+APP_WEB_URL=http://localhost
+FILES_URL=http://localhost
+INTERNAL_FILES_URL=http://api:5001
+TRIGGER_URL=http://localhost
+ENDPOINT_URL_TEMPLATE=http://localhost/e/{hook_id}
+NEXT_PUBLIC_SOCKET_URL=ws://localhost
+EXPOSE_PLUGIN_DEBUGGING_HOST=localhost
+EXPOSE_PLUGIN_DEBUGGING_PORT=5003
+
+# Built-in metadata database defaults.
+DB_TYPE=postgresql
+DB_USERNAME=postgres
+DB_PASSWORD=difyai123456
+DB_HOST=db_postgres
+DB_PORT=5432
+DB_DATABASE=dify
+
+# Built-in Redis defaults.
+REDIS_HOST=redis
+REDIS_PORT=6379
+REDIS_PASSWORD=difyai123456
+
+# Default file storage.
+STORAGE_TYPE=opendal
+OPENDAL_SCHEME=fs
+OPENDAL_FS_ROOT=storage
+
+# Default vector database.
+VECTOR_STORE=weaviate
+
+# Internal service authentication. Paired values must match.
+PLUGIN_DAEMON_KEY=lYkiYYT6owG+71oLerGzA7GXCgOT++6ovaezWAjpCjf+Sjc3ZtU+qUEi
+PLUGIN_DIFY_INNER_API_KEY=QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1
+
+# Host ports.
+EXPOSE_NGINX_PORT=80
+EXPOSE_NGINX_SSL_PORT=443
+
+# Docker Compose profiles for bundled services.
+COMPOSE_PROFILES=${VECTOR_STORE:-weaviate},${DB_TYPE:-postgresql}

docker/README.md

@@ -7,38 +7,28 @@ Welcome to the new `docker` directory for deploying Dify using Docker Compose. T
 - **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`.
 
-- **Persistent Environment Variables**: Default deployment values are provided in `.env.example`. Initialize `.env` from it and keep local changes there so your configuration persists across deployments.
+- **Persistent Environment Variables**: Default environment variables are managed through `.env.default`, while local overrides are stored in `.env`, ensuring that your configurations persist across deployments.
 
   > What is `.env`? </br> </br>
-  > The `.env` file is your local Docker Compose environment file. Start from `.env.example`, then customize it as needed. Use `.env.all` as the full reference when you need advanced configuration.
+  > The `.env` file is a local override file. Keep it small by adding only the values that differ from `.env.default`. Use `.env.example` as the full reference when you need advanced configuration.
 
 - **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.
 
-- **Full Configuration Reference**: `.env.all` keeps the complete variable list for advanced and service-specific settings, while `.env.example` stays focused on the default self-hosted deployment path.
+- **Local .env Overrides**: The `dify-compose` and `dify-compose.ps1` wrappers create `.env` if it is missing and generate a persistent `SECRET_KEY` for this deployment.
 
 ### How to Deploy Dify with `docker-compose.yaml`
 
 1. **Prerequisites**: Ensure Docker and Docker Compose are installed on your system.
 1. **Environment Setup**:
    - Navigate to the `docker` directory.
-   - Create `.env` and generate a deployment-specific `SECRET_KEY`:
-
-     ```bash
-     ./init-env.sh
-     ```
-
-     On Windows PowerShell:
-
-     ```powershell
-     .\init-env.ps1
-     ```
-
-   - Customize `.env` only when you need to override defaults. Refer to `.env.all` for the full list of available variables.
+   - No copy step is required. The `dify-compose` wrappers create `.env` if it is missing and write a generated `SECRET_KEY` to it.
+   - When prompted on first run, press Enter to use the default deployment, or answer `y` to stop and edit `.env` first.
+   - Customize `.env` only when you need to override defaults from `.env.default`. Refer to `.env.example` for the full list of available variables.
    - **Optional (for advanced deployments)**:
-     If you maintain a full `.env` file copied from `.env.all`, you may use the environment synchronization tool to keep it aligned with the latest `.env.all` updates while preserving your custom settings.
+     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 -d` from the `docker` directory to start the services.
+   - Execute `./dify-compose up -d` from the `docker` directory to start the services. On Windows PowerShell, run `.\dify-compose.ps1 up -d`.
    - 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.
@@ -68,11 +58,13 @@ For users migrating from the `docker-legacy` setup:
 1. **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.example`, `.env`, and `.env.all`
+### Overview of `.env.default`, `.env`, and `.env.example`
 
-- `.env.example` contains the minimal default configuration for Docker Compose deployments.
-- `.env` is your local copy. It contains the generated `SECRET_KEY` plus any local changes.
-- `.env.all` is the full reference for advanced configuration.
+- `.env.default` contains the minimal default configuration for Docker Compose deployments.
+- `.env` contains the generated `SECRET_KEY` plus any local overrides.
+- `.env.example` is the full reference for advanced configuration.
+
+The `dify-compose` wrappers merge `.env.default` and `.env` into a temporary environment file, append paired internal service keys when needed, and remove the temporary file after Docker Compose starts.
 
 #### Key Modules and Customization
 
@@ -82,7 +74,7 @@ For users migrating from the `docker-legacy` setup:
 
 #### Other notable variables
 
-The `.env.all` 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 `.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:
 
 1. **Common Variables**:
 
@@ -132,25 +124,25 @@ The `.env.all` file provided in the Docker setup is extensive and covers a wide
 
 ### Environment Variables Synchronization
 
-When upgrading Dify or pulling the latest changes, new environment variables may be introduced in `.env.example` or `.env.all`.
+When upgrading Dify or pulling the latest changes, new environment variables may be introduced in `.env.default` or `.env.example`.
 
-If you use the default workflow, review `.env.example` and add only the values you need to customize to `.env`.
+If you use the default override-only workflow, review `.env.default` and add only the values you need to override to `.env`.
 
-If you maintain a full `.env` file copied from `.env.all`, an optional environment variables synchronization tool is provided.
+If you maintain a full `.env` file copied from `.env.example`, an optional environment variables synchronization tool is provided.
 
-> This tool performs a **one-way synchronization** from `.env.all` to `.env`.
+> This tool performs a **one-way synchronization** from `.env.example` to `.env`.
 > Existing values in `.env` are never overwritten automatically.
 
 #### `dify-env-sync.sh` (Optional)
 
-This script compares your current `.env` file with the latest `.env.all` template and helps safely apply new or updated environment variables.
+This script compares your current `.env` file with the latest `.env.example` template and helps safely apply new or updated environment variables.
 
 **What it does**
 
 - Creates a backup of the current `.env` file before making any changes
-- Synchronizes newly added environment variables from `.env.all`
+- Synchronizes newly added environment variables from `.env.example`
 - Preserves all existing custom values in `.env`
-- Displays differences and variables removed from `.env.all` for review
+- Displays differences and variables removed from `.env.example` for review
 
 **Backup behavior**
 
@@ -160,8 +152,8 @@ Before synchronization, the current `.env` file is saved to the `env-backup/` di
 **When to use**
 
 - After upgrading Dify to a newer version with a full `.env` file
-- When `.env.all` has been updated with new environment variables
-- When managing a large or heavily customized `.env` file copied from `.env.all`
+- When `.env.example` has been updated with new environment variables
+- When managing a large or heavily customized `.env` file copied from `.env.example`
 
 **Usage**
 
@@ -176,6 +168,6 @@ chmod +x dify-env-sync.sh
 ### Additional Information
 
 - **Continuous Improvement Phase**: We are actively seeking feedback from the community to refine and enhance the deployment process. As more users adopt this new method, we will continue to make improvements based on your experiences and suggestions.
-- **Support**: For detailed configuration options and environment variable settings, refer to the `.env.all` file and the Docker Compose configuration files in the `docker` directory.
+- **Support**: For detailed configuration options and environment variable settings, refer to the `.env.example` file and the Docker Compose configuration files in the `docker` directory.
 
 This README aims to guide you through the deployment process using the new Docker Compose setup. For any issues or further assistance, please refer to the official documentation or contact support.

docker/dify-compose

@@ -0,0 +1,334 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cd "$SCRIPT_DIR"
+
+DEFAULT_ENV_FILE=".env.default"
+USER_ENV_FILE=".env"
+
+log() {
+  printf '%s\n' "$*" >&2
+}
+
+die() {
+  printf 'Error: %s\n' "$*" >&2
+  exit 1
+}
+
+detect_compose() {
+  if docker compose version >/dev/null 2>&1; then
+    COMPOSE_CMD=(docker compose)
+    return
+  fi
+
+  if command -v docker-compose >/dev/null 2>&1; then
+    COMPOSE_CMD=(docker-compose)
+    return
+  fi
+
+  die "Docker Compose is not available. Install Docker Compose, then run this command again."
+}
+
+generate_secret_key() {
+  if command -v openssl >/dev/null 2>&1; then
+    openssl rand -base64 42
+    return
+  fi
+
+  if command -v dd >/dev/null 2>&1 && command -v base64 >/dev/null 2>&1; then
+    dd if=/dev/urandom bs=42 count=1 2>/dev/null | base64 | tr -d '\n'
+    printf '\n'
+    return
+  fi
+
+  return 1
+}
+
+ensure_env_files() {
+  [[ -f "$DEFAULT_ENV_FILE" ]] || die "$DEFAULT_ENV_FILE is missing."
+
+  if [[ -f "$USER_ENV_FILE" ]]; then
+    return
+  fi
+
+  : >"$USER_ENV_FILE"
+
+  if [[ ! -t 0 ]]; then
+    log "Created $USER_ENV_FILE for local overrides."
+    return
+  fi
+
+  printf 'Created %s for local overrides.\n' "$USER_ENV_FILE"
+  printf 'Do you need a custom deployment now? (Most users can press Enter to skip.) [y/N] '
+  read -r answer
+
+  case "${answer:-}" in
+    y | Y | yes | YES | Yes)
+      cat <<'EOF'
+Edit .env with the settings you want to override, using .env.example as the full reference.
+Run ./dify-compose up -d again when you are ready.
+EOF
+      exit 0
+      ;;
+  esac
+}
+
+user_env_value() {
+  local key="$1"
+  awk -F= -v target="$key" '
+    /^[[:space:]]*#/ || !/=/{ next }
+    {
+      key = $1
+      gsub(/^[[:space:]]+|[[:space:]]+$/, "", key)
+      if (key == target) {
+        value = substr($0, index($0, "=") + 1)
+        gsub(/^[[:space:]]+|[[:space:]]+$/, "", value)
+        if ((value ~ /^".*"$/) || (value ~ /^'\''.*'\''$/)) {
+          value = substr(value, 2, length(value) - 2)
+        }
+        result = value
+      }
+    }
+    END { print result }
+  ' "$USER_ENV_FILE"
+}
+
+set_user_env_value() {
+  local key="$1"
+  local value="$2"
+  local temp_file
+
+  temp_file="$(mktemp "${TMPDIR:-/tmp}/dify-env.XXXXXX")"
+  awk -F= -v target="$key" -v replacement="$key=$value" '
+    BEGIN { replaced = 0 }
+    /^[[:space:]]*#/ || !/=/{ print; next }
+    {
+      key = $1
+      gsub(/^[[:space:]]+|[[:space:]]+$/, "", key)
+      if (key == target) {
+        if (!replaced) {
+          print replacement
+          replaced = 1
+        }
+        next
+      }
+      print
+    }
+    END {
+      if (!replaced) {
+        print replacement
+      }
+    }
+  ' "$USER_ENV_FILE" >"$temp_file"
+  mv "$temp_file" "$USER_ENV_FILE"
+}
+
+ensure_secret_key() {
+  local current_secret_key
+  local secret_key
+
+  current_secret_key="$(user_env_value SECRET_KEY)"
+  if [[ -n "$current_secret_key" ]]; then
+    return
+  fi
+
+  secret_key="$(generate_secret_key)" || die "Unable to generate SECRET_KEY. Install openssl or configure SECRET_KEY in .env."
+  set_user_env_value SECRET_KEY "$secret_key"
+  log "Generated SECRET_KEY in $USER_ENV_FILE."
+}
+
+env_value() {
+  local key="$1"
+  awk -F= -v target="$key" '
+    /^[[:space:]]*#/ || !/=/{ next }
+    {
+      key = $1
+      gsub(/^[[:space:]]+|[[:space:]]+$/, "", key)
+      if (key == target) {
+        value = substr($0, index($0, "=") + 1)
+        gsub(/^[[:space:]]+|[[:space:]]+$/, "", value)
+        if ((value ~ /^".*"$/) || (value ~ /^'\''.*'\''$/)) {
+          value = substr(value, 2, length(value) - 2)
+        }
+        result = value
+      }
+    }
+    END { print result }
+  ' "$DEFAULT_ENV_FILE" "$USER_ENV_FILE"
+}
+
+user_overrides() {
+  local key="$1"
+  grep -Eq "^[[:space:]]*${key}[[:space:]]*=" "$USER_ENV_FILE"
+}
+
+write_merged_env() {
+  awk '
+    function trim(s) {
+      sub(/^[[:space:]]+/, "", s)
+      sub(/[[:space:]]+$/, "", s)
+      return s
+    }
+
+    /^[[:space:]]*#/ || !/=/{ next }
+
+    {
+      key = $0
+      sub(/=.*/, "", key)
+      key = trim(key)
+      if (key == "") {
+        next
+      }
+
+      value = substr($0, index($0, "=") + 1)
+      value = trim(value)
+
+      if (!(key in seen)) {
+        order[++count] = key
+        seen[key] = 1
+      }
+
+      values[key] = value
+    }
+
+    END {
+      for (i = 1; i <= count; i++) {
+        key = order[i]
+        print key "=" values[key]
+      }
+    }
+  ' "$DEFAULT_ENV_FILE" "$USER_ENV_FILE" >"$MERGED_ENV_FILE"
+}
+
+set_merged_env_value() {
+  local key="$1"
+  local value="$2"
+  local temp_file
+
+  temp_file="$(mktemp "${TMPDIR:-/tmp}/dify-compose-env.XXXXXX")"
+  awk -F= -v target="$key" -v replacement="$key=$value" '
+    BEGIN { replaced = 0 }
+    /^[[:space:]]*#/ || !/=/{ print; next }
+    {
+      key = $1
+      gsub(/^[[:space:]]+|[[:space:]]+$/, "", key)
+      if (key == target) {
+        if (!replaced) {
+          print replacement
+          replaced = 1
+        }
+        next
+      }
+      print
+    }
+    END {
+      if (!replaced) {
+        print replacement
+      }
+    }
+  ' "$MERGED_ENV_FILE" >"$temp_file"
+  mv "$temp_file" "$MERGED_ENV_FILE"
+}
+
+set_if_not_overridden() {
+  local key="$1"
+  local value="$2"
+
+  if user_overrides "$key"; then
+    return
+  fi
+
+  set_merged_env_value "$key" "$value"
+}
+
+metadata_db_host() {
+  case "$1" in
+    mysql) printf 'db_mysql' ;;
+    postgresql | '') printf 'db_postgres' ;;
+    *) printf '%s' "$(env_value DB_HOST)" ;;
+  esac
+}
+
+metadata_db_port() {
+  case "$1" in
+    mysql) printf '3306' ;;
+    postgresql | '') printf '5432' ;;
+    *) printf '%s' "$(env_value DB_PORT)" ;;
+  esac
+}
+
+metadata_db_user() {
+  case "$1" in
+    mysql) printf 'root' ;;
+    postgresql | '') printf 'postgres' ;;
+    *) printf '%s' "$(env_value DB_USERNAME)" ;;
+  esac
+}
+
+build_merged_env() {
+  MERGED_ENV_FILE="$(mktemp "${TMPDIR:-/tmp}/dify-compose.XXXXXX")"
+  trap 'rm -f "$MERGED_ENV_FILE"' EXIT
+
+  write_merged_env
+
+  local db_type
+  local redis_host
+  local redis_port
+  local redis_username
+  local redis_password
+  local redis_auth
+  local code_execution_api_key
+  local weaviate_api_key
+
+  db_type="$(env_value DB_TYPE)"
+
+  set_if_not_overridden DB_HOST "$(metadata_db_host "$db_type")"
+  set_if_not_overridden DB_PORT "$(metadata_db_port "$db_type")"
+  set_if_not_overridden DB_USERNAME "$(metadata_db_user "$db_type")"
+
+  if ! user_overrides CELERY_BROKER_URL; then
+    redis_host="$(env_value REDIS_HOST)"
+    redis_port="$(env_value REDIS_PORT)"
+    redis_username="$(env_value REDIS_USERNAME)"
+    redis_password="$(env_value REDIS_PASSWORD)"
+    redis_auth=""
+
+    if [[ -n "$redis_username" && -n "$redis_password" ]]; then
+      redis_auth="${redis_username}:${redis_password}@"
+    elif [[ -n "$redis_password" ]]; then
+      redis_auth=":${redis_password}@"
+    elif [[ -n "$redis_username" ]]; then
+      redis_auth="${redis_username}@"
+    fi
+
+    set_merged_env_value CELERY_BROKER_URL "redis://${redis_auth}${redis_host:-redis}:${redis_port:-6379}/1"
+  fi
+
+  if ! user_overrides SANDBOX_API_KEY; then
+    code_execution_api_key="$(env_value CODE_EXECUTION_API_KEY)"
+    set_if_not_overridden SANDBOX_API_KEY "${code_execution_api_key:-dify-sandbox}"
+  fi
+
+  if ! user_overrides WEAVIATE_AUTHENTICATION_APIKEY_ALLOWED_KEYS; then
+    weaviate_api_key="$(env_value WEAVIATE_API_KEY)"
+    set_if_not_overridden WEAVIATE_AUTHENTICATION_APIKEY_ALLOWED_KEYS \
+      "${weaviate_api_key:-WVF5YThaHlkYwhGUSmCRgsX3tD5ngdN8pkih}"
+  fi
+}
+
+main() {
+  detect_compose
+  ensure_env_files
+  ensure_secret_key
+  build_merged_env
+
+  if [[ "$#" -eq 0 ]]; then
+    set -- up -d
+  fi
+
+  "${COMPOSE_CMD[@]}" --env-file "$MERGED_ENV_FILE" "$@"
+}
+
+main "$@"

docker/dify-compose.ps1

@@ -0,0 +1,317 @@
+$ErrorActionPreference = "Stop"
+Set-StrictMode -Version Latest
+
+$ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
+Set-Location $ScriptDir
+
+$DefaultEnvFile = ".env.default"
+$UserEnvFile = ".env"
+$MergedEnvFile = $null
+$Utf8NoBom = New-Object System.Text.UTF8Encoding -ArgumentList $false
+
+function Write-Info {
+    param([string]$Message)
+    [Console]::Error.WriteLine($Message)
+}
+
+function Fail {
+    param([string]$Message)
+    [Console]::Error.WriteLine("Error: $Message")
+    exit 1
+}
+
+function Test-CommandSuccess {
+    param([string[]]$Command)
+
+    try {
+        $Executable = $Command[0]
+        $CommandArgs = @()
+        if ($Command.Length -gt 1) {
+            $CommandArgs = @($Command[1..($Command.Length - 1)])
+        }
+
+        & $Executable @CommandArgs *> $null
+        return $LASTEXITCODE -eq 0
+    }
+    catch {
+        return $false
+    }
+}
+
+function Get-ComposeCommand {
+    if (Test-CommandSuccess @("docker", "compose", "version")) {
+        return @("docker", "compose")
+    }
+
+    if ((Get-Command "docker-compose" -ErrorAction SilentlyContinue) -and (Test-CommandSuccess @("docker-compose", "version"))) {
+        return @("docker-compose")
+    }
+
+    Fail "Docker Compose is not available. Install Docker Compose, then run this command again."
+}
+
+function New-SecretKey {
+    $Bytes = New-Object byte[] 42
+    $Generator = [System.Security.Cryptography.RandomNumberGenerator]::Create()
+
+    try {
+        $Generator.GetBytes($Bytes)
+    }
+    finally {
+        $Generator.Dispose()
+    }
+
+    return [Convert]::ToBase64String($Bytes)
+}
+
+function Ensure-EnvFiles {
+    if (-not (Test-Path $DefaultEnvFile -PathType Leaf)) {
+        Fail "$DefaultEnvFile is missing."
+    }
+
+    if (Test-Path $UserEnvFile -PathType Leaf) {
+        return
+    }
+
+    New-Item -ItemType File -Path $UserEnvFile | Out-Null
+
+    if ([Console]::IsInputRedirected) {
+        Write-Info "Created $UserEnvFile for local overrides."
+        return
+    }
+
+    Write-Info "Created $UserEnvFile for local overrides."
+    $Answer = Read-Host "Do you need a custom deployment now? (Most users can press Enter to skip.) [y/N]"
+
+    if ($Answer -match "^(y|yes)$") {
+        Write-Output "Edit .env with the settings you want to override, using .env.example as the full reference."
+        Write-Output "Run .\dify-compose.ps1 up -d again when you are ready."
+        exit 0
+    }
+}
+
+function Read-EnvFile {
+    param([string]$Path)
+
+    $Values = [ordered]@{}
+
+    if (-not (Test-Path $Path -PathType Leaf)) {
+        return $Values
+    }
+
+    foreach ($Line in Get-Content -Path $Path) {
+        if ($Line -match "^\s*#" -or $Line -notmatch "=") {
+            continue
+        }
+
+        $SeparatorIndex = $Line.IndexOf("=")
+        $Key = $Line.Substring(0, $SeparatorIndex).Trim()
+        $Value = $Line.Substring($SeparatorIndex + 1).Trim()
+
+        if (($Value.StartsWith('"') -and $Value.EndsWith('"')) -or ($Value.StartsWith("'") -and $Value.EndsWith("'"))) {
+            $Value = $Value.Substring(1, $Value.Length - 2)
+        }
+
+        if ($Key.Length -gt 0) {
+            $Values[$Key] = $Value
+        }
+    }
+
+    return $Values
+}
+
+function Set-UserEnvValue {
+    param(
+        [string]$Key,
+        [string]$Value
+    )
+
+    $Path = [string](Resolve-Path $UserEnvFile)
+    $Lines = [System.IO.File]::ReadAllLines($Path, [System.Text.Encoding]::UTF8)
+    $Output = New-Object System.Collections.Generic.List[string]
+    $Replaced = $false
+
+    foreach ($Line in $Lines) {
+        if ($Line -match "^\s*#" -or $Line -notmatch "=") {
+            $Output.Add($Line)
+            continue
+        }
+
+        $SeparatorIndex = $Line.IndexOf("=")
+        $CurrentKey = $Line.Substring(0, $SeparatorIndex).Trim()
+
+        if ($CurrentKey -eq $Key) {
+            if (-not $Replaced) {
+                $Output.Add("$Key=$Value")
+                $Replaced = $true
+            }
+            continue
+        }
+
+        $Output.Add($Line)
+    }
+
+    if (-not $Replaced) {
+        $Output.Add("$Key=$Value")
+    }
+
+    [System.IO.File]::WriteAllLines($Path, $Output, $Utf8NoBom)
+}
+
+function Ensure-SecretKey {
+    $Values = Read-EnvFile $UserEnvFile
+
+    if ($Values.Contains("SECRET_KEY") -and $Values["SECRET_KEY"]) {
+        return
+    }
+
+    Set-UserEnvValue "SECRET_KEY" (New-SecretKey)
+    Write-Info "Generated SECRET_KEY in $UserEnvFile."
+}
+
+function Merge-EnvValues {
+    $Values = [ordered]@{}
+
+    foreach ($Entry in (Read-EnvFile $DefaultEnvFile).GetEnumerator()) {
+        $Values[$Entry.Key] = $Entry.Value
+    }
+
+    foreach ($Entry in (Read-EnvFile $UserEnvFile).GetEnumerator()) {
+        $Values[$Entry.Key] = $Entry.Value
+    }
+
+    return $Values
+}
+
+function User-Overrides {
+    param([string]$Key)
+
+    if (-not (Test-Path $UserEnvFile -PathType Leaf)) {
+        return $false
+    }
+
+    return [bool](Select-String -Path $UserEnvFile -Pattern "^\s*$([regex]::Escape($Key))\s*=" -Quiet)
+}
+
+function Metadata-DbHost {
+    param([string]$DbType, $Values)
+
+    switch ($DbType) {
+        "mysql" { return "db_mysql" }
+        "postgresql" { return "db_postgres" }
+        "" { return "db_postgres" }
+        default { return $Values["DB_HOST"] }
+    }
+}
+
+function Metadata-DbPort {
+    param([string]$DbType, $Values)
+
+    switch ($DbType) {
+        "mysql" { return "3306" }
+        "postgresql" { return "5432" }
+        "" { return "5432" }
+        default { return $Values["DB_PORT"] }
+    }
+}
+
+function Metadata-DbUser {
+    param([string]$DbType, $Values)
+
+    switch ($DbType) {
+        "mysql" { return "root" }
+        "postgresql" { return "postgres" }
+        "" { return "postgres" }
+        default { return $Values["DB_USERNAME"] }
+    }
+}
+
+function Write-MergedEnv {
+    param($Values)
+
+    $Output = New-Object System.Collections.Generic.List[string]
+
+    foreach ($Entry in $Values.GetEnumerator()) {
+        $Output.Add("$($Entry.Key)=$($Entry.Value)")
+    }
+
+    [System.IO.File]::WriteAllLines($MergedEnvFile, $Output, $Utf8NoBom)
+}
+
+function Build-MergedEnv {
+    $Values = Merge-EnvValues
+    $script:MergedEnvFile = [System.IO.Path]::GetTempFileName()
+
+    $DbType = if ($Values.Contains("DB_TYPE")) { $Values["DB_TYPE"] } else { "postgresql" }
+
+    if (-not (User-Overrides "DB_HOST")) {
+        $Values["DB_HOST"] = Metadata-DbHost $DbType $Values
+    }
+
+    if (-not (User-Overrides "DB_PORT")) {
+        $Values["DB_PORT"] = Metadata-DbPort $DbType $Values
+    }
+
+    if (-not (User-Overrides "DB_USERNAME")) {
+        $Values["DB_USERNAME"] = Metadata-DbUser $DbType $Values
+    }
+
+    if (-not (User-Overrides "CELERY_BROKER_URL")) {
+        $RedisHost = if ($Values.Contains("REDIS_HOST") -and $Values["REDIS_HOST"]) { $Values["REDIS_HOST"] } else { "redis" }
+        $RedisPort = if ($Values.Contains("REDIS_PORT") -and $Values["REDIS_PORT"]) { $Values["REDIS_PORT"] } else { "6379" }
+        $RedisUsername = if ($Values.Contains("REDIS_USERNAME")) { $Values["REDIS_USERNAME"] } else { "" }
+        $RedisPassword = if ($Values.Contains("REDIS_PASSWORD")) { $Values["REDIS_PASSWORD"] } else { "" }
+        $RedisAuth = ""
+
+        if ($RedisUsername -and $RedisPassword) {
+            $RedisAuth = "${RedisUsername}:${RedisPassword}@"
+        }
+        elseif ($RedisPassword) {
+            $RedisAuth = ":${RedisPassword}@"
+        }
+        elseif ($RedisUsername) {
+            $RedisAuth = "${RedisUsername}@"
+        }
+
+        $Values["CELERY_BROKER_URL"] = "redis://$RedisAuth${RedisHost}:${RedisPort}/1"
+    }
+
+    if (-not (User-Overrides "SANDBOX_API_KEY")) {
+        $CodeExecutionApiKey = if ($Values.Contains("CODE_EXECUTION_API_KEY") -and $Values["CODE_EXECUTION_API_KEY"]) { $Values["CODE_EXECUTION_API_KEY"] } else { "dify-sandbox" }
+        $Values["SANDBOX_API_KEY"] = $CodeExecutionApiKey
+    }
+
+    if (-not (User-Overrides "WEAVIATE_AUTHENTICATION_APIKEY_ALLOWED_KEYS")) {
+        $WeaviateApiKey = if ($Values.Contains("WEAVIATE_API_KEY") -and $Values["WEAVIATE_API_KEY"]) { $Values["WEAVIATE_API_KEY"] } else { "WVF5YThaHlkYwhGUSmCRgsX3tD5ngdN8pkih" }
+        $Values["WEAVIATE_AUTHENTICATION_APIKEY_ALLOWED_KEYS"] = $WeaviateApiKey
+    }
+
+    Write-MergedEnv $Values
+}
+
+$ComposeCommand = Get-ComposeCommand
+
+try {
+    Ensure-EnvFiles
+    Ensure-SecretKey
+    Build-MergedEnv
+
+    $ComposeArgs = @($args)
+    if ($ComposeArgs.Count -eq 0) {
+        $ComposeArgs = @("up", "-d")
+    }
+
+    $ComposeCommandArgs = @()
+    if ($ComposeCommand.Length -gt 1) {
+        $ComposeCommandArgs = @($ComposeCommand[1..($ComposeCommand.Length - 1)])
+    }
+
+    $ComposeExecutable = $ComposeCommand[0]
+    & $ComposeExecutable @ComposeCommandArgs --env-file $MergedEnvFile @ComposeArgs
+    exit $LASTEXITCODE
+}
+finally {
+    if ($MergedEnvFile -and (Test-Path $MergedEnvFile -PathType Leaf)) {
+        Remove-Item -Force $MergedEnvFile
+    }
+}

docker/dify-env-sync.py

@@ -4,7 +4,7 @@
 # Dify Environment Variables Synchronization Script
 #
 # Features:
-# - Synchronize latest settings from .env.all to .env
+# - Synchronize latest settings from .env.example to .env
 # - Preserve custom settings in existing .env
 # - Add new environment variables
 # - Detect removed environment variables
@@ -93,25 +93,25 @@ def parse_env_file(path: Path) -> dict[str, str]:
 
 
 def check_files(work_dir: Path) -> None:
-    """Verify required files exist; create .env from .env.all if absent.
+    """Verify required files exist; create .env from .env.example if absent.
 
     Args:
-        work_dir: Directory that must contain .env.all (and optionally .env).
+        work_dir: Directory that must contain .env.example (and optionally .env).
 
     Raises:
-        SystemExit: If .env.all does not exist.
+        SystemExit: If .env.example does not exist.
     """
     log_info("Checking required files...")
 
-    example_file = work_dir / ".env.all"
+    example_file = work_dir / ".env.example"
     env_file = work_dir / ".env"
 
     if not example_file.exists():
-        log_error(".env.all file not found")
+        log_error(".env.example file not found")
         sys.exit(1)
 
     if not env_file.exists():
-        log_warning(".env file does not exist. Creating from .env.all.")
+        log_warning(".env file does not exist. Creating from .env.example.")
         shutil.copy2(example_file, env_file)
         log_success(".env file created")
 
@@ -147,7 +147,7 @@ def analyze_value_change(current: str, recommended: str) -> str | None:
 
     Args:
         current: Value currently set in .env.
-        recommended: Value present in .env.all.
+        recommended: Value present in .env.example.
 
     Returns:
         A human-readable description string, or None when no analysis applies.
@@ -199,20 +199,20 @@ def analyze_value_change(current: str, recommended: str) -> str | None:
 
 
 def detect_differences(env_vars: dict[str, str], example_vars: dict[str, str]) -> dict[str, tuple[str, str]]:
-    """Find variables whose values differ between .env and .env.all.
+    """Find variables whose values differ between .env and .env.example.
 
     Only variables present in *both* files are compared; new or removed
     variables are handled by separate functions.
 
     Args:
         env_vars: Parsed key/value pairs from .env.
-        example_vars: Parsed key/value pairs from .env.all.
+        example_vars: Parsed key/value pairs from .env.example.
 
     Returns:
         Mapping of key -> (env_value, example_value) for every key whose
         values differ.
     """
-    log_info("Detecting differences between .env and .env.all...")
+    log_info("Detecting differences between .env and .env.example...")
 
     diffs: dict[str, tuple[str, str]] = {}
     for key, example_value in example_vars.items():
@@ -248,11 +248,11 @@ def show_differences_detail(diffs: dict[str, tuple[str, str]]) -> None:
         if use_colors:
             print(f"{YELLOW}[{count}] {key}{NC}")
             print(f"  {GREEN}.env (current){NC}             : {env_value}")
-            print(f"  {BLUE}.env.all (recommended){NC} : {example_value}")
+            print(f"  {BLUE}.env.example (recommended){NC} : {example_value}")
         else:
             print(f"[{count}] {key}")
             print(f"  .env (current)             : {env_value}")
-            print(f"  .env.all (recommended) : {example_value}")
+            print(f"  .env.example (recommended) : {example_value}")
 
         analysis = analyze_value_change(env_value, example_value)
         if analysis:
@@ -266,21 +266,21 @@ def show_differences_detail(diffs: dict[str, tuple[str, str]]) -> None:
 
 
 def detect_removed_variables(env_vars: dict[str, str], example_vars: dict[str, str]) -> list[str]:
-    """Identify variables present in .env but absent from .env.all.
+    """Identify variables present in .env but absent from .env.example.
 
     Args:
         env_vars: Parsed key/value pairs from .env.
-        example_vars: Parsed key/value pairs from .env.all.
+        example_vars: Parsed key/value pairs from .env.example.
 
     Returns:
-        Sorted list of variable names that no longer appear in .env.all.
+        Sorted list of variable names that no longer appear in .env.example.
     """
     log_info("Detecting removed environment variables...")
 
     removed = sorted(set(env_vars) - set(example_vars))
 
     if removed:
-        log_warning("The following environment variables have been removed from .env.all:")
+        log_warning("The following environment variables have been removed from .env.example:")
         for var in removed:
             log_warning(f"  - {var}")
         log_warning("Consider manually removing these variables from .env")
@@ -291,22 +291,22 @@ def detect_removed_variables(env_vars: dict[str, str], example_vars: dict[str, s
 
 
 def sync_env_file(work_dir: Path, env_vars: dict[str, str], diffs: dict[str, tuple[str, str]]) -> None:
-    """Rewrite .env based on .env.all while preserving custom values.
+    """Rewrite .env based on .env.example while preserving custom values.
 
-    The output file follows the exact line structure of .env.all
+    The output file follows the exact line structure of .env.example
     (preserving comments, blank lines, and ordering).  For every variable
     that exists in .env with a different value from the example, the
-    current .env value is kept.  Variables that are new in .env.all
+    current .env value is kept.  Variables that are new in .env.example
     (not present in .env at all) are added with the example's default.
 
     Args:
-        work_dir: Directory containing .env and .env.all.
+        work_dir: Directory containing .env and .env.example.
         env_vars: Parsed key/value pairs from the original .env.
-        diffs: Keys whose .env values differ from .env.all (to preserve).
+        diffs: Keys whose .env values differ from .env.example (to preserve).
     """
     log_info("Starting partial synchronization of .env file...")
 
-    example_file = work_dir / ".env.all"
+    example_file = work_dir / ".env.example"
     new_env_file = work_dir / ".env.new"
 
     # Keys whose current .env value should override the example default
@@ -350,24 +350,24 @@ def sync_env_file(work_dir: Path, env_vars: dict[str, str], diffs: dict[str, tup
     log_success("Successfully created new .env file")
     log_success("Partial synchronization of .env file completed")
     log_info(f"  Preserved .env values: {preserved_count}")
-    log_info(f"  Updated to .env.all values: {updated_count}")
+    log_info(f"  Updated to .env.example values: {updated_count}")
 
 
 def show_statistics(work_dir: Path) -> None:
     """Print a summary of variable counts from both env files.
 
     Args:
-        work_dir: Directory containing .env and .env.all.
+        work_dir: Directory containing .env and .env.example.
     """
     log_info("Synchronization statistics:")
 
-    example_file = work_dir / ".env.all"
+    example_file = work_dir / ".env.example"
     env_file = work_dir / ".env"
 
     example_count = len(parse_env_file(example_file)) if example_file.exists() else 0
     env_count = len(parse_env_file(env_file)) if env_file.exists() else 0
 
-    log_info(f"  .env.all environment variables: {example_count}")
+    log_info(f"  .env.example environment variables: {example_count}")
     log_info(f"  .env environment variables: {env_count}")
 
 
@@ -380,7 +380,7 @@ def build_arg_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(
         prog="dify-env-sync",
         description=(
-            "Synchronize .env with .env.all: add new variables, "
+            "Synchronize .env with .env.example: add new variables, "
             "preserve custom values, and report removed variables."
         ),
         formatter_class=argparse.RawDescriptionHelpFormatter,
@@ -396,7 +396,7 @@ def build_arg_parser() -> argparse.ArgumentParser:
         "--dir",
         metavar="DIRECTORY",
         default=".",
-        help="Working directory containing .env and .env.all (default: current directory)",
+        help="Working directory containing .env and .env.example (default: current directory)",
     )
     parser.add_argument(
         "--no-backup",
@@ -427,7 +427,7 @@ def main() -> None:
 
     # 3. Parse both files
     env_vars = parse_env_file(work_dir / ".env")
-    example_vars = parse_env_file(work_dir / ".env.all")
+    example_vars = parse_env_file(work_dir / ".env.example")
 
     # 4. Report differences (values that changed in the example)
     diffs = detect_differences(env_vars, example_vars)

docker/dify-env-sync.sh

@@ -4,7 +4,7 @@
 # Dify Environment Variables Synchronization Script
 #
 # Features:
-# - Synchronize latest settings from .env.all to .env
+# - Synchronize latest settings from .env.example to .env
 # - Preserve custom settings in existing .env
 # - Add new environment variables
 # - Detect removed environment variables
@@ -61,18 +61,18 @@ log_error() {
 }
 
 # Check for required files and create .env if missing
-# Verifies that .env.all exists and creates .env from template if needed
+# Verifies that .env.example exists and creates .env from template if needed
 check_files() {
     log_info "Checking required files..."
 
-    if [[ ! -f ".env.all" ]]; then
-        log_error ".env.all file not found"
+    if [[ ! -f ".env.example" ]]; then
+        log_error ".env.example file not found"
         exit 1
     fi
 
     if [[ ! -f ".env" ]]; then
-        log_warning ".env file does not exist. Creating from .env.all."
-        cp ".env.all" ".env"
+        log_warning ".env file does not exist. Creating from .env.example."
+        cp ".env.example" ".env"
         log_success ".env file created"
     fi
 
@@ -98,9 +98,9 @@ create_backup() {
     fi
 }
 
-# Detect differences between .env and .env.all (optimized for large files)
+# Detect differences between .env and .env.example (optimized for large files)
 detect_differences() {
-    log_info "Detecting differences between .env and .env.all..."
+    log_info "Detecting differences between .env and .env.example..."
 
     # Create secure temporary directory
     local temp_dir=$(mktemp -d)
@@ -140,7 +140,7 @@ detect_differences() {
         }
     }
     END { print diff_count }
-    ' .env .env.all)
+    ' .env .env.example)
 
     if [[ $diff_count -gt 0 ]]; then
         log_success "Detected differences in $diff_count environment variables"
@@ -201,7 +201,7 @@ show_differences_detail() {
         echo ""
         echo -e "${YELLOW}[$count] $key${NC}"
         echo -e "  ${GREEN}.env (current)${NC}      : ${env_value}"
-        echo -e "  ${BLUE}.env.all (recommended)${NC}: ${example_value}"
+        echo -e "  ${BLUE}.env.example (recommended)${NC}: ${example_value}"
 
         # Analyze value changes
         analyze_value_change "$env_value" "$example_value"
@@ -261,8 +261,8 @@ analyze_value_change() {
     fi
 }
 
-# Synchronize .env file with .env.all while preserving custom values
-# Creates a new .env file based on .env.all structure, preserving existing custom values
+# Synchronize .env file with .env.example while preserving custom values
+# Creates a new .env file based on .env.example structure, preserving existing custom values
 # Global variables used: DIFF_FILE, TEMP_DIR
 sync_env_file() {
     log_info "Starting partial synchronization of .env file..."
@@ -281,7 +281,7 @@ sync_env_file() {
     fi
 
     # Use AWK for efficient processing (much faster than bash loop for large files)
-    log_info "Processing $(wc -l < .env.all) lines with AWK..."
+    log_info "Processing $(wc -l < .env.example) lines with AWK..."
 
     local preserved_keys_file="${TEMP_DIR}/preserved_keys"
     local awk_preserved_count_file="${TEMP_DIR}/awk_preserved_count"
@@ -332,7 +332,7 @@ sync_env_file() {
         print preserved_count > preserved_count_file
         print updated_count > updated_count_file
     }
-    ' .env.all > "$new_env_file"
+    ' .env.example > "$new_env_file"
 
     # Read counters and preserved keys
     if [[ -f "$awk_preserved_count_file" ]]; then
@@ -372,7 +372,7 @@ sync_env_file() {
 
     log_success "Partial synchronization of .env file completed"
     log_info "  Preserved .env values: $preserved_count"
-    log_info "  Updated to .env.all values: $updated_count"
+    log_info "  Updated to .env.example values: $updated_count"
 }
 
 # Detect removed environment variables
@@ -394,8 +394,8 @@ detect_removed_variables() {
         cleanup_temp_dir="$temp_dir"
     fi
 
-    # Get keys from .env.all and .env, sorted for comm
-    awk -F= '!/^[[:space:]]*#/ && /=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $1); print $1}' .env.all | sort > "$temp_example_keys"
+    # Get keys from .env.example and .env, sorted for comm
+    awk -F= '!/^[[:space:]]*#/ && /=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $1); print $1}' .env.example | sort > "$temp_example_keys"
     awk -F= '!/^[[:space:]]*#/ && /=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $1); print $1}' .env | sort > "$temp_current_keys"
 
     # Get keys from existing .env and check for removals
@@ -410,7 +410,7 @@ detect_removed_variables() {
     fi
 
     if [[ ${#removed_vars[@]} -gt 0 ]]; then
-        log_warning "The following environment variables have been removed from .env.all:"
+        log_warning "The following environment variables have been removed from .env.example:"
         for var in "${removed_vars[@]}"; do
             log_warning "  - $var"
         done
@@ -424,10 +424,10 @@ detect_removed_variables() {
 show_statistics() {
     log_info "Synchronization statistics:"
 
-    local total_example=$(grep -c "^[^#]*=" .env.all 2>/dev/null || echo "0")
+    local total_example=$(grep -c "^[^#]*=" .env.example 2>/dev/null || echo "0")
     local total_env=$(grep -c "^[^#]*=" .env 2>/dev/null || echo "0")
 
-    log_info "  .env.all environment variables: $total_example"
+    log_info "  .env.example environment variables: $total_example"
     log_info "  .env environment variables: $total_env"
 }
 

docker/docker-compose.yaml

@@ -1,6 +1,6 @@
 # ==================================================================
 # WARNING: This file is auto-generated by generate_docker_compose
-# Do not modify this file directly. Instead, update the .env.all
+# Do not modify this file directly. Instead, update the .env.example
 # or docker-compose-template.yaml and regenerate this file.
 # ==================================================================
 
@@ -27,7 +27,7 @@ x-shared-env: &shared-api-worker-env
   DEBUG: ${DEBUG:-false}
   FLASK_DEBUG: ${FLASK_DEBUG:-false}
   ENABLE_REQUEST_LOGGING: ${ENABLE_REQUEST_LOGGING:-False}
-  SECRET_KEY: ${SECRET_KEY:?SECRET_KEY must be set. Run ./init-env.sh, or .\\init-env.ps1 on Windows, to generate one in .env.}
+  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}

docker/generate_docker_compose

@@ -18,9 +18,9 @@ SHARED_ENV_EXCLUDE = frozenset(
 )
 
 
-def parse_env_all(file_path):
+def parse_env_example(file_path):
     """
-    Parses the .env.all file and returns a dictionary with variable names as keys and default values as values.
+    Parses the .env.example file and returns a dictionary with variable names as keys and default values as values.
     """
     env_vars = {}
     with open(file_path, "r", encoding="utf-8") as f:
@@ -53,11 +53,6 @@ def generate_shared_env_block(env_vars, anchor_name="shared-api-worker-env"):
     for key, default in env_vars.items():
         if key in SHARED_ENV_EXCLUDE:
             continue
-        if key == "SECRET_KEY":
-            lines.append(
-                "  SECRET_KEY: ${SECRET_KEY:?SECRET_KEY must be set. Run ./init-env.sh, or .\\\\init-env.ps1 on Windows, to generate one in .env.}"
-            )
-            continue
         # If default value is empty, use ${KEY:-}
         if default == "":
             lines.append(f"  {key}: ${{{key}:-}}")
@@ -95,7 +90,7 @@ def insert_shared_env(template_path, output_path, shared_env_block, header_comme
 
 
 def main():
-    env_all_path = ".env.all"
+    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
@@ -104,22 +99,22 @@ def main():
     header_comments = (
         "# ==================================================================\n"
         "# WARNING: This file is auto-generated by generate_docker_compose\n"
-        "# Do not modify this file directly. Instead, update the .env.all\n"
+        "# Do not modify this file directly. Instead, update the .env.example\n"
         "# or docker-compose-template.yaml and regenerate this file.\n"
         "# ==================================================================\n"
     )
 
     # Check if required files exist
-    for path in [env_all_path, template_path]:
+    for path in [env_example_path, template_path]:
         if not os.path.isfile(path):
             print(f"Error: File {path} does not exist.")
             sys.exit(1)
 
-    # Parse .env.all file
-    env_vars = parse_env_all(env_all_path)
+    # Parse .env.example file
+    env_vars = parse_env_example(env_example_path)
 
     if not env_vars:
-        print("Warning: No environment variables found in .env.all.")
+        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)

docker/init-env.ps1

@@ -1,101 +0,0 @@
-$ErrorActionPreference = "Stop"
-
-$ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
-Set-Location $ScriptDir
-
-$EnvExampleFile = ".env.example"
-$EnvFile = ".env"
-
-function New-SecretKey {
-    $bytes = New-Object byte[] 42
-    [System.Security.Cryptography.RandomNumberGenerator]::Fill($bytes)
-    [Convert]::ToBase64String($bytes)
-}
-
-function Get-EnvValue {
-    param([string]$Key)
-
-    if (-not (Test-Path $EnvFile)) {
-        return ""
-    }
-
-    $result = ""
-    foreach ($line in Get-Content $EnvFile) {
-        if ($line -match "^\s*#" -or $line -notmatch "=") {
-            continue
-        }
-
-        $parts = $line.Split("=", 2)
-        if ($parts[0].Trim() -eq $Key) {
-            $value = $parts[1].Trim()
-            if (($value.StartsWith('"') -and $value.EndsWith('"')) -or ($value.StartsWith("'") -and $value.EndsWith("'"))) {
-                $value = $value.Substring(1, $value.Length - 2)
-            }
-            $result = $value
-        }
-    }
-
-    $result
-}
-
-function Set-EnvValue {
-    param(
-        [string]$Key,
-        [string]$Value
-    )
-
-    $output = New-Object System.Collections.Generic.List[string]
-    $replaced = $false
-
-    if (Test-Path $EnvFile) {
-        foreach ($line in Get-Content $EnvFile) {
-            if ($line -match "^\s*#" -or $line -notmatch "=") {
-                $output.Add($line)
-                continue
-            }
-
-            $parts = $line.Split("=", 2)
-            if ($parts[0].Trim() -eq $Key) {
-                if (-not $replaced) {
-                    $output.Add("$Key=$Value")
-                    $replaced = $true
-                }
-                continue
-            }
-
-            $output.Add($line)
-        }
-    }
-
-    if (-not $replaced) {
-        $output.Add("$Key=$Value")
-    }
-
-    $fullPath = Join-Path $ScriptDir $EnvFile
-    $utf8NoBom = New-Object System.Text.UTF8Encoding $false
-    [System.IO.File]::WriteAllLines($fullPath, [string[]]$output, $utf8NoBom)
-}
-
-if (Test-Path $EnvFile) {
-    Write-Output "Using existing $EnvFile."
-}
-else {
-    if (-not (Test-Path $EnvExampleFile)) {
-        Write-Error "$EnvExampleFile is missing."
-        exit 1
-    }
-
-    Copy-Item $EnvExampleFile $EnvFile
-    Write-Output "Created $EnvFile from $EnvExampleFile."
-}
-
-$currentSecretKey = Get-EnvValue "SECRET_KEY"
-if ($currentSecretKey) {
-    Write-Output "SECRET_KEY already exists in $EnvFile."
-}
-else {
-    Set-EnvValue "SECRET_KEY" (New-SecretKey)
-    Write-Output "Generated SECRET_KEY in $EnvFile."
-}
-
-Write-Output "Environment is ready. Run docker compose up -d to start Dify."

docker/init-env.sh

@@ -1,117 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-cd "$SCRIPT_DIR"
-
-ENV_EXAMPLE_FILE=".env.example"
-ENV_FILE=".env"
-
-log() {
-  printf '%s\n' "$*"
-}
-
-die() {
-  printf 'Error: %s\n' "$*" >&2
-  exit 1
-}
-
-generate_secret_key() {
-  if command -v openssl >/dev/null 2>&1; then
-    openssl rand -base64 42
-    return
-  fi
-
-  if command -v dd >/dev/null 2>&1 && command -v base64 >/dev/null 2>&1; then
-    dd if=/dev/urandom bs=42 count=1 2>/dev/null | base64 | tr -d '\n'
-    printf '\n'
-    return
-  fi
-
-  return 1
-}
-
-env_value() {
-  local key="$1"
-  awk -F= -v target="$key" '
-    /^[[:space:]]*#/ || !/=/{ next }
-    {
-      key = $1
-      gsub(/^[[:space:]]+|[[:space:]]+$/, "", key)
-      if (key == target) {
-        value = substr($0, index($0, "=") + 1)
-        gsub(/^[[:space:]]+|[[:space:]]+$/, "", value)
-        if ((value ~ /^".*"$/) || (value ~ /^'\''.*'\''$/)) {
-          value = substr(value, 2, length(value) - 2)
-        }
-        result = value
-      }
-    }
-    END { print result }
-  ' "$ENV_FILE"
-}
-
-set_env_value() {
-  local key="$1"
-  local value="$2"
-  local temp_file
-
-  temp_file="$(mktemp "${TMPDIR:-/tmp}/dify-env.XXXXXX")"
-  if awk -F= -v target="$key" -v replacement="$key=$value" '
-    BEGIN { replaced = 0 }
-    /^[[:space:]]*#/ || !/=/{ print; next }
-    {
-      key = $1
-      gsub(/^[[:space:]]+|[[:space:]]+$/, "", key)
-      if (key == target) {
-        if (!replaced) {
-          print replacement
-          replaced = 1
-        }
-        next
-      }
-      print
-    }
-    END {
-      if (!replaced) {
-        print replacement
-      }
-    }
-  ' "$ENV_FILE" >"$temp_file"; then
-    mv "$temp_file" "$ENV_FILE"
-  else
-    rm -f "$temp_file"
-    return 1
-  fi
-}
-
-ensure_env_file() {
-  if [[ -f "$ENV_FILE" ]]; then
-    log "Using existing $ENV_FILE."
-    return
-  fi
-
-  [[ -f "$ENV_EXAMPLE_FILE" ]] || die "$ENV_EXAMPLE_FILE is missing."
-  cp "$ENV_EXAMPLE_FILE" "$ENV_FILE"
-  log "Created $ENV_FILE from $ENV_EXAMPLE_FILE."
-}
-
-ensure_secret_key() {
-  local current_secret_key
-  local secret_key
-
-  current_secret_key="$(env_value SECRET_KEY)"
-  if [[ -n "$current_secret_key" ]]; then
-    log "SECRET_KEY already exists in $ENV_FILE."
-    return
-  fi
-
-  secret_key="$(generate_secret_key)" || die "Unable to generate SECRET_KEY. Install openssl or set SECRET_KEY in $ENV_FILE."
-  set_env_value SECRET_KEY "$secret_key"
-  log "Generated SECRET_KEY in $ENV_FILE."
-}
-
-ensure_env_file
-ensure_secret_key
-log "Environment is ready. Run docker compose up -d to start Dify."

eslint-suppressions.json

@@ -202,11 +202,6 @@
       "count": 1
     }
   },
-  "web/app/components/app/annotation/add-annotation-modal/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/app/annotation/batch-add-annotation-modal/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
@@ -235,11 +230,6 @@
       "count": 1
     }
   },
-  "web/app/components/app/annotation/edit-annotation-modal/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/app/annotation/header-opts/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
@@ -262,9 +252,6 @@
     "erasable-syntax-only/enums": {
       "count": 1
     },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react/set-state-in-effect": {
       "count": 5
     },
@@ -282,6 +269,11 @@
       "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
@@ -352,9 +344,6 @@
     }
   },
   "web/app/components/app/configuration/config/agent/agent-tools/setting-built-in-tool.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react-hooks/exhaustive-deps": {
       "count": 1
     },
@@ -412,16 +401,6 @@
       "count": 2
     }
   },
-  "web/app/components/app/configuration/configuration-view.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/app/configuration/dataset-config/card-item/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/app/configuration/dataset-config/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
@@ -552,9 +531,6 @@
     }
   },
   "web/app/components/app/log/list.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react/set-state-in-effect": {
       "count": 6
     },
@@ -604,9 +580,6 @@
     }
   },
   "web/app/components/app/workflow-log/list.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react/set-state-in-effect": {
       "count": 2
     }
@@ -931,11 +904,6 @@
       "count": 1
     }
   },
-  "web/app/components/base/drawer-plus/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/base/emoji-picker/index.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -1061,11 +1029,6 @@
       "count": 3
     }
   },
-  "web/app/components/base/float-right-container/index.tsx": {
-    "no-restricted-imports": {
-      "count": 2
-    }
-  },
   "web/app/components/base/form/components/base/base-form.tsx": {
     "ts/no-explicit-any": {
       "count": 6
@@ -1270,7 +1233,7 @@
   },
   "web/app/components/base/icons/src/vender/line/development/index.ts": {
     "no-barrel-files/no-barrel-files": {
-      "count": 1
+      "count": 2
     }
   },
   "web/app/components/base/icons/src/vender/line/editor/index.ts": {
@@ -2181,6 +2144,14 @@
       "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/completed/common/chunk-content.tsx": {
     "react/set-state-in-effect": {
       "count": 1
@@ -2191,6 +2162,11 @@
       "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
@@ -2255,6 +2231,14 @@
       "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
@@ -2296,9 +2280,6 @@
     }
   },
   "web/app/components/datasets/hit-testing/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react/unsupported-syntax": {
       "count": 1
     }
@@ -2338,7 +2319,7 @@
   },
   "web/app/components/datasets/metadata/metadata-dataset/dataset-metadata-drawer.tsx": {
     "no-restricted-imports": {
-      "count": 3
+      "count": 2
     }
   },
   "web/app/components/datasets/metadata/metadata-dataset/select-metadata-modal.tsx": {
@@ -2832,18 +2813,10 @@
     }
   },
   "web/app/components/plugins/plugin-detail-panel/endpoint-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 7
     }
   },
-  "web/app/components/plugins/plugin-detail-panel/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/plugins/plugin-detail-panel/model-list.tsx": {
     "ts/no-explicit-any": {
       "count": 1
@@ -2865,9 +2838,6 @@
     }
   },
   "web/app/components/plugins/plugin-detail-panel/strategy-detail.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 2
     }
@@ -2926,9 +2896,6 @@
     }
   },
   "web/app/components/plugins/plugin-detail-panel/trigger/event-detail-drawer.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 5
     }
@@ -2966,6 +2933,16 @@
       "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
@@ -3193,7 +3170,7 @@
   },
   "web/app/components/tools/edit-custom-collection-modal/config-credentials.tsx": {
     "no-restricted-imports": {
-      "count": 2
+      "count": 1
     }
   },
   "web/app/components/tools/edit-custom-collection-modal/get-schema.tsx": {
@@ -3202,9 +3179,6 @@
     }
   },
   "web/app/components/tools/edit-custom-collection-modal/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react/set-state-in-effect": {
       "count": 4
     },
@@ -3213,9 +3187,6 @@
     }
   },
   "web/app/components/tools/edit-custom-collection-modal/test-api.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -3225,11 +3196,6 @@
       "count": 1
     }
   },
-  "web/app/components/tools/mcp/detail/provider-detail.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/tools/mcp/mcp-server-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -3258,20 +3224,12 @@
       "count": 1
     }
   },
-  "web/app/components/tools/provider/detail.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/tools/provider/empty.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
   "web/app/components/tools/setting/build-in/config-credentials.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 3
     }
@@ -4103,11 +4061,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/knowledge-retrieval/components/dataset-item.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-item.tsx": {
     "ts/no-explicit-any": {
       "count": 1

packages/contracts/generated/enterprise/orpc.gen.ts

@@ -36,6 +36,7 @@ import {
   zEnterpriseAppDeployConsoleListAppInstancesQuery,
   zEnterpriseAppDeployConsoleListAppInstancesResponse,
   zEnterpriseAppDeployConsoleListDeploymentBindingOptionsPath,
+  zEnterpriseAppDeployConsoleListDeploymentBindingOptionsQuery,
   zEnterpriseAppDeployConsoleListDeploymentBindingOptionsResponse,
   zEnterpriseAppDeployConsoleListDeploymentEnvironmentOptionsResponse,
   zEnterpriseAppDeployConsoleListReleasesPath,
@@ -46,6 +47,8 @@ import {
   zEnterpriseAppDeployConsolePreviewReleaseBody,
   zEnterpriseAppDeployConsolePreviewReleasePath,
   zEnterpriseAppDeployConsolePreviewReleaseResponse,
+  zEnterpriseAppDeployConsoleRevealDeveloperApiKeyPath,
+  zEnterpriseAppDeployConsoleRevealDeveloperApiKeyResponse,
   zEnterpriseAppDeployConsoleSearchAccessSubjectsPath,
   zEnterpriseAppDeployConsoleSearchAccessSubjectsQuery,
   zEnterpriseAppDeployConsoleSearchAccessSubjectsResponse,
@@ -197,6 +200,17 @@ export const deleteDeveloperApiKey = oc
   .input(z.object({ params: zEnterpriseAppDeployConsoleDeleteDeveloperApiKeyPath }))
   .output(zEnterpriseAppDeployConsoleDeleteDeveloperApiKeyResponse)
 
+export const revealDeveloperApiKey = oc
+  .route({
+    inputStructure: 'detailed',
+    method: 'POST',
+    operationId: 'EnterpriseAppDeployConsole_RevealDeveloperApiKey',
+    path: '/enterprise/app-instances/{appInstanceId}/api-keys/{apiKeyId}:reveal',
+    tags: ['EnterpriseAppDeployConsole'],
+  })
+  .input(z.object({ params: zEnterpriseAppDeployConsoleRevealDeveloperApiKeyPath }))
+  .output(zEnterpriseAppDeployConsoleRevealDeveloperApiKeyResponse)
+
 export const listDeploymentBindingOptions = oc
   .route({
     inputStructure: 'detailed',
@@ -205,7 +219,12 @@ export const listDeploymentBindingOptions = oc
     path: '/enterprise/app-instances/{appInstanceId}/deployment-binding-options',
     tags: ['EnterpriseAppDeployConsole'],
   })
-  .input(z.object({ params: zEnterpriseAppDeployConsoleListDeploymentBindingOptionsPath }))
+  .input(
+    z.object({
+      params: zEnterpriseAppDeployConsoleListDeploymentBindingOptionsPath,
+      query: zEnterpriseAppDeployConsoleListDeploymentBindingOptionsQuery.optional(),
+    }),
+  )
   .output(zEnterpriseAppDeployConsoleListDeploymentBindingOptionsResponse)
 
 export const createDeployment = oc
@@ -390,7 +409,7 @@ export const listDeploymentEnvironmentOptions = oc
   })
   .output(zEnterpriseAppDeployConsoleListDeploymentEnvironmentOptionsResponse)
 
-export const enterpriseAppDeployConsole = {
+export const appDeploy = {
   listAppInstances,
   createAppInstance,
   deleteAppInstance,
@@ -400,6 +419,7 @@ export const enterpriseAppDeployConsole = {
   searchAccessSubjects,
   createDeveloperApiKey,
   deleteDeveloperApiKey,
+  revealDeveloperApiKey,
   listDeploymentBindingOptions,
   createDeployment,
   updateDeveloperApi,
@@ -528,7 +548,7 @@ export const webAppAuth = {
 }
 
 export const contract = {
-  enterpriseAppDeployConsole,
+  appDeploy,
   consoleSso,
   webAppAuth,
 }

packages/contracts/generated/enterprise/types.gen.ts

@@ -29,6 +29,7 @@ export type AccessStatus = {
   cliUrl?: string
   developerApiEnabled?: boolean
   apiKeyCount?: number
+  apiUrl?: string
 }
 
 export type AccessSubject = {
@@ -92,6 +93,10 @@ export type AppInstanceBasicInfo = {
   sourceAppName?: string
   mode?: string
   createdAt?: string
+  sourceAppAvailable?: boolean
+  canCreateRelease?: boolean
+  icon?: string
+  iconBackground?: string
 }
 
 export type AppInstanceCard = {
@@ -102,6 +107,9 @@ export type AppInstanceCard = {
   sourceAppName?: string
   statuses?: Array<StatusCount>
   lastDeployedAt?: string
+  sourceAppAvailable?: boolean
+  canCreateRelease?: boolean
+  iconBackground?: string
 }
 
 export type AppRunnerBatchRuntimeArtifactReply = {
@@ -256,7 +264,6 @@ export type ConsoleUser = {
 
 export type CreateAppInstanceReply = {
   appInstanceId?: string
-  initialRelease?: ConsoleRelease
 }
 
 export type CreateAppInstanceReq = {
@@ -486,6 +493,7 @@ export type DeploymentStatusRow = {
 export type DeveloperApiAccess = {
   enabled?: boolean
   apiKeys?: Array<DeveloperApiKeyRow>
+  apiUrl?: string
 }
 
 export type DeveloperApiKeyRow = {
@@ -1065,6 +1073,10 @@ export type RetryEnvironmentReq = {
   id?: string
 }
 
+export type RevealDeveloperApiKeyReply = {
+  token?: string
+}
+
 export type RuntimeEndpoints = {
   run?: string
   health?: string
@@ -1609,12 +1621,31 @@ export type EnterpriseAppDeployConsoleDeleteDeveloperApiKeyResponses = {
 export type EnterpriseAppDeployConsoleDeleteDeveloperApiKeyResponse
   = EnterpriseAppDeployConsoleDeleteDeveloperApiKeyResponses[keyof EnterpriseAppDeployConsoleDeleteDeveloperApiKeyResponses]
 
+export type EnterpriseAppDeployConsoleRevealDeveloperApiKeyData = {
+  body?: never
+  path: {
+    appInstanceId: string
+    apiKeyId: string
+  }
+  query?: never
+  url: '/enterprise/app-instances/{appInstanceId}/api-keys/{apiKeyId}:reveal'
+}
+
+export type EnterpriseAppDeployConsoleRevealDeveloperApiKeyResponses = {
+  200: RevealDeveloperApiKeyReply
+}
+
+export type EnterpriseAppDeployConsoleRevealDeveloperApiKeyResponse
+  = EnterpriseAppDeployConsoleRevealDeveloperApiKeyResponses[keyof EnterpriseAppDeployConsoleRevealDeveloperApiKeyResponses]
+
 export type EnterpriseAppDeployConsoleListDeploymentBindingOptionsData = {
   body?: never
   path: {
     appInstanceId: string
   }
-  query?: never
+  query?: {
+    releaseId?: string
+  }
   url: '/enterprise/app-instances/{appInstanceId}/deployment-binding-options'
 }
 

packages/contracts/generated/enterprise/zod.gen.ts

@@ -19,6 +19,7 @@ export const zAccessStatus = z.object({
     .min(-2147483648, { error: 'Invalid value: Expected int32 to be >= -2147483648' })
     .max(2147483647, { error: 'Invalid value: Expected int32 to be <= 2147483647' })
     .optional(),
+  apiUrl: z.string().optional(),
 })
 
 export const zAccessSubject = z.object({
@@ -88,6 +89,10 @@ export const zAppInstanceBasicInfo = z.object({
   sourceAppName: z.string().optional(),
   mode: z.string().optional(),
   createdAt: z.iso.datetime().optional(),
+  sourceAppAvailable: z.boolean().optional(),
+  canCreateRelease: z.boolean().optional(),
+  icon: z.string().optional(),
+  iconBackground: z.string().optional(),
 })
 
 export const zAppRunnerBootstrapAssignment = z.object({
@@ -228,7 +233,6 @@ export const zConsoleUser = z.object({
 
 export const zCreateAppInstanceReply = z.object({
   appInstanceId: z.string().optional(),
-  initialRelease: zConsoleRelease.optional(),
 })
 
 export const zCreateAppInstanceReq = z.object({
@@ -445,6 +449,7 @@ export const zCreateDeveloperApiKeyReply = z.object({
 export const zDeveloperApiAccess = z.object({
   enabled: z.boolean().optional(),
   apiKeys: z.array(zDeveloperApiKeyRow).optional(),
+  apiUrl: z.string().optional(),
 })
 
 /**
@@ -1010,6 +1015,10 @@ export const zRetryEnvironmentReq = z.object({
   id: z.string().optional(),
 })
 
+export const zRevealDeveloperApiKeyReply = z.object({
+  token: z.string().optional(),
+})
+
 export const zRuntimeEndpoints = z.object({
   run: z.string().optional(),
   health: z.string().optional(),
@@ -1139,6 +1148,9 @@ export const zAppInstanceCard = z.object({
   sourceAppName: z.string().optional(),
   statuses: z.array(zStatusCount).optional(),
   lastDeployedAt: z.iso.datetime().optional(),
+  sourceAppAvailable: z.boolean().optional(),
+  canCreateRelease: z.boolean().optional(),
+  iconBackground: z.string().optional(),
 })
 
 export const zSubjectAccountData = z.object({
@@ -1711,10 +1723,24 @@ export const zEnterpriseAppDeployConsoleDeleteDeveloperApiKeyPath = z.object({
  */
 export const zEnterpriseAppDeployConsoleDeleteDeveloperApiKeyResponse = zDeleteDeveloperApiKeyReply
 
+export const zEnterpriseAppDeployConsoleRevealDeveloperApiKeyPath = z.object({
+  appInstanceId: z.string(),
+  apiKeyId: z.string(),
+})
+
+/**
+ * OK
+ */
+export const zEnterpriseAppDeployConsoleRevealDeveloperApiKeyResponse = zRevealDeveloperApiKeyReply
+
 export const zEnterpriseAppDeployConsoleListDeploymentBindingOptionsPath = z.object({
   appInstanceId: z.string(),
 })
 
+export const zEnterpriseAppDeployConsoleListDeploymentBindingOptionsQuery = z.object({
+  releaseId: z.string().optional(),
+})
+
 /**
  * OK
  */

packages/contracts/openapi-ts.enterprise.config.ts

@@ -37,6 +37,13 @@ const stripSchemaNamePrefix = (schemaName: string) => {
     .replace(/^pagination\./, '')
 }
 
+const contractTagSegment = (tag?: string) => {
+  if (tag === 'EnterpriseAppDeployConsole')
+    return 'AppDeploy'
+
+  return tag || 'default'
+}
+
 const contractNameSegments = (operation: ContractOperation) => {
   const operationId = operation.operationId || operation.id
   const tag = operation.tags?.[0]
@@ -48,7 +55,7 @@ const contractNameSegments = (operation: ContractOperation) => {
 }
 
 const contractPathSegments = (operation: ContractOperation) => {
-  return [operation.tags?.[0] || 'default', ...contractNameSegments(operation)]
+  return [contractTagSegment(operation.tags?.[0]), ...contractNameSegments(operation)]
 }
 
 const normalizeEnterpriseOpenApi = () => {

packages/dify-ui/README.md

@@ -28,7 +28,6 @@ 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
 ```
@@ -37,12 +36,12 @@ Importing from `@langgenius/dify-ui` (no subpath) is intentionally not supported
 
 ## Primitives
 
-| 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.                    |
+| Category | Subpath                                                                                                                                            | Notes                                             |
+| -------- | -------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------- |
+| Overlay  | `./alert-dialog`, `./autocomplete`, `./combobox`, `./context-menu`, `./dialog`, `./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:
 
@@ -66,7 +65,7 @@ If a consumer uses Dify UI source files through the workspace, add an explicit s
 
 ## Overlay & portal contract
 
-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.
+All overlay primitives (`dialog`, `alert-dialog`, `autocomplete`, `combobox`, `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.
 
 ### Root isolation requirement
 
@@ -84,19 +83,19 @@ 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, Autocomplete, Combobox, Drawer, 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, 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. |
 
-Rationale: during Dify's migration from legacy `base/modal` / `base/dialog` / `base/drawer` / `base/drawer-plus` 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: during Dify's migration from legacy `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.
 
 See `[web/docs/overlay-migration.md](../../web/docs/overlay-migration.md)` for the Dify-web migration history. Once the legacy overlays are gone, the values in this table can drop back to `z-50` / `z-51`.
 
 ### 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 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.
+- Never portal an overlay manually on top of our primitives — use `DialogTrigger`, `PopoverTrigger`, etc. 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.
 
 ## Development

packages/dify-ui/package.json

@@ -37,10 +37,6 @@
       "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"

packages/dify-ui/src/drawer/__tests__/index.spec.tsx

@@ -1,61 +0,0 @@
-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-1002')
-
-      asHTMLElement(screen.getByRole('button', { name: 'Close drawer' }).element()).click()
-
-      await vi.waitFor(() => {
-        expect(document.body.querySelector('[role="dialog"]')).not.toBeInTheDocument()
-      })
-    })
-  })
-})

packages/dify-ui/src/drawer/index.tsx

@@ -1,116 +0,0 @@
-'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-1002 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-1002 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-1002 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>
-  )
-}

web/AGENTS.md

@@ -9,10 +9,6 @@
 - 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.
 
-## 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.
-
 ## Design Token Mapping
 
 - When translating Figma designs to code, read `../packages/dify-ui/AGENTS.md` for the Figma `--radius/*` token to Tailwind `rounded-*` class mapping. The two scales are offset by one step.

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,
-  categories: overrides.categories ?? ['Writing'],
+  category: overrides.category ?? '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' }, 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'] }),
+        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' }),
       ],
     }
   })
@@ -190,30 +190,6 @@ 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()
 

web/__tests__/tools/tool-provider-detail-flow.test.tsx

@@ -205,7 +205,7 @@ vi.mock('@/app/components/tools/setting/build-in/config-credentials', () => ({
 }))
 
 vi.mock('@/app/components/tools/workflow-tool', () => ({
-  WorkflowToolDrawer: ({ onHide, onSave, onRemove }: { payload: unknown, onHide: () => void, onSave: (d: unknown) => void, onRemove: () => void }) => (
+  default: ({ 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>

web/app/(commonLayout)/deployments/[appInstanceId]/access/page.tsx

@@ -0,0 +1,8 @@
+import { AccessTab } from '@/features/deployments/detail/access-tab'
+
+export default async function InstanceDetailAccessPage({ params }: {
+  params: Promise<{ appInstanceId: string }>
+}) {
+  const { appInstanceId } = await params
+  return <AccessTab appInstanceId={appInstanceId} />
+}

web/app/(commonLayout)/deployments/[appInstanceId]/deploy/page.tsx

@@ -0,0 +1,8 @@
+import { DeployTab } from '@/features/deployments/detail/deploy-tab'
+
+export default async function InstanceDetailDeployPage({ params }: {
+  params: Promise<{ appInstanceId: string }>
+}) {
+  const { appInstanceId } = await params
+  return <DeployTab appInstanceId={appInstanceId} />
+}

web/app/(commonLayout)/deployments/[appInstanceId]/layout.tsx

@@ -0,0 +1,15 @@
+import type { ReactNode } from 'react'
+import { InstanceDetail } from '@/features/deployments/detail'
+
+export default async function InstanceDetailLayout({ children, params }: {
+  children: ReactNode
+  params: Promise<{ appInstanceId: string }>
+}) {
+  const { appInstanceId } = await params
+
+  return (
+    <InstanceDetail appInstanceId={appInstanceId}>
+      {children}
+    </InstanceDetail>
+  )
+}

web/app/(commonLayout)/deployments/[appInstanceId]/overview/page.tsx

@@ -0,0 +1,8 @@
+import { OverviewTab } from '@/features/deployments/detail/overview-tab'
+
+export default async function InstanceDetailOverviewPage({ params }: {
+  params: Promise<{ appInstanceId: string }>
+}) {
+  const { appInstanceId } = await params
+  return <OverviewTab appInstanceId={appInstanceId} />
+}

web/app/(commonLayout)/deployments/[appInstanceId]/page.tsx

@@ -0,0 +1,8 @@
+import { redirect } from '@/next/navigation'
+
+export default async function InstanceDetailPage({ params }: {
+  params: Promise<{ appInstanceId: string }>
+}) {
+  const { appInstanceId } = await params
+  redirect(`/deployments/${appInstanceId}/overview`)
+}

web/app/(commonLayout)/deployments/[appInstanceId]/settings/page.tsx

@@ -0,0 +1,8 @@
+import { SettingsTab } from '@/features/deployments/detail/settings-tab'
+
+export default async function InstanceDetailSettingsPage({ params }: {
+  params: Promise<{ appInstanceId: string }>
+}) {
+  const { appInstanceId } = await params
+  return <SettingsTab appInstanceId={appInstanceId} />
+}

web/app/(commonLayout)/deployments/[appInstanceId]/versions/page.tsx

@@ -0,0 +1,8 @@
+import { VersionsTab } from '@/features/deployments/detail/versions-tab'
+
+export default async function InstanceDetailVersionsPage({ params }: {
+  params: Promise<{ appInstanceId: string }>
+}) {
+  const { appInstanceId } = await params
+  return <VersionsTab appInstanceId={appInstanceId} />
+}

web/app/(commonLayout)/deployments/page.tsx

@@ -0,0 +1,10 @@
+'use client'
+import { useTranslation } from 'react-i18next'
+import { DeploymentsMain } from '@/features/deployments/list'
+import useDocumentTitle from '@/hooks/use-document-title'
+
+export default function DeploymentsPage() {
+  const { t } = useTranslation('deployments')
+  useDocumentTitle(t('documentTitle.list'))
+  return <DeploymentsMain />
+}

web/app/components/app/app-publisher/__tests__/index.spec.tsx

@@ -91,21 +91,6 @@ 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),
@@ -136,15 +121,6 @@ vi.mock('../../app-access-control', () => ({
   ),
 }))
 
-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>
-  ),
-}))
-
 vi.mock('@langgenius/dify-ui/popover', () => import('@/__mocks__/base-ui-popover'))
 
 vi.mock('../sections', () => ({
@@ -167,7 +143,6 @@ vi.mock('../sections', () => ({
       <div>
         <button onClick={props.handleEmbed}>publisher-embed</button>
         <button onClick={() => void props.handleOpenInExplore()}>publisher-open-in-explore</button>
-        <button onClick={props.onConfigureWorkflowTool}>publisher-workflow-tool</button>
       </div>
     )
   },
@@ -256,25 +231,6 @@ describe('AppPublisher', () => {
     expect(screen.getByTestId('embedded-modal'))!.toBeInTheDocument()
   })
 
-  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

web/app/components/app/app-publisher/__tests__/sections.spec.tsx

@@ -190,17 +190,18 @@ describe('app-publisher sections', () => {
         disabledFunctionTooltip="disabled"
         handleEmbed={handleEmbed}
         handleOpenInExplore={handleOpenInExplore}
+        handlePublish={vi.fn()}
         hasHumanInputNode={false}
         hasTriggerNode={false}
+        inputs={[]}
         missingStartNode={false}
+        onRefreshData={vi.fn()}
+        outputs={[]}
+        published={true}
         publishedAt={Date.now()}
         toolPublished
         workflowToolAvailable={false}
-        workflowToolIsLoading={false}
-        workflowToolOutdated={false}
-        workflowToolIsCurrentWorkspaceManager
         workflowToolMessage="workflow-disabled"
-        onConfigureWorkflowTool={vi.fn()}
       />,
     )
 
@@ -222,16 +223,17 @@ describe('app-publisher sections', () => {
         disabledFunctionTooltip="disabled"
         handleEmbed={handleEmbed}
         handleOpenInExplore={handleOpenInExplore}
+        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()}
       />,
     )
 
@@ -246,16 +248,16 @@ describe('app-publisher sections', () => {
         disabledFunctionButton={false}
         handleEmbed={handleEmbed}
         handleOpenInExplore={handleOpenInExplore}
+        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()}
       />,
     )
 

web/app/components/app/app-publisher/index.tsx

@@ -5,12 +5,13 @@ import type { PublishWorkflowParams } from '@/types/workflow'
 import { Button } from '@langgenius/dify-ui/button'
 import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
 import { toast } from '@langgenius/dify-ui/toast'
+import { RiStoreLine } from '@remixicon/react'
 import { useSuspenseQuery } from '@tanstack/react-query'
 import { useKeyPress } from 'ahooks'
 import {
   memo,
-  use,
   useCallback,
+  useContext,
   useEffect,
   useMemo,
   useState,
@@ -19,12 +20,9 @@ import { useTranslation } from 'react-i18next'
 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 { AccessMode } from '@/models/access-control'
@@ -59,8 +57,8 @@ export type AppPublisherProps = {
   debugWithMultipleModel?: boolean
   multipleModelConfigs?: ModelAndParameter[]
   /** modelAndParameter is passed when debugWithMultipleModel is true */
-  onPublish?: AppPublisherPublishHandler
-  onRestore?: AppPublisherRestoreHandler
+  onPublish?: (params?: any) => Promise<any> | any
+  onRestore?: () => Promise<any> | any
   onToggle?: (state: boolean) => void
   crossAxisOffset?: number
   toolPublished?: boolean
@@ -76,12 +74,6 @@ 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,
@@ -108,12 +100,11 @@ 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 [publishingToMarketplace, setPublishingToMarketplace] = useState(false)
 
-  const workflowStore = use(WorkflowContext)
+  const workflowStore = useContext(WorkflowContext)
   const appDetail = useAppStore(state => state.appDetail)
   const setAppDetail = useAppStore(s => s.setAppDetail)
   const { data: systemFeatures } = useSuspenseQuery(systemFeaturesQueryOptions())
@@ -282,31 +273,6 @@ 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',
@@ -377,22 +343,23 @@ const AppPublisher = ({
                 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}
-              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" />}
+                  icon={<RiStoreLine className="h-4 w-4" />}
                   disabled={!publishedAt || publishingToMarketplace}
                   onClick={handlePublishToMarketplace}
                 >
@@ -413,15 +380,6 @@ const AppPublisher = ({
         />
         {showAppAccessControl && <AccessControl app={appDetail!} onConfirm={handleAccessControlUpdate} onClose={() => { setShowAppAccessControl(false) }} />}
       </Popover>
-      {workflowToolDrawerOpen && (
-        <WorkflowToolDrawer
-          isAdd={!workflowToolPublished}
-          payload={workflowTool.payload}
-          onHide={closeWorkflowToolDrawer}
-          onCreate={workflowTool.handleCreate}
-          onSave={workflowTool.handleUpdate}
-        />
-      )}
     </>
   )
 }

web/app/components/app/app-publisher/sections.tsx

@@ -10,9 +10,11 @@ import {
 } from '@langgenius/dify-ui/tooltip'
 import { useTranslation } from 'react-i18next'
 import Divider from '@/app/components/base/divider'
+import { CodeBrowser } from '@/app/components/base/icons/src/vender/line/development'
 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'
@@ -44,8 +46,11 @@ type AccessSectionProps = {
 
 type ActionsSectionProps = Pick<AppPublisherProps, | 'hasHumanInputNode'
   | 'hasTriggerNode'
+  | 'inputs'
   | 'missingStartNode'
+  | 'onRefreshData'
   | 'toolPublished'
+  | 'outputs'
   | 'publishedAt'
   | 'workflowToolAvailable'> & {
     appDetail: {
@@ -62,11 +67,9 @@ type ActionsSectionProps = Pick<AppPublisherProps, | 'hasHumanInputNode'
     disabledFunctionTooltip?: string
     handleEmbed: () => void
     handleOpenInExplore: () => void
-    workflowToolIsLoading: boolean
-    workflowToolOutdated: boolean
-    workflowToolIsCurrentWorkspaceManager: boolean
+    handlePublish: (params?: ModelAndParameter | PublishWorkflowParams) => Promise<void>
+    published: boolean
     workflowToolMessage?: string
-    onConfigureWorkflowTool: () => void
   }
 
 export const AccessModeDisplay = ({ mode }: { mode?: keyof typeof ACCESS_MODE_MAP }) => {
@@ -253,17 +256,18 @@ export const PublisherActionsSection = ({
   disabledFunctionTooltip,
   handleEmbed,
   handleOpenInExplore,
+  handlePublish,
   hasHumanInputNode = false,
   hasTriggerNode = false,
+  inputs,
   missingStartNode = false,
+  onRefreshData,
+  outputs,
+  published,
   publishedAt,
   toolPublished,
   workflowToolAvailable = true,
-  workflowToolIsLoading,
-  workflowToolOutdated,
-  workflowToolIsCurrentWorkspaceManager,
   workflowToolMessage,
-  onConfigureWorkflowTool,
 }: ActionsSectionProps) => {
   const { t } = useTranslation()
 
@@ -301,7 +305,7 @@ export const PublisherActionsSection = ({
             <SuggestedAction
               onClick={handleEmbed}
               disabled={!publishedAt}
-              icon={<span className="i-custom-vender-line-development-code-browser h-4 w-4" />}
+              icon={<CodeBrowser className="h-4 w-4" />}
             >
               {t('common.embedIntoSite', { ns: 'workflow' })}
             </SuggestedAction>
@@ -336,10 +340,18 @@ export const PublisherActionsSection = ({
         <WorkflowToolConfigureButton
           disabled={workflowToolDisabled}
           published={!!toolPublished}
-          isLoading={workflowToolIsLoading}
-          outdated={workflowToolOutdated}
-          isCurrentWorkspaceManager={workflowToolIsCurrentWorkspaceManager}
-          onConfigure={onConfigureWorkflowTool}
+          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}
           disabledReason={workflowToolMessage}
         />
       )}

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,
-  categories: ['Assistant'],
+  category: '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_categories: mockApp.categories,
+        template_category: mockApp.category,
         page: 'studio',
       })
       expect(mockSetShowTryAppPanel).toHaveBeenCalledWith(true, {

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_categories: app.categories,
+      template_category: app.category,
       page: 'studio',
     })
     setShowTryAppPanel?.(true, { appId: app.app_id, app })

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,
-  categories: [category],
+  category,
   app: {
     id: name,
     name,

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.categories?.includes(currCategory) ?? false
+      return item.category === currCategory
     })
     if (currentType.length === 0)
       return filteredByCategory

web/app/components/apps/__tests__/index.spec.tsx

@@ -31,7 +31,7 @@ const mockFetchAppDetail = vi.mocked(fetchAppDetail)
 
 const mockTemplateApp: App = {
   app_id: 'template-1',
-  categories: ['Assistant'],
+  category: 'Assistant',
   app: {
     id: 'template-1',
     mode: AppModeEnum.CHAT,

web/app/components/apps/index.tsx

@@ -151,7 +151,7 @@ const Apps = () => {
           <TryApp
             appId={currentTryAppParams?.appId || ''}
             app={currentTryAppParams?.app}
-            categories={currentTryAppParams?.app?.categories}
+            category={currentTryAppParams?.app?.category}
             onClose={hideTryAppPanel}
             onCreate={handleShowFromTryApp}
           />

web/app/components/base/chat/chat-with-history/sidebar/operation.tsx

@@ -54,22 +54,22 @@ const Operation: FC<Props> = ({
       onOpenChange={setOpen}
     >
       <DropdownMenuTrigger
-        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>
-        )}
+        render={<div />}
         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}

web/app/components/base/chat/chat/__tests__/use-chat-layout.spec.tsx

@@ -182,13 +182,11 @@ 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')
 

web/app/components/base/chat/chat/use-chat-layout.ts

@@ -12,11 +12,6 @@ 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)
@@ -26,9 +21,6 @@ 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) {
@@ -42,39 +34,16 @@ export const useChatLayout = ({ chatList, sidebarCollapseState }: UseChatLayoutO
   }, [chatList.length])
 
   const handleWindowResize = useCallback(() => {
-    if (chatContainerRef.current) {
-      const nextWidth = document.body.clientWidth - (chatContainerRef.current.clientWidth + 16) - 8
-      setWidth(currentWidth => currentWidth === nextWidth ? currentWidth : nextWidth)
-    }
+    if (chatContainerRef.current)
+      setWidth(document.body.clientWidth - (chatContainerRef.current.clientWidth + 16) - 8)
 
     if (chatContainerRef.current && chatFooterRef.current)
-      setStyleValue(chatFooterRef.current, 'width', `${chatContainerRef.current.clientWidth}px`)
+      chatFooterRef.current.style.width = `${chatContainerRef.current.clientWidth}px`
 
     if (chatContainerInnerRef.current && chatFooterInnerRef.current)
-      setStyleValue(chatFooterInnerRef.current, 'width', `${chatContainerInnerRef.current.clientWidth}px`)
+      chatFooterInnerRef.current.style.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)
@@ -108,31 +77,26 @@ export const useChatLayout = ({ chatList, sidebarCollapseState }: UseChatLayoutO
       const resizeContainerObserver = new ResizeObserver((entries) => {
         for (const entry of entries) {
           const { blockSize } = entry.borderBoxSize[0]!
-          pendingFooterBlockSizeRef.current = blockSize
+          chatContainerRef.current!.style.paddingBottom = `${blockSize}px`
+          handleScrollToBottom()
         }
-        scheduleResizeObserverUpdate()
       })
       resizeContainerObserver.observe(chatFooterRef.current)
 
       const resizeFooterObserver = new ResizeObserver((entries) => {
         for (const entry of entries) {
           const { inlineSize } = entry.borderBoxSize[0]!
-          pendingContainerInlineSizeRef.current = inlineSize
+          chatFooterRef.current!.style.width = `${inlineSize}px`
         }
-        scheduleResizeObserverUpdate()
       })
       resizeFooterObserver.observe(chatContainerRef.current)
 
       return () => {
-        if (resizeObserverFrameRef.current !== null) {
-          cancelAnimationFrame(resizeObserverFrameRef.current)
-          resizeObserverFrameRef.current = null
-        }
         resizeContainerObserver.disconnect()
         resizeFooterObserver.disconnect()
       }
     }
-  }, [scheduleResizeObserverUpdate])
+  }, [handleScrollToBottom])
 
   useEffect(() => {
     const setUserScrolled = () => {

web/app/components/base/icons/src/vender/line/development/index.ts

@@ -1 +1,2 @@
 export { default as BracketsX } from './BracketsX'
+export { default as CodeBrowser } from './CodeBrowser'

web/app/components/datasets/documents/detail/__tests__/index.spec.tsx

@@ -120,12 +120,18 @@ vi.mock('../document-title', () => ({
 }))
 
 vi.mock('../segment-add', () => ({
-  SegmentAdd: ({ showNewSegmentModal, showBatchModal, embedding }: { showNewSegmentModal?: () => void, showBatchModal?: () => void, embedding?: boolean }) => (
+  default: ({ 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', () => ({

web/app/components/datasets/documents/detail/batch-modal/index.tsx

@@ -2,15 +2,12 @@
 import type { FC } from 'react'
 import type { ChunkingMode, FileItem } from '@/models/datasets'
 import { Button } from '@langgenius/dify-ui/button'
-import {
-  Dialog,
-  DialogCloseButton,
-  DialogContent,
-  DialogTitle,
-} from '@langgenius/dify-ui/dialog'
+import { RiCloseLine } from '@remixicon/react'
+import { noop } from 'es-toolkit/function'
 import * as React from 'react'
-import { useState } from 'react'
+import { useEffect, 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'
 
@@ -21,9 +18,8 @@ type IBatchModalProps = {
   onConfirm: (file: FileItem) => void
 }
 
-type BatchModalContentProps = Omit<IBatchModalProps, 'isShow'>
-
-const BatchModalContent: FC<BatchModalContentProps> = ({
+const BatchModal: FC<IBatchModalProps> = ({
+  isShow,
   docForm,
   onCancel,
   onConfirm,
@@ -39,13 +35,17 @@ const BatchModalContent: FC<BatchModalContentProps> = ({
     onConfirm(currentCSV)
   }
 
+  useEffect(() => {
+    if (!isShow)
+      setCurrentCSV(undefined)
+  }, [isShow])
+
   return (
-    <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' })}
-      />
+    <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>
       <CSVUploader
         file={currentCSV}
         updateFile={handleFile}
@@ -61,33 +61,7 @@ const BatchModalContent: FC<BatchModalContentProps> = ({
           {t('list.batchModal.run', { ns: 'datasetDocuments' })}
         </Button>
       </div>
-    </DialogContent>
+    </Modal>
   )
 }
-
-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)

web/app/components/datasets/documents/detail/completed/__tests__/index.spec.tsx

@@ -137,8 +137,9 @@ vi.mock('../hooks/use-child-segment-data', () => ({
   },
 }))
 
-vi.mock('../components/menu-bar', () => ({
-  default: ({ totalText, onInputChange, inputValue, isLoading, onSelectedAll, onChangeStatus }: {
+// Mock child components to simplify testing
+vi.mock('../components', () => ({
+  MenuBar: ({ totalText, onInputChange, inputValue, isLoading, onSelectedAll, onChangeStatus }: {
     totalText: string
     onInputChange: (value: string) => void
     inputValue: string
@@ -166,13 +167,7 @@ vi.mock('../components/menu-bar', () => ({
       )}
     </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" />,
 }))
@@ -568,7 +563,7 @@ describe('Edge Cases', () => {
     expect(screen.getByTestId('general-mode-content'))!.toBeInTheDocument()
   })
 
-  it('should handle completed importStatus', () => {
+  it('should handle ProcessStatus.COMPLETED importStatus', () => {
     render(<Completed {...defaultProps} importStatus="completed" />, { wrapper: createWrapper() })
 
     expect(screen.getByTestId('general-mode-content'))!.toBeInTheDocument()

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,6 +167,7 @@ describe('SegmentDetail', () => {
     onCancel: vi.fn(),
     isEditMode: false,
     docForm: ChunkingMode.text,
+    onModalStateChange: vi.fn(),
   }
 
   describe('Rendering', () => {
@@ -351,12 +352,35 @@ 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', () => {
-      render(<SegmentDetail {...defaultProps} isEditMode={true} />)
+      const mockOnModalStateChange = vi.fn()
+      render(
+        <SegmentDetail
+          {...defaultProps}
+          isEditMode={true}
+          onModalStateChange={mockOnModalStateChange}
+        />,
+      )
       fireEvent.click(screen.getByTestId('regenerate-btn'))
 
       fireEvent.click(screen.getByTestId('cancel-regeneration'))
 
+      expect(mockOnModalStateChange).toHaveBeenCalledWith(false)
       expect(screen.queryByTestId('regeneration-modal')).not.toBeInTheDocument()
     })
   })
@@ -480,18 +504,22 @@ 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()
     })
   })

web/app/components/datasets/documents/detail/completed/common/__tests__/drawer.spec.tsx

@@ -1,16 +1,27 @@
-import { fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { render, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { CompletedDrawer } from '../drawer'
+import Drawer from '../drawer'
 
-(
-  globalThis as typeof globalThis & {
-    BASE_UI_ANIMATIONS_DISABLED: boolean
-  }
-).BASE_UI_ANIMATIONS_DISABLED = true
+let capturedKeyPressCallback: ((e: KeyboardEvent) => void) | undefined
 
-const getOverlay = () =>
-  Array.from(document.querySelectorAll<HTMLElement>('[class]'))
-    .find(element => element.className.includes('bg-background-overlay'))
+// 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 },
+    }),
+}))
 
 describe('Drawer', () => {
   const defaultProps = {
@@ -20,109 +31,103 @@ describe('Drawer', () => {
 
   beforeEach(() => {
     vi.clearAllMocks()
+    capturedKeyPressCallback = undefined
   })
 
   describe('Rendering', () => {
     it('should return null when open is false', () => {
       const { container } = render(
-        <CompletedDrawer open={false} onClose={vi.fn()}>
+        <Drawer open={false} onClose={vi.fn()}>
           <span>Content</span>
-        </CompletedDrawer>,
+        </Drawer>,
       )
 
       expect(container.innerHTML).toBe('')
       expect(screen.queryByText('Content')).not.toBeInTheDocument()
     })
 
-    it('should render children in the drawer portal when open is true', () => {
+    it('should render children in portal when open is true', () => {
       render(
-        <CompletedDrawer {...defaultProps}>
+        <Drawer {...defaultProps}>
           <span>Drawer content</span>
-        </CompletedDrawer>,
+        </Drawer>,
       )
 
       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()
     })
   })
 
-  describe('Variant', () => {
-    it('should render a panel drawer without overlay by default', () => {
+  // Overlay visibility
+  describe('Overlay', () => {
+    it('should show overlay when showOverlay is true', () => {
       render(
-        <CompletedDrawer {...defaultProps}>
+        <Drawer {...defaultProps} showOverlay={true}>
           <span>Content</span>
-        </CompletedDrawer>,
+        </Drawer>,
       )
 
-      expect(getOverlay()).toBeUndefined()
-      expect(screen.getByRole('dialog')).toHaveAttribute('aria-modal', 'false')
+      const overlay = document.querySelector('[aria-hidden="true"]')
+      expect(overlay).toBeInTheDocument()
     })
 
-    it('should render a modal drawer with overlay', () => {
+    it('should hide overlay when showOverlay is false', () => {
       render(
-        <CompletedDrawer {...defaultProps} modal>
+        <Drawer {...defaultProps} showOverlay={false}>
           <span>Content</span>
-        </CompletedDrawer>,
+        </Drawer>,
       )
 
-      expect(getOverlay()).toBeInTheDocument()
-      expect(screen.getByRole('dialog')).toHaveAttribute('aria-modal', 'true')
+      const overlay = document.querySelector('[aria-hidden="true"]')
+      expect(overlay).not.toBeInTheDocument()
     })
   })
 
-  describe('Dismissal', () => {
-    it('should call onClose when Escape is pressed', async () => {
-      const onClose = vi.fn()
+  // aria-modal attribute
+  describe('aria-modal', () => {
+    it('should set aria-modal="true" when modal is true', () => {
       render(
-        <CompletedDrawer open={true} onClose={onClose}>
+        <Drawer {...defaultProps} modal={true}>
           <span>Content</span>
-        </CompletedDrawer>,
+        </Drawer>,
       )
 
-      fireEvent.keyDown(document, { key: 'Escape' })
-
-      await waitFor(() => {
-        expect(onClose).toHaveBeenCalledTimes(1)
-      })
+      expect(screen.getByRole('dialog')).toHaveAttribute('aria-modal', 'true')
     })
 
-    it('should keep a panel drawer open when the underlying page is clicked', () => {
-      const onClose = vi.fn()
+    it('should set aria-modal="false" when modal is false', () => {
       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>
+        <Drawer {...defaultProps} modal={false}>
           <span>Content</span>
-        </CompletedDrawer>,
+        </Drawer>,
       )
 
-      fireEvent.click(getOverlay()!)
+      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()
+      render(
+        <Drawer open={true} onClose={onClose}>
+          <span>Content</span>
+        </Drawer>,
+      )
+
+      expect(capturedKeyPressCallback).toBeDefined()
+      const fakeEvent = { preventDefault: vi.fn() } as unknown as KeyboardEvent
+      capturedKeyPressCallback!(fakeEvent)
 
       expect(onClose).toHaveBeenCalledTimes(1)
     })

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 { DocumentDetailDrawer } from '../full-screen-drawer'
+import FullScreenDrawer from '../full-screen-drawer'
 
 // Mock the Drawer component since it has high complexity
 vi.mock('../drawer', () => ({
-  CompletedDrawer: ({ children, open, panelClassName, panelContentClassName, modal }: { children: ReactNode, open: boolean, panelClassName: string, panelContentClassName: string, modal: boolean }) => {
+  default: ({ children, open, panelClassName, panelContentClassName, showOverlay, needCheckChunks, modal }: { children: ReactNode, open: boolean, panelClassName: string, panelContentClassName: string, showOverlay: boolean, needCheckChunks: boolean, modal: boolean }) => {
     if (!open)
       return null
     return (
@@ -13,6 +13,8 @@ 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}
@@ -21,7 +23,7 @@ vi.mock('../drawer', () => ({
   },
 }))
 
-describe('DocumentDetailDrawer', () => {
+describe('FullScreenDrawer', () => {
   beforeEach(() => {
     vi.clearAllMocks()
   })
@@ -29,9 +31,9 @@ describe('DocumentDetailDrawer', () => {
   describe('Rendering', () => {
     it('should render without crashing when open', () => {
       render(
-        <DocumentDetailDrawer open={true} fullScreen={false}>
+        <FullScreenDrawer isOpen={true} fullScreen={false}>
           <div>Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
 
       expect(screen.getByTestId('drawer-mock')).toBeInTheDocument()
@@ -39,9 +41,9 @@ describe('DocumentDetailDrawer', () => {
 
     it('should not render when closed', () => {
       render(
-        <DocumentDetailDrawer open={false} fullScreen={false}>
+        <FullScreenDrawer isOpen={false} fullScreen={false}>
           <div>Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
 
       expect(screen.queryByTestId('drawer-mock')).not.toBeInTheDocument()
@@ -49,9 +51,9 @@ describe('DocumentDetailDrawer', () => {
 
     it('should render children content', () => {
       render(
-        <DocumentDetailDrawer open={true} fullScreen={false}>
+        <FullScreenDrawer isOpen={true} fullScreen={false}>
           <div>Test Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
 
       expect(screen.getByText('Test Content')).toBeInTheDocument()
@@ -61,46 +63,86 @@ describe('DocumentDetailDrawer', () => {
   describe('Props', () => {
     it('should pass fullScreen=true to Drawer with full width class', () => {
       render(
-        <DocumentDetailDrawer open={true} fullScreen={true}>
+        <FullScreenDrawer isOpen={true} fullScreen={true}>
           <div>Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
 
       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(
-        <DocumentDetailDrawer open={true} fullScreen={false}>
+        <FullScreenDrawer isOpen={true} fullScreen={false}>
           <div>Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
 
       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 render as non-modal by default', () => {
+    it('should pass showOverlay prop with default true', () => {
       render(
-        <DocumentDetailDrawer open={true} fullScreen={false}>
+        <FullScreenDrawer isOpen={true} fullScreen={false}>
           <div>Content</div>
-        </DocumentDetailDrawer>,
+        </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>,
       )
 
       const drawer = screen.getByTestId('drawer-mock')
       expect(drawer.getAttribute('data-modal')).toBe('false')
     })
 
-    it('should pass modal when specified', () => {
+    it('should pass modal=true when specified', () => {
       render(
-        <DocumentDetailDrawer open={true} fullScreen={false} modal>
+        <FullScreenDrawer isOpen={true} fullScreen={false} modal={true}>
           <div>Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
 
       const drawer = screen.getByTestId('drawer-mock')
@@ -112,9 +154,9 @@ describe('DocumentDetailDrawer', () => {
   describe('Styling', () => {
     it('should apply panel content classes for non-fullScreen mode', () => {
       render(
-        <DocumentDetailDrawer open={true} fullScreen={false}>
+        <FullScreenDrawer isOpen={true} fullScreen={false}>
           <div>Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
 
       const drawer = screen.getByTestId('drawer-mock')
@@ -125,9 +167,9 @@ describe('DocumentDetailDrawer', () => {
 
     it('should apply panel content classes without border for fullScreen mode', () => {
       render(
-        <DocumentDetailDrawer open={true} fullScreen={true}>
+        <FullScreenDrawer isOpen={true} fullScreen={true}>
           <div>Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
 
       const drawer = screen.getByTestId('drawer-mock')
@@ -142,24 +184,24 @@ describe('DocumentDetailDrawer', () => {
       // Arrange & Act & Assert - should not throw
       expect(() => {
         render(
-          <DocumentDetailDrawer open={true} fullScreen={false}>
+          <FullScreenDrawer isOpen={true} fullScreen={false}>
             <div>Content</div>
-          </DocumentDetailDrawer>,
+          </FullScreenDrawer>,
         )
       }).not.toThrow()
     })
 
     it('should maintain structure when rerendered', () => {
       const { rerender } = render(
-        <DocumentDetailDrawer open={true} fullScreen={false}>
+        <FullScreenDrawer isOpen={true} fullScreen={false}>
           <div>Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
 
       rerender(
-        <DocumentDetailDrawer open={true} fullScreen={true}>
+        <FullScreenDrawer isOpen={true} fullScreen={true}>
           <div>Updated Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
 
       expect(screen.getByText('Updated Content')).toBeInTheDocument()
@@ -167,16 +209,16 @@ describe('DocumentDetailDrawer', () => {
 
     it('should handle toggle between open and closed states', () => {
       const { rerender } = render(
-        <DocumentDetailDrawer open={true} fullScreen={false}>
+        <FullScreenDrawer isOpen={true} fullScreen={false}>
           <div>Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
       expect(screen.getByTestId('drawer-mock')).toBeInTheDocument()
 
       rerender(
-        <DocumentDetailDrawer open={false} fullScreen={false}>
+        <FullScreenDrawer isOpen={false} fullScreen={false}>
           <div>Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
 
       expect(screen.queryByTestId('drawer-mock')).not.toBeInTheDocument()

web/app/components/datasets/documents/detail/completed/common/drawer.tsx

@@ -1,92 +1,143 @@
-import type { ComponentProps, ReactNode } from 'react'
 import { cn } from '@langgenius/dify-ui/cn'
-import {
-  Drawer,
-  DrawerBackdrop,
-  DrawerContent,
-  DrawerPopup,
-  DrawerPortal,
-  DrawerViewport,
-} from '@langgenius/dify-ui/drawer'
+import { useKeyPress } from 'ahooks'
+import * as React from 'react'
+import { useCallback, useEffect, useRef } from 'react'
+import { createPortal } from 'react-dom'
+import { useSegmentListContext } from '..'
 
-type DrawerSide = 'right' | 'left' | 'bottom' | 'top'
-type DrawerSwipeDirection = 'right' | 'left' | 'down' | 'up'
-type DrawerOpenChange = NonNullable<ComponentProps<typeof Drawer>['onOpenChange']>
-
-type CompletedDrawerProps = {
+type DrawerProps = {
   open: boolean
   onClose: () => void
-  side?: DrawerSide
+  side?: 'right' | 'left' | 'bottom' | 'top'
+  showOverlay?: boolean
+  modal?: boolean // click outside event can pass through if modal is false
+  closeOnOutsideClick?: boolean
   panelClassName?: string
   panelContentClassName?: string
-  modal?: boolean
-  children: ReactNode
+  needCheckChunks?: boolean
 }
 
-const SIDE_TO_SWIPE_DIRECTION: Record<DrawerSide, DrawerSwipeDirection> = {
-  right: 'right',
-  left: 'left',
-  bottom: 'down',
-  top: 'up',
+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 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(' ')
+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
+}
 
-export function CompletedDrawer({
+const Drawer = ({
   open,
   onClose,
   side = 'right',
+  showOverlay = true,
+  modal = false,
+  needCheckChunks = false,
   children,
   panelClassName,
   panelContentClassName,
-  modal = false,
-}: CompletedDrawerProps) {
-  const handleOpenChange: DrawerOpenChange = (nextOpen, eventDetails) => {
-    if (nextOpen)
-      return
+}: React.PropsWithChildren<DrawerProps>) => {
+  const panelContentRef = useRef<HTMLDivElement>(null)
+  const currSegment = useSegmentListContext(s => s.currSegment)
+  const currChildChunk = useSegmentListContext(s => s.currChildChunk)
 
-    if (eventDetails.reason === 'focus-out' || eventDetails.reason === 'outside-press')
+  useKeyPress('esc', (e) => {
+    if (!open)
       return
-
+    e.preventDefault()
     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 (
-    <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>
-  )
+  return createPortal(content, document.body)
 }
+
+export default Drawer

web/app/components/datasets/documents/detail/completed/common/full-screen-drawer.tsx

@@ -1,39 +1,46 @@
-import type { ReactNode } from 'react'
 import { cn } from '@langgenius/dify-ui/cn'
 import { noop } from 'es-toolkit/function'
-import { CompletedDrawer } from './drawer'
+import * as React from 'react'
+import Drawer from './drawer'
 
-type DocumentDetailDrawerProps = {
-  open: boolean
+type IFullScreenDrawerProps = {
+  isOpen: boolean
   onClose?: () => void
   fullScreen: boolean
+  showOverlay?: boolean
+  needCheckChunks?: boolean
   modal?: boolean
-  children: ReactNode
 }
 
-export function DocumentDetailDrawer({
-  open,
+const FullScreenDrawer = ({
+  isOpen,
   onClose = noop,
   fullScreen,
   children,
+  showOverlay = true,
+  needCheckChunks = false,
   modal = false,
-}: DocumentDetailDrawerProps) {
+}: React.PropsWithChildren<IFullScreenDrawerProps>) => {
   return (
-    <CompletedDrawer
-      open={open}
+    <Drawer
+      open={isOpen}
       onClose={onClose}
       panelClassName={cn(
         fullScreen
-          ? '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]',
+          ? 'w-full'
+          : 'w-[568px] pt-16 pr-2 pb-2',
       )}
       panelContentClassName={cn(
         'bg-components-panel-bg',
         !fullScreen && 'rounded-xl border-[0.5px] border-components-panel-border',
       )}
+      showOverlay={showOverlay}
+      needCheckChunks={needCheckChunks}
       modal={modal}
     >
       {children}
-    </CompletedDrawer>
+    </Drawer>
   )
 }
+
+export default FullScreenDrawer

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', () => ({
-  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
+  default: ({ isOpen, children }: { isOpen: boolean, children: React.ReactNode }) => (
+    isOpen ? <div data-testid="full-screen-drawer">{children}</div> : null
   ),
 }))
 
 vi.mock('../../segment-detail', () => ({
-  SegmentDetail: () => <div data-testid="segment-detail" />,
+  default: () => <div data-testid="segment-detail" />,
 }))
 
 vi.mock('../../child-segment-detail', () => ({
@@ -31,6 +31,8 @@ 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(),
@@ -53,7 +55,7 @@ describe('DrawerGroup', () => {
 
   it('should render nothing when all modals are closed', () => {
     const { container } = render(<DrawerGroup {...defaultProps} />)
-    expect(container.querySelector('[data-testid="document-detail-drawer"]')).toBeNull()
+    expect(container.querySelector('[data-testid="full-screen-drawer"]')).toBeNull()
   })
 
   it('should render segment detail when segment modal is open', () => {
@@ -64,7 +66,6 @@ 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', () => {
@@ -72,7 +73,6 @@ 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,7 +83,6 @@ 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', () => {
@@ -91,7 +90,6 @@ 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', () => {

web/app/components/datasets/documents/detail/completed/components/drawer-group.tsx

@@ -1,13 +1,15 @@
 '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 { DocumentDetailDrawer } from '../common/full-screen-drawer'
+import FullScreenDrawer 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
@@ -23,10 +25,14 @@ 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
@@ -34,39 +40,52 @@ 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
 }
 
-export function DrawerGroup({
+const DrawerGroup: FC<DrawerGroupProps> = ({
+  // Segment detail drawer
   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 (
     <>
-      <DocumentDetailDrawer
-        open={currSegment.showModal}
+      {/* Edit or view segment detail */}
+      <FullScreenDrawer
+        isOpen={currSegment.showModal}
         fullScreen={fullScreen}
         onClose={onCloseSegmentDetail}
+        showOverlay={false}
+        needCheckChunks
+        modal={isRegenerationModalOpen}
       >
         <SegmentDetail
           key={currSegment.segInfo?.id}
@@ -75,11 +94,13 @@ export function DrawerGroup({
           isEditMode={currSegment.isEditMode}
           onUpdate={onUpdateSegment}
           onCancel={onCloseSegmentDetail}
+          onModalStateChange={setIsRegenerationModalOpen}
         />
-      </DocumentDetailDrawer>
+      </FullScreenDrawer>
 
-      <DocumentDetailDrawer
-        open={showNewSegmentModal}
+      {/* Create New Segment */}
+      <FullScreenDrawer
+        isOpen={showNewSegmentModal}
         fullScreen={fullScreen}
         onClose={onCloseNewSegmentModal}
         modal
@@ -90,12 +111,15 @@ export function DrawerGroup({
           onSave={onSaveNewSegment}
           viewNewlyAddedChunk={viewNewlyAddedChunk}
         />
-      </DocumentDetailDrawer>
+      </FullScreenDrawer>
 
-      <DocumentDetailDrawer
-        open={currChildChunk.showModal}
+      {/* Edit or view child segment detail */}
+      <FullScreenDrawer
+        isOpen={currChildChunk.showModal}
         fullScreen={fullScreen}
         onClose={onCloseChildSegmentDetail}
+        showOverlay={false}
+        needCheckChunks
       >
         <ChildSegmentDetail
           key={currChildChunk.childChunkInfo?.id}
@@ -105,10 +129,11 @@ export function DrawerGroup({
           onUpdate={onUpdateChildChunk}
           onCancel={onCloseChildSegmentDetail}
         />
-      </DocumentDetailDrawer>
+      </FullScreenDrawer>
 
-      <DocumentDetailDrawer
-        open={showNewChildSegmentModal}
+      {/* Create New Child Segment */}
+      <FullScreenDrawer
+        isOpen={showNewChildSegmentModal}
         fullScreen={fullScreen}
         onClose={onCloseNewChildChunkModal}
         modal
@@ -119,7 +144,9 @@ export function DrawerGroup({
           onSave={onSaveNewChildChunk}
           viewNewlyAddedChildChunk={viewNewlyAddedChildChunk}
         />
-      </DocumentDetailDrawer>
+      </FullScreenDrawer>
     </>
   )
 }
+
+export default DrawerGroup

web/app/components/datasets/documents/detail/completed/components/index.ts

@@ -0,0 +1,3 @@
+export { default as DrawerGroup } from './drawer-group'
+export { default as MenuBar } from './menu-bar'
+export { FullDocModeContent, GeneralModeContent } from './segment-list-content'

web/app/components/datasets/documents/detail/completed/hooks/__tests__/use-modal-state.spec.ts

@@ -1,9 +1,7 @@
 import type { ChildChunkDetail, SegmentDetailModel } from '@/models/datasets'
 import { act, renderHook } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import * as modalStateHooks from '../use-modal-state'
-
-const renderDatasetModalState = modalStateHooks.useModalState
+import { useModalState } from '../use-modal-state'
 
 describe('useModalState', () => {
   const onNewSegmentModalChange = vi.fn()
@@ -12,21 +10,22 @@ describe('useModalState', () => {
     vi.clearAllMocks()
   })
 
-  const renderModalState = () =>
-    renderHook(() => renderDatasetModalState({ onNewSegmentModalChange }))
+  const renderUseModalState = () =>
+    renderHook(() => useModalState({ onNewSegmentModalChange }))
 
   it('should initialize with all modals closed', () => {
-    const { result } = renderModalState()
+    const { result } = renderUseModalState()
 
     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 } = renderModalState()
+    const { result } = renderUseModalState()
     const detail = { id: 'seg-1', content: 'test' } as unknown as SegmentDetailModel
 
     act(() => {
@@ -38,25 +37,8 @@ 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 } = renderModalState()
+    const { result } = renderUseModalState()
 
     act(() => {
       result.current.onClickCard({ id: 'seg-1' } as unknown as SegmentDetailModel)
@@ -73,7 +55,7 @@ describe('useModalState', () => {
   })
 
   it('should open child segment detail on slice click', () => {
-    const { result } = renderModalState()
+    const { result } = renderUseModalState()
     const childDetail = { id: 'child-1', segment_id: 'seg-1' } as unknown as ChildChunkDetail
 
     act(() => {
@@ -85,25 +67,8 @@ 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 } = renderModalState()
+    const { result } = renderUseModalState()
 
     act(() => {
       result.current.onClickSlice({ id: 'c1', segment_id: 's1' } as unknown as ChildChunkDetail)
@@ -116,7 +81,7 @@ describe('useModalState', () => {
   })
 
   it('should handle new child chunk modal', () => {
-    const { result } = renderModalState()
+    const { result } = renderUseModalState()
 
     act(() => {
       result.current.handleAddNewChildChunk('parent-chunk-1')
@@ -133,7 +98,7 @@ describe('useModalState', () => {
   })
 
   it('should close new segment modal and notify parent', () => {
-    const { result } = renderModalState()
+    const { result } = renderUseModalState()
 
     act(() => {
       result.current.onCloseNewSegmentModal()
@@ -143,7 +108,7 @@ describe('useModalState', () => {
   })
 
   it('should toggle full screen', () => {
-    const { result } = renderModalState()
+    const { result } = renderUseModalState()
 
     act(() => {
       result.current.toggleFullScreen()
@@ -157,7 +122,7 @@ describe('useModalState', () => {
   })
 
   it('should toggle collapsed', () => {
-    const { result } = renderModalState()
+    const { result } = renderUseModalState()
 
     act(() => {
       result.current.toggleCollapsed()
@@ -169,4 +134,13 @@ 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)
+  })
 })

web/app/components/datasets/documents/detail/completed/hooks/__tests__/use-segment-list-data.spec.ts

@@ -1,12 +1,11 @@
 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 { segmentImportStatus } from '@/types/dataset'
+import { ProcessStatus } from '../../../segment-add'
 import { useSegmentListData } from '../use-segment-list-data'
 
 // Type for mutation callbacks
@@ -177,7 +176,7 @@ const defaultOptions = {
   searchValue: '',
   selectedStatus: 'all' as boolean | 'all',
   selectedSegmentIds: [] as string[],
-  importStatus: undefined as SegmentImportStatus | undefined,
+  importStatus: undefined as ProcessStatus | string | undefined,
   currentPage: 1,
   limit: 10,
   onCloseSegmentDetail: vi.fn(),
@@ -690,7 +689,7 @@ describe('useSegmentListData', () => {
 
       renderHook(() => useSegmentListData({
         ...defaultOptions,
-        importStatus: segmentImportStatus.completed,
+        importStatus: ProcessStatus.COMPLETED,
         clearSelection,
       }), {
         wrapper: createWrapper(),

web/app/components/datasets/documents/detail/completed/hooks/use-modal-state.ts

@@ -13,20 +13,29 @@ 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
 }
@@ -38,15 +47,25 @@ 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 })
   }, [])
 
@@ -55,8 +74,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)
   }, [])
@@ -66,11 +85,13 @@ 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)
@@ -81,6 +102,7 @@ export const useModalState = (options: UseModalStateOptions): UseModalStateRetur
     setFullScreen(false)
   }, [])
 
+  // Display handlers - handles both direct calls and click events
   const toggleFullScreen = useCallback(() => {
     setFullScreen(prev => !prev)
   }, [])
@@ -90,20 +112,29 @@ 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,
   }

web/app/components/datasets/documents/detail/completed/hooks/use-segment-list-data.ts

@@ -1,6 +1,5 @@
 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'
@@ -10,16 +9,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: SegmentImportStatus | undefined
+  importStatus: ProcessStatus | string | undefined
   currentPage: number
   limit: number
   onCloseSegmentDetail: () => void
@@ -93,7 +92,7 @@ export const useSegmentListData = (options: UseSegmentListDataOptions): UseSegme
   }, [pathname])
   // Reset list on import completion
   useEffect(() => {
-    if (importStatus === segmentImportStatus.completed) {
+    if (importStatus === ProcessStatus.COMPLETED) {
       clearSelection()
       invalidSegmentList()
     }

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,9 +13,7 @@ import {
 import { useInvalid } from '@/service/use-base'
 import { useDocumentContext } from '../context'
 import BatchAction from './common/batch-action'
-import { DrawerGroup } from './components/drawer-group'
-import MenuBar from './components/menu-bar'
-import { FullDocModeContent, GeneralModeContent } from './components/segment-list-content'
+import { DrawerGroup, FullDocModeContent, GeneralModeContent, MenuBar } from './components'
 import {
   useChildSegmentData,
   useModalState,
@@ -34,7 +32,7 @@ type ICompletedProps = {
   embeddingAvailable: boolean
   showNewSegmentModal: boolean
   onNewSegmentModalChange: (state: boolean) => void
-  importStatus: SegmentImportStatus | undefined
+  importStatus: ProcessStatus | string | undefined
   archived?: boolean
 }
 
@@ -227,6 +225,8 @@ 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}

web/app/components/datasets/documents/detail/completed/segment-detail.tsx

@@ -1,3 +1,4 @@
+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'
@@ -6,6 +7,7 @@ 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'
@@ -40,15 +42,20 @@ type ISegmentDetailProps = {
   onCancel: () => void
   isEditMode?: boolean
   docForm: ChunkingMode
+  onModalStateChange?: (isOpen: boolean) => void
 }
 
-export function SegmentDetail({
+/**
+ * Show all the contents of the segment
+ */
+const SegmentDetail: FC<ISegmentDetailProps> = ({
   segInfo,
   onUpdate,
   onCancel,
   isEditMode,
   docForm,
-}: ISegmentDetailProps) {
+  onModalStateChange,
+}) => {
   const { t } = useTranslation()
   const [question, setQuestion] = useState(isEditMode ? segInfo?.content || '' : segInfo?.sign_content || '')
   const [answer, setAnswer] = useState(segInfo?.answer || '')
@@ -92,16 +99,19 @@ export function SegmentDetail({
 
   const handleRegeneration = useCallback(() => {
     setShowRegenerationModal(true)
-  }, [])
+    onModalStateChange?.(true)
+  }, [onModalStateChange])
 
   const onCancelRegeneration = useCallback(() => {
     setShowRegenerationModal(false)
-  }, [])
+    onModalStateChange?.(false)
+  }, [onModalStateChange])
 
   const onCloseAfterRegeneration = useCallback(() => {
     setShowRegenerationModal(false)
-    onCancel()
-  }, [onCancel])
+    onModalStateChange?.(false)
+    onCancel() // Close the edit drawer
+  }, [onCancel, onModalStateChange])
 
   const onConfirmRegeneration = useCallback(() => {
     onUpdate(segInfo?.id || '', question, answer, keywords, attachments, summary, true)
@@ -231,3 +241,5 @@ export function SegmentDetail({
     </div>
   )
 }
+
+export default React.memo(SegmentDetail)

web/app/components/datasets/documents/detail/index.tsx

@@ -1,7 +1,6 @@
 'use client'
 import type { FC } from 'react'
 import type { DataSourceInfo, DocumentDisplayStatus, FileItem, FullDocumentDetail, LegacyDataSourceInfo } 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'
@@ -18,7 +17,6 @@ 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'
@@ -26,7 +24,7 @@ import Completed from './completed'
 import { DocumentContext } from './context'
 import { DocumentTitle } from './document-title'
 import Embedding from './embedding'
-import { SegmentAdd } from './segment-add'
+import SegmentAdd, { ProcessStatus } from './segment-add'
 import style from './style.module.css'
 
 type DocumentDetailProps = {
@@ -55,20 +53,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<SegmentImportStatus>()
+  const [importStatus, setImportStatus] = useState<ProcessStatus | string>()
   const showNewSegmentModal = () => setNewSegmentModalVisible(true)
   const showBatchModal = () => setBatchModalVisible(true)
   const hideBatchModal = () => setBatchModalVisible(false)
-  const resetImportStatus = () => setImportStatus(undefined)
+  const resetProcessStatus = () => setImportStatus('')
 
   const { mutateAsync: checkSegmentBatchImportProgress } = useCheckSegmentBatchImportProgress()
   const checkProcess = async (jobID: string) => {
     await checkSegmentBatchImportProgress({ jobID }, {
       onSuccess: (res) => {
         setImportStatus(res.job_status)
-        if (res.job_status === segmentImportStatus.waiting || res.job_status === segmentImportStatus.processing)
+        if (res.job_status === ProcessStatus.WAITING || res.job_status === ProcessStatus.PROCESSING)
           setTimeout(() => checkProcess(res.job_id), 2500)
-        if (res.job_status === segmentImportStatus.error)
+        if (res.job_status === ProcessStatus.ERROR)
           toast.error(`${t('list.batchModal.runError', { ns: 'datasetDocuments' })}`)
       },
       onError: (e) => {
@@ -224,7 +222,7 @@ const DocumentDetail: FC<DocumentDetailProps> = ({ datasetId, documentId }) => {
               <>
                 <SegmentAdd
                   importStatus={importStatus}
-                  clearImportStatus={resetImportStatus}
+                  clearProcessStatus={resetProcessStatus}
                   showNewSegmentModal={showNewSegmentModal}
                   showBatchModal={showBatchModal}
                   embedding={embedding}

web/app/components/datasets/documents/detail/segment-add/__tests__/index.spec.tsx

@@ -1,10 +1,8 @@
-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 } from '../index'
+import SegmentAdd, { ProcessStatus } from '../index'
 
 // Mock provider context
 let mockPlan = { type: Plan.professional }
@@ -24,8 +22,8 @@ describe('SegmentAdd', () => {
   })
 
   const defaultProps = {
-    importStatus: undefined as SegmentImportStatus | undefined,
-    clearImportStatus: vi.fn(),
+    importStatus: undefined as ProcessStatus | string | undefined,
+    clearProcessStatus: vi.fn(),
     showNewSegmentModal: vi.fn(),
     showBatchModal: vi.fn(),
     embedding: false,
@@ -54,33 +52,33 @@ describe('SegmentAdd', () => {
   // Import Status displays
   describe('Import Status Display', () => {
     it('should show processing indicator when status is WAITING', () => {
-      render(<SegmentAdd {...defaultProps} importStatus={segmentImportStatus.waiting} />)
+      render(<SegmentAdd {...defaultProps} importStatus={ProcessStatus.WAITING} />)
 
       expect(screen.getByText(/list\.batchModal\.processing/i)).toBeInTheDocument()
     })
 
     it('should show processing indicator when status is PROCESSING', () => {
-      render(<SegmentAdd {...defaultProps} importStatus={segmentImportStatus.processing} />)
+      render(<SegmentAdd {...defaultProps} importStatus={ProcessStatus.PROCESSING} />)
 
       expect(screen.getByText(/list\.batchModal\.processing/i)).toBeInTheDocument()
     })
 
     it('should show completed status with ok button', () => {
-      render(<SegmentAdd {...defaultProps} importStatus={segmentImportStatus.completed} />)
+      render(<SegmentAdd {...defaultProps} importStatus={ProcessStatus.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={segmentImportStatus.error} />)
+      render(<SegmentAdd {...defaultProps} importStatus={ProcessStatus.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={segmentImportStatus.processing} />)
+      render(<SegmentAdd {...defaultProps} importStatus={ProcessStatus.PROCESSING} />)
 
       expect(screen.queryByText(/list\.action\.addButton/i)).not.toBeInTheDocument()
     })
@@ -96,34 +94,34 @@ describe('SegmentAdd', () => {
       expect(mockShowNewSegmentModal).toHaveBeenCalledTimes(1)
     })
 
-    it('should call clearImportStatus when ok is clicked on completed status', () => {
-      const mockClearImportStatus = vi.fn()
+    it('should call clearProcessStatus when ok is clicked on completed status', () => {
+      const mockClearProcessStatus = vi.fn()
       render(
         <SegmentAdd
           {...defaultProps}
-          importStatus={segmentImportStatus.completed}
-          clearImportStatus={mockClearImportStatus}
+          importStatus={ProcessStatus.COMPLETED}
+          clearProcessStatus={mockClearProcessStatus}
         />,
       )
 
       fireEvent.click(screen.getByText(/list\.batchModal\.ok/i))
 
-      expect(mockClearImportStatus).toHaveBeenCalledTimes(1)
+      expect(mockClearProcessStatus).toHaveBeenCalledTimes(1)
     })
 
-    it('should call clearImportStatus when ok is clicked on error status', () => {
-      const mockClearImportStatus = vi.fn()
+    it('should call clearProcessStatus when ok is clicked on error status', () => {
+      const mockClearProcessStatus = vi.fn()
       render(
         <SegmentAdd
           {...defaultProps}
-          importStatus={segmentImportStatus.error}
-          clearImportStatus={mockClearImportStatus}
+          importStatus={ProcessStatus.ERROR}
+          clearProcessStatus={mockClearProcessStatus}
         />,
       )
 
       fireEvent.click(screen.getByText(/list\.batchModal\.ok/i))
 
-      expect(mockClearImportStatus).toHaveBeenCalledTimes(1)
+      expect(mockClearProcessStatus).toHaveBeenCalledTimes(1)
     })
 
     it('should render batch add option in dropdown', async () => {
@@ -217,14 +215,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={segmentImportStatus.waiting} />)
+      const { container } = render(<SegmentAdd {...defaultProps} importStatus={ProcessStatus.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={segmentImportStatus.processing} />)
+      const { container } = render(<SegmentAdd {...defaultProps} importStatus={ProcessStatus.PROCESSING} />)
 
       const progressBar = container.querySelector('.w-2\\/3')
       expect(progressBar).toBeInTheDocument()
@@ -232,6 +230,15 @@ 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} />)
 

web/app/components/datasets/documents/detail/segment-add/index.tsx

@@ -1,5 +1,5 @@
 'use client'
-import type { SegmentImportStatus } from '@/types/dataset'
+import type { FC } from 'react'
 import { cn } from '@langgenius/dify-ui/cn'
 import {
   DropdownMenu,
@@ -7,92 +7,95 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from '@langgenius/dify-ui/dropdown-menu'
-import { useRef, useState } from 'react'
+import { useBoolean } from 'ahooks'
+import * as React from 'react'
+import { useCallback, useMemo, 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 SegmentAddProps = {
-  importStatus: SegmentImportStatus | undefined
-  clearImportStatus: () => void
+type ISegmentAddProps = {
+  importStatus: ProcessStatus | string | undefined
+  clearProcessStatus: () => void
   showNewSegmentModal: () => void
   showBatchModal: () => void
   embedding: boolean
 }
 
-export function SegmentAdd({
+export enum ProcessStatus {
+  WAITING = 'waiting',
+  PROCESSING = 'processing',
+  COMPLETED = 'completed',
+  ERROR = 'error',
+}
+
+const SegmentAdd: FC<ISegmentAddProps> = ({
   importStatus,
-  clearImportStatus,
+  clearProcessStatus,
   showNewSegmentModal,
   showBatchModal,
   embedding,
-}: SegmentAddProps) {
+}) => {
   const { t } = useTranslation()
-  const [isBatchMenuOpen, setIsBatchMenuOpen] = useState(false)
-  const [isPlanUpgradeModalOpen, setIsPlanUpgradeModalOpen] = useState(false)
-  const batchMenuAnchorRef = useRef<HTMLDivElement>(null)
+  const [isShowPlanUpgradeModal, {
+    setTrue: showPlanUpgradeModal,
+    setFalse: hidePlanUpgradeModal,
+  }] = useBoolean(false)
   const { plan, enableBilling } = useProviderContext()
-  const canAddChunks = !enableBilling || plan.type !== Plan.sandbox
+  const { type } = plan
+  const canAdd = enableBilling ? type !== Plan.sandbox : true
+  const [isBatchMenuOpen, setIsBatchMenuOpen] = useState(false)
+  const batchMenuAnchorRef = useRef<HTMLDivElement>(null)
 
-  const textColor = embedding
-    ? 'text-components-button-secondary-accent-text-disabled'
-    : 'text-components-button-secondary-accent-text'
-
-  const handleAddClick = () => {
-    if (!canAddChunks) {
-      setIsPlanUpgradeModalOpen(true)
-      return
+  const withNeedUpgradeCheck = useCallback((fn: () => void) => {
+    return () => {
+      if (!canAdd) {
+        showPlanUpgradeModal()
+        return
+      }
+      fn()
     }
-
-    showNewSegmentModal()
-  }
-
-  const handleBatchAddClick = () => {
-    setIsBatchMenuOpen(false)
-
-    if (!canAddChunks) {
-      setIsPlanUpgradeModalOpen(true)
-      return
-    }
-
-    showBatchModal()
-  }
+  }, [canAdd, showPlanUpgradeModal])
+  const textColor = useMemo(() => {
+    return embedding
+      ? 'text-components-button-secondary-accent-text-disabled'
+      : 'text-components-button-secondary-accent-text'
+  }, [embedding])
 
   if (importStatus) {
     return (
       <>
-        {(importStatus === segmentImportStatus.waiting || importStatus === segmentImportStatus.processing) && (
+        {(importStatus === ProcessStatus.WAITING || importStatus === ProcessStatus.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 === segmentImportStatus.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 === ProcessStatus.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 === segmentImportStatus.completed && (
+        {importStatus === ProcessStatus.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={clearImportStatus}>{t('list.batchModal.ok', { ns: 'datasetDocuments' })}</span>
+              <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>
             </div>
             <div className="absolute top-0 left-0 -z-10 h-full w-full bg-dataset-chunk-process-success-bg opacity-40" />
           </div>
         )}
-        {importStatus === segmentImportStatus.error && (
+        {importStatus === ProcessStatus.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={clearImportStatus}>{t('list.batchModal.ok', { ns: 'datasetDocuments' })}</span>
+              <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>
             </div>
             <div className="absolute top-0 left-0 -z-10 h-full w-full bg-dataset-chunk-process-error-bg opacity-40" />
           </div>
@@ -113,7 +116,7 @@ export function SegmentAdd({
         type="button"
         className={`inline-flex items-center rounded-l-lg border-r border-r-divider-subtle px-2.5 py-2
           hover:bg-state-base-hover disabled:cursor-not-allowed disabled:hover:bg-transparent`}
-        onClick={handleAddClick}
+        onClick={withNeedUpgradeCheck(showNewSegmentModal)}
         disabled={embedding}
       >
         <span aria-hidden className={cn('i-ri-add-line h-4 w-4', textColor)} />
@@ -139,20 +142,25 @@ export function SegmentAdd({
           placement="bottom-start"
           sideOffset={4}
           positionerProps={{ anchor: batchMenuAnchorRef }}
-          popupClassName="w-[var(--anchor-width)]"
+          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]"
         >
-          <DropdownMenuItem
-            className="system-md-regular"
-            onClick={handleBatchAddClick}
-          >
-            {t('list.action.batchAdd', { ns: 'datasetDocuments' })}
-          </DropdownMenuItem>
+          <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>
         </DropdownMenuContent>
       </DropdownMenu>
-      {isPlanUpgradeModalOpen && (
+      {isShowPlanUpgradeModal && (
         <PlanUpgradeModal
           show
-          onClose={() => setIsPlanUpgradeModalOpen(false)}
+          onClose={hidePlanUpgradeModal}
           title={t('upgrade.addChunks.title', { ns: 'billing' })!}
           description={t('upgrade.addChunks.description', { ns: 'billing' })!}
         />
@@ -161,3 +169,4 @@ export function SegmentAdd({
 
   )
 }
+export default React.memo(SegmentAdd)

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,
-  categories: ['Assistant'],
+  category: '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_categories: app.categories,
+        template_category: app.category,
         page: 'explore',
       })
     })

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_categories: app.categories,
+      template_category: app.category,
       page: 'explore',
     })
     onTry({ appId: app.app_id, app })

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,
-  categories: overrides.categories ?? ['Writing'],
+  category: overrides.category ?? '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' }, categories: ['Translate'] })],
+        allList: [createApp(), createApp({ app_id: 'app-2', app: { ...createApp().app, name: 'Beta' }, category: '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' }, categories: ['Translate'] })],
+        allList: [createApp(), createApp({ app_id: 'app-2', app: { ...createApp().app, name: 'Beta' }, category: 'Translate' })],
       }
 
       renderAppList(false, undefined, { category: 'Writing' })

web/app/components/explore/app-list/index.tsx

@@ -77,10 +77,7 @@ const Apps = ({
   const filteredList = useMemo(() => {
     if (!data)
       return []
-    return data.allList.filter(item => (
-      currCategory === allCategoriesEn
-      || item.categories?.includes(currCategory)
-    ))
+    return data.allList.filter(item => currCategory === allCategoriesEn || item.category === currCategory)
   }, [data, currCategory, allCategoriesEn])
 
   const searchFilteredList = useMemo(() => {
@@ -280,7 +277,7 @@ const Apps = ({
         <TryApp
           appId={currentTryApp?.appId || ''}
           app={currentTryApp?.app}
-          categories={currentTryApp?.app?.categories}
+          category={currentTryApp?.app?.category}
           onClose={hideTryAppPanel}
           onCreate={handleShowFromTryApp}
         />