Gate OpenAPI KnowledgeFS commands on server availability, restore full context propagation for Classic retrieval threads, and remove the unnecessary workspace datasource credentials Service API endpoint with its generated contracts.
Keep KnowledgeFS upgrade file leases in main's batched dataset cleanup,
wrap the non-error root layout in QueryStateProvider, and combine the
model selector's ARIA props with its new trigger ref. Drop the upgrade
guide i18n keys left unused by the confirmation dialog move.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Conflict resolution notes:
- Adopt main's ORPCError-based HTTP errors: replace local responseStatus
helpers in new-rag with getHttpErrorStatus, make KnowledgeFS failure-body
and settings-save error mapping read ORPCError data, and update test
mocks to createHttpError.
- API keys: take main's split dialog components and drop api-key-modal;
re-apply KnowledgeFS space scoping on main's DatasetScopeDialog and
extract DatasetApiKeyDialogContent so the KnowledgeFS API access dialog
reuses the workspace dataset key manager.
- Adapt branch call sites to main's composed Avatar and AppIcon data APIs.
- Keep the branch's recursive S3 scan over main's duplicate implementation.
- Regenerate API contracts and keep both sides' i18n keys.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Adapt the KnowledgeFS branch to main's refactors:
- Move KnowledgeFS membership hooks from the removed account_service into
WorkspaceRepository/WorkspaceMemberService within the same transaction.
- Route Classic-to-Agent upgrade endpoints through a new
KnowledgeUpgradeApplicationService behind console_account_admission, and
carry creator_ids and knowledge_fs_upgrade through the dataset list service.
- Adopt main's data-source credential repository/gateways in KnowledgeFS
initial-source preview, tasks, and datasource backwards invocation.
- Take main's catalog-driven difyctl v2; the hand-written KnowledgeFS CLI
commands are dropped since the server catalog now drives commands.
- Port dify-ui API renames (AlertDialogFooter, DrawerClose + IconButton),
the lazy workflow panel map, the dataset card inline menu, and the new
date picker into the reorganized knowledge UI.
- Restore main's external knowledge endpoint JSON probe and missing oxlint
suppressions lost in earlier merges; regenerate contracts and OpenAPI docs.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
FFXN
Stephen ZhouandClaude Opus 5.5
Stephen ZhouandClaude Opus 5.5
Byron.wangandautofix-ci[bot]
Jyong
盐粒 Yanliandautofix-ci[bot]
Wu Tianweiandjyong
quicksand
lexmin0412
Jasonfish
Jyong
eux
Summer-Gu
Bowen Liang
John Wang