From 81c922c7beba08b9685830dbbcfee46893d69e77 Mon Sep 17 00:00:00 2001 From: imccyu <276526105+imccyu@users.noreply.github.com> Date: Sun, 23 Aug 2026 22:51:16 +0800 Subject: [PATCH] chore(client): remove feature module externals --- packages/api/session-controller/package.json | 6 ++-- .../session-controller/tsconfig.client.json | 1 + packages/client/tsdown.client.ts | 2 +- packages/client/ui-approval/package.json | 4 --- packages/client/ui-chat/package.json | 10 +++---- packages/client/ui-chat/tsconfig.json | 6 ++++ packages/client/ui-conversation/package.json | 7 ++--- packages/client/ui-conversation/tsconfig.json | 3 ++ .../ui-directory-picker-browse/package.json | 3 -- packages/client/ui-input-trigger/package.json | 3 -- .../client/ui-model-selection/package.json | 3 -- .../client/ui-permission-presets/package.json | 3 -- packages/client/ui-skill/package.json | 3 -- packages/client/ui-subagent/package.json | 3 -- packages/client/ui-tool/package.json | 9 +++--- packages/client/ui-tool/tsconfig.json | 3 ++ packages/client/ui-trajectory/package.json | 9 +++--- packages/client/ui-trajectory/tsconfig.json | 3 ++ .../client/ui-user-questions/package.json | 3 -- packages/client/ui-workspace/package.json | 8 ++--- packages/client/ui-workspace/tsconfig.json | 3 ++ pnpm-lock.yaml | 30 +++++++++++++++++++ tsconfig.base.json | 2 ++ 23 files changed, 75 insertions(+), 52 deletions(-) diff --git a/packages/api/session-controller/package.json b/packages/api/session-controller/package.json index a6d764bf4a..4079dd712a 100644 --- a/packages/api/session-controller/package.json +++ b/packages/api/session-controller/package.json @@ -99,7 +99,8 @@ "@deepseek-ai/dsh-tools": "workspace:^", "@deepseek-ai/dsh-typert-protocol": "workspace:^", "@deepseek-ai/dsh-typert-registry": "workspace:^", - "@deepseek-ai/dsh-workspace": "workspace:^" + "@deepseek-ai/dsh-workspace": "workspace:^", + "@deepseek-ai/dsh-util-workspace-path": "workspace:^" }, "peerDependenciesMeta": { "@deepseek-ai/dsh-jobs": { "optional": true }, @@ -134,6 +135,7 @@ "@deepseek-ai/dsh-typert-protocol": "workspace:^", "@deepseek-ai/dsh-typert-registry": "workspace:^", "@deepseek-ai/dsh-util-crypto": "workspace:^", - "@deepseek-ai/dsh-workspace": "workspace:^" + "@deepseek-ai/dsh-workspace": "workspace:^", + "@deepseek-ai/dsh-util-workspace-path": "workspace:^" } } diff --git a/packages/api/session-controller/tsconfig.client.json b/packages/api/session-controller/tsconfig.client.json index 5703caf280..838fa6a03c 100644 --- a/packages/api/session-controller/tsconfig.client.json +++ b/packages/api/session-controller/tsconfig.client.json @@ -24,6 +24,7 @@ { "path": "../../core/tools" }, { "path": "../../util/brand" }, { "path": "../../util/crypto" }, + { "path": "../../util/workspace-path" }, { "path": "../../workspace/workspace" }, { "path": "../../typert/protocol" } ] diff --git a/packages/client/tsdown.client.ts b/packages/client/tsdown.client.ts index 9b3621f8c9..c21885f78e 100644 --- a/packages/client/tsdown.client.ts +++ b/packages/client/tsdown.client.ts @@ -58,7 +58,7 @@ function styleInjectionModule( * Everything else under @deepseek-ai/* is either a module-table entry * (external) or a leak the purity gate rejects. */ -export const INLINE_SAFE = /^@deepseek-ai\/dsh-(host-apiproxy|file-reference|session|llm|tools|brand|util-crypto)(\/|$)/ +export const INLINE_SAFE = /^@deepseek-ai\/dsh-(?:host-apiproxy|file-reference|session|llm|tools|brand|util-crypto|util-workspace-path)(?:\/|$)/ /** * Vendored framework libraries: rescoped into @deepseek-ai, so the gate below diff --git a/packages/client/ui-approval/package.json b/packages/client/ui-approval/package.json index 649b855553..90f61b4893 100644 --- a/packages/client/ui-approval/package.json +++ b/packages/client/ui-approval/package.json @@ -31,10 +31,6 @@ }, "dsh": { "client": { - "external": [ - "@deepseek-ai/dsh-api-session-controller/client", - "@deepseek-ai/dsh-client-ui-conversation/client" - ], "inject": [ "@deepseek-ai/dsh-api-remotes", "@deepseek-ai/dsh-api-session-controller", diff --git a/packages/client/ui-chat/package.json b/packages/client/ui-chat/package.json index 4b5275de98..186afe1f55 100644 --- a/packages/client/ui-chat/package.json +++ b/packages/client/ui-chat/package.json @@ -31,10 +31,6 @@ }, "dsh": { "client": { - "external": [ - "@deepseek-ai/dsh-api-workspace-controller/client", - "@deepseek-ai/dsh-client-ui-conversation/client" - ], "inject": [ "@deepseek-ai/dsh-api-session-controller", "@deepseek-ai/dsh-api-workspace-controller", @@ -75,7 +71,9 @@ "@deepseek-ai/dsh-session": "workspace:^", "@deepseek-ai/dsh-session-stats": "workspace:^", "@deepseek-ai/dsh-token-meter": "workspace:^", - "@deepseek-ai/dsh-tools": "workspace:^" + "@deepseek-ai/dsh-tools": "workspace:^", + "@deepseek-ai/dsh-util-crypto": "workspace:^", + "@deepseek-ai/dsh-util-workspace-path": "workspace:^" }, "devDependencies": { "@deepseek-ai/cordis": "workspace:^", @@ -103,6 +101,8 @@ "@deepseek-ai/dsh-session-stats": "workspace:^", "@deepseek-ai/dsh-token-meter": "workspace:^", "@deepseek-ai/dsh-tools": "workspace:^", + "@deepseek-ai/dsh-util-crypto": "workspace:^", + "@deepseek-ai/dsh-util-workspace-path": "workspace:^", "@types/react": "~18.3.1", "react": "^18.2.0" }, diff --git a/packages/client/ui-chat/tsconfig.json b/packages/client/ui-chat/tsconfig.json index c551d4cfc1..6f37d011f3 100644 --- a/packages/client/ui-chat/tsconfig.json +++ b/packages/client/ui-chat/tsconfig.json @@ -50,6 +50,12 @@ { "path": "../../runtime-diagnostics/invariants" }, + { + "path": "../../util/crypto" + }, + { + "path": "../../util/workspace-path" + }, { "path": "../../session/session-stats" }, diff --git a/packages/client/ui-conversation/package.json b/packages/client/ui-conversation/package.json index 876a3dbd9d..e80dd8e04f 100644 --- a/packages/client/ui-conversation/package.json +++ b/packages/client/ui-conversation/package.json @@ -31,9 +31,6 @@ }, "dsh": { "client": { - "external": [ - "@deepseek-ai/dsh-api-session-controller/client" - ], "inject": [ "@deepseek-ai/dsh-api-session-controller", "@deepseek-ai/dsh-client-locale", @@ -80,7 +77,8 @@ "@deepseek-ai/dsh-token-meter": "workspace:^", "@deepseek-ai/dsh-tool-todo": "workspace:^", "@deepseek-ai/dsh-util-crypto": "workspace:^", - "@deepseek-ai/dsh-workspace": "workspace:^" + "@deepseek-ai/dsh-workspace": "workspace:^", + "@deepseek-ai/dsh-util-workspace-path": "workspace:^" }, "devDependencies": { "@deepseek-ai/cordis": "workspace:^", @@ -112,6 +110,7 @@ "@deepseek-ai/dsh-tool-todo": "workspace:^", "@deepseek-ai/dsh-util-crypto": "workspace:^", "@deepseek-ai/dsh-workspace": "workspace:^", + "@deepseek-ai/dsh-util-workspace-path": "workspace:^", "@types/react": "~18.3.1", "react": "^18.2.0" }, diff --git a/packages/client/ui-conversation/tsconfig.json b/packages/client/ui-conversation/tsconfig.json index a851104426..020f0568c2 100644 --- a/packages/client/ui-conversation/tsconfig.json +++ b/packages/client/ui-conversation/tsconfig.json @@ -88,6 +88,9 @@ }, { "path": "../../util/crypto" + }, + { + "path": "../../util/workspace-path" } ], "exclude": [ diff --git a/packages/client/ui-directory-picker-browse/package.json b/packages/client/ui-directory-picker-browse/package.json index 1bd81078ab..9c134a13ff 100644 --- a/packages/client/ui-directory-picker-browse/package.json +++ b/packages/client/ui-directory-picker-browse/package.json @@ -31,9 +31,6 @@ }, "dsh": { "client": { - "external": [ - "@deepseek-ai/dsh-client-ui-workspace/client" - ], "inject": [ "@deepseek-ai/dsh-client-connection", "@deepseek-ai/dsh-client-ui-renderer", diff --git a/packages/client/ui-input-trigger/package.json b/packages/client/ui-input-trigger/package.json index 4489bbe5af..d87637ed67 100644 --- a/packages/client/ui-input-trigger/package.json +++ b/packages/client/ui-input-trigger/package.json @@ -31,9 +31,6 @@ }, "dsh": { "client": { - "external": [ - "@deepseek-ai/dsh-api-session-controller/client" - ], "inject": [ "@deepseek-ai/dsh-api-session-controller", "@deepseek-ai/dsh-client-locale", diff --git a/packages/client/ui-model-selection/package.json b/packages/client/ui-model-selection/package.json index 04d454ccb3..0fb58c8207 100644 --- a/packages/client/ui-model-selection/package.json +++ b/packages/client/ui-model-selection/package.json @@ -31,9 +31,6 @@ }, "dsh": { "client": { - "external": [ - "@deepseek-ai/dsh-api-session-controller/client" - ], "inject": [ "@deepseek-ai/dsh-api-session-controller", "@deepseek-ai/dsh-client-locale", diff --git a/packages/client/ui-permission-presets/package.json b/packages/client/ui-permission-presets/package.json index d178d3dcef..cc0fc0cfb6 100644 --- a/packages/client/ui-permission-presets/package.json +++ b/packages/client/ui-permission-presets/package.json @@ -31,9 +31,6 @@ }, "dsh": { "client": { - "external": [ - "@deepseek-ai/dsh-api-session-controller/client" - ], "inject": [ "@deepseek-ai/dsh-api-session-controller", "@deepseek-ai/dsh-client-connection", diff --git a/packages/client/ui-skill/package.json b/packages/client/ui-skill/package.json index c744093af2..d90bd9fbb2 100644 --- a/packages/client/ui-skill/package.json +++ b/packages/client/ui-skill/package.json @@ -31,9 +31,6 @@ }, "dsh": { "client": { - "external": [ - "@deepseek-ai/dsh-api-session-controller/client" - ], "inject": [ "@deepseek-ai/dsh-api-session-controller", "@deepseek-ai/dsh-client-locale", diff --git a/packages/client/ui-subagent/package.json b/packages/client/ui-subagent/package.json index 775289d61b..5aeeb4189b 100644 --- a/packages/client/ui-subagent/package.json +++ b/packages/client/ui-subagent/package.json @@ -31,9 +31,6 @@ }, "dsh": { "client": { - "external": [ - "@deepseek-ai/dsh-api-session-controller/client" - ], "inject": [ "@deepseek-ai/dsh-api-session-controller", "@deepseek-ai/dsh-client-locale", diff --git a/packages/client/ui-tool/package.json b/packages/client/ui-tool/package.json index 8c93e10f21..0e38fce093 100644 --- a/packages/client/ui-tool/package.json +++ b/packages/client/ui-tool/package.json @@ -31,9 +31,6 @@ }, "dsh": { "client": { - "external": [ - "@deepseek-ai/dsh-api-workspace-controller/client" - ], "inject": [ "@deepseek-ai/dsh-api-workspace-controller", "@deepseek-ai/dsh-client-connection", @@ -61,7 +58,8 @@ "@deepseek-ai/dsh-api-workspace-controller": "workspace:^", "@deepseek-ai/dsh-client-ui-chat": "workspace:^", "@deepseek-ai/dsh-client-ui-renderer": "workspace:^", - "@deepseek-ai/dsh-client-ui-session": "workspace:^" + "@deepseek-ai/dsh-client-ui-session": "workspace:^", + "@deepseek-ai/dsh-util-workspace-path": "workspace:^" }, "devDependencies": { "@deepseek-ai/cordis": "workspace:^", @@ -80,7 +78,8 @@ "@deepseek-ai/dsh-api-workspace-controller": "workspace:^", "@deepseek-ai/dsh-client-ui-chat": "workspace:^", "@deepseek-ai/dsh-client-ui-renderer": "workspace:^", - "@deepseek-ai/dsh-client-ui-session": "workspace:^" + "@deepseek-ai/dsh-client-ui-session": "workspace:^", + "@deepseek-ai/dsh-util-workspace-path": "workspace:^" }, "files": [ "lib/index.js", diff --git a/packages/client/ui-tool/tsconfig.json b/packages/client/ui-tool/tsconfig.json index 7b30739361..9abd3e0837 100644 --- a/packages/client/ui-tool/tsconfig.json +++ b/packages/client/ui-tool/tsconfig.json @@ -46,6 +46,9 @@ }, { "path": "../../core/tools" + }, + { + "path": "../../util/workspace-path" } ] } diff --git a/packages/client/ui-trajectory/package.json b/packages/client/ui-trajectory/package.json index e55e7a09df..5f4fa4981d 100644 --- a/packages/client/ui-trajectory/package.json +++ b/packages/client/ui-trajectory/package.json @@ -31,9 +31,6 @@ }, "dsh": { "client": { - "external": [ - "@deepseek-ai/dsh-client-ui-conversation/client" - ], "inject": [ "@deepseek-ai/dsh-api-session-controller", "@deepseek-ai/dsh-client-locale", @@ -64,7 +61,8 @@ "@deepseek-ai/dsh-session": "workspace:^", "@deepseek-ai/dsh-api-session-controller": "workspace:^", "@deepseek-ai/dsh-client-ui-renderer": "workspace:^", - "@deepseek-ai/dsh-client-ui-session": "workspace:^" + "@deepseek-ai/dsh-client-ui-session": "workspace:^", + "@deepseek-ai/dsh-llm": "workspace:^" }, "devDependencies": { "@deepseek-ai/dsh-agent": "workspace:^", @@ -86,7 +84,8 @@ "@deepseek-ai/dsh-session": "workspace:^", "@deepseek-ai/dsh-api-session-controller": "workspace:^", "@deepseek-ai/dsh-client-ui-renderer": "workspace:^", - "@deepseek-ai/dsh-client-ui-session": "workspace:^" + "@deepseek-ai/dsh-client-ui-session": "workspace:^", + "@deepseek-ai/dsh-llm": "workspace:^" }, "files": [ "lib/index.js", diff --git a/packages/client/ui-trajectory/tsconfig.json b/packages/client/ui-trajectory/tsconfig.json index f18a03de31..8bd120c437 100644 --- a/packages/client/ui-trajectory/tsconfig.json +++ b/packages/client/ui-trajectory/tsconfig.json @@ -46,6 +46,9 @@ }, { "path": "../../runtime-diagnostics/invariants" + }, + { + "path": "../../llm/llm" } ] } diff --git a/packages/client/ui-user-questions/package.json b/packages/client/ui-user-questions/package.json index 788b8b6e2c..8db49c53e7 100644 --- a/packages/client/ui-user-questions/package.json +++ b/packages/client/ui-user-questions/package.json @@ -31,9 +31,6 @@ }, "dsh": { "client": { - "external": [ - "@deepseek-ai/dsh-client-ui-conversation/client" - ], "inject": [ "@deepseek-ai/dsh-api-remotes", "@deepseek-ai/dsh-api-session-controller", diff --git a/packages/client/ui-workspace/package.json b/packages/client/ui-workspace/package.json index 73b7c6650d..a50f80911e 100644 --- a/packages/client/ui-workspace/package.json +++ b/packages/client/ui-workspace/package.json @@ -31,10 +31,6 @@ }, "dsh": { "client": { - "external": [ - "@deepseek-ai/dsh-api-session-controller/client", - "@deepseek-ai/dsh-api-workspace-controller/client" - ], "inject": [ "@deepseek-ai/dsh-api-session-controller", "@deepseek-ai/dsh-api-workspace-controller", @@ -67,7 +63,8 @@ "@deepseek-ai/dsh-client-ui-sidebar": "workspace:^", "@deepseek-ai/dsh-invariants": "workspace:^", "@deepseek-ai/cordis": "workspace:^", - "@deepseek-ai/dsh-session": "workspace:^" + "@deepseek-ai/dsh-session": "workspace:^", + "@deepseek-ai/dsh-util-workspace-path": "workspace:^" }, "devDependencies": { "@deepseek-ai/dsh-api-session-controller": "workspace:^", @@ -84,6 +81,7 @@ "@deepseek-ai/dsh-client-ui-slots": "workspace:^", "@deepseek-ai/dsh-invariants": "workspace:^", "@deepseek-ai/dsh-session": "workspace:^", + "@deepseek-ai/dsh-util-workspace-path": "workspace:^", "@types/react": "~18.3.1", "@deepseek-ai/cordis": "workspace:^", "react": "^18.2.0" diff --git a/packages/client/ui-workspace/tsconfig.json b/packages/client/ui-workspace/tsconfig.json index 80bc10dc0d..5d7708e031 100644 --- a/packages/client/ui-workspace/tsconfig.json +++ b/packages/client/ui-workspace/tsconfig.json @@ -49,6 +49,9 @@ }, { "path": "../../runtime-diagnostics/invariants" + }, + { + "path": "../../util/workspace-path" } ] } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index db280b365d..9d0f5561de 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1071,6 +1071,9 @@ importers: '@deepseek-ai/dsh-util-crypto': specifier: workspace:^ version: link:../../util/crypto + '@deepseek-ai/dsh-util-workspace-path': + specifier: workspace:^ + version: link:../../util/workspace-path '@deepseek-ai/dsh-workspace': specifier: workspace:^ version: link:../../workspace/workspace @@ -2164,6 +2167,12 @@ importers: '@deepseek-ai/dsh-tools': specifier: workspace:^ version: link:../../core/tools + '@deepseek-ai/dsh-util-crypto': + specifier: workspace:^ + version: link:../../util/crypto + '@deepseek-ai/dsh-util-workspace-path': + specifier: workspace:^ + version: link:../../util/workspace-path '@types/react': specifier: ~18.3.1 version: 18.3.31 @@ -2325,6 +2334,9 @@ importers: '@deepseek-ai/dsh-util-crypto': specifier: workspace:^ version: link:../../util/crypto + '@deepseek-ai/dsh-util-workspace-path': + specifier: workspace:^ + version: link:../../util/workspace-path '@deepseek-ai/dsh-workspace': specifier: workspace:^ version: link:../../workspace/workspace @@ -3539,6 +3551,9 @@ importers: '@deepseek-ai/dsh-invariants': specifier: workspace:^ version: link:../../runtime-diagnostics/invariants + '@deepseek-ai/dsh-util-workspace-path': + specifier: workspace:^ + version: link:../../util/workspace-path '@testing-library/react': specifier: ^16.1.0 version: 16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -3603,6 +3618,9 @@ importers: '@deepseek-ai/dsh-invariants': specifier: workspace:^ version: link:../../runtime-diagnostics/invariants + '@deepseek-ai/dsh-llm': + specifier: workspace:^ + version: link:../../llm/llm '@deepseek-ai/dsh-session': specifier: workspace:^ version: link:../../core/session @@ -3791,6 +3809,9 @@ importers: '@deepseek-ai/dsh-session': specifier: workspace:^ version: link:../../core/session + '@deepseek-ai/dsh-util-workspace-path': + specifier: workspace:^ + version: link:../../util/workspace-path '@types/react': specifier: ~18.3.1 version: 18.3.31 @@ -9113,6 +9134,15 @@ importers: specifier: workspace:^ version: link:../../runtime-diagnostics/invariants + packages/util/workspace-path: + devDependencies: + '@deepseek-ai/cordis': + specifier: workspace:^ + version: link:../../../vendor/cordis + '@deepseek-ai/dsh-invariants': + specifier: workspace:^ + version: link:../../runtime-diagnostics/invariants + packages/web/tool-web: dependencies: '@deepseek-ai/schemastery': diff --git a/tsconfig.base.json b/tsconfig.base.json index 195cb5d398..2c64da3ce6 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -70,7 +70,9 @@ "@deepseek-ai/dsh-tool-todo/client": ["./packages/todo/tool-todo/src/client.ts"], "@deepseek-ai/dsh-session-title/types": ["./packages/session/session-title/src/types.ts"], "@deepseek-ai/dsh-session-title/client": ["./packages/session/session-title/src/client.ts"], + "@deepseek-ai/dsh-subagent/client": ["./packages/subagent/subagent/src/client.ts"], "@deepseek-ai/dsh-workspace/types": ["./packages/workspace/workspace/src/types.ts"], + "@deepseek-ai/dsh-util-workspace-path": ["./packages/util/workspace-path/src/index.ts"], "@deepseek-ai/dsh-session-stats/types": ["./packages/session/session-stats/src/types.ts"], "@deepseek-ai/dsh-session-stats/client": ["./packages/session/session-stats/src/client.ts"], "@deepseek-ai/dsh-plan-mode/types": ["./packages/plan/plan-mode/src/types.ts"],