Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

fix: expose KnowledgeFS availability in workspace features (#45073)

yyhf1739f12d76d
diff --git a/api/controllers/console/knowledge_fs/features.py b/api/controllers/console/knowledge_fs/features.py
index 9f62fe7974e..fb3dc0521de 100644
--- a/api/controllers/console/knowledge_fs/features.py
+++ b/api/controllers/console/knowledge_fs/features.py
@@ -14,7 +14,6 @@ from services.knowledge_fs.feature_service import get_knowledge_fs_features
class KnowledgeFSFeaturesResponse(ResponseModel):
- enabled: bool
upload_enabled: bool
agent_enabled: bool
@@ -24,7 +23,7 @@ register_response_schema_models(console_ns, KnowledgeFSFeaturesResponse)
@console_ns.route("/knowledge-fs/features")
class KnowledgeFSFeaturesApi(Resource):
- @console_ns.doc(description="Get which Agent Knowledge Base surfaces this deployment offers")
+ @console_ns.doc(description="Get which Agent Knowledge Base capabilities this deployment offers")
@console_ns.response(
HTTPStatus.OK,
"Agent Knowledge Base availability",
diff --git a/api/openapi/markdown/console-openapi.md b/api/openapi/markdown/console-openapi.md
index b44f55caa92..73e032f3e23 100644
--- a/api/openapi/markdown/console-openapi.md
+++ b/api/openapi/markdown/console-openapi.md
@@ -8339,7 +8339,7 @@ Get instruction generation template
| default | Error | **application/json**: [ErrorResponse](#errorresponse)<br> |
### [GET] /knowledge-fs/features
-Get which Agent Knowledge Base surfaces this deployment offers
+Get which Agent Knowledge Base capabilities this deployment offers
#### Responses
@@ -25221,6 +25221,7 @@ Effective feature availability and limits for the current workspace.
| can_replace_logo | boolean | | Yes |
| documents_upload_quota | [LimitationModel](#limitationmodel) | | Yes |
| education | [EducationModel](#educationmodel) | | Yes |
+| enable_knowledge_fs | boolean | | Yes |
| enable_skill | boolean, <br>**Default:** true | | Yes |
| human_input_email_delivery_enabled | boolean | | Yes |
| is_allow_transfer_workspace | boolean, <br>**Default:** true | | Yes |
@@ -26844,7 +26845,6 @@ Accepted staged or legacy multipart upload, preserving both response shapes.
| Name | Type | Description | Required |
| ---- | ---- | ----------- | -------- |
| agent_enabled | boolean | | Yes |
-| enabled | boolean | | Yes |
| upload_enabled | boolean | | Yes |
#### KnowledgeFSGoldenQuestionBulkImportItemResponse
diff --git a/api/services/entities/feature_entities.py b/api/services/entities/feature_entities.py
index 20f9d149000..843b64c723b 100644
--- a/api/services/entities/feature_entities.py
+++ b/api/services/entities/feature_entities.py
@@ -149,6 +149,7 @@ class FeatureModel(FeatureResponseModel):
billing: BillingModel = BillingModel()
education: EducationModel = EducationModel()
enable_skill: bool = True
+ enable_knowledge_fs: bool = False
members: LimitationModel = LimitationModel(size=0, limit=1)
apps: LimitationModel = LimitationModel(size=0, limit=10)
# Indexing tasks still consume this internally; Console queries vector usage separately.
diff --git a/api/services/feature_service.py b/api/services/feature_service.py
index c740a0d1461..6049a851305 100644
--- a/api/services/feature_service.py
+++ b/api/services/feature_service.py
@@ -4,6 +4,7 @@ from services.account_education_service import EDUCATION_EDITIONS
from services.billing_service import BillingInfo, BillingService
from services.enterprise.enterprise_service import EnterpriseService
from services.entities import feature_entities
+from services.knowledge_fs.feature_service import get_knowledge_fs_features
class FeatureService:
@@ -124,6 +125,7 @@ class FeatureService:
dify_config.EDUCATION_ENABLED and dify_config.DEPLOYMENT_EDITION in EDUCATION_EDITIONS
)
features.enable_skill = dify_config.ENABLE_SKILL
+ features.enable_knowledge_fs = get_knowledge_fs_features().enabled
@classmethod
def _fulfill_params_from_workspace_info(cls, features: feature_entities.FeatureModel, tenant_id: str):
diff --git a/api/tests/unit_tests/controllers/console/knowledge_fs/test_features.py b/api/tests/unit_tests/controllers/console/knowledge_fs/test_features.py
index c141de2637e..41be175cb59 100644
--- a/api/tests/unit_tests/controllers/console/knowledge_fs/test_features.py
+++ b/api/tests/unit_tests/controllers/console/knowledge_fs/test_features.py
@@ -9,4 +9,4 @@ def test_get_knowledge_fs_features_serializes_deployment_availability(config_ove
result = unwrap(KnowledgeFSFeaturesApi.get)(KnowledgeFSFeaturesApi())
- assert result == {"enabled": False, "upload_enabled": False, "agent_enabled": False}
+ assert result == {"upload_enabled": False, "agent_enabled": False}
diff --git a/api/tests/unit_tests/services/test_feature_service.py b/api/tests/unit_tests/services/test_feature_service.py
index e7fbbe21733..abf968b6581 100644
--- a/api/tests/unit_tests/services/test_feature_service.py
+++ b/api/tests/unit_tests/services/test_feature_service.py
@@ -242,6 +242,21 @@ def test_skill_feature_follows_env_config(config_overrides: Callable[..., None])
assert features.enable_skill is True
[email protected]("enabled", [True, False])
+def test_knowledge_fs_feature_follows_deployment_availability(
+ config_overrides: Callable[..., None], enabled: bool
+) -> None:
+ config_overrides(
+ DEPLOYMENT_EDITION=DeploymentEdition.COMMUNITY,
+ KNOWLEDGE_FS_ENABLED=enabled,
+ KNOWLEDGE_FS_COMMUNITY_DEV_ENABLED=True,
+ )
+
+ features = FeatureService.get_features("")
+
+ assert features.enable_knowledge_fs is enabled
+
+
def test_get_public_system_features_excludes_trial_models() -> None:
result = SystemFeatureService.get_public_system_features().model_dump()
diff --git a/packages/contracts/generated/api/console/features/types.gen.ts b/packages/contracts/generated/api/console/features/types.gen.ts
index 687afc86dfd..e4f56eed25e 100644
--- a/packages/contracts/generated/api/console/features/types.gen.ts
+++ b/packages/contracts/generated/api/console/features/types.gen.ts
@@ -12,6 +12,7 @@ export type FeatureModel = {
can_replace_logo: boolean
documents_upload_quota: LimitationModel
education: EducationModel
+ enable_knowledge_fs: boolean
enable_skill: boolean
human_input_email_delivery_enabled: boolean
is_allow_transfer_workspace: boolean
diff --git a/packages/contracts/generated/api/console/features/zod.gen.ts b/packages/contracts/generated/api/console/features/zod.gen.ts
index 351b1fa8040..e130a65f7b1 100644
--- a/packages/contracts/generated/api/console/features/zod.gen.ts
+++ b/packages/contracts/generated/api/console/features/zod.gen.ts
@@ -115,6 +115,7 @@ export const zFeatureModel = z.object({
can_replace_logo: z.boolean().default(false),
documents_upload_quota: zLimitationModel.default({ limit: 50, size: 0 }),
education: zEducationModel.default({ activated: false, enabled: false }),
+ enable_knowledge_fs: z.boolean().default(false),
enable_skill: z.boolean().default(true),
human_input_email_delivery_enabled: z.boolean().default(false),
is_allow_transfer_workspace: z.boolean().default(true),
diff --git a/packages/contracts/generated/api/console/knowledge-fs/orpc.gen.ts b/packages/contracts/generated/api/console/knowledge-fs/orpc.gen.ts
index 5c784393773..724fb42501b 100644
--- a/packages/contracts/generated/api/console/knowledge-fs/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/knowledge-fs/orpc.gen.ts
@@ -377,11 +377,11 @@ export const wellKnown = {
}
/**
- * Get which Agent Knowledge Base surfaces this deployment offers
+ * Get which Agent Knowledge Base capabilities this deployment offers
*/
export const get2 = oc
.route({
- description: 'Get which Agent Knowledge Base surfaces this deployment offers',
+ description: 'Get which Agent Knowledge Base capabilities this deployment offers',
inputStructure: 'detailed',
method: 'GET',
operationId: 'getKnowledgeFsFeatures',
diff --git a/packages/contracts/generated/api/console/knowledge-fs/types.gen.ts b/packages/contracts/generated/api/console/knowledge-fs/types.gen.ts
index a2994773e47..365faf6630f 100644
--- a/packages/contracts/generated/api/console/knowledge-fs/types.gen.ts
+++ b/packages/contracts/generated/api/console/knowledge-fs/types.gen.ts
@@ -20,7 +20,6 @@ export type ErrorResponse = {
export type KnowledgeFsFeaturesResponse = {
agent_enabled: boolean
- enabled: boolean
upload_enabled: boolean
}
diff --git a/packages/contracts/generated/api/console/knowledge-fs/zod.gen.ts b/packages/contracts/generated/api/console/knowledge-fs/zod.gen.ts
index f34d1bfce4b..182c5b83107 100644
--- a/packages/contracts/generated/api/console/knowledge-fs/zod.gen.ts
+++ b/packages/contracts/generated/api/console/knowledge-fs/zod.gen.ts
@@ -23,7 +23,6 @@ export const zErrorResponse = z.object({
*/
export const zKnowledgeFsFeaturesResponse = z.object({
agent_enabled: z.boolean(),
- enabled: z.boolean(),
upload_enabled: z.boolean(),
})
diff --git a/web/__tests__/api-key-management.spec.tsx b/web/__tests__/api-key-management.spec.tsx
index 286ef993ce1..7e791fede86 100644
--- a/web/__tests__/api-key-management.spec.tsx
+++ b/web/__tests__/api-key-management.spec.tsx
@@ -83,6 +83,7 @@ async function renderDialog(
const { wrapper: Wrapper } = createConsoleQueryWrapper({
workspacePermissionKeys: ['dataset.api_key.manage'],
currentWorkspace: { id: 'workspace-1', name: 'Test Workspace' },
+ features: {},
})
const user = userEvent.setup()
render(
diff --git a/web/app/(commonLayout)/datasets/new/__tests__/layout.spec.tsx b/web/app/(commonLayout)/datasets/new/__tests__/layout.spec.tsx
index ea02a85b4c3..17bfdc119c3 100644
--- a/web/app/(commonLayout)/datasets/new/__tests__/layout.spec.tsx
+++ b/web/app/(commonLayout)/datasets/new/__tests__/layout.spec.tsx
@@ -2,14 +2,14 @@ import type { ReactElement, ReactNode } from 'react'
import { render, screen } from '@testing-library/react'
const mocks = vi.hoisted(() => ({
- getKnowledgeFsFeatures: vi.fn(),
+ getFeatures: vi.fn(),
redirect: vi.fn((_href: string) => {
throw new Error('NEXT_REDIRECT')
}),
}))
-vi.mock('@/features/knowledge-fs-availability/server', () => ({
- getKnowledgeFsFeatures: () => mocks.getKnowledgeFsFeatures(),
+vi.mock('@/service/console', () => ({
+ consoleClient: { features: { get: () => mocks.getFeatures() } },
}))
vi.mock('@/next/navigation', () => ({
@@ -25,19 +25,19 @@ async function renderLayout(children: ReactNode) {
describe('NewKnowledgeLayout', () => {
beforeEach(() => {
vi.clearAllMocks()
- mocks.getKnowledgeFsFeatures.mockResolvedValue({ enabled: true })
+ mocks.getFeatures.mockResolvedValue({ enable_knowledge_fs: true })
})
it('renders new knowledge routes when KnowledgeFS is enabled', async () => {
await renderLayout(<div>New knowledge content</div>)
- expect(mocks.getKnowledgeFsFeatures).toHaveBeenCalledOnce()
+ expect(mocks.getFeatures).toHaveBeenCalledOnce()
expect(screen.getByText('New knowledge content')).toBeInTheDocument()
expect(mocks.redirect).not.toHaveBeenCalled()
})
it('redirects to datasets when KnowledgeFS is disabled', async () => {
- mocks.getKnowledgeFsFeatures.mockResolvedValue({ enabled: false })
+ mocks.getFeatures.mockResolvedValue({ enable_knowledge_fs: false })
const { default: Layout } = await import('../layout')
await expect(Layout({ children: <div>New knowledge content</div> })).rejects.toThrow(
@@ -49,7 +49,7 @@ describe('NewKnowledgeLayout', () => {
it('preserves KnowledgeFS availability failures', async () => {
const error = new Error('KnowledgeFS availability unavailable')
- mocks.getKnowledgeFsFeatures.mockRejectedValue(error)
+ mocks.getFeatures.mockRejectedValue(error)
const { default: Layout } = await import('../layout')
await expect(Layout({ children: <div>New knowledge content</div> })).rejects.toBe(error)
diff --git a/web/app/(commonLayout)/datasets/new/layout.tsx b/web/app/(commonLayout)/datasets/new/layout.tsx
index 55e4f96fac2..b02817c10ba 100644
--- a/web/app/(commonLayout)/datasets/new/layout.tsx
+++ b/web/app/(commonLayout)/datasets/new/layout.tsx
@@ -1,11 +1,11 @@
import type { ReactNode } from 'react'
-import { getKnowledgeFsFeatures } from '@/features/knowledge-fs-availability/server'
import { redirect } from '@/next/navigation'
+import { consoleClient } from '@/service/console'
export default async function Layout({ children }: { children: ReactNode }) {
- const knowledgeFsFeatures = await getKnowledgeFsFeatures()
+ const features = await consoleClient.features.get()
- if (!knowledgeFsFeatures.enabled) redirect('/datasets')
+ if (!features.enable_knowledge_fs) redirect('/datasets')
return children
}
diff --git a/web/app/components/api-key/__tests__/dataset-api-key-dialog-content.spec.tsx b/web/app/components/api-key/__tests__/dataset-api-key-dialog-content.spec.tsx
index 33af0083e80..74097cb2c91 100644
--- a/web/app/components/api-key/__tests__/dataset-api-key-dialog-content.spec.tsx
+++ b/web/app/components/api-key/__tests__/dataset-api-key-dialog-content.spec.tsx
@@ -66,7 +66,7 @@ function renderDialog() {
// KnowledgeFS spaces only show up in the scope picker when the workspace has KnowledgeFS.
return renderWithConsoleQuery(<DatasetApiKeys />, {
currentWorkspace: { id: 'workspace-1' },
- knowledgeFsFeatures: { enabled: apiMocks.knowledgeFsEnabled },
+ features: { enable_knowledge_fs: apiMocks.knowledgeFsEnabled },
})
}
diff --git a/web/app/components/api-key/dataset-scope-dialog.tsx b/web/app/components/api-key/dataset-scope-dialog.tsx
index 65b1dc377af..8af6e256004 100644
--- a/web/app/components/api-key/dataset-scope-dialog.tsx
+++ b/web/app/components/api-key/dataset-scope-dialog.tsx
@@ -33,11 +33,9 @@ import {
} from '@langgenius/dify-ui/dialog'
import { IconButton } from '@langgenius/dify-ui/icon-button'
import { Radio, RadioGroup } from '@langgenius/dify-ui/radio-group'
-import { useInfiniteQuery } from '@tanstack/react-query'
-import { useAtomValue } from 'jotai'
+import { useInfiniteQuery, useSuspenseQuery } from '@tanstack/react-query'
import { useId, useMemo, useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
-import { knowledgeFsEnabledAtom } from '@/features/knowledge-fs-availability/state'
import { consoleQuery } from '@/service/console'
type Scope = 'all' | 'specific'
@@ -165,7 +163,11 @@ function DatasetScopeContent({
}: Omit<DatasetScopeDialogProps, 'open' | 'finalFocus' | 'onOpenChange'>) {
const { t } = useTranslation(['appApi', 'common'])
const scopeId = useId()
- const knowledgeFsEnabled = useAtomValue(knowledgeFsEnabledAtom)
+ const { data: knowledgeFsEnabled } = useSuspenseQuery(
+ consoleQuery.features.get.queryOptions({
+ select: (features) => features.enable_knowledge_fs,
+ }),
+ )
const [scope, setScope] = useState<Scope>('all')
const [selected, setSelected] = useState<SelectedKb[]>([])
const [keyword, setKeyword] = useState('')
diff --git a/web/app/components/datasets/list/__tests__/index.spec.tsx b/web/app/components/datasets/list/__tests__/index.spec.tsx
index f09a1621714..9fb434faa96 100644
--- a/web/app/components/datasets/list/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/list/__tests__/index.spec.tsx
@@ -84,6 +84,7 @@ function setup(
'dataset.tag.manage',
],
systemFeatures: { rbac_enabled: true },
+ features: {},
...options,
},
)
@@ -383,26 +384,31 @@ describe('KnowledgeFS view', () => {
const agentView = { name: 'knowledgeSpace.view.agent knowledgeSpace.view.beta' }
it('keeps the classic list without requesting KnowledgeFS when it is disabled', async () => {
- setup({ knowledgeFsFeatures: { enabled: false } }, undefined, '?view=agent')
+ setup(
+ { features: { enable_knowledge_fs: false }, knowledgeFsFeatures: null },
+ undefined,
+ '?view=agent',
+ )
expect(await screen.findByRole('link', { name: 'Test Dataset' })).toBeInTheDocument()
expect(screen.queryByRole('radio', agentView)).not.toBeInTheDocument()
+ expect(api.knowledgeFsFeatures).not.toHaveBeenCalled()
expect(api.knowledgeSpaces).not.toHaveBeenCalled()
})
- it('keeps the classic list when KnowledgeFS availability cannot be loaded', async () => {
- api.knowledgeFsFeatures.mockRejectedValue(new Error('KnowledgeFS availability unavailable'))
- setup({ knowledgeFsFeatures: null }, undefined, '?view=agent')
+ it('renders the view switcher before KnowledgeFS capabilities resolve', () => {
+ api.knowledgeFsFeatures.mockReturnValue(new Promise(() => {}))
+ setup({ features: { enable_knowledge_fs: true }, knowledgeFsFeatures: null })
- expect(await screen.findByRole('link', { name: 'Test Dataset' })).toBeInTheDocument()
- await waitFor(() => expect(api.knowledgeFsFeatures).toHaveBeenCalled())
- expect(screen.queryByRole('radio', agentView)).not.toBeInTheDocument()
- expect(api.knowledgeSpaces).not.toHaveBeenCalled()
+ expect(screen.getByRole('radio', { name: 'knowledgeSpace.view.classic' })).toHaveAttribute(
+ 'aria-checked',
+ 'true',
+ )
})
it('switches to the Agent view and back while keeping other URL filters', async () => {
const { onUrlUpdate, user } = setup(
- { knowledgeFsFeatures: { enabled: true } },
+ { features: { enable_knowledge_fs: true } },
undefined,
'?creator_ids=creator-1',
)
@@ -427,7 +433,7 @@ describe('KnowledgeFS view', () => {
})
it('restores the Agent view from the URL', async () => {
- setup({ knowledgeFsFeatures: { enabled: true } }, undefined, '?view=agent')
+ setup({ features: { enable_knowledge_fs: true } }, undefined, '?view=agent')
expect(await screen.findByRole('region', { name: 'knowledgeSpace.new' })).toBeInTheDocument()
expect(screen.getByRole('radio', agentView)).toHaveAttribute('aria-checked', 'true')
@@ -435,12 +441,12 @@ describe('KnowledgeFS view', () => {
})
it('shows the first-visit guide once and reopens it on request', async () => {
- const first = setup({ knowledgeFsFeatures: { enabled: true } })
+ const first = setup({ features: { enable_knowledge_fs: true } })
const guide = await screen.findByRole('dialog', { name: 'knowledgeSpace.guideTitle' })
await first.user.click(within(guide).getByRole('button', { name: 'knowledgeSpace.gotIt' }))
first.unmount()
- const { user } = setup({ knowledgeFsFeatures: { enabled: true } })
+ const { user } = setup({ features: { enable_knowledge_fs: true } })
expect(
screen.queryByRole('dialog', { name: 'knowledgeSpace.guideTitle' }),
).not.toBeInTheDocument()
@@ -450,7 +456,7 @@ describe('KnowledgeFS view', () => {
).toBeInTheDocument()
})
it('keeps a dismissed guide closed after hydrating a full page reload', async () => {
- const first = setup({ knowledgeFsFeatures: { enabled: true } })
+ const first = setup({ features: { enable_knowledge_fs: true } })
const guide = await screen.findByRole('dialog', { name: 'knowledgeSpace.guideTitle' })
await first.user.click(within(guide).getByRole('button', { name: 'knowledgeSpace.gotIt' }))
first.unmount()
@@ -462,7 +468,7 @@ describe('KnowledgeFS view', () => {
}
const { queryClient, wrapper: QueryWrapper } = createConsoleQueryWrapper({
currentWorkspace: { role: 'owner' },
- knowledgeFsFeatures: { enabled: true },
+ features: { enable_knowledge_fs: true },
})
const store = createStore()
store.set(queryClientAtom, queryClient)
diff --git a/web/app/components/datasets/list/index.tsx b/web/app/components/datasets/list/index.tsx
index fa0ef24c5e0..6e4f8f4de75 100644
--- a/web/app/components/datasets/list/index.tsx
+++ b/web/app/components/datasets/list/index.tsx
@@ -1,7 +1,7 @@
'use client'
import type { KnowledgeViewSwitcherProps } from '@/features/new-rag/list/knowledge-view-switcher'
-import { useQuery } from '@tanstack/react-query'
+import { useQuery, useSuspenseQuery } from '@tanstack/react-query'
// Libraries
import { useBoolean } from 'ahooks'
import { useDebouncedValue } from 'foxact/use-debounced-value'
@@ -21,7 +21,6 @@ import {
} from '@/app/components/step-by-step-tour/target-registry'
import { workspacePermissionKeysAtom } from '@/context/permission-state'
import { isCurrentWorkspaceOwnerAtom } from '@/context/workspace-state'
-import { knowledgeFsEnabledAtom } from '@/features/knowledge-fs-availability/state'
import { NewKnowledgeList } from '@/features/new-rag/list/new-knowledge-list'
import { KnowledgeUpgradeProvider } from '@/features/new-rag/upgrade/knowledge-upgrade-context'
import { TagManagementModal } from '@/features/tag-management/components/tag-management-modal'
@@ -231,8 +230,11 @@ function KnowledgeFsList() {
}
function List() {
- // The legacy list stays usable while KnowledgeFS availability is loading or unavailable.
- const knowledgeFsEnabled = useAtomValue(knowledgeFsEnabledAtom)
+ const { data: knowledgeFsEnabled } = useSuspenseQuery(
+ consoleQuery.features.get.queryOptions({
+ select: (features) => features.enable_knowledge_fs,
+ }),
+ )
if (!knowledgeFsEnabled) return <LegacyList />
diff --git a/web/app/components/rag-pipeline/hooks/__tests__/use-available-nodes-meta-data.spec.ts b/web/app/components/rag-pipeline/hooks/__tests__/use-available-nodes-meta-data.spec.ts
index 69c817b9843..580ba14c3fb 100644
--- a/web/app/components/rag-pipeline/hooks/__tests__/use-available-nodes-meta-data.spec.ts
+++ b/web/app/components/rag-pipeline/hooks/__tests__/use-available-nodes-meta-data.spec.ts
@@ -16,7 +16,7 @@ vi.mock('@/features/agent-v2/feature-flag', () => ({
it.each([true, false])('offers the pipeline node catalog with Agent v2 enabled=%s', (enabled) => {
mockIsAgentV2Enabled.mockReturnValue(enabled)
const { result } = renderHookWithConsoleQuery(() => useAvailableNodesMetaData(), {
- knowledgeFsFeatures: { enabled: true },
+ features: { enable_knowledge_fs: true },
})
const { nodes, nodesMap } = result.current
const types = nodes.map((node) => node.metaData.type)
@@ -56,7 +56,7 @@ it.each([true, false])('offers the pipeline node catalog with Agent v2 enabled=%
it('hides Knowledge Retrieval V2 when KnowledgeFS is unavailable', () => {
const { result } = renderHookWithConsoleQuery(() => useAvailableNodesMetaData(), {
- knowledgeFsFeatures: { enabled: false },
+ features: { enable_knowledge_fs: false },
})
const types = result.current.nodes.map((node) => node.metaData.type)
expect(types).not.toContain(BlockEnum.KnowledgeRetrievalV2)
diff --git a/web/app/components/rag-pipeline/hooks/use-available-nodes-meta-data.ts b/web/app/components/rag-pipeline/hooks/use-available-nodes-meta-data.ts
index d80aa77bffd..80a748dd6f6 100644
--- a/web/app/components/rag-pipeline/hooks/use-available-nodes-meta-data.ts
+++ b/web/app/components/rag-pipeline/hooks/use-available-nodes-meta-data.ts
@@ -1,5 +1,5 @@
import type { AvailableNodesMetaData } from '@/app/components/workflow/hooks-store/store'
-import { useAtomValue } from 'jotai'
+import { useSuspenseQuery } from '@tanstack/react-query'
import { useMemo } from 'react'
import { useTranslation } from 'react-i18next'
import { WORKFLOW_COMMON_NODES } from '@/app/components/workflow/constants/node'
@@ -9,13 +9,17 @@ import knowledgeBaseDefault from '@/app/components/workflow/nodes/knowledge-base
import { BlockEnum } from '@/app/components/workflow/types'
import { useDocLink } from '@/context/i18n'
import { isAgentV2Enabled } from '@/features/agent-v2/feature-flag'
-import { knowledgeFsEnabledAtom } from '@/features/knowledge-fs-availability/state'
+import { consoleQuery } from '@/service/console'
export const useAvailableNodesMetaData = () => {
const { t } = useTranslation(['workflow'])
const docLink = useDocLink()
const agentV2Enabled = isAgentV2Enabled()
- const knowledgeFsEnabled = useAtomValue(knowledgeFsEnabledAtom)
+ const { data: knowledgeFsEnabled } = useSuspenseQuery(
+ consoleQuery.features.get.queryOptions({
+ select: (features) => features.enable_knowledge_fs,
+ }),
+ )
const mergedNodesMetaData = useMemo(
() => [
diff --git a/web/app/components/workflow/__tests__/node-catalog.spec.ts b/web/app/components/workflow/__tests__/node-catalog.spec.ts
index d8a5debae10..a3b03a274dc 100644
--- a/web/app/components/workflow/__tests__/node-catalog.spec.ts
+++ b/web/app/components/workflow/__tests__/node-catalog.spec.ts
@@ -5,7 +5,7 @@ import { createConsoleQueryWrapper } from '@/test/console/query-data'
// The node catalog reads KnowledgeFS availability from the console features query.
const catalogQueryClient = ({ enabled = true } = {}) =>
- createConsoleQueryWrapper({ knowledgeFsFeatures: { enabled } }).queryClient
+ createConsoleQueryWrapper({ features: { enable_knowledge_fs: enabled } }).queryClient
const mockIsAgentV2Enabled = vi.hoisted(() => vi.fn(() => true))
const mockIsAgentV2InChatflowEnabled = vi.hoisted(() => vi.fn(() => false))
diff --git a/web/app/components/workflow/__tests__/workflow-test-providers.tsx b/web/app/components/workflow/__tests__/workflow-test-providers.tsx
index c3776a6d451..71141ed7882 100644
--- a/web/app/components/workflow/__tests__/workflow-test-providers.tsx
+++ b/web/app/components/workflow/__tests__/workflow-test-providers.tsx
@@ -11,7 +11,7 @@ import { createQueryClientWrapper } from '@/test/console/query-client'
import {
seedAppDetail,
seedAppDslVersion,
- seedKnowledgeFsFeatures,
+ seedFeatures,
seedSystemFeatures,
} from '@/test/console/query-data'
import { createAppDetailFixture } from '@/test/fixtures/app'
@@ -97,8 +97,9 @@ export function createWorkflowWrapper(
},
})
if (!externalQueryClient) seedSystemFeatures(queryClient)
- // The node catalog reads KnowledgeFS availability; keep it unavailable unless a suite seeds it.
- if (!externalQueryClient) seedKnowledgeFsFeatures(queryClient)
+ // The node catalog suspends on workspace features; keep KnowledgeFS unavailable unless a suite seeds it.
+ if (queryClient.getQueryData(consoleQuery.features.get.queryKey()) === undefined)
+ seedFeatures(queryClient)
if (!externalQueryClient) seedAppDslVersion(queryClient)
if (!externalQueryClient) seedAccountProfileQuery(queryClient)
if (resource.kind === 'app') {
diff --git a/web/app/components/workflow/hooks/__tests__/selection-interactions.browser.spec.tsx b/web/app/components/workflow/hooks/__tests__/selection-interactions.browser.spec.tsx
index ee5c3faaa68..8686c3ada1c 100644
--- a/web/app/components/workflow/hooks/__tests__/selection-interactions.browser.spec.tsx
+++ b/web/app/components/workflow/hooks/__tests__/selection-interactions.browser.spec.tsx
@@ -112,6 +112,7 @@ async function setup() {
workspacePermissionKeys: [],
appDslVersion: '0.6.0',
systemFeatures: { enable_collaboration_mode: false },
+ features: {},
})
seedModelProviderQueries(queryClient)
seedToolProviders(queryClient, {
diff --git a/web/app/components/workflow/hooks/__tests__/use-checklist.spec.tsx b/web/app/components/workflow/hooks/__tests__/use-checklist.spec.tsx
index 92eef4cac37..eebd3c7caa1 100644
--- a/web/app/components/workflow/hooks/__tests__/use-checklist.spec.tsx
+++ b/web/app/components/workflow/hooks/__tests__/use-checklist.spec.tsx
@@ -49,7 +49,7 @@ vi.mock('@/service/base', async (importOriginal) => ({
}))
function createChecklistQueryClient(builtInTools: ToolProviderListResponse = []) {
- const { queryClient } = createConsoleQueryWrapper()
+ const { queryClient } = createConsoleQueryWrapper({ features: {} })
seedModelProviderQueries(queryClient)
seedToolProviders(queryClient, { builtInTools, customTools: [], workflowTools: [], mcpTools: [] })
queryClient.setQueryData(consoleQuery.workspaces.current.agentProviders.get.queryKey(), [])
diff --git a/web/app/components/workflow/node-catalog.ts b/web/app/components/workflow/node-catalog.ts
index 6a89700895d..37ca83e9406 100644
--- a/web/app/components/workflow/node-catalog.ts
+++ b/web/app/components/workflow/node-catalog.ts
@@ -1,5 +1,6 @@
import type { AvailableNodesMetaData } from '@/app/components/workflow/hooks-store/store'
import type { DocPathWithoutLang } from '@/types/doc-paths'
+import { useSuspenseQuery } from '@tanstack/react-query'
import { useAtomValue } from 'jotai'
import { useMemo } from 'react'
import { useTranslation } from 'react-i18next'
@@ -15,7 +16,7 @@ import TriggerWebhookDefault from '@/app/components/workflow/nodes/trigger-webho
import { BlockEnum } from '@/app/components/workflow/types'
import { useDocLink } from '@/context/i18n'
import { isAgentV2Enabled, isAgentV2InChatflowEnabled } from '@/features/agent-v2/feature-flag'
-import { knowledgeFsEnabledAtom } from '@/features/knowledge-fs-availability/state'
+import { consoleQuery } from '@/service/console'
import { isProductlessDocPathWithAnchor } from '@/types/doc-paths'
const getNodeHelpLinkPath = (helpLinkUri?: string): DocPathWithoutLang | undefined => {
@@ -33,7 +34,11 @@ export const useWorkflowNodeCatalog = () => {
// Chatflow (advanced-chat) keeps Agent v2 hidden by default; opt in via
// NEXT_PUBLIC_ENABLE_AGENT_V2_IN_CHATFLOW. Pure workflows are unaffected.
const shouldUseAgentV2 = agentV2Enabled && (!isChatflow || isAgentV2InChatflowEnabled())
- const knowledgeFsEnabled = useAtomValue(knowledgeFsEnabledAtom)
+ const { data: knowledgeFsEnabled } = useSuspenseQuery(
+ consoleQuery.features.get.queryOptions({
+ select: (features) => features.enable_knowledge_fs,
+ }),
+ )
const startNodeMetaData = useMemo(
() => ({
diff --git a/web/features/agent-v2/agent-detail/configure/components/__tests__/agent-prompt-editor-test-env.tsx b/web/features/agent-v2/agent-detail/configure/components/__tests__/agent-prompt-editor-test-env.tsx
index 07abaa15516..a93516a3ad9 100644
--- a/web/features/agent-v2/agent-detail/configure/components/__tests__/agent-prompt-editor-test-env.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/__tests__/agent-prompt-editor-test-env.tsx
@@ -80,7 +80,7 @@ export function createAgentPromptEnvironment({
})
const { wrapper: QueryProvider, queryClient } = createConsoleQueryWrapper({
features: { enable_skill: true },
- knowledgeFsFeatures: { enabled: false, upload_enabled: false, agent_enabled: false },
+ knowledgeFsFeatures: { upload_enabled: false, agent_enabled: false },
})
store.set(queryClientAtom, queryClient)
seedToolProviders(queryClient, { builtInTools, mcpTools, customTools: [], workflowTools: [] })
diff --git a/web/features/knowledge-fs-availability/client.ts b/web/features/knowledge-fs-availability/client.ts
index d95e9149c27..3b024ae92e9 100644
--- a/web/features/knowledge-fs-availability/client.ts
+++ b/web/features/knowledge-fs-availability/client.ts
@@ -1,6 +1,6 @@
import { consoleQuery } from '@/service/console'
-// Deployment configuration: it changes only with a redeploy, so the hydrated snapshot never goes stale.
+// Deployment configuration: it changes only with a redeploy, so the snapshot never goes stale.
export const knowledgeFsFeaturesQueryOptions = () =>
consoleQuery.knowledgeFs.features.get.queryOptions({
staleTime: Infinity,
diff --git a/web/features/knowledge-fs-availability/server.ts b/web/features/knowledge-fs-availability/server.ts
deleted file mode 100644
index bc341b04d3b..00000000000
--- a/web/features/knowledge-fs-availability/server.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { consoleClient } from '@/service/console'
-import 'server-only'
-
-// Route gates read the signed-in user's deployment availability; failures propagate to the route.
-export const getKnowledgeFsFeatures = () => consoleClient.knowledgeFs.features.get()
diff --git a/web/features/knowledge-fs-availability/state.ts b/web/features/knowledge-fs-availability/state.ts
index 95b69109f21..7b773cb866a 100644
--- a/web/features/knowledge-fs-availability/state.ts
+++ b/web/features/knowledge-fs-availability/state.ts
@@ -6,11 +6,9 @@ import { knowledgeFsFeaturesQueryOptions } from './client'
const knowledgeFsFeaturesQueryAtom = atomWithQuery(() => knowledgeFsFeaturesQueryOptions())
-// Every surface stays unavailable until the authenticated query resolves, and after it fails.
+// Every capability stays unavailable until the authenticated query resolves, and after it fails.
const knowledgeFsFeaturesAtom = atom((get) => get(knowledgeFsFeaturesQueryAtom).data)
-export const knowledgeFsEnabledAtom = atom((get) => get(knowledgeFsFeaturesAtom)?.enabled ?? false)
-
export const knowledgeFsUploadEnabledAtom = atom(
(get) => get(knowledgeFsFeaturesAtom)?.upload_enabled ?? false,
)
diff --git a/web/features/new-rag/documents/__tests__/delete-document.browser.spec.tsx b/web/features/new-rag/documents/__tests__/delete-document.browser.spec.tsx
index 95c91af3233..e99fc3a88bc 100644
--- a/web/features/new-rag/documents/__tests__/delete-document.browser.spec.tsx
+++ b/web/features/new-rag/documents/__tests__/delete-document.browser.spec.tsx
@@ -84,7 +84,8 @@ async function setup(ids: string[]) {
})
const { queryClient } = createConsoleQueryWrapper({
systemFeatures: { deployment_edition: 'ENTERPRISE' },
- knowledgeFsFeatures: { enabled: true, upload_enabled: true },
+ features: { enable_knowledge_fs: true },
+ knowledgeFsFeatures: { upload_enabled: true },
})
const screen = await render(
<QueryClientTestProvider queryClient={queryClient}>
diff --git a/web/features/new-rag/documents/__tests__/scroll.browser.spec.tsx b/web/features/new-rag/documents/__tests__/scroll.browser.spec.tsx
index 7a254120fe5..824a7f40ff7 100644
--- a/web/features/new-rag/documents/__tests__/scroll.browser.spec.tsx
+++ b/web/features/new-rag/documents/__tests__/scroll.browser.spec.tsx
@@ -72,7 +72,8 @@ it.each([
)
const { queryClient } = createConsoleQueryWrapper({
systemFeatures: { deployment_edition: 'ENTERPRISE' },
- knowledgeFsFeatures: { enabled: true, upload_enabled: true },
+ features: { enable_knowledge_fs: true },
+ knowledgeFsFeatures: { upload_enabled: true },
})
const screen = await render(
<QueryClientTestProvider queryClient={queryClient}>
diff --git a/web/features/new-rag/list/__tests__/new-knowledge-list.spec.tsx b/web/features/new-rag/list/__tests__/new-knowledge-list.spec.tsx
index cf0669a2797..7cc92fbb821 100644
--- a/web/features/new-rag/list/__tests__/new-knowledge-list.spec.tsx
+++ b/web/features/new-rag/list/__tests__/new-knowledge-list.spec.tsx
@@ -181,7 +181,8 @@ function setup({
)
const rendered = renderWithConsoleQuery(ui(), {
accountProfile: { id: 'account-1' },
- knowledgeFsFeatures: { enabled: true, upload_enabled: true },
+ features: { enable_knowledge_fs: true },
+ knowledgeFsFeatures: { upload_enabled: true },
workspacePermissionKeys: ['dataset.create_and_management', 'dataset.external.connect'],
...options,
})
@@ -551,7 +552,7 @@ describe('NewKnowledgeList', () => {
})
it('keeps upload unavailable when KnowledgeFS upload is disabled', async () => {
- setup({ knowledgeFsFeatures: { enabled: true, upload_enabled: false } })
+ setup({ knowledgeFsFeatures: { upload_enabled: false } })
const uploadFiles = await screen.findByRole('button', { name: 'knowledgeSpace.uploadFiles' })
expect(uploadFiles).toBeDisabled()
diff --git a/web/test/console/query-data.ts b/web/test/console/query-data.ts
index d6a2b974e2f..020a02668c7 100644
--- a/web/test/console/query-data.ts
+++ b/web/test/console/query-data.ts
@@ -157,7 +157,6 @@ export const seedKnowledgeFsFeatures = (
overrides: Partial<KnowledgeFsFeaturesResponse> = {},
): KnowledgeFsFeaturesResponse => {
const data: KnowledgeFsFeaturesResponse = {
- enabled: false,
upload_enabled: false,
agent_enabled: false,
...overrides,
@@ -213,9 +212,10 @@ export type ConsoleQueryTestOptions = {
*/
systemFeatures?: DeepPartial<GetSystemFeaturesResponse> | null
/**
- * Partial overrides for the signed-in KnowledgeFS availability query. When
- * omitted, every KnowledgeFS surface is seeded as unavailable. Pass `null`
- * to leave the query unseeded.
+ * Partial overrides for the signed-in KnowledgeFS capability query. When
+ * omitted, every KnowledgeFS capability is seeded as unavailable. Pass `null`
+ * to leave the query unseeded. Product availability is
+ * `features.enable_knowledge_fs`.
*/
knowledgeFsFeatures?: Partial<KnowledgeFsFeaturesResponse> | null
accountProfile?: Partial<GetAccountProfileResponse> | null