dsh-agy-link 0.2.7 → 0.2.9

package/CHANGELOG.md

@@ -1,5 +1,57 @@
 # Changelog
 
+## 0.2.9 (2026-08-19)
+
+- **Tool activity moved out of the thinking panel into the reply body.**
+  User feedback on 0.2.8: tool annotations hidden inside the DSH thinking
+  fold were invisible and felt wrong. agy tools now render as visible
+  `🔧 [agy tool: name] args -> output` lines in the message body (they
+  cannot become native DSH tool cards: a finish:tool-calls would make the
+  DSH agent try to execute tools it does not own — agy runs its own closed
+  tool loop). The thinking panel keeps only what is genuinely thinking
+  signal: `[agy thinking turn · N thinking tokens]` turn annotations
+  (agy print mode never streams thinking text) and terminal error notes.
+
+## 0.2.8 (2026-08-19)
+
+- **Fix: real agy 1.1.15 stream-json parsing.** The parser only understood
+  flat, hypothesized event shapes; the live CLI nests every step payload
+  under a `step_update` envelope and uses a different vocabulary
+  (`agent_response` + `text_delta` fragments, `tool` with `tool_name` /
+  `tool_info` with `parameters` / `output` / `error`). As a result thinking
+  and tool activity were silently dropped and only the final result text
+  survived. Both shapes are now parsed (legacy aliases kept).
+- **New: visible thinking turns + tool activity.** agy does not stream
+  thinking text in print mode (only `thinking_tokens` usage), so each
+  thinking-only `agent_response` turn surfaces as an annotated reasoning
+  block (`[agy thinking turn · N thinking tokens]`), tool calls render as
+  `[agy tool: name] args -> output` reasoning annotations, and failed tools
+  render `[agy tool error: name] message`.
+- **Fix: `result.status=ERROR` with a usable response** (e.g. a tool timed
+  out mid-run) no longer discards the answer — the response streams, the
+  error is annotated, the turn finishes normally. A bare envelope error
+  now maps to a precise `AGY_ERROR` finish instead of INVALID_OUTPUT.
+- **Fix: `agy models` deadlock — stdin pipe never closed.** agy reads stdin
+  when it is a pipe and waits for EOF; every non-auth spawn kept the pipe
+  open, so model discovery silently timed out and the catalog always fell
+  back to the bundled list. Stdin now closes right after spawn (auth probes
+  keep it open).
+- **Fix: auth phase was always `idle`** until someone ran `/agy auth`, so
+  the settings page claimed "needs Google login" for signed-in users.
+  Status surfaces now lazily probe the real login state via `agy models`
+  (60s cache) and report `ok` / `signed-out` truthfully.
+- **Fix: `/plugins/agy-link/*` routes never registered on dsh web** (settings
+  page stuck on `binary: not found / auth: unknown / models: 0`). Routes are
+  now registered through a reactive `ctx.inject(['webServer'])` sub-fiber,
+  so they attach whenever the service appears instead of racing it. The
+  settings page also renders an honest "endpoint unreachable" state instead
+  of misleading placeholders when the route is missing.
+- **Removed: sidebar footer AGY button** (user request). Login (QR +
+  authorization code) and mode/effort quick controls moved to Settings →
+  Antigravity; the conversation header `AGY` pill stays.
+- Tests: real-1.1.15 fixture modes (`real`, `real-error`, `real-fail`) and
+  parser/mapper/adapter coverage for the nested format (73 tests).
+
 ## 0.2.7 (2026-08-19)
 
 - Visible agy status in DSH: conversation header `AGY` pill, Settings → Antigravity status page, and sidebar footer label.

package/README.md

@@ -38,7 +38,7 @@
 | 🔗 **会话连续** | 每个 DSH 会话绑定原生 agy 会话（`--conversation`），多轮上下文由 agy 历史承载，不重发全量 |
 | 📊 **token 用量** | 输入/输出/思考/缓存 token 全部进入 DSH 用量统计 |
 | ⚙️ **设置页状态** | DSH 设置 → Antigravity 页面显示 agy 连接/登录/工作区/绑定数/最近运行状态 |
-| 🔐 **GUI 内 Google 登录** | `/agy auth` 打印授权 URL；侧栏面板提供二维码 + 授权码粘贴框 |
+| 🔐 **GUI 内 Google 登录** | `/agy auth` 打印授权 URL；设置 → Antigravity 页面提供二维码 + 授权码粘贴框 |
 | 🤝 **`agy_ask` 工具** | 任何 DSH 模型都可以把一次性任务委托给 Antigravity 模型（AskAntigravity 模式） |
 | ⌨️ **`/agy` 命令族** | `status` / `auth` / `auth-code` / `models` / `mode` / `effort` / `workspace` / `clear` / `doctor` / `help` |
 | 🖼 **图片多模态（v0.2）** | 图片落盘到本地媒体目录（TTL 清理），prompt 以绝对路径引用 + `--add-dir` 授权，agy 用自己的工具看图 |
@@ -75,7 +75,7 @@ dsh plugin --profile web add dsh-agy-link
 
 # 3. 登录（一次性；终端里已经跑过 agy 登录过的可跳过）：
 #   /agy auth               ← 打开授权 URL，批准并复制授权码
-#   /agy auth-code <授权码>  ← 或直接用侧栏面板的二维码 + 粘贴框
+#   /agy auth-code <授权码>  ← 或直接用设置 → Antigravity 页面的二维码 + 粘贴框
 
 # 4. /model 选择器里选 antigravity 模型，开聊
 ```
@@ -111,7 +111,7 @@ DSH 侧的工具与权限不受影响——这里只约束 agy 子进程在自
 
 ## 🧩 工作原理
 
-一次 DSH 模型调用 = 一个短生命周期 `agy -p --output-format stream-json` 进程。NDJSON 事件流被解析、归一化并映射为 DSH StreamChunk：思考 → reasoning 块，文本 → text 块，工具活动 → 注记 reasoning 块，结果信封 → usage + finish。会话 id 优先取自流本身，conversations 目录快照对比兜底。**不逆向数据库、不解码 protobuf、不碰 token 文件**——只启动官方未修改的 agy 二进制。
+一次 DSH 模型调用 = 一个短生命周期 `agy -p --output-format stream-json` 进程。NDJSON 事件流被解析、归一化并映射为 DSH StreamChunk：文本 → text 块，工具活动 → 注记 reasoning 块（含失败注记），结果信封 → usage + finish。agy 的 print 模式**不输出思考文本**（只有 `thinking_tokens` 计数），因此每个思考轮次以 `[agy thinking turn · N thinking tokens]` 注记呈现，思考 token 也进入用量统计。会话 id 优先取自流本身，conversations 目录快照对比兜底。**不逆向数据库、不解码 protobuf、不碰 token 文件**——只启动官方未修改的 agy 二进制。
 
 ## 📋 它做不到什么（诚实清单）
 
@@ -149,7 +149,7 @@ Bring **Google Antigravity models into DeepSeek Harness (DSH)** — chat, thinki
 | 🔗 **Session continuity** | Each DSH session binds to a native agy conversation (`--conversation`); multi-turn context rides agy history instead of re-sending everything |
 | 📊 **Token usage** | Input/output/thinking/cache tokens surface in DSH usage accounting |
 | ⚙️ **Settings status** | DSH Settings → Antigravity page shows agy connection/login/workspace/bindings/last-run state |
-| 🔐 **In-GUI Google login** | `/agy auth` prints the consent URL; the sidebar panel adds a QR code and a paste box for the authorization code |
+| 🔐 **In-GUI Google login** | `/agy auth` prints the consent URL; Settings → Antigravity adds a QR code and a paste box for the authorization code |
 | 🤝 **`agy_ask` tool** | Let any DSH model delegate a one-shot task to an Antigravity model (the AskAntigravity pattern) |
 | ⌨️ **`/agy` commands** | `status`, `auth`, `auth-code`, `models`, `mode`, `effort`, `workspace`, `clear`, `doctor`, `help` |
 | 😴 **Dormant-safe** | No agy binary? Not signed in? The plugin loads anyway and tells you what to fix |
@@ -186,7 +186,7 @@ dsh plugin --profile web add dsh-agy-link
 
 # 3. Login (one time; skip if you already ran agy in a terminal):
 #   /agy auth               <- open the consent URL, approve, copy the code
-#   /agy auth-code <code>   <- or use the sidebar panel (QR + paste box)
+#   /agy auth-code <code>   <- or use Settings -> Antigravity (QR + paste box)
 
 # 4. Pick an antigravity model in /model and chat
 ```

package/dist/client.js

@@ -6,10 +6,7 @@ window.__ModuleLoader__.load({
 		Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 		//#region src/client/index.ts
 		const { createElement: h, useState, useEffect } = require("react");
-		const reactDom = require("react-dom");
 		const win = globalThis;
-		const bodyEl = win.document?.body;
-		const portalToBody = bodyEl != null && reactDom.createPortal ? (node) => reactDom.createPortal(node, bodyEl) : (node) => node;
 		const name = "dsh-agy-link-client";
 		const inject = ["slots"];
 		const base = win.location?.origin ?? "";
@@ -73,15 +70,12 @@ window.__ModuleLoader__.load({
 			}
 		};
 		function apply(ctx) {
-			const AgyPanel = (props) => {
-				const { wide = false } = props ?? {};
-				const [open, setOpen] = useState(false);
+			const AgySettingsSection = () => {
 				const [status, setStatus] = useState(null);
 				const [code, setCode] = useState("");
 				const [busy, setBusy] = useState(false);
 				const [notice, setNotice] = useState("");
 				useEffect(() => {
-					if (!open) return;
 					let alive = true;
 					const tick = async () => {
 						const st = await getStatus();
@@ -93,14 +87,15 @@ window.__ModuleLoader__.load({
 						alive = false;
 						clearInterval(timer);
 					};
-				}, [open]);
-				const dot = status === null ? "#9aa0a6" : status.dormantReason ? "#f5a623" : status.auth?.phase === "pending" || status.auth?.phase === "failed" || status.auth?.phase === "submitting" ? "#f5a623" : status.lastRun && !status.lastRun.ok ? "#e5484d" : "#30a46c";
+				}, []);
+				const refresh = async () => {
+					setStatus(await getStatus());
+				};
 				const startAuth = async () => {
 					setBusy(true);
 					setNotice("");
 					await postJson("/plugins/agy-link/auth", {});
-					const st = await getStatus();
-					setStatus(st);
+					await refresh();
 					setBusy(false);
 				};
 				const submitCode = async () => {
@@ -119,40 +114,17 @@ window.__ModuleLoader__.load({
 						key,
 						value
 					});
-					const st = await getStatus();
-					setStatus(st);
+					await refresh();
 					setBusy(false);
 				};
-				const badge = h("button", {
-					type: "button",
-					onClick: () => setOpen(!open),
-					style: {
-						background: "transparent",
-						border: "none",
-						cursor: "pointer",
-						padding: "2px 6px",
-						fontSize: "14px",
-						lineHeight: 1
-					},
-					title: "Antigravity (agy) bridge"
-				}, h("span", { style: {
-					display: "inline-block",
-					width: "9px",
-					height: "9px",
-					borderRadius: "50%",
-					background: dot
-				} }), wide ? h("span", { style: {
-					marginLeft: "6px",
-					fontSize: "12px",
-					lineHeight: 1
-				} }, "AGY") : null);
-				if (!open) return badge;
-				const needsAuth = status !== null && !status.dormantReason && status.auth !== void 0 && status.auth.phase !== "ok";
-				const dormantLine = h("div", null, "Bridge dormant: ", status?.dormantReason ?? "");
+				const reachable = status !== null;
+				const summary = !reachable ? "Status endpoint unreachable — the plugin host did not answer /plugins/agy-link/status. Restart the DSH web server and check its logs." : status.dormantReason ? "Not ready — " + status.dormantReason : status.auth?.phase === "ok" ? "Ready — agy is connected" : "Needs Google login — start the login flow below, or run /agy auth";
+				const color = !reachable ? "#e5484d" : status.dormantReason ? "#f5a623" : status.auth?.phase === "ok" ? "#30a46c" : "#f5a623";
 				const infoBlock = h("div", { style: {
 					...S.muted,
-					lineHeight: 1.5
-				} }, h("div", null, "agy: ", status?.bin ?? "not found", " — v", status?.version ?? "?"), h("div", null, "auth: ", status?.auth?.phase ?? "unknown"), h("div", null, "models: ", String(status?.catalog?.count ?? 0), " — ", status?.catalog?.source ?? ""), h("div", null, "workspace: ", status?.workspaceRoot ? status.workspaceRoot : "(session cwd / process cwd)"), h("div", null, "bindings: ", String(status?.bindings ?? 0)), h("div", null, "last run: ", status?.lastRun ? (status.lastRun.ok ? "ok" : status.lastRun.code) + " — " + status.lastRun.model : "none"));
+					lineHeight: 1.6,
+					margin: "6px 0 12px"
+				} }, h("div", null, "agy binary: ", status?.bin ?? "not found", status?.version ? " — v" + status.version : ""), h("div", null, "auth: ", status?.auth?.phase ?? "unknown"), h("div", null, "workspace: ", status?.workspaceRoot ? status.workspaceRoot : "(session cwd / process cwd)"), h("div", null, "models: ", String(status?.catalog?.count ?? 0), " — ", status?.catalog?.source ?? ""), h("div", null, "bindings: ", String(status?.bindings ?? 0)), h("div", null, "last run: ", status?.lastRun ? (status.lastRun.ok ? "ok" : status.lastRun.code) + " — " + status.lastRun.model : "none"));
 				const modeRow = h("div", { style: {
 					...S.row,
 					marginTop: "8px"
@@ -190,7 +162,10 @@ window.__ModuleLoader__.load({
 					style: status?.defaultEffort === "" ? S.btnPrimary : S.btn,
 					onClick: () => void setCfg("defaultEffort", "")
 				}, "auto"));
-				const skipWarn = h("div", { style: S.muted }, "skip runs agy tools with --dangerously-skip-permissions (no approval prompts). plan is the safe read-only default.");
+				const skipWarn = h("div", { style: {
+					...S.muted,
+					marginBottom: "8px"
+				} }, "skip runs agy tools with --dangerously-skip-permissions (no approval prompts). plan is the safe read-only default.");
 				const authBlock = h("div", null, h("div", { style: {
 					fontWeight: 600,
 					marginBottom: "4px"
@@ -219,53 +194,8 @@ window.__ModuleLoader__.load({
 					disabled: busy,
 					onClick: () => void startAuth()
 				}, "Restart login")), notice !== "" ? h("div", null, notice) : null);
-				const body = status?.dormantReason ? dormantLine : needsAuth ? authBlock : h("div", null, infoBlock, modeRow, effortRow, skipWarn);
-				const header = h("div", { style: {
-					display: "flex",
-					justifyContent: "space-between",
-					alignItems: "center",
-					marginBottom: "8px"
-				} }, h("span", { style: {
-					fontWeight: 600,
-					fontSize: "13px"
-				} }, "Antigravity bridge"), h("button", {
-					type: "button",
-					style: S.btn,
-					onClick: () => setOpen(false)
-				}, "close"));
-				const popover = h("div", { style: {
-					position: "fixed",
-					bottom: "56px",
-					left: "16px",
-					width: "300px",
-					maxHeight: "70vh",
-					overflowY: "auto",
-					padding: "12px 14px",
-					borderRadius: "10px",
-					border: "1px solid rgba(128,128,128,0.35)",
-					background: "rgba(28,28,32,0.98)",
-					boxShadow: "0 8px 32px rgba(0,0,0,0.5)",
-					zIndex: 1e3
-				} }, header, body);
-				return h("div", { style: { display: "contents" } }, badge, portalToBody(popover));
-			};
-			const AgySettingsSection = () => {
-				const [status, setStatus] = useState(null);
-				useEffect(() => {
-					let alive = true;
-					const tick = async () => {
-						const st = await getStatus();
-						if (alive) setStatus(st);
-					};
-					tick();
-					const timer = setInterval(tick, 3e3);
-					return () => {
-						alive = false;
-						clearInterval(timer);
-					};
-				}, []);
-				const summary = status === null ? "Loading…" : status.dormantReason ? "Not ready — " + status.dormantReason : status.auth?.phase === "ok" ? "Ready — agy is connected" : "Needs Google login — open the sidebar dot or run /agy auth";
-				const color = status === null ? "#9aa0a6" : status.dormantReason ? "#f5a623" : status.auth?.phase === "ok" ? "#30a46c" : "#f5a623";
+				const needsAuth = reachable && !status.dormantReason && status.auth !== void 0 && status.auth.phase !== "ok";
+				const controls = !reachable ? null : status.dormantReason ? h("div", { style: S.muted }, "Bridge dormant: ", status.dormantReason) : needsAuth ? authBlock : h("div", null, infoBlock, modeRow, effortRow, skipWarn);
 				return h("div", { style: { lineHeight: 1.6 } }, h("div", { style: {
 					display: "flex",
 					alignItems: "center",
@@ -281,10 +211,7 @@ window.__ModuleLoader__.load({
 				} }), "Antigravity (agy CLI)"), h("div", { style: {
 					...S.muted,
 					margin: "6px 0 12px"
-				} }, summary), h("div", { style: {
-					...S.muted,
-					lineHeight: 1.6
-				} }, h("div", null, "agy binary: ", status?.bin ?? "not found", status?.version ? " — v" + status.version : ""), h("div", null, "auth: ", status?.auth?.phase ?? "unknown"), h("div", null, "workspace: ", status?.workspaceRoot ? status.workspaceRoot : "(session cwd / process cwd)"), h("div", null, "models: ", String(status?.catalog?.count ?? 0), " — ", status?.catalog?.source ?? ""), h("div", null, "bindings: ", String(status?.bindings ?? 0)), h("div", null, "last run: ", status?.lastRun ? (status.lastRun.ok ? "ok" : status.lastRun.code) + " — " + status.lastRun.model : "none")), h("div", { style: S.muted }, "Run `/agy status` for full diagnostics, or use the sidebar dot for quick login/controls."));
+				} }, summary), controls, h("div", { style: S.muted }, "Run `/agy status` for full diagnostics, `/agy doctor` to export a report."));
 			};
 			const AgySessionStatus = () => {
 				const [status, setStatus] = useState(null);
@@ -327,14 +254,6 @@ window.__ModuleLoader__.load({
 					background: color
 				} }), "AGY");
 			};
-			ctx.slots.inject("sidebar.footer.action", () => {
-				return ctx.slots.register({
-					name: "sidebar.footer.action",
-					id: "agy-link-entry",
-					order: 30,
-					label: "Antigravity"
-				}, AgyPanel);
-			});
 			ctx.slots.inject("conversation.session.header.actions", () => {
 				return ctx.slots.register({
 					name: "conversation.session.header.actions",

package/dist/index.js

@@ -349,6 +349,7 @@ var EventMapper = class {
 	openAcc = "";
 	emittedByKey = /* @__PURE__ */ new Map();
 	toolPhaseSeen = /* @__PURE__ */ new Set();
+	thinkingAnnounced = /* @__PURE__ */ new Set();
 	sawTextStep = false;
 	finished = false;
 	constructor(opts = {}) {
@@ -408,47 +409,97 @@ var EventMapper = class {
 		if (ev.kind === "garbage") return;
 		if (ev.kind === "step") {
 			if (ev.stepKind === "text") {
+				const thoughtTokens = ev.usage?.thinking_tokens ?? 0;
+				if (ev.text === "" && thoughtTokens > 0 && !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");
+					if (d) yield d;
+					return;
+				}
+				if (ev.text === "" && !ev.fragment) return;
 				this.sawTextStep = true;
 				yield* this.ensureBlock("text");
-				const delta = suffixDelta(this.emittedByKey.get(ev.stepKey) ?? "", ev.text);
-				this.emittedByKey.set(ev.stepKey, ev.text);
-				const d = this.appendDelta(delta);
+				let d;
+				if (ev.fragment === true) {
+					const acc = (this.emittedByKey.get(ev.stepKey) ?? "") + ev.text;
+					this.emittedByKey.set(ev.stepKey, acc);
+					d = this.appendDelta(ev.text);
+				} else {
+					const delta = suffixDelta(this.emittedByKey.get(ev.stepKey) ?? "", ev.text);
+					this.emittedByKey.set(ev.stepKey, ev.text);
+					d = this.appendDelta(delta);
+				}
 				if (d) yield d;
 				return;
 			}
-			if (ev.stepKind === "thinking" || ev.stepKind === "tool" || ev.stepKind === "subagent") {
+			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;
-				} else if (ev.stepKind === "tool" && ev.tool) {
-					const announceKey = ev.stepKey + ":a";
-					if (!this.toolPhaseSeen.has(announceKey)) {
-						this.toolPhaseSeen.add(announceKey);
-						const line = (this.opts.announce ?? defaultAnnounce)(ev.tool.name, ev.tool.args);
-						const d = this.appendDelta(line);
-						if (d) yield d;
-					}
-					const outKey = ev.stepKey + ":o";
-					if (ev.tool.output !== void 0 && !this.toolPhaseSeen.has(outKey)) {
-						this.toolPhaseSeen.add(outKey);
-						const rendered = this.opts.toolOutput ? this.opts.toolOutput(ev.tool.name, ev.tool.args, ev.tool.output) : defaultOutput(ev.tool.output);
-						if (rendered !== null) {
-							const d = this.appendDelta(rendered);
-							if (d) yield d;
-						}
-					}
-				} else if (ev.stepKind === "subagent") {
+				} else {
 					const d = this.appendDelta("[agy subagent] " + ev.text + "\n");
 					if (d) yield d;
 				}
 				return;
 			}
+			if (ev.stepKind === "tool" && ev.tool) {
+				yield* this.ensureBlock("text");
+				const announceKey = ev.stepKey + ":a";
+				if (!this.toolPhaseSeen.has(announceKey)) {
+					this.toolPhaseSeen.add(announceKey);
+					const line = (this.opts.announce ?? defaultAnnounce)(ev.tool.name, ev.tool.args);
+					const d = this.appendDelta("🔧 " + line);
+					if (d) yield d;
+				}
+				const outKey = ev.stepKey + ":o";
+				const errKey = ev.stepKey + ":e";
+				if (ev.tool.error !== void 0 && !this.toolPhaseSeen.has(errKey)) {
+					this.toolPhaseSeen.add(errKey);
+					const d = this.appendDelta("⚠ [agy tool error: " + ev.tool.name + "] " + ev.tool.error + "\n");
+					if (d) yield d;
+				}
+				if (ev.tool.output !== void 0 && !this.toolPhaseSeen.has(outKey)) {
+					this.toolPhaseSeen.add(outKey);
+					const rendered = this.opts.toolOutput ? this.opts.toolOutput(ev.tool.name, ev.tool.args, ev.tool.output) : defaultOutput(ev.tool.output);
+					if (rendered !== null) {
+						const d = this.appendDelta(rendered);
+						if (d) yield d;
+					}
+				}
+				return;
+			}
+			return;
+		}
+		if (!ev.ok) {
+			if (ev.response === "") return;
+			if (!this.sawTextStep) {
+				yield* this.ensureBlock("text");
+				const d = this.appendDelta(ev.response);
+				if (d) yield d;
+			}
+			if (ev.error !== void 0 && ev.error !== "") {
+				yield* this.ensureBlock("reasoning");
+				const d = this.appendDelta("[agy finished with error] " + ev.error + "\n");
+				if (d) yield d;
+			}
+			const closeErr = this.closeOpen();
+			if (closeErr) yield closeErr;
+			yield {
+				type: "usage",
+				usage: usageFromRaw(ev.usage)
+			};
+			yield {
+				type: "finish",
+				reason: { kind: "stop" },
+				...ev.conversationId !== "" ? { replayState: { response: { conversationId: ev.conversationId } } } : {}
+			};
+			this.finished = true;
 			return;
 		}
-		if (!ev.ok) return;
 		if (!this.sawTextStep && ev.response !== "") {
 			yield* this.ensureBlock("text");
 			const d = this.appendDelta(ev.response);
@@ -512,7 +563,7 @@ function parseModelsOutput(stdout) {
 	for (const line of text.split(/\n/)) {
 		const t = line.trim();
 		if (t === "" || t.startsWith("Fetching") || t.startsWith("Error")) continue;
-		const m = t.match(/^(\S+)\s{2,}(.+)$/);
+		const m = t.match(/^(\S+)(?:\t+|\s{2,})(.+)$/);
 		if (m && m[1] !== void 0 && m[2] !== void 0) out.push({
 			slug: m[1],
 			label: m[2].trim()
@@ -717,7 +768,9 @@ const TEXT_STEP_TYPES = /* @__PURE__ */ new Set([
 	"model_response",
 	"modelresponse",
 	"message",
-	"response_text"
+	"response_text",
+	"agent_response",
+	"agentresponse"
 ]);
 const THINKING_STEP_TYPES = /* @__PURE__ */ new Set([
 	"thinking",
@@ -802,6 +855,11 @@ function extractText(obj) {
 	}
 	return "";
 }
+/** agy ≥1.1.15 streams assistant text as `text_delta` fragments. */
+function extractTextDelta(obj) {
+	const v = obj.text_delta ?? obj.textDelta;
+	return typeof v === "string" ? v : void 0;
+}
 function extractTool(obj) {
 	const info = pick(obj, [
 		"tool_info",
@@ -818,21 +876,31 @@ function extractTool(obj) {
 		"canonical_name"
 	]);
 	if (typeof name !== "string" || name === "") return void 0;
+	const args = pick(src, [
+		"parameters",
+		"params",
+		"input",
+		"args",
+		"input_json",
+		"inputJson"
+	]);
+	const output = pick(src, [
+		"output",
+		"result",
+		"output_text"
+	]);
+	const errObj = src.error;
+	let error;
+	if (typeof errObj === "string") error = errObj;
+	else if (errObj && typeof errObj === "object") {
+		const msg = errObj.message;
+		if (typeof msg === "string" && msg !== "") error = msg;
+	}
 	return {
 		name,
-		args: pick(src, [
-			"parameters",
-			"params",
-			"input",
-			"args",
-			"input_json",
-			"inputJson"
-		]),
-		output: pick(src, [
-			"output",
-			"result",
-			"output_text"
-		])
+		args,
+		output,
+		...error !== void 0 ? { error } : {}
 	};
 }
 function parseUsage(v) {
@@ -866,20 +934,36 @@ function classifyEvent(obj, seq) {
 			"session_id",
 			"sessionId"
 		]);
+		const initObj = o.init;
+		const initSrc = initObj && typeof initObj === "object" && !Array.isArray(initObj) ? initObj : {};
 		const model = pick(o, [
 			"model",
 			"model_name",
 			"modelName"
+		]) ?? pick(initSrc, [
+			"model",
+			"model_name",
+			"modelName"
 		]);
+		let convId = typeof cid === "string" && cid !== "" ? cid : void 0;
+		if (convId === void 0) {
+			const nested = pick(initSrc, ["conversation_id", "conversationId"]);
+			if (typeof nested === "string" && nested !== "") convId = nested;
+		}
 		return {
 			kind: "init",
-			...typeof cid === "string" && cid !== "" ? { conversationId: cid } : {},
+			...convId !== void 0 ? { conversationId: convId } : {},
 			...typeof model === "string" ? { model } : {},
 			raw: o
 		};
 	}
 	if (evt === "step_update" || evt === "step" || evt === "stepUpdate") {
-		const idxV = pick(o, [
+		const nested = o.step_update ?? o.stepUpdate ?? o.step;
+		const su = nested && typeof nested === "object" && !Array.isArray(nested) ? nested : {};
+		const src = Object.keys(su).length > 0 ? su : o;
+		const idxV = pick(src, [
+			"step_index",
+			"stepIndex",
 			"idx",
 			"index",
 			"step_idx",
@@ -889,18 +973,25 @@ function classifyEvent(obj, seq) {
 			"stepId"
 		]);
 		const stepKey = typeof idxV === "number" || typeof idxV === "string" ? String(idxV) : String(seq);
-		const stepKind = normalizeStepKind(pick(o, [
+		const stepKind = normalizeStepKind(pick(src, [
 			"step_type",
 			"stepType",
 			"type"
 		]));
-		const toolInfo = stepKind === "tool" ? extractTool(o) : void 0;
+		const toolInfo = stepKind === "tool" ? extractTool(src) : void 0;
+		const delta = extractTextDelta(src);
+		const text = delta !== void 0 ? delta : extractText(src);
+		const stateV = pick(src, ["state"]);
+		const usageRaw = pick(src, ["usage"]);
 		return {
 			kind: "step",
 			stepKey,
 			stepKind,
-			text: extractText(o),
+			text,
+			...delta !== void 0 ? { fragment: true } : {},
 			...toolInfo !== void 0 ? { tool: toolInfo } : {},
+			...typeof stateV === "string" ? { state: stateV } : {},
+			...usageRaw && typeof usageRaw === "object" ? { usage: parseUsage(usageRaw) } : {},
 			raw: o
 		};
 	}
@@ -938,6 +1029,10 @@ function classifyEvent(obj, seq) {
 		event: "step_update",
 		...o
 	}, seq);
+	if ((o.step_update !== void 0 || o.stepUpdate !== void 0) && (o.step_update ?? o.stepUpdate) !== null && typeof (o.step_update ?? o.stepUpdate) === "object") return classifyEvent({
+		event: "step_update",
+		step_update: o.step_update ?? o.stepUpdate
+	}, seq);
 }
 var StreamJsonParser = class {
 	buffer = "";
@@ -947,7 +1042,8 @@ var StreamJsonParser = class {
 		garbage: 0,
 		consecutiveGarbage: 0,
 		authUrl: void 0,
-		sawAuthFailure: false
+		sawAuthFailure: false,
+		lastResultError: void 0
 	};
 	/** Ring buffer of raw stdout lines for /agy doctor export. */
 	recentLines = [];
@@ -1003,6 +1099,7 @@ var StreamJsonParser = class {
 				line
 			};
 		}
+		if (ev.kind === "result") this.stats.lastResultError = ev.error ?? void 0;
 		this.stats.consecutiveGarbage = 0;
 		return ev;
 	}
@@ -1225,6 +1322,9 @@ function startAgyProcess(opts) {
 	let timedOut = false;
 	let aborted = false;
 	let settled = false;
+	if (!opts.keepStdin) try {
+		child.stdin?.end();
+	} catch {}
 	const watchdog = opts.timeoutMs && opts.timeoutMs > 0 ? setTimeout(() => {
 		timedOut = true;
 		killTree(child);
@@ -1263,9 +1363,6 @@ function startAgyProcess(opts) {
 					opts.onLine?.(pending);
 					pending = "";
 				}
-				if (!opts.keepStdin) try {
-					child.stdin?.end();
-				} catch {}
 				resolve({
 					code,
 					signal,
@@ -1597,6 +1694,11 @@ var AgyAdapter = class extends LlmAdapter {
 					code: Err.PROCESS_EXIT,
 					message: "agy exited with code " + outcome.code + (outcome.stderrTail !== "" ? ": " + brief(outcome.stderrTail) : "")
 				};
+				else if (parser.stats.lastResultError) failure = {
+					kind: "error",
+					code: Err.AGY_ERROR,
+					message: "agy reported an error: " + parser.stats.lastResultError
+				};
 				else failure = {
 					kind: "error",
 					code: Err.INVALID_OUTPUT,
@@ -1907,12 +2009,63 @@ var AuthHelper = class {
 	capturedUrl = null;
 	urlWaiter = null;
 	urlTimer = null;
+	signedInCache = null;
+	signedInFlight = null;
 	constructor(bin) {
 		this.bin = bin;
 	}
 	status() {
 		return { ...this.state };
 	}
+	/**
+	* Ground-truth login probe: `agy models` succeeds only when signed in and
+	* prints a sign-in error otherwise. Cached for 60s; in-flight calls share
+	* one spawn. Returns true/false, or null when undeterminable (no binary,
+	* spawn failure, ambiguous output). While a login flow is active the
+	* in-memory phase wins and the probe is skipped.
+	*/
+	async probeSignedIn(force = false) {
+		if (this.state.phase === "pending" || this.state.phase === "submitting") return null;
+		if (this.state.phase === "ok") return true;
+		const now = Date.now();
+		if (!force && this.signedInCache !== null && now - this.signedInCache.at < 6e4) return this.signedInCache.value;
+		if (this.signedInFlight !== null) return this.signedInFlight;
+		const bin = this.bin();
+		if (!bin) return null;
+		this.signedInFlight = (async () => {
+			let value = null;
+			try {
+				const out = await probeProcess(bin, ["models"], 15e3);
+				const tail = out.stderrTail + "\n" + out.stdout.slice(0, 2e3);
+				if (out.code === 0 && !looksLikeAuthFailure(out.stdout)) value = true;
+				else if (out.code !== 0 && looksLikeAuthFailure(tail)) value = false;
+			} catch {
+				value = null;
+			}
+			this.signedInCache = {
+				value,
+				at: Date.now()
+			};
+			this.signedInFlight = null;
+			return value;
+		})();
+		return this.signedInFlight;
+	}
+	/** status() enriched with a lazily probed login state for idle phases. */
+	async resolvedStatus() {
+		const st = this.status();
+		if (st.phase !== "idle") return st;
+		const signedIn = await this.probeSignedIn();
+		if (signedIn === true) return {
+			phase: "ok",
+			message: "signed in (probed via agy models)"
+		};
+		if (signedIn === false) return {
+			phase: "signed-out",
+			message: "agy is not signed in — run /agy auth"
+		};
+		return st;
+	}
 	startProbe() {
 		const bin = this.bin();
 		if (!bin) return null;
@@ -2090,7 +2243,7 @@ async function handle(deps, raw) {
 	const sub = parts[0] ?? "help";
 	const arg = parts[1] ?? "";
 	try {
-		if (sub === "status") return ok(renderStatus(deps));
+		if (sub === "status") return ok(await renderStatus(deps));
 		if (sub === "auth") {
 			const auth = deps.auth();
 			if (!auth) return err("agy binary not found — install the CLI first");
@@ -2163,10 +2316,11 @@ async function handle(deps, raw) {
 		return err(e instanceof Error ? e.message : String(e));
 	}
 }
-function renderStatus(deps) {
+async function renderStatus(deps) {
 	const cfg = deps.cfg();
 	const bin = deps.bin();
-	const auth = deps.auth()?.status();
+	const authHelper = deps.auth();
+	const auth = authHelper ? await authHelper.resolvedStatus() : void 0;
 	const cat = deps.catalog().get();
 	const bindings = Object.keys(deps.store().all()).length;
 	const last = deps.lastRun();
@@ -2707,60 +2861,66 @@ function apply(ctx, entryConfig = {}) {
 		}
 	};
 	syncAskTool();
-	const webServer = ctx.get("webServer");
-	const sendJson = (res, status, body) => {
-		res.writeHead(status, { "Content-Type": "application/json; charset=utf-8" });
-		res.end(JSON.stringify(body));
-	};
-	const readBody = (req) => {
-		const r = req;
-		return new Promise((resolve) => {
-			const chunks = [];
-			r.on?.("data", (c) => chunks.push(c));
-			r.on?.("end", () => {
-				try {
-					const v = JSON.parse(Buffer.concat(chunks).toString("utf8"));
-					resolve(v && typeof v === "object" ? v : {});
-				} catch {
-					resolve({});
-				}
+	const registerRoutes = (webServer) => {
+		const disposers = [];
+		const reg = (route) => {
+			const d = webServer.register(route);
+			if (typeof d === "function") disposers.push(d);
+		};
+		const sendJson = (res, status, body) => {
+			res.writeHead(status, { "Content-Type": "application/json; charset=utf-8" });
+			res.end(JSON.stringify(body));
+		};
+		const readBody = (req) => {
+			const r = req;
+			return new Promise((resolve) => {
+				const chunks = [];
+				r.on?.("data", (c) => chunks.push(c));
+				r.on?.("end", () => {
+					try {
+						const v = JSON.parse(Buffer.concat(chunks).toString("utf8"));
+						resolve(v && typeof v === "object" ? v : {});
+					} catch {
+						resolve({});
+					}
+				});
 			});
-		});
-	};
-	const methodOf = (req) => {
-		const m = req.method;
-		return typeof m === "string" ? m.toUpperCase() : "GET";
-	};
-	if (webServer) {
-		webServer.register({
+		};
+		const methodOf = (req) => {
+			const m = req.method;
+			return typeof m === "string" ? m.toUpperCase() : "GET";
+		};
+		reg({
 			kind: "exact",
 			path: "/plugins/agy-link/status",
 			handler: (_req, res) => {
-				const cfg = getConfig();
-				const cat = catalog.get();
-				sendJson(res, 200, {
-					plugin: "dsh-agy-link",
-					bin: bin(),
-					version: versionCache,
-					dormantReason,
-					enabled: cfg.enabled,
-					permissionMode: cfg.permissionMode,
-					workspaceRoot: cfg.workspaceRoot,
-					defaultModel: cfg.defaultModel,
-					defaultEffort: cfg.defaultEffort,
-					askTool: cfg.askTool,
-					auth: auth.status(),
-					catalog: {
-						source: cat.source,
-						count: cat.models.length,
-						lastError: cat.lastError ?? null
-					},
-					bindings: Object.keys(store.all()).length,
-					lastRun
-				});
+				(async () => {
+					const cfg = getConfig();
+					const cat = catalog.get();
+					sendJson(res, 200, {
+						plugin: "dsh-agy-link",
+						bin: bin(),
+						version: versionCache,
+						dormantReason,
+						enabled: cfg.enabled,
+						permissionMode: cfg.permissionMode,
+						workspaceRoot: cfg.workspaceRoot,
+						defaultModel: cfg.defaultModel,
+						defaultEffort: cfg.defaultEffort,
+						askTool: cfg.askTool,
+						auth: await auth.resolvedStatus(),
+						catalog: {
+							source: cat.source,
+							count: cat.models.length,
+							lastError: cat.lastError ?? null
+						},
+						bindings: Object.keys(store.all()).length,
+						lastRun
+					});
+				})();
 			}
 		});
-		webServer.register({
+		reg({
 			kind: "exact",
 			path: "/plugins/agy-link/auth",
 			handler: (req, res) => {
@@ -2775,7 +2935,7 @@ function apply(ctx, entryConfig = {}) {
 				})();
 			}
 		});
-		webServer.register({
+		reg({
 			kind: "exact",
 			path: "/plugins/agy-link/auth-code",
 			handler: (req, res) => {
@@ -2796,7 +2956,7 @@ function apply(ctx, entryConfig = {}) {
 				})();
 			}
 		});
-		webServer.register({
+		reg({
 			kind: "exact",
 			path: "/plugins/agy-link/config",
 			handler: (req, res) => {
@@ -2827,7 +2987,7 @@ function apply(ctx, entryConfig = {}) {
 				})();
 			}
 		});
-		webServer.register({
+		reg({
 			kind: "exact",
 			path: "/plugins/agy-link/qr",
 			handler: (_req, res) => {
@@ -2858,7 +3018,17 @@ function apply(ctx, entryConfig = {}) {
 				})();
 			}
 		});
-	}
+		return () => {
+			for (const d of disposers) try {
+				d();
+			} catch {}
+		};
+	};
+	ctx.inject(["webServer"], (sub) => {
+		const webServer = sub.get("webServer");
+		if (!webServer) return;
+		return registerRoutes(webServer);
+	});
 	const mediaDir = () => {
 		const cfg = getConfig();
 		return cfg.mediaDir !== "" ? cfg.mediaDir : defaultMediaDir(stateDir());

package/package.json

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