pi-web-ui 0.63.0 → 0.63.2

package/dist/server/dsh/runtime/launcher.mjs

@@ -1,164 +1,164 @@
-#!/usr/bin/env node
-/**
- * pi-web-ui DSH runtime launcher (DshEngine的运行时子进程).
- *
- * 组合 = 全局/本地 dsh 运行时树里的 dsh-base bundle patch + 本文件同目录的
- * override patch（挂 stdio JSON-RPC 服务插件 + pin 会话持久化/人设/沙箱）。
- * 与官方 dsh CLI 的 profile 机制无关 —— 直接以 boot() 组合静态入口，绕开
- * $DSH_HOME/profiles 初始化。
- *
- * 运行时树解析顺序（实现见 runtime-root.mjs，支持 flat / dsh 嵌套两种布局）：
- *   1. $PI_WEB_DSH_RUNTIME — 显式指定 node_modules 根（含 @deepseek-ai/dsh-base）
- *   2. 本包 node_modules — 若 pi-web-ui 完整安装了 dsh 依赖树
- *   3. execPath 邻近 node_modules — fnm / 独立 node 的稳定布局
- *   4. `npm root -g` — 全局 dsh 安装（`npm i -g @deepseek-ai/dsh`）
- *
- * JSON-RPC 服务插件（dsh-sdk-jsonrpc-server）按项目依赖解析：override patch
- * 里的 name 由 $PI_WEB_DSH_JSONRPC_ENTRY 用 !!js 求值成绝对路径（指向项目
- * node_modules），其 peer 依赖从项目树自洽解析 —— cordis loader 的裸包解析
- * 只有单一 base，所以混树只能走绝对路径挂载。
- *
- * 协议：newline-delimited JSON-RPC 2.0 于 stdio（stdout 只承载协议帧）。
- */
-import { dirname, join, resolve } from "node:path";
-import { readdirSync } from "node:fs";
-import { fileURLToPath, pathToFileURL } from "node:url";
-import { resolveRuntimeBase } from "./runtime-root.mjs";
-
-const HERE = dirname(fileURLToPath(import.meta.url));
-const BIN_NAME = "pi-web-ui-dsh";
-
-const runtimeBase = await resolveRuntimeBase();
-if (!runtimeBase) {
-	console.error(
-		`[${BIN_NAME}] 找不到 DSH 运行时树（含 @deepseek-ai/dsh-base 的 node_modules）。` +
-			"请先执行 npm i -g @deepseek-ai/dsh（或设置 PI_WEB_DSH_RUNTIME 指向其 node_modules）。",
-	);
-	process.exit(1);
-}
-
-const runConfig = process.env.DSH_CORDIS_CONFIG ?? join(HERE, "cordis.yml");
-const baseBundlePatch = join(runtimeBase, "@deepseek-ai", "dsh-base", "cordis.patch.yml");
-const overridePatch = join(HERE, "override.patch.yml");
-
-// 用户 patch 层：<dataDir>/dsh-patches/*.yml（按文件名序，在 override 之后）。
-// 引擎（DshClientSession）负责在重启运行时前创建目录；launcher 只负责加载。
-const userPatchDir = process.env.PI_WEB_DSH_DATA_DIR
-	? join(process.env.PI_WEB_DSH_DATA_DIR, "dsh-patches")
-	: (process.env.PI_WEB_DSH_PATCH_DIR ?? null);
-const userPatchFiles = [];
-if (userPatchDir) {
-	try {
-		for (const name of readdirSync(userPatchDir)) {
-			if (/^[^.]/u.test(name) && /\.ya?ml$/iu.test(name)) {
-				userPatchFiles.push(join(userPatchDir, name));
-			}
-		}
-	} catch {
-		// 目录不存在/不可读 = 无用户 patch，静默跳过。
-	}
-}
-userPatchFiles.sort((a, b) => a.localeCompare(b));
-
-// ---------------------------------------------------------------------------
-// boot
-// ---------------------------------------------------------------------------
-
-const { boot, installFailLoud, loadOverlayPatches } = await import(
-	pathToFileURL(join(runtimeBase, "@deepseek-ai", "dsh-app-boot", "lib", "index.js")).href
-);
-
-// cordis loader 只对 entry 的 config 做 !!js 插值，name 字段不支持。
-// sdk-jsonrpc 走本地扩展插件 goal-rpc.mjs（官方 server 类 + goal RPC 方法）；
-// 官方入口（base 类）通过 env PI_WEB_DSH_JSONRPC_ENTRY 传给 wrapper。
-const jsonrpcWrapper = join(HERE, "goal-rpc.mjs");
-const _jsonrpcEntry = process.env.PI_WEB_DSH_JSONRPC_ENTRY
-	? resolve(process.env.PI_WEB_DSH_JSONRPC_ENTRY)
-	: join(
-			resolve(HERE, "..", "..", "..", ".."),
-			"node_modules",
-			"@deepseek-ai",
-			"dsh-sdk-jsonrpc-server",
-			"lib",
-			"index.js",
-		);
-
-const overrideList = loadOverlayPatches(BIN_NAME, overridePatch);
-// cordis loader 只对 entry 的 config 做 !!js 插值，name 字段不支持——
-// 插件绝对路径在这里用 JS 写回（sdk-jsonrpc → 本地 goal-rpc wrapper；
-// 用户 patch 若用 id 覆盖 sdk-jsonrpc 或 insert 同名 entry 也拿到 wrapper）。
-const fixJsonrpcName = (patch) => {
-	if (patch.id === "sdk-jsonrpc") {
-		patch.name = jsonrpcWrapper;
-	}
-	for (const entry of patch.insert ?? []) {
-		if (entry.id === "sdk-jsonrpc") entry.name = jsonrpcWrapper;
-	}
-};
-for (const patch of overrideList) fixJsonrpcName(patch);
-const userPatchLists = userPatchFiles.map((file) => {
-	try {
-		return loadOverlayPatches(BIN_NAME, file);
-	} catch (err) {
-		process.stderr.write(`[${BIN_NAME}] 跳过用户 patch ${file}: ${err?.message ?? String(err)}\n`);
-		return [];
-	}
-});
-for (const list of userPatchLists) for (const patch of list) fixJsonrpcName(patch);
-// patches 参数必须是扁平列表（boot → mountRootInclude → Include.applyPatches →
-// applyEntryPatches 逐个消费；数组嵌套会被当无 id 的 patch 跳过）。
-const patches = [
-	...loadOverlayPatches(BIN_NAME, baseBundlePatch),
-	...overrideList,
-	// 用户 patch：同样按文件展开为扁平 patch entry 列表（一个文件可含多 entry）。
-	...userPatchLists.flat(),
-];
-
-let ctx;
-try {
-	ctx = await boot(
-		BIN_NAME,
-		runConfig,
-		patches,
-		undefined,
-		// 裸包名（dsh-base 组合行）锚定到运行时树；jsonrpc 行走绝对路径。
-		pathToFileURL(runtimeBase + "/").href,
-	);
-} catch (err) {
-	const seen = new Set();
-	const walk = (e, depth) => {
-		if (!e || seen.has(e)) return;
-		seen.add(e);
-		const msg = e?.message ?? String(e);
-		const indent = "    " + "  ".repeat(Math.min(depth, 6));
-		process.stderr.write(`${indent}${msg}\n`);
-		const kids = e?.aggregateErrors ?? e?.errors ?? (e?.cause ? [e.cause] : []);
-		for (const k of kids) walk(k, depth + 1);
-	};
-	process.stderr.write(`[${BIN_NAME}] boot 失败: ${err?.message ?? String(err)}\n   runtime base: ${runtimeBase}\n`);
-	walk(err, 0);
-	process.exit(1);
-}
-
-let releasing = false;
-const release = () => {
-	if (releasing) return;
-	releasing = true;
-	void (async () => {
-		try {
-			await ctx.fiber.dispose();
-		} catch (err) {
-			console.error(`[${BIN_NAME}] teardown 错误: ${err?.message ?? String(err)}`);
-		}
-		process.exit(0);
-	})();
-	return true;
-};
-installFailLoud(BIN_NAME, process, release);
-
-// stdin EOF = 客户端消失 → 有序释放后退出。
-process.stdin.resume();
-process.stdin.on("end", release);
-process.stdin.on("close", release);
-process.on("SIGTERM", release);
-process.on("SIGINT", () => process.exit(130));
+#!/usr/bin/env node
+/**
+ * pi-web-ui DSH runtime launcher (DshEngine的运行时子进程).
+ *
+ * 组合 = 全局/本地 dsh 运行时树里的 dsh-base bundle patch + 本文件同目录的
+ * override patch（挂 stdio JSON-RPC 服务插件 + pin 会话持久化/人设/沙箱）。
+ * 与官方 dsh CLI 的 profile 机制无关 —— 直接以 boot() 组合静态入口，绕开
+ * $DSH_HOME/profiles 初始化。
+ *
+ * 运行时树解析顺序（实现见 runtime-root.mjs，支持 flat / dsh 嵌套两种布局）：
+ *   1. $PI_WEB_DSH_RUNTIME — 显式指定 node_modules 根（含 @deepseek-ai/dsh-base）
+ *   2. 本包 node_modules — 若 pi-web-ui 完整安装了 dsh 依赖树
+ *   3. execPath 邻近 node_modules — fnm / 独立 node 的稳定布局
+ *   4. `npm root -g` — 全局 dsh 安装（`npm i -g @deepseek-ai/dsh`）
+ *
+ * JSON-RPC 服务插件（dsh-sdk-jsonrpc-server）按项目依赖解析：override patch
+ * 里的 name 由 $PI_WEB_DSH_JSONRPC_ENTRY 用 !!js 求值成绝对路径（指向项目
+ * node_modules），其 peer 依赖从项目树自洽解析 —— cordis loader 的裸包解析
+ * 只有单一 base，所以混树只能走绝对路径挂载。
+ *
+ * 协议：newline-delimited JSON-RPC 2.0 于 stdio（stdout 只承载协议帧）。
+ */
+import { dirname, join, resolve } from "node:path";
+import { readdirSync } from "node:fs";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import { resolveRuntimeBase } from "./runtime-root.mjs";
+
+const HERE = dirname(fileURLToPath(import.meta.url));
+const BIN_NAME = "pi-web-ui-dsh";
+
+const runtimeBase = await resolveRuntimeBase();
+if (!runtimeBase) {
+	console.error(
+		`[${BIN_NAME}] 找不到 DSH 运行时树（含 @deepseek-ai/dsh-base 的 node_modules）。` +
+			"请先执行 npm i -g @deepseek-ai/dsh（或设置 PI_WEB_DSH_RUNTIME 指向其 node_modules）。",
+	);
+	process.exit(1);
+}
+
+const runConfig = process.env.DSH_CORDIS_CONFIG ?? join(HERE, "cordis.yml");
+const baseBundlePatch = join(runtimeBase, "@deepseek-ai", "dsh-base", "cordis.patch.yml");
+const overridePatch = join(HERE, "override.patch.yml");
+
+// 用户 patch 层：<dataDir>/dsh-patches/*.yml（按文件名序，在 override 之后）。
+// 引擎（DshClientSession）负责在重启运行时前创建目录；launcher 只负责加载。
+const userPatchDir = process.env.PI_WEB_DSH_DATA_DIR
+	? join(process.env.PI_WEB_DSH_DATA_DIR, "dsh-patches")
+	: (process.env.PI_WEB_DSH_PATCH_DIR ?? null);
+const userPatchFiles = [];
+if (userPatchDir) {
+	try {
+		for (const name of readdirSync(userPatchDir)) {
+			if (/^[^.]/u.test(name) && /\.ya?ml$/iu.test(name)) {
+				userPatchFiles.push(join(userPatchDir, name));
+			}
+		}
+	} catch {
+		// 目录不存在/不可读 = 无用户 patch，静默跳过。
+	}
+}
+userPatchFiles.sort((a, b) => a.localeCompare(b));
+
+// ---------------------------------------------------------------------------
+// boot
+// ---------------------------------------------------------------------------
+
+const { boot, installFailLoud, loadOverlayPatches } = await import(
+	pathToFileURL(join(runtimeBase, "@deepseek-ai", "dsh-app-boot", "lib", "index.js")).href
+);
+
+// cordis loader 只对 entry 的 config 做 !!js 插值，name 字段不支持。
+// sdk-jsonrpc 走本地扩展插件 goal-rpc.mjs（官方 server 类 + goal RPC 方法）；
+// 官方入口（base 类）通过 env PI_WEB_DSH_JSONRPC_ENTRY 传给 wrapper。
+const jsonrpcWrapper = join(HERE, "goal-rpc.mjs");
+const _jsonrpcEntry = process.env.PI_WEB_DSH_JSONRPC_ENTRY
+	? resolve(process.env.PI_WEB_DSH_JSONRPC_ENTRY)
+	: join(
+			resolve(HERE, "..", "..", "..", ".."),
+			"node_modules",
+			"@deepseek-ai",
+			"dsh-sdk-jsonrpc-server",
+			"lib",
+			"index.js",
+		);
+
+const overrideList = loadOverlayPatches(BIN_NAME, overridePatch);
+// cordis loader 只对 entry 的 config 做 !!js 插值，name 字段不支持——
+// 插件绝对路径在这里用 JS 写回（sdk-jsonrpc → 本地 goal-rpc wrapper；
+// 用户 patch 若用 id 覆盖 sdk-jsonrpc 或 insert 同名 entry 也拿到 wrapper）。
+const fixJsonrpcName = (patch) => {
+	if (patch.id === "sdk-jsonrpc") {
+		patch.name = jsonrpcWrapper;
+	}
+	for (const entry of patch.insert ?? []) {
+		if (entry.id === "sdk-jsonrpc") entry.name = jsonrpcWrapper;
+	}
+};
+for (const patch of overrideList) fixJsonrpcName(patch);
+const userPatchLists = userPatchFiles.map((file) => {
+	try {
+		return loadOverlayPatches(BIN_NAME, file);
+	} catch (err) {
+		process.stderr.write(`[${BIN_NAME}] 跳过用户 patch ${file}: ${err?.message ?? String(err)}\n`);
+		return [];
+	}
+});
+for (const list of userPatchLists) for (const patch of list) fixJsonrpcName(patch);
+// patches 参数必须是扁平列表（boot → mountRootInclude → Include.applyPatches →
+// applyEntryPatches 逐个消费；数组嵌套会被当无 id 的 patch 跳过）。
+const patches = [
+	...loadOverlayPatches(BIN_NAME, baseBundlePatch),
+	...overrideList,
+	// 用户 patch：同样按文件展开为扁平 patch entry 列表（一个文件可含多 entry）。
+	...userPatchLists.flat(),
+];
+
+let ctx;
+try {
+	ctx = await boot(
+		BIN_NAME,
+		runConfig,
+		patches,
+		undefined,
+		// 裸包名（dsh-base 组合行）锚定到运行时树；jsonrpc 行走绝对路径。
+		pathToFileURL(runtimeBase + "/").href,
+	);
+} catch (err) {
+	const seen = new Set();
+	const walk = (e, depth) => {
+		if (!e || seen.has(e)) return;
+		seen.add(e);
+		const msg = e?.message ?? String(e);
+		const indent = "    " + "  ".repeat(Math.min(depth, 6));
+		process.stderr.write(`${indent}${msg}\n`);
+		const kids = e?.aggregateErrors ?? e?.errors ?? (e?.cause ? [e.cause] : []);
+		for (const k of kids) walk(k, depth + 1);
+	};
+	process.stderr.write(`[${BIN_NAME}] boot 失败: ${err?.message ?? String(err)}\n   runtime base: ${runtimeBase}\n`);
+	walk(err, 0);
+	process.exit(1);
+}
+
+let releasing = false;
+const release = () => {
+	if (releasing) return;
+	releasing = true;
+	void (async () => {
+		try {
+			await ctx.fiber.dispose();
+		} catch (err) {
+			console.error(`[${BIN_NAME}] teardown 错误: ${err?.message ?? String(err)}`);
+		}
+		process.exit(0);
+	})();
+	return true;
+};
+installFailLoud(BIN_NAME, process, release);
+
+// stdin EOF = 客户端消失 → 有序释放后退出。
+process.stdin.resume();
+process.stdin.on("end", release);
+process.stdin.on("close", release);
+process.on("SIGTERM", release);
+process.on("SIGINT", () => process.exit(130));

package/dist/server/dsh/runtime/override.patch.yml

@@ -1,71 +1,71 @@
-# pi-web-ui DSH runtime overrides — applies AFTER the dsh-base bundle patch
-# (loaded from the runtime tree). Rows that restate a base row use id-targeted
-# REPLACE (last write wins per row); new rows come in a plain insert block.
-# !!js 表达式由 Cordis Loader 在挂载时求值（boot 暴露 dshHomePath，process.env
-# 直读）。
-
-# 会话持久化根 —— 覆盖 base 的 dshHomePath('sessions')，让 pi-web-ui 指向自己的数据目录。
-- id: session-persistence-jsonl
-  name: "@deepseek-ai/dsh-session-persistence-jsonl"
-  config:
-    root: !!js process.env.DSH_SESSION_ROOT ?? dshHomePath('sessions')
-
-# Agent 默认模型 —— initialize() 每次都带 provider/model，这里只兜底。
-- id: agent-default-model
-  name: "@deepseek-ai/dsh-agent-default-model"
-  config:
-    provider: !!js process.env.DSH_DEFAULT_PROVIDER ?? 'deepseek-official'
-    model: !!js process.env.DSH_DEFAULT_MODEL ?? 'deepseek-v4-flash'
-
-# 部署人设（默认空；pi-web-ui 设置面板可注入）。
-- id: system-prompt
-  name: "@deepseek-ai/dsh-system-prompt"
-  config:
-    persona: !!js process.env.DSH_PERSONA ?? ''
-
-# 沙箱工作区根（workspace-write 权限模式的护栏边界）。
-- id: sandbox-policy
-  name: "@deepseek-ai/dsh-sandbox-policy"
-  config:
-    mode: !!js process.env.DSH_PERMISSION_MODE ?? 'workspace-write'
-    workspaceRoot: !!js process.env.DSH_CWD ?? process.cwd()
-
-# 无头 JSON-RPC 服务：没有交互用户来应答审批弹窗；工具在 workspace-write
-# 沙箱内直接执行，用户的 Stop 按钮就是控制手段。
-- id: approval
-  name: "@deepseek-ai/dsh-user-approval"
-  config:
-    policy: "never"
-
-# 权限预设表 —— 与 approval=never 组合匹配。patch 语义：整行 config 全量替换，
-# 必须重述 base 的全部预设并补上 (workspace-write, never) 组合，显式 defaultPreset。
-- id: permission
-  name: "@deepseek-ai/dsh-permission-presets"
-  config:
-    presets:
-      read-only:
-        sandbox: read-only
-        approval: ask
-      workspace-write:
-        sandbox: workspace-write
-        approval: ask
-      workspace-write-never:
-        sandbox: workspace-write
-        approval: never
-      danger-full-access:
-        sandbox: danger-full-access
-        approval: never
-    defaultPreset: workspace-write-never
-
-# ── 新行（plain insert）─────────────────────────────────────────────────────
-- insert:
-    # 模型提问工具：ask_user_question → ctx.userQuestions（base 已挂 user-questions
-    # 服务）→ goal-rpc wrapper 注册的 provider 桥到浏览器对话框。
-    - id: tool-ask-user
-      name: "@deepseek-ai/dsh-tool-ask-user"
-    # Stdio JSON-RPC 服务插件（inject: agents）。name 用 !!js 求值为绝对路径
-    # （指向项目 node_modules 里的 dsh-sdk-jsonrpc-server），因为 cordis loader
-    # 的裸包解析只认 bareModuleBaseUrl（运行时树），混树挂载必须走绝对路径；
-    # 该插件的 peer 依赖从项目树自洽解析。
-    - id: sdk-jsonrpc
-      name: !!js process.env.PI_WEB_DSH_JSONRPC_ENTRY
+# pi-web-ui DSH runtime overrides — applies AFTER the dsh-base bundle patch
+# (loaded from the runtime tree). Rows that restate a base row use id-targeted
+# REPLACE (last write wins per row); new rows come in a plain insert block.
+# !!js 表达式由 Cordis Loader 在挂载时求值（boot 暴露 dshHomePath，process.env
+# 直读）。
+
+# 会话持久化根 —— 覆盖 base 的 dshHomePath('sessions')，让 pi-web-ui 指向自己的数据目录。
+- id: session-persistence-jsonl
+  name: "@deepseek-ai/dsh-session-persistence-jsonl"
+  config:
+    root: !!js process.env.DSH_SESSION_ROOT ?? dshHomePath('sessions')
+
+# Agent 默认模型 —— initialize() 每次都带 provider/model，这里只兜底。
+- id: agent-default-model
+  name: "@deepseek-ai/dsh-agent-default-model"
+  config:
+    provider: !!js process.env.DSH_DEFAULT_PROVIDER ?? 'deepseek-official'
+    model: !!js process.env.DSH_DEFAULT_MODEL ?? 'deepseek-v4-flash'
+
+# 部署人设（默认空；pi-web-ui 设置面板可注入）。
+- id: system-prompt
+  name: "@deepseek-ai/dsh-system-prompt"
+  config:
+    persona: !!js process.env.DSH_PERSONA ?? ''
+
+# 沙箱工作区根（workspace-write 权限模式的护栏边界）。
+- id: sandbox-policy
+  name: "@deepseek-ai/dsh-sandbox-policy"
+  config:
+    mode: !!js process.env.DSH_PERMISSION_MODE ?? 'workspace-write'
+    workspaceRoot: !!js process.env.DSH_CWD ?? process.cwd()
+
+# 无头 JSON-RPC 服务：没有交互用户来应答审批弹窗；工具在 workspace-write
+# 沙箱内直接执行，用户的 Stop 按钮就是控制手段。
+- id: approval
+  name: "@deepseek-ai/dsh-user-approval"
+  config:
+    policy: "never"
+
+# 权限预设表 —— 与 approval=never 组合匹配。patch 语义：整行 config 全量替换，
+# 必须重述 base 的全部预设并补上 (workspace-write, never) 组合，显式 defaultPreset。
+- id: permission
+  name: "@deepseek-ai/dsh-permission-presets"
+  config:
+    presets:
+      read-only:
+        sandbox: read-only
+        approval: ask
+      workspace-write:
+        sandbox: workspace-write
+        approval: ask
+      workspace-write-never:
+        sandbox: workspace-write
+        approval: never
+      danger-full-access:
+        sandbox: danger-full-access
+        approval: never
+    defaultPreset: workspace-write-never
+
+# ── 新行（plain insert）─────────────────────────────────────────────────────
+- insert:
+    # 模型提问工具：ask_user_question → ctx.userQuestions（base 已挂 user-questions
+    # 服务）→ goal-rpc wrapper 注册的 provider 桥到浏览器对话框。
+    - id: tool-ask-user
+      name: "@deepseek-ai/dsh-tool-ask-user"
+    # Stdio JSON-RPC 服务插件（inject: agents）。name 用 !!js 求值为绝对路径
+    # （指向项目 node_modules 里的 dsh-sdk-jsonrpc-server），因为 cordis loader
+    # 的裸包解析只认 bareModuleBaseUrl（运行时树），混树挂载必须走绝对路径；
+    # 该插件的 peer 依赖从项目树自洽解析。
+    - id: sdk-jsonrpc
+      name: !!js process.env.PI_WEB_DSH_JSONRPC_ENTRY

package/dist/server/dsh/runtime/runtime-root.mjs

@@ -1,86 +1,86 @@
-// Shared runtime-tree resolution for the pi-web-ui DSH runtime.
-// Used by launcher.mjs (boot-time) and probe-mixed.mjs (self-check).
-//
-// A "runtime tree" is a node_modules root that directly contains the dsh
-// runtime packages: `@deepseek-ai/dsh-base` (with its cordis.patch.yml
-// bundle) and `@deepseek-ai/dsh-app-boot`. Two layouts are accepted:
-//
-//   flat:   <root>/@deepseek-ai/dsh-base/cordis.patch.yml
-//           (a node_modules root where the runtime packages live top-level)
-//
-//   nested: <root>/@deepseek-ai/dsh/node_modules/@deepseek-ai/…
-//           (`npm i -g @deepseek-ai/dsh` installs the CLI package with its
-//           OWN nested runtime tree of ~196 packages; the global root itself
-//           only holds the `dsh` package)
-//
-// The returned value is always the *bare-module base dir*: the node_modules
-// root that directly contains the runtime packages. That is what
-// boot(bareModuleBaseUrl) anchors bare package names (dsh-base rows) to.
-import { existsSync } from "node:fs";
-import { dirname, join, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-
-const HERE = dirname(fileURLToPath(import.meta.url));
-
-/** Given a candidate node_modules root, return the bare-module base dir, or null. */
-export function runtimeBaseFor(root) {
-	if (root == null) return null;
-	const flatScope = join(root, "@deepseek-ai");
-	if (
-		existsSync(join(flatScope, "dsh-base", "cordis.patch.yml")) &&
-		existsSync(join(flatScope, "dsh-app-boot", "lib", "index.js"))
-	) {
-		return resolve(root);
-	}
-	const nestedScope = join(root, "@deepseek-ai", "dsh", "node_modules", "@deepseek-ai");
-	if (
-		existsSync(join(nestedScope, "dsh-base", "cordis.patch.yml")) &&
-		existsSync(join(nestedScope, "dsh-app-boot", "lib", "index.js"))
-	) {
-		return resolve(join(root, "@deepseek-ai", "dsh", "node_modules"));
-	}
-	return null;
-}
-
-/**
- * Resolution order:
- *   1. $PI_WEB_DSH_RUNTIME — explicit node_modules root
- *   2. this package's node_modules — full local install scenario
- *   3. execPath-adjacent node_modules — fnm / standalone node stable layout
- *      (<node.exe dir>/node_modules is a junction to the global tree)
- *   4. `npm root -g` — global install (win32 .cmd shim needs a shell)
- */
-export async function resolveRuntimeBase() {
-	const explicit = process.env.PI_WEB_DSH_RUNTIME;
-	if (explicit) {
-		const base = runtimeBaseFor(explicit);
-		if (base) return base;
-	}
-	const local = join(resolve(HERE, "..", "..", ".."), "node_modules");
-	{
-		const base = runtimeBaseFor(local);
-		if (base) return base;
-	}
-	const adjacent = join(dirname(process.execPath), "node_modules");
-	{
-		const base = runtimeBaseFor(adjacent);
-		if (base) return base;
-	}
-	try {
-		const { spawnSync } = await import("node:child_process");
-		const res = spawnSync(process.platform === "win32" ? "npm" : "npm", ["root", "-g"], {
-			encoding: "utf8",
-			timeout: 15_000,
-			windowsHide: true,
-			...(process.platform === "win32" ? { shell: true } : {}),
-		});
-		const root = String(res.stdout ?? "").trim();
-		if (root) {
-			const base = runtimeBaseFor(root);
-			if (base) return base;
-		}
-	} catch {
-		/* fall through */
-	}
-	return null;
-}
+// Shared runtime-tree resolution for the pi-web-ui DSH runtime.
+// Used by launcher.mjs (boot-time) and probe-mixed.mjs (self-check).
+//
+// A "runtime tree" is a node_modules root that directly contains the dsh
+// runtime packages: `@deepseek-ai/dsh-base` (with its cordis.patch.yml
+// bundle) and `@deepseek-ai/dsh-app-boot`. Two layouts are accepted:
+//
+//   flat:   <root>/@deepseek-ai/dsh-base/cordis.patch.yml
+//           (a node_modules root where the runtime packages live top-level)
+//
+//   nested: <root>/@deepseek-ai/dsh/node_modules/@deepseek-ai/…
+//           (`npm i -g @deepseek-ai/dsh` installs the CLI package with its
+//           OWN nested runtime tree of ~196 packages; the global root itself
+//           only holds the `dsh` package)
+//
+// The returned value is always the *bare-module base dir*: the node_modules
+// root that directly contains the runtime packages. That is what
+// boot(bareModuleBaseUrl) anchors bare package names (dsh-base rows) to.
+import { existsSync } from "node:fs";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const HERE = dirname(fileURLToPath(import.meta.url));
+
+/** Given a candidate node_modules root, return the bare-module base dir, or null. */
+export function runtimeBaseFor(root) {
+	if (root == null) return null;
+	const flatScope = join(root, "@deepseek-ai");
+	if (
+		existsSync(join(flatScope, "dsh-base", "cordis.patch.yml")) &&
+		existsSync(join(flatScope, "dsh-app-boot", "lib", "index.js"))
+	) {
+		return resolve(root);
+	}
+	const nestedScope = join(root, "@deepseek-ai", "dsh", "node_modules", "@deepseek-ai");
+	if (
+		existsSync(join(nestedScope, "dsh-base", "cordis.patch.yml")) &&
+		existsSync(join(nestedScope, "dsh-app-boot", "lib", "index.js"))
+	) {
+		return resolve(join(root, "@deepseek-ai", "dsh", "node_modules"));
+	}
+	return null;
+}
+
+/**
+ * Resolution order:
+ *   1. $PI_WEB_DSH_RUNTIME — explicit node_modules root
+ *   2. this package's node_modules — full local install scenario
+ *   3. execPath-adjacent node_modules — fnm / standalone node stable layout
+ *      (<node.exe dir>/node_modules is a junction to the global tree)
+ *   4. `npm root -g` — global install (win32 .cmd shim needs a shell)
+ */
+export async function resolveRuntimeBase() {
+	const explicit = process.env.PI_WEB_DSH_RUNTIME;
+	if (explicit) {
+		const base = runtimeBaseFor(explicit);
+		if (base) return base;
+	}
+	const local = join(resolve(HERE, "..", "..", ".."), "node_modules");
+	{
+		const base = runtimeBaseFor(local);
+		if (base) return base;
+	}
+	const adjacent = join(dirname(process.execPath), "node_modules");
+	{
+		const base = runtimeBaseFor(adjacent);
+		if (base) return base;
+	}
+	try {
+		const { spawnSync } = await import("node:child_process");
+		const res = spawnSync(process.platform === "win32" ? "npm" : "npm", ["root", "-g"], {
+			encoding: "utf8",
+			timeout: 15_000,
+			windowsHide: true,
+			...(process.platform === "win32" ? { shell: true } : {}),
+		});
+		const root = String(res.stdout ?? "").trim();
+		if (root) {
+			const base = runtimeBaseFor(root);
+			if (base) return base;
+		}
+	} catch {
+		/* fall through */
+	}
+	return null;
+}