Files
dify/.github
Stephen ZhouandClaude Opus 5.5 3d2a03136c Merge remote-tracking branch 'origin/main' into deploy/konwledge
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>
2026-10-15 15:04:46 +08:00
..