dsh-agy-link 0.4.34 → 0.4.36

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## 0.4.36 (2026-09-18)
+
+### English
+
+- **Fix (issue #30): Windows quota panel empty.** `readSystemKeychainToken()` had no win32 branch; primary credentials live in Windows Credential Manager (`gemini:antigravity`), not a disk token file. Added a PowerShell `CredRead` reader (same zero-dep pattern as macOS `security` / Linux `secret-tool`).
+- **Fix: thinking blank after a reply finishes.** The client no longer rewrites React-managed `thinkBody` DOM (that wiped thought text on post-turn re-render). Styling is CSS-only; auto-expand uses the host disclosure control when prose is present.
+
+### 中文 (Chinese)
+
+- **修复 #30：** Windows 额度读取 — 从 Credential Manager 读 `gemini:antigravity`。
+- **修复：思考结束后变空** — 不再改写宿主 React 的 thinkBody；仅 CSS + 非破坏性展开。
+
+## 0.4.35 (2026-09-18)
+
+### English
+
+- **Reasoning UI: only show thinking when there is real content.** Empty `[agy thinking turn · N thinking tokens]` chips no longer spam tool-heavy turns. When agy stores only `toolAction`/`toolSummary` (common), those become the visible thought line (e.g. `Searching the web — Search Wo Tianyu profile`). Full CoT prose still renders when present in the conversation DB.
+
+### 中文 (Chinese)
+
+- **思考 UI：** 无正文时不再刷 token 横幅；工具步骤优先展示 `toolAction`/`toolSummary` 作为意图说明；完整思维链仍按 DB 正文展示。
+
 ## 0.4.34 (2026-09-18)
 
 ### English

package/dist/client.js

@@ -1476,7 +1476,7 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/reasoning.ts
 		const REASONING_CSS = `
-/* Ensure thinking disclosure row hover effect works reliably across all builds */
+/* Hover affordance on thinking disclosure rows */
 div[data-variant="think"] [data-disclosure-row]:hover [class*="iconIdle"],
 div[data-variant="think"] [class*="row"]:hover [class*="iconIdle"] {
 	opacity: 0 !important;
@@ -1486,7 +1486,7 @@ div[data-variant="think"] [class*="row"]:hover [class*="chevronHover"] {
 	opacity: 1 !important;
 }
 
-/* Scrollable thinking body when content is long */
+/* Scrollable thinking body (does not touch DOM structure) */
 div[data-variant="think"] [class*="thinkBody"] {
 	max-height: 360px;
 	overflow-y: auto;
@@ -1511,20 +1511,11 @@ div[data-variant="think"] [class*="thinkBody"]::-webkit-scrollbar-track {
 	margin: 4px 0;
 }
 
-/* Tasteful metadata chip for [agy thinking turn · ...] banner */
-.agy-thought-banner {
-	display: inline-block;
-	font-size: 11px;
-	line-height: 16px;
-	padding: 1px 7px;
-	margin-bottom: 6px;
-	border-radius: 4px;
-	color: var(--dsw-alias-label-tertiary, #64748b);
-	background: var(--dsw-alias-bg-layer-3, rgba(0, 0, 0, 0.04));
-	border: 0.5px solid var(--dsw-alias-border-l1, rgba(0, 0, 0, 0.1));
-	font-family: var(--dsw-font-family-code, ui-monospace, SFMono-Regular, Menlo, Consolas, monospace);
-	font-weight: 500;
-	user-select: none;
+/* Style leading banner token sequence without rewriting DOM: host text nodes
+   keep ownership; this only paints the first line if the host wraps it. */
+div[data-variant="think"] [class*="thinkBody"] > span:first-child,
+div[data-variant="think"] [class*="thinkBody"] {
+	font-family: inherit;
 }
 `;
 		function injectStyles() {
@@ -1539,37 +1530,41 @@ div[data-variant="think"] [class*="thinkBody"]::-webkit-scrollbar-track {
 			}
 		}
 		/**
-		* Cleanly format any `[agy thinking turn ...]` banner in `thinkBody`
-		* into a styled metadata chip so the prose displays cleanly.
+		* Try to expand a thinking row once when its body contains real prose
+		* (not a bare [agy thinking turn · N tokens] chip). Uses the host's own
+		* disclosure control when present — never mutates thinkBody children.
 		*/
-		function formatThinkingBody(thinkBodyEl) {
-			if (thinkBodyEl.dataset.agyFormatted === "true") return;
-			const text = thinkBodyEl.textContent ?? "";
-			const match = text.match(/^\[agy thinking turn(?: · \d+ thinking tokens)?\]\s*/);
-			if (!match) return;
-			const bannerText = match[0].trim();
-			const restText = text.slice(match[0].length);
-			thinkBodyEl.dataset.agyFormatted = "true";
-			thinkBodyEl.textContent = "";
-			const bannerSpan = document.createElement("span");
-			bannerSpan.className = "agy-thought-banner";
-			bannerSpan.textContent = bannerText;
-			thinkBodyEl.appendChild(bannerSpan);
-			if (restText.length > 0) thinkBodyEl.appendChild(document.createTextNode("\n" + restText));
+		function tryExpandThinkRow(root) {
+			if (root.dataset.agyExpanded === "true") return;
+			const body = root.querySelector("[class*=\"thinkBody\"]");
+			if (!body) return;
+			const text = (body.textContent ?? "").trim();
+			if (text === "") return;
+			if (/^\[agy thinking turn(?: · \d+ thinking tokens)?\]\s*$/.test(text)) return;
+			const style = typeof getComputedStyle === "function" ? getComputedStyle(body) : null;
+			if (style && style.display !== "none" && body.clientHeight > 8) {
+				root.dataset.agyExpanded = "true";
+				return;
+			}
+			const toggle = root.querySelector("[data-disclosure-row]") ?? root.querySelector("[class*=\"disclosure\"]") ?? root.querySelector("button");
+			if (toggle) try {
+				toggle.click();
+				root.dataset.agyExpanded = "true";
+			} catch {}
 		}
-		function scanThinkingBlocks() {
+		function scanThinkingRows() {
 			if (typeof document === "undefined") return;
-			const thinkBodies = document.querySelectorAll("div[data-variant=\"think\"] [class*=\"thinkBody\"]");
-			for (let i = 0; i < thinkBodies.length; i++) {
-				const body = thinkBodies[i];
-				if (body) formatThinkingBody(body);
+			const rows = document.querySelectorAll("div[data-variant=\"think\"]");
+			for (let i = 0; i < rows.length; i++) {
+				const row = rows[i];
+				if (row) tryExpandThinkRow(row);
 			}
 		}
 		function installAutoExpandReasoning() {
 			if (typeof window === "undefined" || typeof document === "undefined") return;
 			injectStyles();
 			const observer = new MutationObserver(() => {
-				scanThinkingBlocks();
+				scanThinkingRows();
 			});
 			const setupObserver = () => {
 				if (document.body) {
@@ -1577,7 +1572,7 @@ div[data-variant="think"] [class*="thinkBody"]::-webkit-scrollbar-track {
 						childList: true,
 						subtree: true
 					});
-					scanThinkingBlocks();
+					scanThinkingRows();
 				}
 			};
 			if (document.readyState === "loading") window.addEventListener("DOMContentLoaded", setupObserver, { once: true });

package/dist/index.js

@@ -1051,20 +1051,11 @@ var EventMapper = class {
 	*/
 	*emitThinking(absIndex, thoughtTokens) {
 		const text = this.opts.resolvedThoughts?.get(absIndex);
-		const hasText = text !== void 0 && text.trim() !== "";
-		if (!hasText && thoughtTokens <= 0) return;
-		if (!hasText && this.bannerOnlyThinkingEmitted) return;
+		if (!(text !== void 0 && text.trim() !== "")) return;
 		yield* this.ensureBlock("reasoning");
-		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 {
-			this.bannerOnlyThinkingEmitted = true;
-			const d = this.appendDelta(`${banner}\n`);
-			if (d) yield d;
-		}
+		const combined = `${thoughtTokens > 0 ? "[agy thinking turn · " + thoughtTokens + " thinking tokens]" : "[agy thinking turn]"} ${text.trim()}\n`;
+		const d = this.appendDelta(combined);
+		if (d) yield d;
 	}
 	/**
 	* Map one event. `absIndex` is the event's position in the run recording;
@@ -2331,65 +2322,111 @@ function readVarint(b, offset) {
 /**
 * 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).
+* Primary: field 20 -> sub-field 3 (verified on simple print-mode turns).
+* Fallback: longest non-JSON prose string, then toolAction/toolSummary
+* embedded in tool-arg JSON (tool-heavy agent turns often store only those).
 */
 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;
+	const proseCandidates = [];
+	const actionCandidates = [];
+	const consider = (str) => {
+		const t = str.trim();
+		if (t.length < 8) return;
+		if (/^SYSTEM ROLE/i.test(t)) return;
+		if (t.startsWith("/plan ") || t.includes("<PLAN>The user is requesting that you think")) return;
+		if (/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(t)) return;
+		if (/^bot-|^call_/.test(t)) return;
+		const act = /"toolAction"\s*:\s*"([^"]{3,200})"/.exec(t);
+		const sum = /"toolSummary"\s*:\s*"([^"]{3,200})"/.exec(t);
+		if (act || sum) {
+			const line = [act?.[1] ?? "", sum?.[1] ?? ""].filter((s) => s !== "").join(" — ");
+			if (line !== "") actionCandidates.push(line);
+		}
+		const looksJson = t.startsWith("{") || t.startsWith("[");
+		if (!looksJson && t.length >= 24 && t.length <= 4e3 && /[a-zA-Z一-鿿]/.test(t) && !/^[0-9a-f-]{30,}$/i.test(t)) {
+			if ((t.match(/[.!?]|，|。| /g) ?? []).length >= 2 || /[a-zA-Z]{4,}\s+[a-zA-Z]{3,}/.test(t)) proseCandidates.push(t);
+			return;
+		}
+		if (looksJson) try {
+			const obj = JSON.parse(t);
+			const line = [typeof obj.toolAction === "string" ? obj.toolAction.trim() : "", typeof obj.toolSummary === "string" ? obj.toolSummary.trim() : ""].filter((s) => s !== "").join(" — ");
+			if (line !== "") actionCandidates.push(line);
+		} catch {}
+	};
+	const walk = (buf, depth) => {
+		if (depth > 3) return;
+		let pos = 0;
+		while (pos < buf.length) {
+			const res = readVarint(buf, 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(buf, pos);
+				if (lenRes === null) break;
+				pos = lenRes.next;
+				const len = lenRes.val;
+				if (pos + len > buf.length) break;
+				const slice = buf.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.trim() !== "") {
+									consider(str);
+									if (!str.trim().startsWith("{") && str.trim().length >= 24) proseCandidates.unshift(str.trim());
+								}
+							} else if (f20 === 2 || f20 === 1) consider(s20.toString("utf-8"));
+						} 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;
-	}
+				if (len >= 8 && len < 2e5) walk(slice, depth + 1);
+			} else if (wireType === 0) {
+				const vRes = readVarint(buf, pos);
+				if (vRes === null) break;
+				pos = vRes.next;
+			} else if (wireType === 1) pos += 8;
+			else if (wireType === 5) pos += 4;
+			else break;
+		}
+	};
+	walk(payload, 0);
+	const full = payload.toString("utf8");
+	const act = /"toolAction"\s*:\s*"([^"]{3,200})"/.exec(full);
+	const sum = /"toolSummary"\s*:\s*"([^"]{3,200})"/.exec(full);
+	if (act || sum) {
+		const line = [act?.[1] ?? "", sum?.[1] ?? ""].filter((s) => s !== "").join(" — ");
+		if (line !== "") actionCandidates.push(line);
+	}
+	if (proseCandidates.length > 0) {
+		proseCandidates.sort((a, b) => b.length - a.length);
+		return proseCandidates[0];
+	}
+	if (actionCandidates.length > 0) return actionCandidates[0];
 	return null;
 }
 /**
@@ -2441,9 +2478,9 @@ async function loadAgyDbData(conversationId, accountHome) {
 				const info = extractToolInfo(payload);
 				if (info !== null) steps.set(idx, info);
 			}
-			if (stepType === 14 || stepType === 15) {
+			if (stepType === 14 || stepType === 15 || TOOL_STEP_TYPES.has(stepType)) {
 				const th = extractStepThoughts(payload);
-				if (th !== null && th.trim() !== "") thoughts.set(idx, th);
+				if (th !== null && th.trim() !== "" && !/^SYSTEM ROLE/i.test(th.trim())) thoughts.set(idx, th);
 			}
 		}
 	} catch {} finally {
@@ -28689,6 +28726,72 @@ function readMacKeychainToken() {
 		return null;
 	}
 }
+/**
+* Read the primary Antigravity OAuth token from Windows Credential Manager.
+* agy on Windows stores it via go-keyring under target `gemini:antigravity`
+* (user `antigravity`) as a UTF-8 JSON blob with the same shape as macOS
+* Keychain / Linux Secret Service. Without this reader the quota panel stays
+* empty on Windows: the on-disk `antigravity-oauth-token` file is often
+* absent while agy itself still authenticates via CredRead (issue #30).
+*/
+function readWindowsCredentialToken() {
+	if (process.platform !== "win32") return null;
+	try {
+		const script = [
+			"$sig = @'",
+			"using System;",
+			"using System.Runtime.InteropServices;",
+			"public class AgyCred {",
+			"  [DllImport(\"advapi32.dll\", SetLastError=true, CharSet=CharSet.Unicode)]",
+			"  public static extern bool CredRead(string target, int type, int flags, out IntPtr credential);",
+			"  [DllImport(\"advapi32.dll\", SetLastError=true)]",
+			"  public static extern void CredFree(IntPtr cred);",
+			"  [StructLayout(LayoutKind.Sequential, CharSet=CharSet.Unicode)]",
+			"  public struct CREDENTIAL {",
+			"    public int Flags; public int Type; public IntPtr TargetName;",
+			"    public IntPtr Comment; public long LastWritten; public int CredentialBlobSize;",
+			"    public IntPtr CredentialBlob; public int Persist; public int AttributeCount;",
+			"    public IntPtr Attributes; public IntPtr TargetAlias; public IntPtr UserName;",
+			"  }",
+			"  public static byte[] Read(string target) {",
+			"    IntPtr p;",
+			"    if (!CredRead(target, 1, 0, out p)) return null;",
+			"    CREDENTIAL c = (CREDENTIAL)Marshal.PtrToStructure(p, typeof(CREDENTIAL));",
+			"    byte[] b = new byte[c.CredentialBlobSize];",
+			"    Marshal.Copy(c.CredentialBlob, b, 0, c.CredentialBlobSize);",
+			"    CredFree(p);",
+			"    return b;",
+			"  }",
+			"}",
+			"'@",
+			"Add-Type -TypeDefinition $sig -ErrorAction Stop",
+			"$b = [AgyCred]::Read('gemini:antigravity')",
+			"if ($b -eq $null) { exit 1 }",
+			"[Console]::Out.Write([System.Text.Encoding]::UTF8.GetString($b))"
+		].join("\n");
+		const raw = execFileSync("powershell.exe", [
+			"-NoProfile",
+			"-NonInteractive",
+			"-ExecutionPolicy",
+			"Bypass",
+			"-Command",
+			script
+		], {
+			encoding: "utf8",
+			timeout: 8e3,
+			stdio: [
+				"ignore",
+				"pipe",
+				"ignore"
+			],
+			windowsHide: true
+		}).trim();
+		if (!raw) return null;
+		return parseGoKeyringPayload(raw);
+	} catch {
+		return null;
+	}
+}
 var QuotaService = class {
 	pool;
 	preferredEndpointIndex = 0;
@@ -28706,6 +28809,7 @@ var QuotaService = class {
 	readSystemKeychainToken() {
 		if (process.platform === "darwin") return readMacKeychainToken();
 		if (process.platform === "linux") return readLinuxSecretToken();
+		if (process.platform === "win32") return readWindowsCredentialToken();
 		return null;
 	}
 	/**

package/package.json

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