dsh-agy-link 0.4.32 → 0.4.34

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## 0.4.34 (2026-09-18)
+
+### English
+
+- **UI: cleaner tool cards in Code Mode.** When DSH registers `agy_tool`, the bridge now emits native tool-call blocks instead of `run_code` wrappers. Code Mode titles use a human preview (`$ ls · run_command`) instead of `replay agy tool step N`. A `run_code` toolview renders Antigravity cards when the program is still a mirror wrapper.
+- **UI: less thinking spam.** Banner-only `[agy thinking turn · N tokens]` chips (no prose) emit at most once per run; turns that extract thought prose still show full reasoning.
+
+### 中文 (Chinese)
+
+- **界面：** Code Mode 下工具卡片更干净；有 prose 的思考仍完整展示，无正文的 token 横幅每轮最多一条。
+
+## 0.4.33 (2026-09-18)
+
+### English
+
+- **Fix: thinking / tool-args invisible for pool accounts.** agy conversation SQLite DBs for isolated accounts live under `~/.dsh/agy-accounts/<id>/.gemini/antigravity-cli/conversations`, not system `~/.gemini`. The reader now searches the run's account home, `GEMINI_CLI_HOME`, system home, and pool account dirs.
+- **Fix: `/agy status` could hang the command UI.** Auth probe is now bounded (8s) so command results always return (issue #29 symptom).
+
+### 中文 (Chinese)
+
+- **修复：号池隔离账号看不到思维链/工具参数** — 会话库在账号自己的 HOME 下，读取时会搜索账号目录。
+- **修复：`/agy status` 可能挂起导致命令无输出** — 探测加 8s 超时。
+
 ## 0.4.32 (2026-09-17)
 
 ### English

package/dist/client.js

@@ -664,13 +664,83 @@ window.__ModuleLoader__.load({
 				inspect
 			}))] : []);
 		}
+		/** Extract the agy mirror cursor (and tool name) from a run_code program. */
+		function parseAgyMirrorFromCode(argsRaw) {
+			try {
+				const parsed = JSON.parse(argsRaw);
+				const code = typeof parsed?.code === "string" ? parsed.code : "";
+				const m = /tools\['agy_tool'\]\((\{.*?"step":\d+\})\)/.exec(code);
+				if (!m) return null;
+				const v = JSON.parse(m[1]);
+				if (typeof v.run !== "string" || typeof v.step !== "number") return null;
+				const tm = /replay recorded agy tool step \d+ \(([^)]+)\)/.exec(code);
+				return {
+					run: v.run,
+					step: v.step,
+					tool: tm?.[1]
+				};
+			} catch {}
+			return null;
+		}
+		/**
+		* run_code toolview: when the program is an agy mirror wrapper, render the
+		* native Antigravity card instead of a raw code row. Other run_code calls
+		* fall through to the host renderer via a minimal wrapper that still shows
+		* something useful.
+		*/
+		function AgyRunCodeToolView(props) {
+			const block = props?.block;
+			const raw = block !== void 0 ? parsedArgsRaw(block) : "{}";
+			const mirror = parseAgyMirrorFromCode(raw);
+			if (mirror === null) {
+				let code = "";
+				try {
+					const parsed = JSON.parse(raw);
+					code = typeof parsed?.code === "string" ? parsed.code : raw;
+				} catch {
+					code = raw;
+				}
+				return hx("div", { className: cls("agy-tv-root") }, hx("div", { className: "agy-tv-header" }, hx("span", { className: "agy-tv-title" }, "run_code"), hx("span", { className: "agy-tv-badge" }, "code")), hx("pre", {
+					className: "agy-tv-pre",
+					style: {
+						margin: 0,
+						whiteSpace: "pre-wrap",
+						fontSize: "12px"
+					}
+				}, code.slice(0, 400)));
+			}
+			return AgyMirrorToolView({ block: {
+				...block,
+				call: {
+					...block?.call ?? {},
+					name: "agy_tool",
+					argsRaw: JSON.stringify({
+						run: mirror.run,
+						step: mirror.step,
+						...mirror.tool !== void 0 ? { tool: mirror.tool } : {}
+					})
+				}
+			} });
+		}
 		function installAgyToolView(ctx) {
-			ctx.slots.inject("tool.call.toolview", () => ctx.slots.register({
-				name: "tool.call.toolview",
-				key: "agy_tool",
-				id: "agy-tool-view",
-				label: "Antigravity tool"
-			}, AgyMirrorToolView));
+			ctx.slots.inject("tool.call.toolview", () => {
+				const d1 = ctx.slots.register({
+					name: "tool.call.toolview",
+					key: "agy_tool",
+					id: "agy-tool-view",
+					label: "Antigravity tool"
+				}, AgyMirrorToolView);
+				const d2 = ctx.slots.register({
+					name: "tool.call.toolview",
+					key: "run_code",
+					id: "agy-run-code-view",
+					label: "Antigravity (code mode)"
+				}, AgyRunCodeToolView);
+				return () => {
+					d2();
+					d1();
+				};
+			});
 		}
 		const ROW_CSS = `
 /* Container */

package/dist/index.js

@@ -400,6 +400,8 @@ var RunRecording = class {
 	fullArgs = null;
 	/** DB-resolved thoughts keyed by event index (set during span driving). */
 	thoughts = null;
+	/** Isolated pool-account HOME used for this run's agy conversation DB. */
+	accountHome = void 0;
 	/**
 	* Set by the adapter right after spawn. A mid-turn user steer makes DSH
 	* open a NEW stream() call for the same session while this run's process
@@ -648,16 +650,37 @@ function getGitHeadContent(filePath, execFn = execFileSync) {
 * whose single statement calls the registered mirror tool — the inner
 * dispatch is what renders the native tool card.
 */
-function buildMirrorRunCode(runId, eventIndex, toolName) {
+function buildMirrorRunCode(runId, eventIndex, toolName, brief) {
 	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
+		description: brief !== void 0 && brief !== "" ? brief + " · " + toolName : toolName
 	};
 }
+/** Short human preview for a recorded tool step (used in Code Mode titles). */
+function toolStepBrief(toolName, args) {
+	const a = args !== null && typeof args === "object" ? args : {};
+	const pickStr = (...keys) => {
+		for (const k of keys) {
+			const v = a[k];
+			if (typeof v === "string" && v.trim() !== "") return v.trim();
+		}
+		return "";
+	};
+	if (toolName === "run_command" || toolName === "execute_command") {
+		const cmd = pickStr("Command", "command", "Cmd", "cmd");
+		return cmd !== "" ? "$ " + cmd.slice(0, 80) : "run command";
+	}
+	if (toolName === "view_file" || toolName === "read_file") return "read " + (pickStr("Path", "path", "TargetFile", "File") || "file");
+	if (toolName === "write_to_file" || toolName === "create_file") return "write " + (pickStr("Path", "path", "TargetFile", "File") || "file");
+	if (toolName === "replace_file_content" || toolName === "edit_file") return "edit " + (pickStr("Path", "path", "TargetFile", "File") || "file");
+	if (toolName === "grep_search" || toolName === "search") return "search " + (pickStr("Query", "query", "SearchPattern") || "");
+	if (toolName === "list_dir" || toolName === "list_directory") return "ls " + (pickStr("Path", "path", "DirectoryPath") || ".");
+	return toolName;
+}
 /** agy serializes some tool args as a JSON string; presenters get an object. */
 function toolInput(args) {
 	const raw = args.input;
@@ -965,6 +988,7 @@ var EventMapper = class {
 	emittedByKey = /* @__PURE__ */ new Map();
 	announcedTools = /* @__PURE__ */ new Set();
 	thinkingAnnounced = /* @__PURE__ */ new Set();
+	bannerOnlyThinkingEmitted = false;
 	sawTextStep;
 	finished = false;
 	constructor(opts) {
@@ -1029,6 +1053,7 @@ var EventMapper = class {
 		const text = this.opts.resolvedThoughts?.get(absIndex);
 		const hasText = text !== void 0 && text.trim() !== "";
 		if (!hasText && thoughtTokens <= 0) return;
+		if (!hasText && this.bannerOnlyThinkingEmitted) return;
 		yield* this.ensureBlock("reasoning");
 		const banner = thoughtTokens > 0 ? "[agy thinking turn · " + thoughtTokens + " thinking tokens]" : "[agy thinking turn]";
 		if (hasText) {
@@ -1036,6 +1061,7 @@ var EventMapper = class {
 			const d = this.appendDelta(combined);
 			if (d) yield d;
 		} else {
+			this.bannerOnlyThinkingEmitted = true;
 			const d = this.appendDelta(`${banner}\n`);
 			if (d) yield d;
 		}
@@ -1123,7 +1149,7 @@ var EventMapper = class {
 					...fullArgs,
 					...typeof ev.tool.args === "object" ? ev.tool.args : {}
 				} : ev.tool.args;
-				const argumentsJson = useCode ? JSON.stringify(buildMirrorRunCode(this.opts.runId, absIndex, ev.tool.name)) : JSON.stringify({
+				const argumentsJson = useCode ? JSON.stringify(buildMirrorRunCode(this.opts.runId, absIndex, ev.tool.name, toolStepBrief(ev.tool.name, effectiveArgs))) : JSON.stringify({
 					run: this.opts.runId,
 					step: absIndex,
 					tool: ev.tool.name,
@@ -2228,6 +2254,43 @@ async function probeProcess(bin, args, timeoutMs = 3e4, signal, env) {
 //#region src/host/agy-db.ts
 const execFileAsync = promisify(execFile);
 let AGY_DB_DIR = join(homedir(), ".gemini", "antigravity-cli", "conversations");
+/**
+* Candidate conversations directories for a conversation id.
+* Pool/isolated accounts write agy state under their own HOME
+* (~/.dsh/agy-accounts/<id>/.gemini/...), NOT the system ~/.gemini
+* (issue: thinking/tool-args invisible when using isolated accounts).
+*/
+function conversationsDirCandidates(accountHome) {
+	const dirs = [];
+	const push = (d) => {
+		if (!dirs.includes(d)) dirs.push(d);
+	};
+	if (accountHome !== void 0 && accountHome !== "") push(join(accountHome, ".gemini", "antigravity-cli", "conversations"));
+	const gch = process.env.GEMINI_CLI_HOME;
+	if (gch !== void 0 && gch !== "") push(join(gch, "antigravity-cli", "conversations"));
+	push(AGY_DB_DIR);
+	push(join(homedir(), ".gemini", "antigravity-cli", "conversations"));
+	const poolBase = join(homedir(), ".dsh", "agy-accounts");
+	try {
+		for (const ent of readdirSync(poolBase)) {
+			if (ent.startsWith(".")) continue;
+			push(join(poolBase, ent, ".gemini", "antigravity-cli", "conversations"));
+		}
+	} catch {}
+	return dirs;
+}
+/** Locate an existing conversation DB across system + pool homes. */
+function findConversationDb(conversationId, accountHome) {
+	if (!isSafeConversationId(conversationId)) return null;
+	const name = `${conversationId}.db`;
+	for (const dir of conversationsDirCandidates(accountHome)) {
+		const p = join(dir, name);
+		try {
+			if (existsSync(p)) return p;
+		} catch {}
+	}
+	return null;
+}
 const TOOL_STEP_TYPES = /* @__PURE__ */ new Set([
 	5,
 	7,
@@ -2333,7 +2396,7 @@ function extractStepThoughts(payload) {
 * Copy the agy SQLite DB to a temp path (avoiding WAL lock issues), then
 * query tool and thought step payloads via sqlite3 CLI.
 */
-async function loadAgyDbData(conversationId) {
+async function loadAgyDbData(conversationId, accountHome) {
 	const steps = /* @__PURE__ */ new Map();
 	const thoughts = /* @__PURE__ */ new Map();
 	const seenSteps = /* @__PURE__ */ new Set();
@@ -2342,20 +2405,12 @@ async function loadAgyDbData(conversationId) {
 		thoughts,
 		seenSteps
 	};
-	const dbPath = join(AGY_DB_DIR, `${conversationId}.db`);
-	try {
-		if ((await stat(dbPath)).size === 0) return {
-			steps,
-			thoughts,
-			seenSteps
-		};
-	} catch {
-		return {
-			steps,
-			thoughts,
-			seenSteps
-		};
-	}
+	const dbPath = findConversationDb(conversationId, accountHome);
+	if (dbPath === null) return {
+		steps,
+		thoughts,
+		seenSteps
+	};
 	const tmpDb = join(tmpdir(), `agy-db-${conversationId.slice(0, 8)}-${Date.now()}.db`);
 	try {
 		await copyFile(dbPath, tmpDb);
@@ -2531,7 +2586,7 @@ function scanFallbackJson(payload) {
 * Results are cached per conversationId for up to 5 minutes to avoid
 * repeated DB reads within the same session.
 */
-async function readFullToolArgs(conversationId, stepIndex) {
+async function readFullToolArgs(conversationId, stepIndex, accountHome) {
 	if (!isSafeConversationId(conversationId)) return null;
 	const now = Date.now();
 	if (cache?.conversationId === conversationId && cache.loaded && now - cacheTime < MAX_CACHE_AGE_MS) {
@@ -2539,7 +2594,7 @@ async function readFullToolArgs(conversationId, stepIndex) {
 		if (cached !== void 0) return cached;
 		if (cache.checkedSteps.has(stepIndex)) return null;
 	}
-	const data = await loadAgyDbData(conversationId);
+	const data = await loadAgyDbData(conversationId, accountHome);
 	cache = {
 		conversationId,
 		steps: data.steps,
@@ -2555,7 +2610,7 @@ async function readFullToolArgs(conversationId, stepIndex) {
 * conversation database. Returns null when the DB is unavailable or the
 * step does not contain thought text.
 */
-async function readStepThoughts(conversationId, stepIndex) {
+async function readStepThoughts(conversationId, stepIndex, accountHome) {
 	if (!isSafeConversationId(conversationId)) return null;
 	const now = Date.now();
 	if (cache?.conversationId === conversationId && cache.loaded && now - cacheTime < MAX_CACHE_AGE_MS) {
@@ -2563,7 +2618,7 @@ async function readStepThoughts(conversationId, stepIndex) {
 		if (cached !== void 0) return cached;
 		if (cache.checkedSteps.has(stepIndex)) return null;
 	}
-	const data = await loadAgyDbData(conversationId);
+	const data = await loadAgyDbData(conversationId, accountHome);
 	cache = {
 		conversationId,
 		steps: data.steps,
@@ -2793,7 +2848,8 @@ var AgyAdapter = class extends LlmAdapter {
 		if (!bin) throw new LlmError("agy binary not found on PATH — install it via https://antigravity.google/docs/cli/install", Err.AGY_NOT_INSTALLED);
 		const isAux = options.purpose === "compaction" || options.purpose === "session-title";
 		if (isAux && !cfg.allowAuxiliary) throw new LlmError("auxiliary calls are disabled for the antigravity route (allowAuxiliary: false)", Err.AUX_DISABLED);
-		const isCodeMode = options.tools ? options.tools.some((t) => t.name === "run_code") : false;
+		const toolNames = new Set((options.tools ?? []).map((t) => t.name));
+		const isCodeMode = toolNames.has("run_code") && !toolNames.has("agy_tool");
 		const sessionKey = options.sessionId !== void 0 ? String(options.sessionId) : "";
 		let workspaceRoot = cfg.workspaceRoot;
 		if (workspaceRoot === "") {
@@ -2964,6 +3020,7 @@ var AgyAdapter = class extends LlmAdapter {
 		}
 		const before = snapshotConversations();
 		const rec = this.deps.runs.create();
+		rec.accountHome = account && account.dir ? account.dir : void 0;
 		const parser = new StreamJsonParser();
 		this.deps.onParser?.(parser);
 		let streamCid = null;
@@ -3179,10 +3236,10 @@ var AgyAdapter = class extends LlmAdapter {
 						const activeConvId = rec.conversationId ?? (typeof rawObj?.conversation_id === "string" ? rawObj.conversation_id : null) ?? (typeof stepUpdate?.conversation_id === "string" ? stepUpdate.conversation_id : null);
 						const stepIdx = parseInt(ev.stepKey, 10);
 						if (activeConvId !== null && Number.isFinite(stepIdx)) try {
-							let th = await readStepThoughts(activeConvId, stepIdx);
+							let th = await readStepThoughts(activeConvId, stepIdx, rec.accountHome);
 							if (th === null && (ev.state === "DONE" || (ev.usage?.thinking_tokens ?? 0) > 0 || ev.stepKind === "thinking")) {
 								await new Promise((r) => setTimeout(r, 50));
-								th = await readStepThoughts(activeConvId, stepIdx);
+								th = await readStepThoughts(activeConvId, stepIdx, rec.accountHome);
 							}
 							if (th !== null && th.trim() !== "") {
 								resolvedThoughts.set(i, th);
@@ -3196,10 +3253,10 @@ var AgyAdapter = class extends LlmAdapter {
 						const activeConvId = rec.conversationId ?? (typeof rawObj?.conversation_id === "string" ? rawObj.conversation_id : null) ?? (typeof stepUpdate?.conversation_id === "string" ? stepUpdate.conversation_id : null);
 						const stepIdx = parseInt(ev.stepKey, 10);
 						if (activeConvId !== null && Number.isFinite(stepIdx)) try {
-							let full = await readFullToolArgs(activeConvId, stepIdx);
+							let full = await readFullToolArgs(activeConvId, stepIdx, rec.accountHome);
 							if (full === null) {
 								await new Promise((r) => setTimeout(r, 50));
-								full = await readFullToolArgs(activeConvId, stepIdx);
+								full = await readFullToolArgs(activeConvId, stepIdx, rec.accountHome);
 							}
 							if (full !== null && full.args !== void 0) {
 								resolved.set(i, full.args);
@@ -27685,7 +27742,7 @@ async function renderStatus(deps) {
 	const cfg = deps.cfg();
 	const bin = deps.bin();
 	const authHelper = deps.auth();
-	const auth = authHelper ? await authHelper.resolvedStatus() : void 0;
+	const auth = authHelper ? await Promise.race([authHelper.resolvedStatus(), new Promise((r) => setTimeout(() => r(void 0), 8e3))]) : void 0;
 	const cat = deps.catalog().get();
 	const bindings = Object.keys(deps.store().all()).length;
 	const last = deps.lastRun();

package/package.json

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