dsh-agy-link 0.4.34 → 0.4.35

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 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/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 {

package/package.json

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