dsh-agy-link 0.4.28 → 0.4.32

package/dist/index.js

@@ -398,6 +398,8 @@ var RunRecording = class {
 	[waiters] = /* @__PURE__ */ new Set();
 	/** DB-resolved full tool args keyed by event index (set during span driving). */
 	fullArgs = null;
+	/** DB-resolved thoughts keyed by event index (set during span driving). */
+	thoughts = null;
 	/**
 	* 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
@@ -536,6 +538,15 @@ var RunRecording = class {
 		this.fullArgs ??= /* @__PURE__ */ new Map();
 		this.fullArgs.set(eventIndex, args);
 	}
+	/** Store DB-resolved thoughts for a step (set during span driving). */
+	setThoughts(eventIndex, text) {
+		this.thoughts ??= /* @__PURE__ */ new Map();
+		this.thoughts.set(eventIndex, text);
+	}
+	/** Retrieve DB-resolved thoughts for a step if previously resolved. */
+	getThoughts(eventIndex) {
+		return this.thoughts?.get(eventIndex);
+	}
 };
 /** Prefix every mirrored agy tool callId carries; continuation detection key. */
 const AGY_CALL_PREFIX = "agytc-";
@@ -1008,11 +1019,26 @@ var EventMapper = class {
 			text: delta
 		};
 	}
-	/** The honest thinking signal agy exposes: a token-count line. */
-	*emitThinkingLine(thoughtTokens) {
+	/**
+	* Emit thinking: always retain the [agy thinking turn · ... thinking tokens]
+	* banner. When real thought prose is present, place the banner and thought
+	* text on the same initial line so DSH's collapsed summary renders:
+	*   [agy thinking turn · *** thinking tokens] [Chain-of-Thought body]
+	*/
+	*emitThinking(absIndex, thoughtTokens) {
+		const text = this.opts.resolvedThoughts?.get(absIndex);
+		const hasText = text !== void 0 && text.trim() !== "";
+		if (!hasText && thoughtTokens <= 0) return;
 		yield* this.ensureBlock("reasoning");
-		const d = this.appendDelta("[agy thinking turn · " + thoughtTokens + " thinking tokens]\n");
-		if (d) yield d;
+		const banner = thoughtTokens > 0 ? "[agy thinking turn · " + thoughtTokens + " thinking tokens]" : "[agy thinking turn]";
+		if (hasText) {
+			const combined = `${banner} ${text.trim()}\n`;
+			const d = this.appendDelta(combined);
+			if (d) yield d;
+		} else {
+			const d = this.appendDelta(`${banner}\n`);
+			if (d) yield d;
+		}
 	}
 	/**
 	* Map one event. `absIndex` is the event's position in the run recording;
@@ -1028,15 +1054,17 @@ var EventMapper = class {
 			if (ev.stepKind === "text") {
 				const thoughtTokens = ev.usage?.thinking_tokens ?? 0;
 				const stepTextEmitted = (this.emittedByKey.get(ev.stepKey) ?? "") !== "";
-				if (thoughtTokens > 0 && !stepTextEmitted && !this.thinkingAnnounced.has(ev.stepKey)) {
+				const dbThought = this.opts.resolvedThoughts?.get(absIndex);
+				const shouldAnnounce = dbThought !== void 0 && dbThought.trim() !== "" || thoughtTokens > 0;
+				if (shouldAnnounce && !stepTextEmitted && !this.thinkingAnnounced.has(ev.stepKey)) {
 					this.thinkingAnnounced.add(ev.stepKey);
-					yield* this.emitThinkingLine(thoughtTokens);
+					yield* this.emitThinking(absIndex, thoughtTokens);
 				}
-				const deferred = thoughtTokens > 0 && stepTextEmitted && !this.thinkingAnnounced.has(ev.stepKey);
+				const deferred = shouldAnnounce && stepTextEmitted && !this.thinkingAnnounced.has(ev.stepKey);
 				if (ev.text === "" && !ev.fragment) {
 					if (deferred) {
 						this.thinkingAnnounced.add(ev.stepKey);
-						yield* this.emitThinkingLine(thoughtTokens);
+						yield* this.emitThinking(absIndex, thoughtTokens);
 					}
 					return;
 				}
@@ -1055,17 +1083,25 @@ var EventMapper = class {
 				if (d) yield d;
 				if (deferred) {
 					this.thinkingAnnounced.add(ev.stepKey);
-					yield* this.emitThinkingLine(thoughtTokens);
+					yield* this.emitThinking(absIndex, thoughtTokens);
 				}
 				return;
 			}
 			if (ev.stepKind === "thinking" || ev.stepKind === "subagent") {
 				yield* this.ensureBlock("reasoning");
 				if (ev.stepKind === "thinking") {
-					const delta = suffixDelta(this.emittedByKey.get(ev.stepKey) ?? "", ev.text);
-					this.emittedByKey.set(ev.stepKey, ev.text);
-					const d = this.appendDelta(delta);
-					if (d) yield d;
+					const dbThought = this.opts.resolvedThoughts?.get(absIndex);
+					if (dbThought && dbThought.trim() !== "") {
+						const delta = suffixDelta(this.emittedByKey.get(ev.stepKey) ?? "", dbThought);
+						this.emittedByKey.set(ev.stepKey, dbThought);
+						const d = this.appendDelta(delta);
+						if (d) yield d;
+					} else {
+						const delta = suffixDelta(this.emittedByKey.get(ev.stepKey) ?? "", ev.text);
+						this.emittedByKey.set(ev.stepKey, ev.text);
+						const d = this.appendDelta(delta);
+						if (d) yield d;
+					}
 				} else {
 					const d = this.appendDelta("[agy subagent] " + ev.text + "\n");
 					if (d) yield d;
@@ -1454,7 +1490,7 @@ const THINKING_STEP_TYPES = /* @__PURE__ */ new Set([
 	"thought",
 	"reasoning"
 ]);
-const TOOL_STEP_TYPES = /* @__PURE__ */ new Set([
+const TOOL_STEP_TYPES$1 = /* @__PURE__ */ new Set([
 	"tool_call",
 	"toolcall",
 	"tool",
@@ -1503,7 +1539,7 @@ function normalizeStepKind(v) {
 		const s = v.toLowerCase();
 		if (TEXT_STEP_TYPES.has(s)) return "text";
 		if (THINKING_STEP_TYPES.has(s)) return "thinking";
-		if (TOOL_STEP_TYPES.has(s)) return "tool";
+		if (TOOL_STEP_TYPES$1.has(s)) return "tool";
 		if (TITLE_STEP_TYPES.has(s)) return "title";
 		if (SUBAGENT_STEP_TYPES.has(s)) return "subagent";
 		if (USER_INPUT_STEP_TYPES.has(s)) return "user-input";
@@ -2192,6 +2228,19 @@ 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");
+const TOOL_STEP_TYPES = /* @__PURE__ */ new Set([
+	5,
+	7,
+	8,
+	9,
+	17,
+	21,
+	33,
+	101,
+	132,
+	138,
+	139
+]);
 const MAX_CACHE_AGE_MS = 3e5;
 let cache = null;
 let cacheTime = 0;
@@ -2200,19 +2249,112 @@ const SAFE_CONVERSATION_ID = /^[A-Za-z0-9_-]{1,64}$/;
 function isSafeConversationId(id) {
 	return SAFE_CONVERSATION_ID.test(id);
 }
+function readVarint(b, offset) {
+	let val = 0;
+	let shift = 0;
+	let pos = offset;
+	while (pos < b.length) {
+		const byte = b[pos++];
+		val |= (byte & 127) << shift;
+		shift += 7;
+		if ((byte & 128) === 0) return {
+			val,
+			next: pos
+		};
+		if (shift > 35) return null;
+	}
+	return null;
+}
+/**
+* Extract model thought text from a protobuf step_payload.
+*
+* In agy SQLite databases (steps table, step_type = 15 agent_response),
+* the thought text is stored inside Protobuf field 20 (response body) ->
+* sub-field 3 (length-delimited UTF-8 string).
+*/
+function extractStepThoughts(payload) {
+	let pos = 0;
+	while (pos < payload.length) {
+		const res = readVarint(payload, pos);
+		if (res === null) break;
+		pos = res.next;
+		const tag = res.val;
+		const wireType = tag & 7;
+		const fieldNum = tag >>> 3;
+		if (wireType === 2) {
+			const lenRes = readVarint(payload, pos);
+			if (lenRes === null) break;
+			pos = lenRes.next;
+			const len = lenRes.val;
+			if (pos + len > payload.length) break;
+			const slice = payload.subarray(pos, pos + len);
+			pos += len;
+			if (fieldNum === 20) {
+				let p20 = 0;
+				while (p20 < slice.length) {
+					const t20Res = readVarint(slice, p20);
+					if (t20Res === null) break;
+					p20 = t20Res.next;
+					const t20 = t20Res.val;
+					const w20 = t20 & 7;
+					const f20 = t20 >>> 3;
+					if (w20 === 2) {
+						const l20Res = readVarint(slice, p20);
+						if (l20Res === null) break;
+						p20 = l20Res.next;
+						const l20 = l20Res.val;
+						if (p20 + l20 > slice.length) break;
+						const s20 = slice.subarray(p20, p20 + l20);
+						p20 += l20;
+						if (f20 === 3) {
+							const str = s20.toString("utf-8");
+							if (str.length > 0) return str;
+						}
+					} else if (w20 === 0) {
+						const v20Res = readVarint(slice, p20);
+						if (v20Res === null) break;
+						p20 = v20Res.next;
+					} else if (w20 === 1) p20 += 8;
+					else if (w20 === 5) p20 += 4;
+					else break;
+				}
+			}
+		} else if (wireType === 0) {
+			const vRes = readVarint(payload, pos);
+			if (vRes === null) break;
+			pos = vRes.next;
+		} else if (wireType === 1) pos += 8;
+		else if (wireType === 5) pos += 4;
+		else break;
+	}
+	return null;
+}
 /**
 * Copy the agy SQLite DB to a temp path (avoiding WAL lock issues), then
-* query tool step payloads via sqlite3 CLI. Returns a Map of stepIndex →
-* {name, args} for every tool step found.
+* query tool and thought step payloads via sqlite3 CLI.
 */
-async function loadToolSteps(conversationId) {
-	const result = /* @__PURE__ */ new Map();
-	if (!isSafeConversationId(conversationId)) return result;
+async function loadAgyDbData(conversationId) {
+	const steps = /* @__PURE__ */ new Map();
+	const thoughts = /* @__PURE__ */ new Map();
+	const seenSteps = /* @__PURE__ */ new Set();
+	if (!isSafeConversationId(conversationId)) return {
+		steps,
+		thoughts,
+		seenSteps
+	};
 	const dbPath = join(AGY_DB_DIR, `${conversationId}.db`);
 	try {
-		if ((await stat(dbPath)).size === 0) return result;
+		if ((await stat(dbPath)).size === 0) return {
+			steps,
+			thoughts,
+			seenSteps
+		};
 	} catch {
-		return result;
+		return {
+			steps,
+			thoughts,
+			seenSteps
+		};
 	}
 	const tmpDb = join(tmpdir(), `agy-db-${conversationId.slice(0, 8)}-${Date.now()}.db`);
 	try {
@@ -2223,20 +2365,31 @@ async function loadToolSteps(conversationId) {
 		try {
 			await copyFile(dbPath + "-shm", tmpDb + "-shm");
 		} catch {}
-		const { stdout } = await execFileAsync("sqlite3", [tmpDb, `SELECT idx, hex(step_payload) FROM steps WHERE step_type IN (5,7,8,9,17,21,33,101,132) AND length(step_payload) > 20`], {
+		const { stdout } = await execFileAsync("sqlite3", [tmpDb, `SELECT idx, step_type, hex(step_payload) FROM steps WHERE (step_type IN (5,7,8,9,14,15,17,21,33,101,132,138,139)) AND length(step_payload) > 20`], {
 			timeout: 5e3,
 			encoding: "utf-8",
-			maxBuffer: 10485760
+			maxBuffer: 26214400
 		});
 		for (const line of stdout.split("\n")) {
-			const pipeIdx = line.indexOf("|");
-			if (pipeIdx < 0) continue;
-			const idx = parseInt(line.slice(0, pipeIdx), 10);
+			const firstPipe = line.indexOf("|");
+			if (firstPipe < 0) continue;
+			const secondPipe = line.indexOf("|", firstPipe + 1);
+			if (secondPipe < 0) continue;
+			const idx = parseInt(line.slice(0, firstPipe), 10);
+			const stepType = parseInt(line.slice(firstPipe + 1, secondPipe), 10);
 			if (!Number.isFinite(idx)) continue;
-			const hexPayload = line.slice(pipeIdx + 1).trim();
+			seenSteps.add(idx);
+			const hexPayload = line.slice(secondPipe + 1).trim();
 			if (hexPayload === "" || hexPayload === "NULL") continue;
-			const info = extractToolInfo(Buffer.from(hexPayload, "hex"));
-			if (info !== null) result.set(idx, info);
+			const payload = Buffer.from(hexPayload, "hex");
+			if (TOOL_STEP_TYPES.has(stepType)) {
+				const info = extractToolInfo(payload);
+				if (info !== null) steps.set(idx, info);
+			}
+			if (stepType === 14 || stepType === 15) {
+				const th = extractStepThoughts(payload);
+				if (th !== null && th.trim() !== "") thoughts.set(idx, th);
+			}
 		}
 	} catch {} finally {
 		try {
@@ -2249,7 +2402,11 @@ async function loadToolSteps(conversationId) {
 			await unlink(tmpDb + "-shm");
 		} catch {}
 	}
-	return result;
+	return {
+		steps,
+		thoughts,
+		seenSteps
+	};
 }
 /**
 * Extract tool name and full JSON args from a protobuf step_payload.
@@ -2380,15 +2537,42 @@ async function readFullToolArgs(conversationId, stepIndex) {
 	if (cache?.conversationId === conversationId && cache.loaded && now - cacheTime < MAX_CACHE_AGE_MS) {
 		const cached = cache.steps.get(stepIndex);
 		if (cached !== void 0) return cached;
+		if (cache.checkedSteps.has(stepIndex)) return null;
 	}
-	const steps = await loadToolSteps(conversationId);
+	const data = await loadAgyDbData(conversationId);
 	cache = {
 		conversationId,
-		steps,
+		steps: data.steps,
+		thoughts: data.thoughts,
+		checkedSteps: data.seenSteps,
 		loaded: true
 	};
 	cacheTime = now;
-	return steps.get(stepIndex) ?? null;
+	return data.steps.get(stepIndex) ?? null;
+}
+/**
+* Read the full thought/reasoning text for a given step index from the agy
+* conversation database. Returns null when the DB is unavailable or the
+* step does not contain thought text.
+*/
+async function readStepThoughts(conversationId, stepIndex) {
+	if (!isSafeConversationId(conversationId)) return null;
+	const now = Date.now();
+	if (cache?.conversationId === conversationId && cache.loaded && now - cacheTime < MAX_CACHE_AGE_MS) {
+		const cached = cache.thoughts.get(stepIndex);
+		if (cached !== void 0) return cached;
+		if (cache.checkedSteps.has(stepIndex)) return null;
+	}
+	const data = await loadAgyDbData(conversationId);
+	cache = {
+		conversationId,
+		steps: data.steps,
+		thoughts: data.thoughts,
+		checkedSteps: data.seenSteps,
+		loaded: true
+	};
+	cacheTime = now;
+	return data.thoughts.get(stepIndex) ?? null;
 }
 //#endregion
 //#region src/host/adapter.ts
@@ -2784,6 +2968,7 @@ var AgyAdapter = class extends LlmAdapter {
 		this.deps.onParser?.(parser);
 		let streamCid = null;
 		const activeModelForArgs = activeModel === "" ? cfg.defaultModel : activeModel;
+		const effectiveAddDirs = workspaceRoot !== "" ? stagedDirs.includes(workspaceRoot) ? stagedDirs : [workspaceRoot, ...stagedDirs] : stagedDirs;
 		const argsBase = this.buildArgs({
 			prompt,
 			model: activeModelForArgs,
@@ -2793,7 +2978,7 @@ var AgyAdapter = class extends LlmAdapter {
 			timeoutMs: cfg.timeoutMs,
 			printTimeoutMinutes: Math.max(240, Math.ceil(cfg.timeoutMs / 6e4)),
 			extraArgs: cfg.extraArgs,
-			addDirs: stagedDirs
+			addDirs: effectiveAddDirs
 		});
 		const promptViaStdin = shouldUsePromptStdin(argsBase);
 		const args = promptViaStdin ? this.buildArgs({
@@ -2805,7 +2990,7 @@ var AgyAdapter = class extends LlmAdapter {
 			timeoutMs: cfg.timeoutMs,
 			printTimeoutMinutes: Math.max(240, Math.ceil(cfg.timeoutMs / 6e4)),
 			extraArgs: cfg.extraArgs,
-			addDirs: stagedDirs,
+			addDirs: effectiveAddDirs,
 			promptViaStdin: true
 		}) : argsBase;
 		const stdinPayload = promptViaStdin ? buildStreamInputLine(prompt) : void 0;
@@ -2972,6 +3157,7 @@ var AgyAdapter = class extends LlmAdapter {
 		const queue = new ChunkQueue();
 		(async () => {
 			const resolved = /* @__PURE__ */ new Map();
+			const resolvedThoughts = /* @__PURE__ */ new Map();
 			rec.conversationId;
 			const mapper = new EventMapper({
 				runId: rec.runId,
@@ -2979,11 +3165,31 @@ var AgyAdapter = class extends LlmAdapter {
 				initialSawText: rec.sawTextBefore(from),
 				useCodeWrapper,
 				usage: rec,
-				resolvedFullArgs: resolved
+				resolvedFullArgs: resolved,
+				resolvedThoughts
 			});
 			let i = from;
 			try {
 				for await (const ev of rec.eventsFrom(from)) {
+					const recordedThought = rec.getThoughts(i);
+					if (recordedThought !== void 0) resolvedThoughts.set(i, recordedThought);
+					else if (ev.kind === "step") {
+						const rawObj = ev.raw && typeof ev.raw === "object" ? ev.raw : null;
+						const stepUpdate = rawObj?.step_update && typeof rawObj.step_update === "object" ? rawObj.step_update : null;
+						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);
+							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);
+							}
+							if (th !== null && th.trim() !== "") {
+								resolvedThoughts.set(i, th);
+								rec.setThoughts(i, th);
+							}
+						} catch {}
+					}
 					if (ev.kind === "step" && ev.stepKind === "tool" && ev.tool) {
 						const rawObj = ev.raw && typeof ev.raw === "object" ? ev.raw : null;
 						const stepUpdate = rawObj?.step_update && typeof rawObj.step_update === "object" ? rawObj.step_update : null;
@@ -27339,6 +27545,7 @@ function agyCommandDefinition(deps) {
 	return {
 		name: "agy",
 		description: "Antigravity (agy CLI) bridge: status, login, models, mode, diagnostics",
+		input: { hint: "<status|pool|models|mode|effort|workspace|clear|doctor|help>" },
 		handler: (invocation) => handle(deps, invocation.rawInput)
 	};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-agy-link",
-  "version": "0.4.28",
+  "version": "0.4.32",
   "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",
@@ -42,7 +42,7 @@
       "optional": true
     },
     "@deepseek-ai/dsh-client-locale": {
-      "optional": true
+      "optional": false
     },
     "@deepseek-ai/dsh-commands": {
       "optional": true