dsh-agy-link 0.2.0 → 0.2.1

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 0.2.1 (2026-08-19)
+
+- Cross-platform hardening (Linux / macOS / Windows):
+  - binary discovery is platform-aware: agy / agy.exe / .cmd / .bat across
+    PATH, ~/.local/bin, /usr/local/bin, /opt/homebrew/bin,
+    %LOCALAPPDATA%\Programs, and the npm shim dir; a real executable is
+    always preferred over a cmd shim
+  - Windows .cmd/.bat shims spawn through cmd.exe with cross-spawn-style
+    argument quoting (unit-tested)
+  - tree-kill uses taskkill /T /F on Windows (Unix process groups do not
+    exist there); detached sessions are POSIX-only so no console window
+    flashes on Windows
+  - CRLF stdout is normalized (trailing \r stripped per line)
+  - the MCP bridge script path resolves via fileURLToPath (URL.pathname
+    would yield /C:/... on Windows and break the spawn)
+- 5 new cross-platform tests (56 total).
+
 ## 0.2.0 (2026-08-19)
 
 - Multimodal (path-based): DSH image attachments are staged to a local media
@@ -25,4 +42,3 @@
 - README restructured into a single bilingual page: Chinese first, then
   English (README.zh.md removed; package files list updated).
 - Releases now publish to npm automatically (NPM_TOKEN secret configured).
-

package/README.md

@@ -59,6 +59,8 @@ dsh plugin --profile web add dsh-agy-link
 
 > 插件绝不读取/复制/移动 `~/.gemini/antigravity-cli/antigravity-oauth-token`；登录完全通过官方 CLI 自己的流程完成。
 
+> 🖥 **跨平台**：Linux / macOS / Windows 均受支持——bin 探测按平台查找 `agy`/`agy.exe`（PATH、`~/.local/bin`、`/usr/local/bin`、`/opt/homebrew/bin`、`%LOCALAPPDATA%\Programs`，npm `.cmd` shim 自动经 cmd.exe 安全引号包裹启动）；中断/超时杀树在 Windows 走 `taskkill /T /F`；CRLF 输出统一剥离；媒体目录与 MCP 桥路径全部 `fileURLToPath`/`join` 构造。
+
 ## ⚙️ 配置
 
 配置在 `agy-link` 插件条目里（`/plugin` 或 profile patch 层编辑），环境变量优先：
@@ -145,6 +147,8 @@ dsh plugin --profile web add dsh-agy-link
 
 > The plugin never reads, copies, or moves `~/.gemini/antigravity-cli/antigravity-oauth-token`; login is driven entirely through the official CLI's own flow.
 
+> 🖥 **Cross-platform**: Linux / macOS / Windows — platform-aware binary discovery (`agy` / `agy.exe` across PATH, `~/.local/bin`, `/usr/local/bin`, `/opt/homebrew/bin`, `%LOCALAPPDATA%\Programs`; npm `.cmd` shims spawn through cmd.exe with safe quoting), tree-kill via `taskkill /T /F` on Windows, CRLF output normalized, media and bridge paths built with `fileURLToPath`/`join`.
+
 ## ⚙️ Configuration
 
 Config lives in the `agy-link` plugin entry (edit via `/plugin` or the profile patch layer). Environment variables override the file:

package/dist/index.js

@@ -7,6 +7,7 @@ import { execFileSync, spawn } from "node:child_process";
 import { defineTool } from "@deepseek-ai/dsh-tools";
 import { createServer } from "node:http";
 import { randomBytes } from "node:crypto";
+import { fileURLToPath } from "node:url";
 //#region src/common/types.ts
 const PROVIDER_ID = "antigravity";
 const PLUGIN_ID = "agy-link";
@@ -1015,20 +1016,51 @@ async function sweepDir(dir, ttlMs, now = Date.now()) {
 function defaultMediaDir(stateDir) {
 	return join(stateDir, "media");
 }
+//#endregion
+//#region src/host/runner.ts
+const IS_WIN = process.platform === "win32";
+/** Executable candidates for one PATH entry, per-platform. Exported for tests. */
+function binCandidates(dir, platform = process.platform) {
+	return (platform === "win32" ? [
+		".exe",
+		".cmd",
+		".bat"
+	] : [""]).map((e) => join(dir, "agy" + e));
+}
+/** True when the resolved bin is a Windows cmd shim (needs shell wrapping). */
+function isCmdShim(bin) {
+	return /\.(cmd|bat)$/i.test(bin);
+}
+/** cmd.exe argument quoting (cross-spawn rules). Exported for tests. */
+function windowsQuote(arg) {
+	if (/[ \t\n\v"]/.test(arg) === false) return arg;
+	let escaped = arg.replace(/(\\+)\"/g, "$1$1\\\"").replace(/(\\+)$/, "$1$1");
+	escaped = "\"" + escaped.replace(/"/g, "\\\"") + "\"";
+	return escaped;
+}
 function resolveAgyBin(cfg) {
 	const candidates = [];
 	if (cfg.agyBin !== "") candidates.push(cfg.agyBin);
 	const pathEnv = process.env.PATH ?? "";
-	for (const dir of pathEnv.split(delimiter)) if (dir !== "") candidates.push(join(dir, "agy"));
-	candidates.push(join(homedir(), ".local", "bin", "agy"));
-	candidates.push("/usr/local/bin/agy");
+	for (const dir of pathEnv.split(delimiter)) if (dir !== "") candidates.push(...binCandidates(dir));
+	if (IS_WIN) {
+		const local = process.env.LOCALAPPDATA ?? "";
+		if (local !== "") candidates.push(join(local, "Programs", "agy", "agy.exe"));
+		candidates.push(join(homedir(), ".local", "bin", "agy.exe"));
+		candidates.push(join(homedir(), "AppData", "Roaming", "npm", "agy.cmd"));
+	} else {
+		candidates.push(join(homedir(), ".local", "bin", "agy"));
+		candidates.push("/usr/local/bin/agy");
+		candidates.push("/opt/homebrew/bin/agy");
+	}
+	const hits = [];
 	for (const c of candidates) try {
-		accessSync(c, constants.X_OK);
-		return c;
+		accessSync(c, constants.F_OK);
+		hits.push(c);
 	} catch {
 		continue;
 	}
-	return null;
+	return hits.find((h) => !isCmdShim(h)) ?? hits[0] ?? null;
 }
 function compareVersions(a, b) {
 	const pa = a.split(/\./).map(Number);
@@ -1045,6 +1077,24 @@ function parseVersion(out) {
 }
 function killTree(child) {
 	if (child.pid === void 0) return;
+	if (IS_WIN) {
+		try {
+			spawn("taskkill", [
+				"/pid",
+				String(child.pid),
+				"/T",
+				"/F"
+			], {
+				stdio: "ignore",
+				windowsHide: true
+			});
+		} catch {
+			try {
+				child.kill();
+			} catch {}
+		}
+		return;
+	}
 	try {
 		process.kill(-child.pid, "SIGTERM");
 	} catch {
@@ -1055,15 +1105,31 @@ function killTree(child) {
 }
 function startAgyProcess(opts) {
 	const started = Date.now();
-	const child = spawn(opts.bin, opts.args, {
+	const child = IS_WIN && isCmdShim(opts.bin) ? spawn(process.env.ComSpec ?? "cmd.exe", [
+		"/d",
+		"/s",
+		"/c",
+		[opts.bin, ...opts.args].map(windowsQuote).join(" ")
+	], {
 		cwd: opts.cwd,
 		env: process.env,
-		detached: true,
 		stdio: [
 			"pipe",
 			"pipe",
 			"pipe"
-		]
+		],
+		windowsVerbatimArguments: true,
+		windowsHide: true
+	}) : spawn(opts.bin, opts.args, {
+		cwd: opts.cwd,
+		env: process.env,
+		detached: !IS_WIN,
+		stdio: [
+			"pipe",
+			"pipe",
+			"pipe"
+		],
+		windowsHide: true
 	});
 	let stdout = "";
 	let stderr = "";
@@ -1088,7 +1154,7 @@ function startAgyProcess(opts) {
 		pending += chunk;
 		let nl;
 		while ((nl = pending.indexOf("\n")) >= 0) {
-			const line = pending.slice(0, nl);
+			const line = pending.slice(0, nl).replace(/\r$/, "");
 			pending = pending.slice(nl + 1);
 			opts.onLine?.(line);
 		}
@@ -2715,7 +2781,7 @@ function apply(ctx, entryConfig = {}) {
 		const want = cfg.mcpBridge && cfg.enabled;
 		if (want && bridgeState.bridge === null) (async () => {
 			try {
-				const script = new URL("./bridge.mjs", import.meta.url).pathname;
+				const script = fileURLToPath(new URL("./bridge.mjs", import.meta.url));
 				const toolsSvc = ctx.get("tools");
 				const bridge = await startMcpBridge({
 					bridgeScript: script,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-agy-link",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Google Antigravity (agy CLI) models for DeepSeek Harness — stream Gemini/Claude/GPT-OSS subscriptions into DSH with thinking, tool activity, token usage and in-GUI Google OAuth login.",
   "type": "module",
   "license": "MIT",