fe9dfb45b5
fix: overwrite cli and openapi controllers with main to drop stale conflict resolution
...
A prior 'Merge branch main' resolved cli/openapi conflicts incorrectly,
keeping feat/rbac's stale copies and reverting main's refactors. This
restores both paths to upstream/main exactly so the PR no longer shows
spurious cli/openapi diffs.
2026-06-15 10:47:32 +08:00
796d601649
Merge branch 'main' into feat/rbac
2026-06-12 13:55:15 +08:00
ba59d9a4ac
feat: unified ErrorBody contract for /openapi/v1 and difyctl ( #37285 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-06-11 10:26:27 +00:00
da1819e0da
Merge branch 'main' into feat/rbac
2026-06-10 18:33:42 +08:00
0a051b598f
feat: support import / export dsl in CLI ( #37232 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com >
Co-authored-by: cheatofrom <85830867+cheatofrom@users.noreply.github.com >
Co-authored-by: Escape0707 <tothesong@gmail.com >
Co-authored-by: Rohit Gahlawat <personal.rg56@gmail.com >
Co-authored-by: L1nSn0w <l1nsn0w@qq.com >
Co-authored-by: 盐粒 Yanli <yanli@dify.ai >
2026-06-10 09:51:40 +00:00
629e046303
refactor(openapi): unify request validation behind @accepts/@returns decorators ( #37216 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-06-10 03:02:24 +00:00
2fca6e27d3
Merge branch 'main' into feat/rbac
2026-06-10 10:06:15 +08:00
cc061d66bc
[autofix.ci] apply automated fixes
2026-06-10 01:44:01 +00:00
1502a57381
feat(api,cli): strict UUID validation for app-id and workspace-id ( #37212 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-06-09 07:35:18 +00:00
b224accb64
Merge remote-tracking branch 'upstream/main' into feat/rbac
2026-06-09 10:16:40 +08:00
a15ecf6bec
feat(cli): adopt generated oRPC contract for unary endpoints ( #37090 )
...
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com >
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-06-08 08:09:44 +00:00
54107772a5
fix: fix failed test and type check failed
2026-06-08 09:52:21 +08:00
544c6f63a5
Merge branch 'main' into feat/rbac
2026-06-05 19:37:39 +08:00
a1ad4be61e
fix(api): expose device-flow approve rate limit as env var ( #37083 )
2026-06-05 02:56:23 +00:00
18ffe5e8d8
Merge branch 'main' into feat/rbac
2026-06-04 09:49:06 +08:00
57b573d02b
refactor(api): migrate tenant/user via DI for several endpoints ( #37004 )
2026-06-03 08:59:00 +00:00
cad0942f4d
fix(api): enforce workspace membership + role checks in auth pipeline ( #36931 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-06-03 07:31:47 +00:00
c09ea2fc3b
fix: fix permission check
2026-05-29 10:16:31 +08:00
4c15e16f59
Merge remote-tracking branch 'upstream/main' into feat/rbac
...
# Conflicts:
# .github/workflows/cli-tests.yml
# api/clients/agent_backend/__init__.py
# api/clients/agent_backend/request_builder.py
# api/controllers/console/app/app.py
# api/controllers/console/app/mcp_server.py
# api/controllers/console/workspace/members.py
# api/controllers/openapi/__init__.py
# api/controllers/openapi/_models.py
# api/controllers/openapi/account.py
# api/controllers/openapi/app_run.py
# api/controllers/openapi/apps.py
# api/controllers/openapi/apps_permitted_external.py
# api/controllers/openapi/auth/__init__.py
# api/controllers/openapi/auth/composition.py
# api/controllers/openapi/auth/pipeline.py
# api/controllers/openapi/files.py
# api/controllers/openapi/human_input_form.py
# api/controllers/openapi/workflow_events.py
# api/controllers/openapi/workspaces.py
# api/core/workflow/node_factory.py
# api/core/workflow/nodes/agent_v2/agent_node.py
# api/core/workflow/nodes/agent_v2/runtime_request_builder.py
# api/libs/oauth_bearer.py
# api/models/agent_config_entities.py
# api/openapi/markdown/openapi-swagger.md
# api/services/account_service.py
# api/tests/unit_tests/clients/agent_backend/test_request_builder.py
# api/tests/unit_tests/controllers/console/test_workspace_members.py
# api/tests/unit_tests/controllers/console/workspace/test_members.py
# api/tests/unit_tests/controllers/openapi/auth/test_composition.py
# api/tests/unit_tests/controllers/openapi/auth/test_pipeline.py
# api/tests/unit_tests/controllers/openapi/conftest.py
# api/tests/unit_tests/controllers/openapi/test_account.py
# api/tests/unit_tests/controllers/openapi/test_app_run_streaming.py
# api/tests/unit_tests/controllers/openapi/test_human_input_form.py
# api/tests/unit_tests/controllers/openapi/test_workflow_events_openapi.py
# api/tests/unit_tests/core/workflow/nodes/agent_v2/test_agent_node.py
# api/tests/unit_tests/core/workflow/nodes/agent_v2/test_runtime_request_builder.py
# api/tests/unit_tests/libs/test_oauth_bearer_rate_limit_ordering.py
# api/tests/unit_tests/libs/test_oauth_bearer_require_scope.py
# api/tests/unit_tests/libs/test_workspace_member_helper.py
# api/tests/unit_tests/services/test_oauth_device_flow.py
# cli/AGENTS.md
# cli/ARD.md
# cli/package.json
# cli/src/api/account-sessions.ts
# cli/src/api/app-meta.test.ts
# cli/src/api/workspaces.ts
# cli/src/auth/file-backend.test.ts
# cli/src/auth/file-backend.ts
# cli/src/auth/hosts.test.ts
# cli/src/auth/hosts.ts
# cli/src/cache/app-info.test.ts
# cli/src/cache/app-info.ts
# cli/src/cache/nudge-store.test.ts
# cli/src/cache/nudge-store.ts
# cli/src/commands/_shared/authed-command.ts
# cli/src/commands/auth/devices/_shared/devices.test.ts
# cli/src/commands/auth/devices/_shared/devices.ts
# cli/src/commands/auth/devices/list/index.ts
# cli/src/commands/auth/login/index.ts
# cli/src/commands/auth/login/login.test.ts
# cli/src/commands/auth/login/login.ts
# cli/src/commands/auth/logout/index.ts
# cli/src/commands/auth/logout/logout.test.ts
# cli/src/commands/auth/logout/logout.ts
# cli/src/commands/auth/status/index.ts
# cli/src/commands/auth/status/status.test.ts
# cli/src/commands/auth/status/status.ts
# cli/src/commands/auth/whoami/index.ts
# cli/src/commands/auth/whoami/whoami.test.ts
# cli/src/commands/auth/whoami/whoami.ts
# cli/src/commands/config/get/index.ts
# cli/src/commands/config/get/run.test.ts
# cli/src/commands/config/get/run.ts
# cli/src/commands/config/path/index.ts
# cli/src/commands/config/set/index.ts
# cli/src/commands/config/set/run.test.ts
# cli/src/commands/config/set/run.ts
# cli/src/commands/config/unset/index.ts
# cli/src/commands/config/unset/run.test.ts
# cli/src/commands/config/unset/run.ts
# cli/src/commands/config/view/index.ts
# cli/src/commands/config/view/run.test.ts
# cli/src/commands/config/view/run.ts
# cli/src/commands/describe/app/run.test.ts
# cli/src/commands/describe/app/run.ts
# cli/src/commands/env/list/run-list.ts
# cli/src/commands/get/app/run.ts
# cli/src/commands/get/workspace/run.ts
# cli/src/commands/resume/app/run.ts
# cli/src/commands/run/app/_strategies/streaming-structured.ts
# cli/src/commands/run/app/_strategies/streaming-text.ts
# cli/src/commands/run/app/handlers.ts
# cli/src/commands/run/app/hitl-render.ts
# cli/src/commands/run/app/run.test.ts
# cli/src/commands/run/app/run.ts
# cli/src/commands/run/app/stream-handlers.ts
# cli/src/commands/tree.generated.ts
# cli/src/commands/version/index.ts
# cli/src/env/registry.ts
# cli/src/errors/format.ts
# cli/src/util/browser.ts
# cli/src/version/info.ts
# cli/src/version/nudge.test.ts
# cli/src/version/nudge.ts
# cli/src/version/probe.test.ts
# cli/src/version/probe.ts
# cli/src/version/render.ts
# cli/src/workspace/resolver.ts
# cli/tsconfig.json
# eslint-suppressions.json
# packages/contracts/generated/api/console/apps/types.gen.ts
# packages/contracts/generated/api/console/apps/zod.gen.ts
# packages/contracts/generated/api/openapi/orpc.gen.ts
# packages/contracts/generated/api/openapi/types.gen.ts
# packages/contracts/generated/api/openapi/zod.gen.ts
# packages/dify-ui/README.md
# pnpm-lock.yaml
# web/app/components/app/app-publisher/index.tsx
# web/app/components/app/app-publisher/sections.tsx
# web/app/components/app/create-app-modal/__tests__/index.spec.tsx
# web/app/components/app/create-app-modal/index.tsx
# web/app/components/app/duplicate-modal/__tests__/index.spec.tsx
# web/app/components/base/chip/index.tsx
# web/app/components/datasets/list/dataset-card/index.tsx
# web/app/components/datasets/list/datasets.tsx
# web/app/components/datasets/settings/form/components/basic-info-section.tsx
# web/app/components/rag-pipeline/components/rag-pipeline-header/run-mode.tsx
# web/app/components/tools/edit-custom-collection-modal/index.tsx
# web/app/components/tools/mcp/__tests__/index.spec.tsx
# web/app/components/tools/mcp/index.tsx
# web/app/components/tools/provider-list.tsx
# web/app/components/tools/workflow-tool/__tests__/configure-button.spec.tsx
2026-05-28 14:01:01 +08:00
d2788d7aba
feat(openapi): redesign auth pipeline with per-token-type routing ( #36693 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-27 12:45:30 +00:00
6e1e0d9439
feat(openapi,cli): workspace switch + member management ( #36651 )
...
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com >
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-27 03:05:47 +00:00
6c0bbef7a7
feat: adding dify cli ( #36348 )
...
Co-authored-by: GareArc <garethcxy@dify.ai >
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com >
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: L1nSn0w <l1nsn0w@qq.com >
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com >
Co-authored-by: gigglewang <gigglewang@dify.ai >
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Co-authored-by: Xiyuan Chen <52963600+GareArc@users.noreply.github.com >
2026-05-27 10:16:10 +08:00
a728e0ac69
feat: adding dify cli ( #36348 )
...
Co-authored-by: GareArc <garethcxy@dify.ai >
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com >
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: L1nSn0w <l1nsn0w@qq.com >
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com >
Co-authored-by: gigglewang <gigglewang@dify.ai >
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Co-authored-by: Xiyuan Chen <52963600+GareArc@users.noreply.github.com >
2026-05-26 01:12:36 +00:00
