dsh-agy-link 0.3.2 → 0.3.3

package/README.md

@@ -223,7 +223,7 @@ DSH-side tools and permissions are unaffected — this only governs what the spa
 
 ## 🧩 How it works
 
-One DSH turn = one short-lived `agy -p --output-format stream-json` process. The NDJSON event stream is parsed, normalized, and recorded. Spans of that recording are mapped to DSH StreamChunks — thinking → reasoning blocks, text → text blocks, result envelope → usage + finish — and each **completed agy tool step cuts the span** with a `tool-calls` finish addressed to the internal `agy_tool` mirror. DSH's agent loop dispatches the mirror (it instantly replays the recorded output), writes real `tool/call` + `tool/result` session events, and re-calls the provider to continue the run — so tool activity renders with DSH's **native tool-card UI** (terminal cards, diffs, read/search icons) instead of text annotations. Conversation ids come from the stream itself, with a conversations-directory snapshot diff as fallback. **No reverse-engineered database scraping, no protobuf decoding, no token-file access** — only the official unmodified agy binary is spawned.
+One DSH turn = one short-lived `agy -p --output-format stream-json` process. The NDJSON event stream is parsed, normalized, and recorded. Spans of that recording are mapped to DSH StreamChunks — thinking → reasoning blocks, text → text blocks, result envelope → usage + finish — and each **completed agy tool step cuts the span** with a `tool-calls` finish. The tool-call block addresses `run_code` — the only tool DSH's dispatch policy lets a model call directly — wrapping a generated one-line program that invokes the internal `agy_tool` mirror; the inner dispatch instantly replays the recorded output, writes real `tool/call` + `tool/result` session events, and re-calls the provider to continue the run. Tool activity therefore renders with DSH's **native tool-card UI** (terminal cards, diffs, read/search icons) instead of text annotations, and cards read agy's PascalCase arg keys (`CommandLine`, `AbsolutePath`, …). Conversation ids come from the stream itself, with a conversations-directory snapshot diff as fallback. **No reverse-engineered database scraping, no protobuf decoding, no token-file access** — only the official unmodified agy binary is spawned.
 
 ## 📋 What it cannot do (honest list)
 

package/dist/index.js

@@ -3,9 +3,9 @@ import { accessSync, constants, existsSync, mkdirSync, readFileSync, readdirSync
 import { homedir, tmpdir } from "node:os";
 import { CallId, LlmAdapter, LlmError } from "@deepseek-ai/dsh-llm";
 import { randomBytes, randomUUID } from "node:crypto";
+import { defineTool } from "@deepseek-ai/dsh-tools";
 import { mkdir, mkdtemp, readFile, readdir, rm, stat, unlink, writeFile } from "node:fs/promises";
 import { spawn } from "node:child_process";
-import { defineTool } from "@deepseek-ai/dsh-tools";
 import { createServer } from "node:http";
 import { fileURLToPath } from "node:url";
 //#region src/common/types.ts
@@ -178,7 +178,7 @@ function readJson(file) {
 function readOverrides(file = overridesPath()) {
 	return readJson(file);
 }
-function asString$1(v) {
+function asString(v) {
 	return typeof v === "string" ? v : void 0;
 }
 function asBool(v) {
@@ -207,11 +207,11 @@ function resolveConfig(entry, env = process.env, overrides = readOverrides()) {
 	const cfg = {
 		...base,
 		enabled: asBool(get("enabled")) ?? base.enabled,
-		agyBin: asString$1(get("agyBin")) ?? base.agyBin,
+		agyBin: asString(get("agyBin")) ?? base.agyBin,
 		extraArgs: Array.isArray(get("extraArgs")) ? get("extraArgs").filter((x) => typeof x === "string") : base.extraArgs,
 		permissionMode: asMode(get("permissionMode")) ?? base.permissionMode,
-		defaultModel: asString$1(get("defaultModel")) ?? base.defaultModel,
-		defaultEffort: asString$1(get("defaultEffort")) ?? base.defaultEffort,
+		defaultModel: asString(get("defaultModel")) ?? base.defaultModel,
+		defaultEffort: asString(get("defaultEffort")) ?? base.defaultEffort,
 		timeoutMs: asNum(get("timeoutMs")) ?? base.timeoutMs,
 		maxConcurrent: asNum(get("maxConcurrent")) ?? base.maxConcurrent,
 		contextWindowDefault: asNum(get("contextWindowDefault")) ?? base.contextWindowDefault,
@@ -221,15 +221,15 @@ function resolveConfig(entry, env = process.env, overrides = readOverrides()) {
 		modelsCacheTtlMs: asNum(get("modelsCacheTtlMs")) ?? base.modelsCacheTtlMs,
 		allowAuxiliary: asBool(get("allowAuxiliary")) ?? base.allowAuxiliary,
 		compactionMaxChars: asNum(get("compactionMaxChars")) ?? base.compactionMaxChars,
-		workspaceRoot: asString$1(get("workspaceRoot")) ?? base.workspaceRoot,
+		workspaceRoot: asString(get("workspaceRoot")) ?? base.workspaceRoot,
 		fallbackModels: Array.isArray(get("fallbackModels")) ? get("fallbackModels").filter((x) => !!x && typeof x === "object" && typeof x.id === "string") : base.fallbackModels,
 		askTool: asBool(get("askTool")) ?? base.askTool,
-		mediaDir: asString$1(get("mediaDir")) ?? base.mediaDir,
+		mediaDir: asString(get("mediaDir")) ?? base.mediaDir,
 		mediaTtlMs: asNum(get("mediaTtlMs")) ?? base.mediaTtlMs,
 		mediaMaxBytes: asNum(get("mediaMaxBytes")) ?? base.mediaMaxBytes,
 		mediaMaxImages: asNum(get("mediaMaxImages")) ?? base.mediaMaxImages,
 		mcpBridge: asBool(get("mcpBridge")) ?? base.mcpBridge,
-		mcpToolAllowlist: asString$1(get("mcpToolAllowlist")) ?? base.mcpToolAllowlist
+		mcpToolAllowlist: asString(get("mcpToolAllowlist")) ?? base.mcpToolAllowlist
 	};
 	if (env.DSH_AGY_ENABLED !== void 0) cfg.enabled = asBool(env.DSH_AGY_ENABLED) ?? cfg.enabled;
 	if (env.DSH_AGY_BIN) cfg.agyBin = env.DSH_AGY_BIN;
@@ -451,6 +451,261 @@ var RunRegistry = class {
 	}
 };
 //#endregion
+//#region src/host/mirror-tool.ts
+const MIRROR_TOOL_NAME = "agy_tool";
+/** The only tool this DSH deployment lets a model call directly. */
+const WRAPPER_TOOL_NAME = "run_code";
+/**
+* Build the run_code tool-call arguments that replay one recorded agy tool
+* step. The deployment's tool-dispatch policy only allows `run_code` as a
+* direct model call (everything else must be invoked from inside a
+* program), so the span cut addresses run_code with a generated program
+* whose single statement calls the registered mirror tool — the inner
+* dispatch is what renders the native tool card.
+*/
+function buildMirrorRunCode(runId, eventIndex, toolName) {
+	const invocation = JSON.stringify({
+		run: runId,
+		step: eventIndex
+	});
+	return {
+		code: "// dsh-agy-link mirror: replay recorded agy tool step " + eventIndex + " (" + toolName + ")\nreturn await tools['agy_tool'](" + invocation + ")",
+		description: "replay agy tool step " + eventIndex + " · " + toolName
+	};
+}
+/** agy serializes some tool args as a JSON string; presenters get an object. */
+function toolInput(args) {
+	const raw = args.input;
+	if (raw === void 0 || raw === null) return {};
+	if (typeof raw === "object") return raw;
+	if (typeof raw === "string") try {
+		const parsed = JSON.parse(raw);
+		return typeof parsed === "object" && parsed !== null ? parsed : { value: parsed };
+	} catch {
+		return { value: raw };
+	}
+	return { value: raw };
+}
+/**
+* agy serializes tool args with PascalCase keys (CommandLine, AbsolutePath,
+* SearchDirectory, …); pick() accepts both spellings so cards always read
+* the real field instead of falling back to raw JSON.
+*/
+function pick$1(input, ...keys) {
+	for (const k of keys) {
+		const v = input[k];
+		if (typeof v === "string") return v;
+	}
+}
+/** Native pending-card projection for one mirrored agy tool call. */
+function presentMirrorCall(args) {
+	const a = args;
+	const name = typeof a?.tool === "string" ? a.tool : "";
+	const input = toolInput(a);
+	switch (name) {
+		case "run_command":
+		case "bash":
+		case "execute_command": return {
+			card: "terminal",
+			title: pick$1(input, "command", "cmd", "CommandLine", "Cmd") ?? JSON.stringify(input),
+			...pick$1(input, "description", "Description") !== void 0 ? { description: pick$1(input, "description", "Description") } : {},
+			...pick$1(input, "cwd", "Cwd", "WorkingDirectory") !== void 0 ? { cwd: pick$1(input, "cwd", "Cwd", "WorkingDirectory") } : {}
+		};
+		case "write_to_file":
+		case "write_file":
+		case "create_file": {
+			const path = pick$1(input, "path", "file_path", "filename", "Path", "FilePath", "FileName", "AbsolutePath") ?? "file";
+			const content = pick$1(input, "content", "Content", "FileContents", "contents") ?? "";
+			return {
+				card: "diff",
+				title: "Write " + path,
+				diffs: [{
+					path,
+					oldText: null,
+					newText: content
+				}],
+				locations: [{ path }]
+			};
+		}
+		case "edit_file":
+		case "replace_in_file":
+		case "edit": {
+			const path = pick$1(input, "path", "file_path", "Path", "FilePath", "AbsolutePath") ?? "file";
+			const newText = pick$1(input, "new_string", "newText", "content", "NewString", "NewText", "Content") ?? "";
+			const oldText = pick$1(input, "old_string", "oldText", "OldString", "OldText") ?? null;
+			return {
+				card: "diff",
+				title: "Edit " + path,
+				diffs: [{
+					path,
+					oldText,
+					newText
+				}],
+				locations: [{ path }]
+			};
+		}
+		case "read_file":
+		case "view_file":
+		case "read":
+		case "open_file": {
+			const path = pick$1(input, "path", "file_path", "filename", "Path", "FilePath", "FileName", "AbsolutePath") ?? "";
+			const offset = typeof input.offset === "number" ? input.offset : typeof input.Offset === "number" ? input.Offset : void 0;
+			return {
+				card: "generic",
+				title: "Read " + path,
+				kind: "read",
+				...path !== "" ? { locations: [{
+					path,
+					...offset !== void 0 ? { line: offset + 1 } : {}
+				}] } : {}
+			};
+		}
+		case "find_by_name":
+		case "glob":
+		case "search_files":
+		case "search":
+		case "search_file_content":
+		case "grep": {
+			const q = pick$1(input, "pattern", "query", "regex", "Pattern", "Query", "Regex", "QueryString") ?? "";
+			return {
+				card: "generic",
+				title: q !== "" ? "Search " + q : "Search",
+				kind: "search"
+			};
+		}
+		case "list_dir":
+		case "ls": {
+			const path = pick$1(input, "path", "directory", "Path", "Directory", "SearchDirectory", "AbsolutePath") ?? "";
+			return {
+				card: "generic",
+				title: path !== "" ? "List " + path : "List directory"
+			};
+		}
+		case "delete_file":
+		case "remove_file":
+		case "rm": return {
+			card: "generic",
+			title: "Delete " + (pick$1(input, "path", "file_path", "Path", "FilePath", "AbsolutePath") ?? ""),
+			kind: "delete"
+		};
+		default: return {
+			card: "generic",
+			title: name !== "" ? name : "agy tool",
+			rawInput: input
+		};
+	}
+}
+/** Native completed-card projection for one mirrored agy tool call. */
+function presentMirrorResult(args, result) {
+	const a = args;
+	const name = typeof a?.tool === "string" ? a.tool : "";
+	const text = resultText$1(result.content);
+	switch (name) {
+		case "run_command":
+		case "bash":
+		case "execute_command": return {
+			card: "terminal",
+			output: text
+		};
+		case "write_to_file":
+		case "write_file":
+		case "create_file":
+		case "edit_file":
+		case "replace_in_file":
+		case "edit": {
+			const call = presentMirrorCall(args);
+			return {
+				card: "diff",
+				diffs: call !== void 0 && call.card === "diff" ? call.diffs : []
+			};
+		}
+		default: return {
+			card: "generic",
+			content: [{
+				type: "text",
+				text: clip(text, 4e3)
+			}]
+		};
+	}
+}
+function resultText$1(content) {
+	const parts = [];
+	for (const b of Array.isArray(content) ? content : []) {
+		const blk = b;
+		if (blk && blk.type === "text" && typeof blk.text === "string") parts.push(blk.text);
+	}
+	return parts.join("\n");
+}
+function clip(s, max) {
+	return s.length > max ? s.slice(0, max) + "… (+" + (s.length - max) + " chars)" : s;
+}
+function defineAgyMirrorTool(deps) {
+	const enrichArgs = (args) => {
+		if (typeof args.tool === "string" && args.tool !== "") return args;
+		const runId = typeof args.run === "string" ? args.run : "";
+		const step = typeof args.step === "number" ? args.step : -1;
+		const t = deps.runs.get(runId)?.toolEventAt(step) ?? null;
+		if (t === null) return args;
+		return {
+			...args,
+			tool: t.name,
+			...args.input === void 0 && t.args !== void 0 ? { input: t.args } : {}
+		};
+	};
+	return defineTool({
+		name: MIRROR_TOOL_NAME,
+		description: "Internal to the dsh-agy-link bridge: replays one tool activity recorded from a Google Antigravity (agy) CLI run so it renders as a native tool card and rides the agent loop. Emitted automatically by the antigravity provider — do not call it directly.",
+		parameters: {
+			run: {
+				type: "string",
+				required: true,
+				description: "Recording run id."
+			},
+			step: {
+				type: "number",
+				required: true,
+				description: "Recorded event index of the tool step."
+			},
+			tool: {
+				type: "string",
+				description: "agy tool name that ran (optional — resolved from the recording)."
+			},
+			input: {
+				type: "json",
+				description: "agy tool arguments as recorded (optional — resolved from the recording)."
+			}
+		},
+		output: {
+			schema: { type: "string" },
+			render: (_args, value) => [{
+				type: "text",
+				text: value
+			}]
+		},
+		presentCall: (args) => presentMirrorCall(enrichArgs(args)),
+		presentResult: (args, result) => presentMirrorResult(enrichArgs(args), result),
+		async execute(args, exec) {
+			exec.signal;
+			const runId = typeof args.run === "string" ? args.run : "";
+			const step = typeof args.step === "number" ? args.step : -1;
+			typeof args.tool === "string" && args.tool;
+			const rec = deps.runs.get(runId);
+			if (rec === void 0) throw new Error("agy_tool: no recorded agy run \"" + runId + "\" — this tool only replays bridge-recorded activity");
+			const t = rec.toolEventAt(step);
+			if (t === null) throw new Error("agy_tool: event " + step + " of run " + runId + " is not a completed tool step");
+			if (t.error !== void 0) throw new Error("agy tool " + t.name + " failed: " + t.error);
+			const out = t.output;
+			if (out === void 0 || out === null) return "";
+			if (typeof out === "string") return out;
+			try {
+				return JSON.stringify(out, null, 2);
+			} catch {
+				return String(out);
+			}
+		}
+	});
+}
+//#endregion
 //#region src/host/mapper.ts
 function usageFromRaw(raw) {
 	const usage = {
@@ -543,7 +798,8 @@ var EventMapper = class {
 		if (ev.kind === "step") {
 			if (ev.stepKind === "text") {
 				const thoughtTokens = ev.usage?.thinking_tokens ?? 0;
-				if (thoughtTokens > 0 && !this.thinkingAnnounced.has(ev.stepKey)) {
+				const stepTextEmitted = (this.emittedByKey.get(ev.stepKey) ?? "") !== "";
+				if (thoughtTokens > 0 && !stepTextEmitted && !this.thinkingAnnounced.has(ev.stepKey)) {
 					this.thinkingAnnounced.add(ev.stepKey);
 					yield* this.ensureBlock("reasoning");
 					const d = this.appendDelta("[agy thinking turn · " + thoughtTokens + " thinking tokens]\n");
@@ -586,13 +842,7 @@ var EventMapper = class {
 				const close = this.closeOpen();
 				if (close) yield close;
 				const idx = this.blockIdx;
-				const input = ev.tool.args === void 0 ? {} : { input: ev.tool.args };
-				const argumentsJson = JSON.stringify({
-					run: this.opts.runId,
-					step: absIndex,
-					tool: ev.tool.name,
-					...input
-				});
+				const argumentsJson = JSON.stringify(buildMirrorRunCode(this.opts.runId, absIndex, ev.tool.name));
 				yield {
 					type: "block-start",
 					index: idx,
@@ -604,7 +854,7 @@ var EventMapper = class {
 					block: {
 						type: "tool-call",
 						id: CallId(mirrorCallId(this.opts.runId, absIndex)),
-						name: "agy_tool",
+						name: WRAPPER_TOOL_NAME,
 						arguments: argumentsJson
 					}
 				};
@@ -2620,222 +2870,6 @@ function writeDoctorReport(deps) {
 	return file;
 }
 //#endregion
-//#region src/host/mirror-tool.ts
-const MIRROR_TOOL_NAME = "agy_tool";
-/** agy serializes some tool args as a JSON string; presenters get an object. */
-function toolInput(args) {
-	const raw = args.input;
-	if (raw === void 0 || raw === null) return {};
-	if (typeof raw === "object") return raw;
-	if (typeof raw === "string") try {
-		const parsed = JSON.parse(raw);
-		return typeof parsed === "object" && parsed !== null ? parsed : { value: parsed };
-	} catch {
-		return { value: raw };
-	}
-	return { value: raw };
-}
-function asString(v) {
-	return typeof v === "string" ? v : void 0;
-}
-/** Native pending-card projection for one mirrored agy tool call. */
-function presentMirrorCall(args) {
-	const a = args;
-	const name = typeof a?.tool === "string" ? a.tool : "";
-	const input = toolInput(a);
-	switch (name) {
-		case "run_command":
-		case "bash":
-		case "execute_command": return {
-			card: "terminal",
-			title: asString(input.command) ?? asString(input.cmd) ?? JSON.stringify(input),
-			...asString(input.description) !== void 0 ? { description: asString(input.description) } : {},
-			...asString(input.cwd) !== void 0 ? { cwd: asString(input.cwd) } : {}
-		};
-		case "write_to_file":
-		case "write_file":
-		case "create_file": {
-			const path = asString(input.path) ?? asString(input.file_path) ?? asString(input.filename) ?? "file";
-			const content = asString(input.content) ?? "";
-			return {
-				card: "diff",
-				title: "Write " + path,
-				diffs: [{
-					path,
-					oldText: null,
-					newText: content
-				}],
-				locations: [{ path }]
-			};
-		}
-		case "edit_file":
-		case "replace_in_file":
-		case "edit": {
-			const path = asString(input.path) ?? asString(input.file_path) ?? "file";
-			const newText = asString(input.new_string) ?? asString(input.newText) ?? asString(input.content) ?? "";
-			const oldText = asString(input.old_string) ?? asString(input.oldText) ?? null;
-			return {
-				card: "diff",
-				title: "Edit " + path,
-				diffs: [{
-					path,
-					oldText,
-					newText
-				}],
-				locations: [{ path }]
-			};
-		}
-		case "read_file":
-		case "view_file":
-		case "read":
-		case "open_file": {
-			const path = asString(input.path) ?? asString(input.file_path) ?? asString(input.filename) ?? "";
-			const offset = typeof input.offset === "number" ? input.offset : void 0;
-			return {
-				card: "generic",
-				title: "Read " + path,
-				kind: "read",
-				...path !== "" ? { locations: [{
-					path,
-					...offset !== void 0 ? { line: offset + 1 } : {}
-				}] } : {}
-			};
-		}
-		case "find_by_name":
-		case "glob":
-		case "search_files":
-		case "search":
-		case "search_file_content":
-		case "grep": {
-			const q = asString(input.pattern) ?? asString(input.query) ?? asString(input.regex) ?? "";
-			return {
-				card: "generic",
-				title: q !== "" ? "Search " + q : "Search",
-				kind: "search"
-			};
-		}
-		case "list_dir":
-		case "ls": {
-			const path = asString(input.path) ?? asString(input.directory) ?? "";
-			return {
-				card: "generic",
-				title: path !== "" ? "List " + path : "List directory"
-			};
-		}
-		case "delete_file":
-		case "remove_file":
-		case "rm": return {
-			card: "generic",
-			title: "Delete " + (asString(input.path) ?? asString(input.file_path) ?? ""),
-			kind: "delete"
-		};
-		default: return {
-			card: "generic",
-			title: name !== "" ? name : "agy tool",
-			rawInput: input
-		};
-	}
-}
-/** Native completed-card projection for one mirrored agy tool call. */
-function presentMirrorResult(args, result) {
-	const a = args;
-	const name = typeof a?.tool === "string" ? a.tool : "";
-	const text = resultText$1(result.content);
-	switch (name) {
-		case "run_command":
-		case "bash":
-		case "execute_command": return {
-			card: "terminal",
-			output: text
-		};
-		case "write_to_file":
-		case "write_file":
-		case "create_file":
-		case "edit_file":
-		case "replace_in_file":
-		case "edit": {
-			const call = presentMirrorCall(args);
-			return {
-				card: "diff",
-				diffs: call !== void 0 && call.card === "diff" ? call.diffs : []
-			};
-		}
-		default: return {
-			card: "generic",
-			content: [{
-				type: "text",
-				text: clip(text, 4e3)
-			}]
-		};
-	}
-}
-function resultText$1(content) {
-	const parts = [];
-	for (const b of Array.isArray(content) ? content : []) {
-		const blk = b;
-		if (blk && blk.type === "text" && typeof blk.text === "string") parts.push(blk.text);
-	}
-	return parts.join("\n");
-}
-function clip(s, max) {
-	return s.length > max ? s.slice(0, max) + "… (+" + (s.length - max) + " chars)" : s;
-}
-function defineAgyMirrorTool(deps) {
-	return defineTool({
-		name: MIRROR_TOOL_NAME,
-		description: "Internal to the dsh-agy-link bridge: replays one tool activity recorded from a Google Antigravity (agy) CLI run so it renders as a native tool card and rides the agent loop. Emitted automatically by the antigravity provider — do not call it directly.",
-		parameters: {
-			run: {
-				type: "string",
-				required: true,
-				description: "Recording run id."
-			},
-			step: {
-				type: "number",
-				required: true,
-				description: "Recorded event index of the tool step."
-			},
-			tool: {
-				type: "string",
-				required: true,
-				description: "agy tool name that ran."
-			},
-			input: {
-				type: "json",
-				description: "agy tool arguments as recorded."
-			}
-		},
-		output: {
-			schema: { type: "string" },
-			render: (_args, value) => [{
-				type: "text",
-				text: value
-			}]
-		},
-		presentCall: (args) => presentMirrorCall(args),
-		presentResult: (args, result) => presentMirrorResult(args, result),
-		async execute(args, exec) {
-			exec.signal;
-			const runId = typeof args.run === "string" ? args.run : "";
-			const step = typeof args.step === "number" ? args.step : -1;
-			typeof args.tool === "string" && args.tool;
-			const rec = deps.runs.get(runId);
-			if (rec === void 0) throw new Error("agy_tool: no recorded agy run \"" + runId + "\" — this tool only replays bridge-recorded activity");
-			const t = rec.toolEventAt(step);
-			if (t === null) throw new Error("agy_tool: event " + step + " of run " + runId + " is not a completed tool step");
-			if (t.error !== void 0) throw new Error("agy tool " + t.name + " failed: " + t.error);
-			const out = t.output;
-			if (out === void 0 || out === null) return "";
-			if (typeof out === "string") return out;
-			try {
-				return JSON.stringify(out, null, 2);
-			} catch {
-				return String(out);
-			}
-		}
-	});
-}
-//#endregion
 //#region src/host/sessions.ts
 var SessionStore = class {
 	file;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-agy-link",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "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",