Merge origin/master: session projection base, command channel, composer seats
Resolution follows the reattachment plan: the #587 wire layer (planMode/ setPlanMode RPC, prompt.planMode, client Session projection fences) is dropped in favor of the session-projection base now on master; master structure wins in all shared files. Kept from the PR side: the approval-only pending filter in ChatView (questions render solely through the composer takeover) and the auto-merged QuestionComposer improvements. The deleted host/runtime package and retired test carriers are removed with master.
This commit is contained in:
+29
-2
@@ -41,8 +41,15 @@
|
||||
"@deepseek-ai/dsh-session/invariant": ["./packages/core/session/src/invariant.ts"],
|
||||
"@deepseek-ai/dsh-session/types": ["./packages/core/session/src/types.ts"],
|
||||
"@deepseek-ai/dsh-session/surface": ["./packages/core/session/src/surface.ts"],
|
||||
"@deepseek-ai/dsh-session-projection/types": ["./packages/session-projection/session-projection/src/types.ts"],
|
||||
"@deepseek-ai/dsh-tool-todo/types": ["./packages/todo/tool-todo/src/types.ts"],
|
||||
"@deepseek-ai/dsh-tool-todo/client": ["./packages/todo/tool-todo/src/client.ts"],
|
||||
"@deepseek-ai/dsh-session-title/types": ["./packages/session-title/session-title/src/types.ts"],
|
||||
"@deepseek-ai/dsh-session-title/client": ["./packages/session-title/session-title/src/client.ts"],
|
||||
"@deepseek-ai/dsh-llm/types": ["./packages/llm/llm/src/types.ts"],
|
||||
"@deepseek-ai/dsh-llm/brand": ["./packages/llm/llm/src/brand.ts"],
|
||||
"@deepseek-ai/dsh-llm/message": ["./packages/llm/llm/src/message.ts"],
|
||||
"@deepseek-ai/dsh-commands/brand": ["./packages/ui/commands/src/brand.ts"],
|
||||
"@deepseek-ai/dsh-tools/presentation": ["./packages/core/tools/src/presentation.ts"],
|
||||
"@deepseek-ai/dsh-user-approval/types": ["./packages/ui/user-approval/src/types.ts"],
|
||||
"@deepseek-ai/dsh-user-interaction/types": ["./packages/ui/user-interaction/src/types.ts"],
|
||||
@@ -54,6 +61,7 @@
|
||||
"./packages/prompt/*/src/invariant.ts",
|
||||
"./packages/llm/*/src/invariant.ts",
|
||||
"./packages/bash/*/src/invariant.ts",
|
||||
"./packages/subprocess/*/src/invariant.ts",
|
||||
"./packages/code-runtime/*/src/invariant.ts",
|
||||
"./packages/fs/*/src/invariant.ts",
|
||||
"./packages/skill/*/src/invariant.ts",
|
||||
@@ -73,7 +81,12 @@
|
||||
"./packages/sandbox/*/src/invariant.ts",
|
||||
"./packages/hooks/*/src/invariant.ts",
|
||||
"./packages/session-persistence/*/src/invariant.ts",
|
||||
"./packages/session-projection/*/src/invariant.ts",
|
||||
"./packages/session-query/*/src/invariant.ts",
|
||||
"./packages/telemetry/*/src/invariant.ts",
|
||||
"./packages/acp/*/src/invariant.ts",
|
||||
"./packages/storage/*/src/invariant.ts",
|
||||
"./packages/workspace/*/src/invariant.ts",
|
||||
"./packages/sdk/*/src/invariant.ts",
|
||||
"./packages/ui/*/src/invariant.ts",
|
||||
"./packages/examples/*/src/invariant.ts",
|
||||
@@ -96,7 +109,6 @@
|
||||
"@deepseek-ai/dsh-host-apiproxy": ["./packages/host/apiproxy/src"],
|
||||
"@deepseek-ai/dsh-host-apiproxy/client": ["./packages/host/apiproxy/src/fetch/client.ts"],
|
||||
"@deepseek-ai/dsh-host-apiproxy/*": ["./packages/host/apiproxy/src/*"],
|
||||
"@deepseek-ai/dsh-host-runtime": ["./packages/host/runtime/src"],
|
||||
"@deepseek-ai/dsh-host-webserver": ["./packages/host/webserver/src"],
|
||||
"@deepseek-ai/dsh-client-ui-slots": ["./packages/client/ui-slots/src"],
|
||||
"@deepseek-ai/dsh-client-ui-primitives": ["./packages/client/ui-primitives/src"],
|
||||
@@ -109,11 +121,20 @@
|
||||
"@deepseek-ai/dsh-client-ui-layout": ["./packages/client/ui-layout/src"],
|
||||
"@deepseek-ai/dsh-client-ui-sidebar": ["./packages/client/ui-sidebar/src"],
|
||||
"@deepseek-ai/dsh-client-ui-conversation": ["./packages/client/ui-conversation/src"],
|
||||
"@deepseek-ai/dsh-client-ui-slash": ["./packages/client/ui-slash/src"],
|
||||
"@deepseek-ai/dsh-client-ui-command": ["./packages/client/ui-command/src"],
|
||||
"@deepseek-ai/dsh-client-ui-model": ["./packages/client/ui-model/src"],
|
||||
"@deepseek-ai/dsh-client-ui-skill": ["./packages/client/ui-skill/src"],
|
||||
"@deepseek-ai/dsh-client-ui-subagent": ["./packages/client/ui-subagent/src"],
|
||||
"@deepseek-ai/dsh-client-ui-plan": ["./packages/client/ui-plan/src"],
|
||||
"@deepseek-ai/dsh-client-ui-question": ["./packages/client/ui-question/src"],
|
||||
"@deepseek-ai/dsh-client-ui-trajectory": ["./packages/client/ui-trajectory/src"],
|
||||
"@deepseek-ai/dsh-client-ui-workspace": ["./packages/client/ui-workspace/src"],
|
||||
"@deepseek-ai/dsh-client-ui-theme": ["./packages/client/ui-theme/src"],
|
||||
"@deepseek-ai/dsh-client-i18n": ["./packages/client/i18n/src"],
|
||||
"@deepseek-ai/dsh-client-ui-settings": ["./packages/client/ui-settings/src"],
|
||||
"@deepseek-ai/dsh-client-ui-settings-general": ["./packages/client/ui-settings-general/src"],
|
||||
"@deepseek-ai/dsh-client-ui-models": ["./packages/client/ui-models/src"],
|
||||
"@deepseek-ai/dsh-client-locale": ["./packages/client/locale/src"],
|
||||
"@deepseek-ai/dsh-client-web": ["./packages/client/web/src"],
|
||||
"@deepseek-ai/dsh-*": [
|
||||
"./packages/core/*/src",
|
||||
@@ -121,6 +142,7 @@
|
||||
"./packages/llm/*/src",
|
||||
"./packages/bash/*/src",
|
||||
"./packages/pty/*/src",
|
||||
"./packages/subprocess/*/src",
|
||||
"./packages/code-runtime/*/src",
|
||||
"./packages/fs/*/src",
|
||||
"./packages/lsp/*/src",
|
||||
@@ -141,8 +163,13 @@
|
||||
"./packages/sandbox/*/src",
|
||||
"./packages/hooks/*/src",
|
||||
"./packages/session-persistence/*/src",
|
||||
"./packages/session-projection/*/src",
|
||||
"./packages/session-query/*/src",
|
||||
"./packages/session-title/*/src",
|
||||
"./packages/telemetry/*/src",
|
||||
"./packages/acp/*/src",
|
||||
"./packages/storage/*/src",
|
||||
"./packages/workspace/*/src",
|
||||
"./packages/sdk/*/src",
|
||||
"./packages/ui/*/src",
|
||||
"./packages/examples/*/src",
|
||||
|
||||
Reference in New Issue
Block a user