mirror of
https://github.com/langgenius/dify.git
synced 2026-05-12 15:58:19 +08:00
Conflicts resolved: - api/services/app_service.py: extend AppListParams with status + openapi_visible fields so the openapi caller's per-page visibility gate survives the dict->BaseModel refactor; openapi controller now constructs AppListParams. - pnpm-workspace.yaml: union of CLI-only entries (@napi-rs/keyring, @oclif/*) with main's bumped versions (@next/*, @orpc/*, eslint-plugin-sonarjs, eslint-plugin-storybook); kept eventsource-parser. - pnpm-lock.yaml: regenerated. - web/app/signin/utils/post-login-redirect.ts: union impl — keep main's resolvePostLoginRedirect(searchParams) + setOAuthPendingRedirect; add hardened sessionStorage-based setPostLoginRedirect for device flow with same-origin + path whitelist; device redirect takes precedence over oauth pending. |
||
|---|---|---|
| .. | ||
| advanced_chat | ||
| agent_chat | ||
| chat | ||
| common | ||
| completion | ||
| pipeline | ||
| workflow | ||
| __init__.py | ||
| base_app_generate_response_converter.py | ||
| base_app_generator.py | ||
| base_app_queue_manager.py | ||
| base_app_runner.py | ||
| draft_variable_saver.py | ||
| exc.py | ||
| message_based_app_generator.py | ||
| message_based_app_queue_manager.py | ||
| message_generator.py | ||
| streaming_utils.py | ||
| workflow_app_runner.py | ||