dsh-crwu-workbench 0.0.11 → 0.0.13

package/lib/index.js

@@ -229,7 +229,7 @@ const PLUGIN_INJECT = [
 * 还会让打包器的 JSON 插件成为隐式依赖。代价是升版本时要同时改这里 ——
 * `tests/unit/host-package.test.mjs` 有一条断言盯着它必须等于 `package.json` 的 version。
 */
-const PLUGIN_VERSION = "0.0.11";
+const PLUGIN_VERSION = "0.0.13";
 /**
 * `ping` / `boot` 应答里的版本指纹，形如 `pkg-0.0.5`。
 *
@@ -1554,9 +1554,51 @@ function sanitizeOssError(value) {
 }
 //#endregion
 //#region src/host/environment/probe.ts
+/**
+* 把一个参数安全地放进**该平台真实使用的 shell** 的命令串里。
+*
+* POSIX 上就是 `bash -c`：能不加引号就不加（`quoteArg`），需要时用单引号 + `'\''`。
+*
+* **Windows 上是 PowerShell，不是 `cmd.exe`**（DSH 在 Windows 挂 `@deepseek-ai/dsh-pwsh-local`，
+* 整串命令交给 `pwsh -Command`）。所以这里用 PowerShell 的单引号字面量、内部单引号翻倍：
+* 双引号在 PowerShell 里会做 `$` / 反引号插值（路径或 URL 里出现 `$` 就会被当变量展开），
+* 而单引号是纯字面量。cmd 那套 `"…"` + `""` 转义在这里既没必要也不安全。
+*
+* 以引号开头的命令还需要 PowerShell 的调用运算符 `&` —— 那是**命令位置**的事，由下面的
+* `shellInvoke()` 负责；`shellQuote` 只管「一个参数」。
+*/
 function shellQuote$1(value, platform) {
 	if (!isWindowsPlatform(text(platform))) return quoteArg(value);
-	return `"${String(value).replace(/"/g, "\"\"")}"`;
+	return `'${String(value).replace(/'/g, "''")}'`;
+}
+/**
+* 拼一条**可执行文件 + 参数**的命令串（命令位置）。
+*
+* 为什么不能直接 `${shellQuote(exe, platform)} 参数…`（2026-09-28 修，员工在 Windows 上实测报错）：
+* DSH 在 Windows 挂的执行器是 `@deepseek-ai/dsh-pwsh-local`，它把整条命令作为**一个 argv 元素**
+* 交给 `pwsh -NoLogo -NoProfile -NonInteractive -Command <整串>`（该包自己的 README：*the command
+* string is passed as ONE argv element to `-Command`; PowerShell itself parses the text*）。
+* 也就是说插件拼的是 **PowerShell 脚本**，不是 `cmd.exe` 的批处理行。
+*
+* 后果很硬：**以引号开头的 token 在 PowerShell 里是字符串表达式，不是命令调用**。
+*
+* ```text
+* PS> "C:\…\crwu.exe" "h3yun" "session" "status"
+* 表达式或语句中包含意外的标记"h3yun"。
+* ```
+*
+* 员工看到的正是这个：环境页「氚云员工会话」「钉钉认证」两行一起红，因为它们的命令都以包内绝对
+* 路径开头。PowerShell 的调用运算符 `&` 才是「把这段字符串当命令执行」，所以 Windows 上必须写
+* `& 'C:\…\crwu.exe' 'h3yun' 'session' 'status'`。
+*
+* POSIX 上**绝不能**加 `&`：`bash -c` 里它是后台作业，会把前台命令变成异步执行。
+*
+* 所有「第一条 token 是可执行文件」的调用点都必须走这里，而不是自己 join ——
+* `tests/unit/host-shell-fs.test.mjs` 里有静态守卫钉着这一点。
+*/
+function shellInvoke(executable, args, platform) {
+	const parts = [executable, ...args].map((item) => shellQuote$1(item, platform));
+	return isWindowsPlatform(text(platform)) ? `& ${parts.join(" ")}` : parts.join(" ");
 }
 /**
 * 包内路径：`<包根>` 与 `<包根>/bin/manifest.json`。
@@ -1853,10 +1895,16 @@ async function probeOss(ctx, oss, platform, options = {}) {
 */
 function buildOssProbeCommand(oss, ossutil, platform) {
 	const { bucket, prefix, target } = ossProbeTarget(oss);
-	const endpointArg = oss.endpoint === "" ? "" : ` --endpoint ${shellQuote$1(oss.endpoint, platform)}`;
-	const extra = oss.extraArgs.map((arg) => ` ${shellQuote$1(arg, platform)}`).join("");
-	if (oss.probeCommand !== "") return oss.probeCommand.split("{ossutil}").join(shellQuote$1(ossutil, platform)).split("{bucket}").join(bucket).split("{prefix}").join(prefix).split("{target}").join(target).split("{endpoint}").join(oss.endpoint);
-	return `${shellQuote$1(ossutil, platform)} ls ${shellQuote$1(target, platform)}${endpointArg} --limited-num 1${extra}`;
+	const executable = shellInvoke(ossutil, [], platform);
+	if (oss.probeCommand !== "") return oss.probeCommand.split("{ossutil}").join(executable).split("{bucket}").join(bucket).split("{prefix}").join(prefix).split("{target}").join(target).split("{endpoint}").join(oss.endpoint);
+	return shellInvoke(ossutil, [
+		"ls",
+		target,
+		...oss.endpoint === "" ? [] : ["--endpoint", oss.endpoint],
+		"--limited-num",
+		"1",
+		...oss.extraArgs
+	], platform);
 }
 /**
 * OSS 失败 → 人话归因。
@@ -2000,8 +2048,8 @@ async function runCrwu(ctx, argv, options) {
 	const allowed = escalationAllowed(clean);
 	if (options.escalate === true && !allowed) return failed(`该 crwu 子命令不允许无沙箱执行：${clean.slice(0, 3).join(" ")}`);
 	const canEscalate = (options.trusted === true && allowed || options.escalate === true) && (options.workdir ?? "") !== "";
-	const quote = (value) => shellQuote$1(value, options.platform ?? "");
-	const result = await runShell(ctx, [await resolveBundledCommand(ctx, options.platform ?? "", "crwu"), ...clean.slice(1)].map(quote).join(" "), {
+	const platform = options.platform ?? "";
+	const result = await runShell(ctx, shellInvoke(await resolveBundledCommand(ctx, platform, "crwu"), clean.slice(1), platform), {
 		...options.workdir === void 0 ? {} : { workdir: options.workdir },
 		timeoutMs: options.timeoutMs ?? 6e4,
 		escalate: canEscalate,
@@ -3343,8 +3391,7 @@ async function runDws(ctx, platform, argv, options) {
 	const resolved = await requireBundledCommand(ctx, platform, "dws");
 	if (!resolved.ok) return failure(resolved.errorKind, resolved.error, shown);
 	const canEscalate = options.credentialOperation === true && options.trusted === true && options.workdir !== "" && dwsEscalationAllowed(argv);
-	const quote = (value) => shellQuote$1(value, platform);
-	const result = await runShell(ctx, [resolved.path, ...argv.map((item) => text(item))].map(quote).join(" "), {
+	const result = await runShell(ctx, shellInvoke(resolved.path, argv.map((item) => text(item)), platform), {
 		...options.workdir === "" ? {} : { workdir: options.workdir },
 		timeoutMs: options.timeoutMs ?? 18e4,
 		stdoutMaxBytes: options.stdoutMaxBytes ?? 16777216,
@@ -5030,7 +5077,7 @@ async function writeIfindSecret(ctx, home, rawSecret, options = {}) {
 	if (fs === void 0) return writeFailure("infrastructure", "Host 文件服务不可用，无法保存同花顺 iFinD 凭据", path);
 	const platform = text(options.platform) || process.platform;
 	const dir = ifindStateDir(home);
-	const mkdir = await runShell(ctx, `mkdir -p ${shellQuote(dir, platform)}`, {
+	const mkdir = await runShell(ctx, isWindowsPlatform(platform) ? `New-Item -ItemType Directory -Force -Path ${shellQuote(dir, platform)} | Out-Null` : `mkdir -p ${shellQuote(dir, platform)}`, {
 		workdir: home,
 		timeoutMs: 15e3,
 		escalate: true
@@ -5046,18 +5093,23 @@ async function writeIfindSecret(ctx, home, rawSecret, options = {}) {
 	} catch (error) {
 		return writeFailure("infrastructure", `写入 ${path} 失败：${error instanceof Error ? error.message : String(error)}`, path);
 	}
-	const chmod = await runShell(ctx, `chmod 600 ${shellQuote(path, platform)}`, {
-		workdir: home,
-		timeoutMs: 15e3,
-		escalate: true
-	});
-	const chmodError = chmod.ok ? "" : (text(chmod.stderr) || text(chmod.error) || "权限设置命令没有跑起来").slice(0, 200);
+	let chmodOk = true;
+	let chmodError = "";
+	if (!isWindowsPlatform(platform)) {
+		const chmod = await runShell(ctx, `chmod 600 ${shellQuote(path, platform)}`, {
+			workdir: home,
+			timeoutMs: 15e3,
+			escalate: true
+		});
+		chmodOk = chmod.ok;
+		chmodError = chmod.ok ? "" : (text(chmod.stderr) || text(chmod.error) || "权限设置命令没有跑起来").slice(0, 200);
+	}
 	return {
 		ok: true,
 		errorKind: "",
 		error: "",
 		dirReady,
-		chmodOk: chmod.ok,
+		chmodOk,
 		chmodError,
 		mode: "file",
 		view: {
@@ -5095,7 +5147,7 @@ async function clearIfindSecret(ctx, home, options = {}) {
 		mode: "file"
 	};
 	const platform = text(options.platform) || process.platform;
-	const result = await runShell(ctx, `rm -f ${shellQuote(ifindCredentialPath(home), platform)}`, {
+	const result = await runShell(ctx, isWindowsPlatform(platform) ? `Remove-Item -LiteralPath ${shellQuote(ifindCredentialPath(home), platform)} -Force -ErrorAction SilentlyContinue` : `rm -f ${shellQuote(ifindCredentialPath(home), platform)}`, {
 		workdir: home,
 		timeoutMs: 15e3,
 		escalate: true
@@ -5116,14 +5168,15 @@ async function clearIfindSecret(ctx, home, options = {}) {
 /**
 * 平台引用方式。
 *
-* 与 `environment/probe.ts` 的 `shellQuote` 同一判据（POSIX 单引号 / Windows 双引号），
+* 与 `environment/probe.ts` 的 `shellQuote` 同一判据（POSIX 单引号 / Windows 也是单引号 ——
+* Windows 上 DSH 跑的是 PowerShell，单引号才是纯字面量，双引号会插值），
 * 这里各写一份是因为 `probe.ts` 已经反向依赖本模块（`checkIfindSecret` 由它复用），
-* 再互相 import 会成环。两处都只有三行，且都有单测钉着 Windows 分支。
+* 再互相 import 会成环。两处都只有两行，且都有单测钉着 Windows 分支。
 */
 function shellQuote(value, platform) {
 	const raw = text(value);
 	if (!isWindowsPlatform(text(platform))) return `'${raw.replace(/'/g, "'\\''")}'`;
-	return `"${raw.replace(/"/g, "\"\"")}"`;
+	return `'${raw.replace(/'/g, "''")}'`;
 }
 //#endregion
 //#region src/host/ifind/mcp.ts
@@ -7278,7 +7331,7 @@ function ossTools(deps) {
 				];
 				if (oss.endpoint !== "") argv.push("--endpoint", oss.endpoint);
 				for (const extra of oss.extraArgs) argv.push(extra);
-				const run = await runShell(ctx, argv.map((item) => shellQuote$1(item, platform)).join(" "), {
+				const run = await runShell(ctx, shellInvoke(argv[0] ?? "", argv.slice(1), platform), {
 					workdir: caseDir,
 					timeoutMs: 18e4,
 					signal: exec.signal
@@ -7329,11 +7382,12 @@ function ossTools(deps) {
 }
 /** 列举前缀并核对目标对象的字节数。 */
 async function verifyObject(ctx, platform, bucket, prefix, key, localSize, workdir, ossutil, signal) {
-	const run = await runShell(ctx, [
+	const argv = [
 		ossutil,
 		"ls",
 		`oss://${bucket}/${prefix}/`
-	].map((item) => shellQuote$1(item, platform)).join(" "), {
+	];
+	const run = await runShell(ctx, shellInvoke(argv[0] ?? "", argv.slice(1), platform), {
 		workdir,
 		timeoutMs: 9e4,
 		stdoutMaxBytes: 4194304,
@@ -8965,7 +9019,7 @@ async function ossIndex(deps, args = {}) {
 		`oss://${oss.bucket}/${listedPrefix}/`
 	];
 	if (oss.endpoint !== "") argv.push("--endpoint", oss.endpoint);
-	const run = await runShell(deps.ctx, argv.map((item) => shellQuote$1(item, deps.platform)).join(" "), {
+	const run = await runShell(deps.ctx, shellInvoke(argv[0] ?? "", argv.slice(1), deps.platform), {
 		workdir: await shellWorkdir(deps),
 		timeoutMs: 9e4,
 		stdoutMaxBytes: 4194304
@@ -9010,7 +9064,7 @@ async function ossResult(deps, args) {
 		`oss://${oss.bucket}/${key}`
 	];
 	if (oss.endpoint !== "") argv.push("--endpoint", oss.endpoint);
-	const run = await runShell(deps.ctx, argv.map((item) => shellQuote$1(item, deps.platform)).join(" "), {
+	const run = await runShell(deps.ctx, shellInvoke(argv[0] ?? "", argv.slice(1), deps.platform), {
 		workdir: await shellWorkdir(deps),
 		timeoutMs: 6e4,
 		stdoutMaxBytes: 8388608
@@ -9058,7 +9112,7 @@ async function ossLink(deps, args) {
 			String(oss.linkTtl)
 		];
 		if (oss.endpoint !== "") argv.push("--endpoint", oss.endpoint);
-		const run = await runShell(deps.ctx, argv.map((item) => shellQuote$1(item, deps.platform)).join(" "), {
+		const run = await runShell(deps.ctx, shellInvoke(argv[0] ?? "", argv.slice(1), deps.platform), {
 			workdir: await shellWorkdir(deps),
 			timeoutMs: 3e4
 		});
@@ -9115,7 +9169,7 @@ async function uploadArtifacts(deps, item, projectId, ossutil, oss) {
 		];
 		if (oss.endpoint !== "") argv.push("--endpoint", oss.endpoint);
 		for (const extra of oss.extraArgs) argv.push(extra);
-		const run = await runShell(deps.ctx, argv.map((item2) => shellQuote$1(item2, deps.platform)).join(" "), {
+		const run = await runShell(deps.ctx, shellInvoke(argv[0] ?? "", argv.slice(1), deps.platform), {
 			workdir: await shellWorkdir(deps),
 			timeoutMs: 18e4
 		});
@@ -9271,17 +9325,23 @@ async function writeOssCred(deps, input) {
 			chmodError: ""
 		};
 	}
-	const chmod = await runShell(deps.ctx, `chmod 600 ${shellQuote$1(path, deps.platform)}`, {
-		workdir: await shellWorkdir(deps),
-		timeoutMs: 15e3
-	});
+	let chmodOk = true;
+	let chmodError = "";
+	if (!isWindowsPlatform(deps.platform)) {
+		const chmod = await runShell(deps.ctx, `chmod 600 ${shellQuote$1(path, deps.platform)}`, {
+			workdir: await shellWorkdir(deps),
+			timeoutMs: 15e3
+		});
+		chmodOk = chmod.ok;
+		chmodError = chmod.ok ? "" : (text(chmod.stderr) || text(chmod.error) || "权限设置失败").slice(0, 200);
+	}
 	return {
 		ok: true,
 		error: "",
 		path,
 		operation,
-		chmodOk: chmod.ok,
-		chmodError: chmod.ok ? "" : (text(chmod.stderr) || text(chmod.error) || "权限设置失败").slice(0, 200)
+		chmodOk,
+		chmodError
 	};
 }
 /** 生成 ossutil 配置内容（`[Credentials]` 段）。 */
@@ -9676,7 +9736,7 @@ async function dwsLogin(deps, args) {
 		"login"
 	];
 	if (args.device === true) argv.push("--device");
-	const run = await runShell(deps.ctx, argv.map((item) => shellQuote$1(item, deps.platform)).join(" "), {
+	const run = await runShell(deps.ctx, shellInvoke(argv[0] ?? "", argv.slice(1), deps.platform), {
 		workdir: await deps.workdir(),
 		timeoutMs: 3e5,
 		escalate: true
@@ -9767,7 +9827,13 @@ function readSelfDocument(payload) {
 }
 async function dwsSelf(deps) {
 	const dws = await resolveBundledCommand(deps.ctx, deps.platform ?? "", "dws");
-	const run = await runShell(deps.ctx, `${shellQuote$1(dws, deps.platform ?? "")} contact user get-self --format json`, {
+	const run = await runShell(deps.ctx, shellInvoke(dws, [
+		"contact",
+		"user",
+		"get-self",
+		"--format",
+		"json"
+	], deps.platform ?? ""), {
 		workdir: await deps.workdir(),
 		timeoutMs: deps.timeoutMs ?? 3e4,
 		escalate: true
@@ -10291,7 +10357,12 @@ async function loadEnvironment(deps, args) {
 	});
 	const trustedCredentials = state.trustCredentials === true;
 	const dwsCommand = await resolveBundledCommand(ctx, platform, "dws");
-	const dwsRun = trustedCredentials ? await runShell(ctx, `${shellQuote$1(dwsCommand, platform)} auth status --format json`, {
+	const dwsRun = trustedCredentials ? await runShell(ctx, shellInvoke(dwsCommand, [
+		"auth",
+		"status",
+		"--format",
+		"json"
+	], platform), {
 		workdir: await deps.sessionRoot(),
 		timeoutMs: 3e4,
 		escalate: true
@@ -12776,7 +12847,7 @@ function createPythonRuntimeResolver(deps) {
 			} catch (error) {
 				return failed("failed", `无法访问 DSH Python 路径：${python}（${error instanceof Error ? error.message : String(error)}）`);
 			}
-			const probe = await runShell(ctx, `${shellQuote$1(python, platform)} -c ${shellQuote$1("import sys;print(sys.version.split()[0])", platform)}`, {
+			const probe = await runShell(ctx, shellInvoke(python, ["-c", "import sys;print(sys.version.split()[0])"], platform), {
 				workdir: await deps.world.workdir(),
 				timeoutMs: 3e4
 			});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-crwu-workbench",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "中瑞世联工作台 / CRWU audit workbench for DeepSeek Harness: pick a pending audit report, dispatch one AI audit subagent, watch and stop/restart it, auto-upload deliverables to Aliyun OSS.",
   "keywords": [
     "deepseek-harness",