@zhuxixi/pi-agent-board 0.5.0 → 0.5.2

package/src/index.ts

@@ -6,9 +6,10 @@
  * the count of sessions needing attention. See docs/EXPLORATION.md for the design.
  */
 import { fileURLToPath } from "node:url";
+import { createConnection } from "node:net";
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { resolvePiInvocation } from "./core/invocation.mjs";
-import { defaultRoot } from "./core/paths.mjs";
+import { controlSocketPathFor, defaultRoot } from "./core/paths.mjs";
 import { listRows } from "./core/store.mjs";
 import { createService } from "./runtime/service.mjs";
 import { openDashboard, registerAgentBoardCommand } from "./commands/agent-board.js";
@@ -19,6 +20,8 @@ const PTY_RUNNER_SCRIPT = fileURLToPath(new URL("../runner/pty-runner.mjs", impo
 const TITLE_RUNNER_SCRIPT = fileURLToPath(new URL("../runner/title-runner.mjs", import.meta.url));
 const AUTO_STATE_RUNNER_SCRIPT = fileURLToPath(new URL("../runner/state-runner.mjs", import.meta.url));
 
+let hostedEditorReporter: { start(): void; stop(): void } | null = null;
+
 export default function piAgentBoard(pi: ExtensionAPI): void {
 	const root = defaultRoot();
 	const { piCommand, piArgsPrefix } = resolvePiInvocation();
@@ -71,6 +74,14 @@ export default function piAgentBoard(pi: ExtensionAPI): void {
 	};
 
 	pi.on("session_start", async (event, ctx) => {
+		if (isHostedChild && !hostedEditorReporter && typeof ctx.ui?.getEditorText === "function" && hostedViewId) {
+			const { createEditorStateReporter } = await import("./core/editor-state-reporter.mjs");
+			hostedEditorReporter = createEditorStateReporter({
+				getEditorText: () => ctx.ui.getEditorText(),
+				connect: () => createConnection(controlSocketPathFor(process.platform as "win32" | "linux" | "darwin", root, hostedViewId)),
+			});
+			hostedEditorReporter.start();
+		}
 		updateStatus(ctx);
 		if (event.reason === "startup" && !isHostedChild && pi.getFlag("agent-board") === true && ctx.hasUI) {
 			const service = createService({ root, runnerScript: RUNNER_SCRIPT, ptyRunnerScript: PTY_RUNNER_SCRIPT, titleRunnerScript: TITLE_RUNNER_SCRIPT, autoStateRunnerScript: AUTO_STATE_RUNNER_SCRIPT, piCommand, piArgsPrefix, defaultCwd: ctx.cwd });

package/src/ui/dashboard.ts

@@ -250,7 +250,9 @@ export class DashboardComponent implements Component {
 	private moveSelection(delta: number): void {
 		if (this.orderedIds.length === 0) return;
 		const cur = this.selectedId ? this.orderedIds.indexOf(this.selectedId) : 0;
-		const next = Math.max(0, Math.min(this.orderedIds.length - 1, (cur < 0 ? 0 : cur) + delta));
+		const len = this.orderedIds.length;
+		// Wrap around both ends: down past last -> first, up past first -> last.
+		const next = (((cur < 0 ? 0 : cur) + delta) % len + len) % len;
 		const nextId = this.orderedIds[next];
 		if (nextId === this.selectedId) return;
 		this.selectedId = nextId;
@@ -1095,7 +1097,9 @@ export class DashboardComponent implements Component {
 		if (!this.peekId) return;
 		const idx = this.orderedIds.indexOf(this.peekId);
 		if (idx < 0) return;
-		const next = Math.max(0, Math.min(this.orderedIds.length - 1, idx + delta));
+		const len = this.orderedIds.length;
+		// Wrap around both ends, same as moveSelection().
+		const next = ((idx + delta) % len + len) % len;
 		this.peekId = this.orderedIds[next];
 		this.selectedId = this.peekId;
 	}

package/src/ui/pty-attach.ts

@@ -5,7 +5,7 @@ import { closeSync, existsSync, openSync, readSync, statSync } from "node:fs";
 import { createConnection, type Socket } from "node:net";
 import type { Component, KeybindingsManager, TUI } from "@earendil-works/pi-tui";
 import { CURSOR_MARKER, Key, matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import { isProbablyEmptyPiInputLine } from "../core/pty-input.mjs";
+import { isProbablyEmptyPiInputLine, isProbablyPiInputLine, resolveEditorEmpty } from "../core/pty-input.mjs";
 import { findHttpUrlAtCells, findWordRangeAtCells } from "../core/pty-links.mjs";
 import { createAttachOutputRenderScheduler, nextAttachRender, projectPtyCursor, shouldScheduleAttachRenderForMessage } from "../core/pty-attach-render.mjs";
 import { evaluateAttachReconnect, shouldEscapeAttach } from "../core/pty-attach-reconnect.mjs";
@@ -29,7 +29,7 @@ export interface PtyAttachOptions {
 const require = createRequire(import.meta.url);
 const { Terminal } = require("@xterm/headless") as { Terminal: new (opts: Record<string, unknown>) => XtermLike };
 
-const DETACH_KEYS = new Set(["\x1d"]); // ctrl+]
+
 const MOUSE_ENABLE = "\x1b[?1000h\x1b[?1002h\x1b[?1006h";
 const MOUSE_DISABLE = "\x1b[?1006l\x1b[?1002l\x1b[?1000l";
 const XTSHIFTESCAPE_SELECT = "\x1b[>0s";
@@ -40,6 +40,8 @@ const LOADING_TICK_MS = 120;
 const ATTACH_SETTLE_MS = 250;
 /** Hard cap on the attach transition so a silent session can't stall the banner. */
 const ATTACH_HARD_TIMEOUT_MS = 2500;
+/** Give ordered detach packets time to flush before using destroy as a fallback. */
+const GRACEFUL_SOCKET_CLOSE_MS = 1000;
 /** How many tail bytes of the screen log to replay on attach. Read from the file tail
  * (not the whole file) so multi-MB logs don't block startup; ~60KB covers the last
  * handful of screens, which is all a fresh attach needs. */
@@ -156,6 +158,9 @@ export class PtyAttachComponent implements Component {
 	private pendingClickTimer: ReturnType<typeof setTimeout> | null = null;
 	private lastClickPoint: MousePoint | null = null;
 	private lastClickAt = 0;
+	/** Authoritative editor emptiness pushed by the child Pi extension via the
+	 * control socket (issue #68). null = unknown — fall back to the heuristic. */
+	private editorEmpty: boolean | null = null;
 	// Whether any PTY output (live or replayed) has been shown yet. Until then we paint a
 	// loading banner instead of an empty buffer so a slow (cold) host start doesn't leave
 	// the previous screen visible.
@@ -166,6 +171,7 @@ export class PtyAttachComponent implements Component {
 	private attaching = true;
 	private attachSettleTimer: ReturnType<typeof setTimeout> | null = null;
 	private attachHardTimeout: ReturnType<typeof setTimeout> | null = null;
+	private gracefulSocketCloseTimer: ReturnType<typeof setTimeout> | null = null;
 	// Force a single full-clear on the first paint so the prior session/dashboard can't
 	// ghost behind this overlay; every later paint uses the TUI's coalesced, throttled,
 	// differential renderer so wheel/output bursts don't each trigger a full repaint.
@@ -238,15 +244,12 @@ export class PtyAttachComponent implements Component {
 			this.send({ type: "input", data });
 			return;
 		}
-		if (
-			DETACH_KEYS.has(data) ||
-			matchesKey(data, Key.left) ||
-			matchesKey(data, Key.ctrl("]"))
-		) {
+		if (matchesKey(data, Key.left)) {
 			// While the socket is down the key can never reach the child, so
 			// escape unconditionally — the view must always be exitable, even
-			// after the host crashes mid-output (issue #48).
-			if (shouldEscapeAttach(this.connected, this.childInputLooksEmpty())) {
+			// after the host crashes mid-output (issue #48). Note: ctrl+] is NOT
+			// a detach key — it passes through to Pi (tui.editor.jumpForward).
+			if (shouldEscapeAttach(this.connected, resolveEditorEmpty(this.editorEmpty, this.childInputLooksEmpty()))) {
 				this.detach();
 				return;
 			}
@@ -268,7 +271,7 @@ export class PtyAttachComponent implements Component {
 		const bodyHeight = Math.max(1, height - 2);
 		let body: string[];
 		if (!this.attaching && this.receivedOutput) {
-			const projected = this.project(bodyHeight, width);
+			const projected = this.project(bodyHeight);
 			body = projected.lines;
 			while (body.length < bodyHeight) body.unshift("");
 		} else {
@@ -276,7 +279,7 @@ export class PtyAttachComponent implements Component {
 		}
 		const header =
 			this.theme.fg("accent", this.theme.bold(` ${this.opts.title} `)) +
-			this.theme.fg("muted", `${this.status} · click opens links · dblclick/drag selects+copies · ← detach · ctrl+] detach`);
+			this.theme.fg("muted", `${this.status} · click opens links · dblclick/drag selects+copies · ← detach`);
 		return [clip(header, width), ...body.map((l) => clipTerminalLine(l, width)), this.theme.fg("dim", "─".repeat(width))];
 	}
 
@@ -292,7 +295,7 @@ export class PtyAttachComponent implements Component {
 		out.push(center(this.theme.fg("accent", this.theme.bold(title)), width));
 		out.push(center(this.theme.fg("muted", detail), width));
 		out.push("");
-		out.push(center(this.theme.fg("dim", "← or ctrl+] to detach"), width));
+		out.push(center(this.theme.fg("dim", "← to detach"), width));
 		while (out.length < height) out.push("");
 		return out.slice(0, height);
 	}
@@ -311,17 +314,62 @@ export class PtyAttachComponent implements Component {
 	}
 
 	private detach(): void {
+		// Restore a held PTY before ending the control socket. The runner closes
+		// the socket immediately after receiving detach, so sending detach first
+		// can drop the G3 restore resize (issue #42).
+		this.jiggleRetry.restoreAndStop();
 		this.send({ type: "detach" });
-		this.close();
+		this.close(true);
 		this.done({ action: "detached" });
 	}
 
+	/** Bottom-most line whose cells include an inverse-video cell — Pi renders
+	 * its editor cursor as an inverse "fake cursor" (`ESC[7m`), and the cell
+	 * persists in the buffer even while streaming differential frames skip
+	 * repainting the editor line. */
+	private findLastInverseCellLine(active: {
+		baseY: number;
+		length: number;
+		getLine(index: number): BufferLineLike | undefined;
+	}): number | null {
+		for (let y = active.baseY + active.length - 1; y >= active.baseY; y--) {
+			const line = active.getLine(y);
+			if (!line) continue;
+			for (let x = 0; x < line.length; x++) {
+				if (line.getCell(x)?.isInverse()) return y;
+			}
+		}
+		return null;
+	}
+
 	private childInputLooksEmpty(): boolean {
 		if (!this.receivedOutput) return true;
 		const active = this.term.buffer.active;
-		if (typeof active.cursorY !== "number") return false;
-		const line = active.getLine(active.baseY + active.cursorY)?.translateToString(true) ?? "";
-		return isProbablyEmptyPiInputLine(line);
+		// The terminal cursor is not a reliable anchor for the editor line:
+		// while Pi streams output (or right after attach) the cursor rests on
+		// working/output lines, never the input line, so a genuinely empty
+		// editor was misread as non-empty and ← stopped detaching (issue #66).
+		// Pi's editor line always carries an inverse-video fake-cursor cell,
+		// so anchor on that instead.
+		const fakeCursorLine = this.findLastInverseCellLine(active);
+		if (fakeCursorLine !== null) {
+			const line = active.getLine(fakeCursorLine)?.translateToString(true) ?? "";
+			return isProbablyEmptyPiInputLine(line);
+		}
+		// Fallback: Pi variants that render no fake cursor — look for an EMPTY
+		// prompt-glyph line. Only an empty glyph line proves an empty editor:
+		// content glyph lines (markdown table rows `│ … │`, quotes `> …`, or a
+		// real draft in a no-fake-cursor Pi variant) cannot be told apart, and
+		// trapping the user is worse than a spurious detach (issue #69) — skip
+		// them and keep scanning; the loop-end escape below stays authoritative.
+		for (let y = active.baseY + active.length - 1; y >= active.baseY; y--) {
+			const line = active.getLine(y)?.translateToString(true) ?? "";
+			if (isProbablyPiInputLine(line) && isProbablyEmptyPiInputLine(line)) return true;
+		}
+		// No editor line recoverable (e.g. a garbled replay buffer): treat the
+		// input as empty — ← is the only detach key left on the attach surface,
+		// so it must always escape rather than trap the user.
+		return true;
 	}
 
 	private connect(): void {
@@ -336,7 +384,14 @@ export class PtyAttachComponent implements Component {
 		}
 		const socket = createConnection(this.opts.socketPath);
 		this.socket = socket;
+		// A partial protocol line left over from a failed socket would prefix the
+		// replacement connection's first line; start each socket with a clean buffer.
+		this.parserBuffer = "";
 		socket.on("connect", () => {
+			if (this.socket !== socket) {
+				try { socket.destroy(); } catch {}
+				return;
+			}
 			this.clearRetry();
 			this.connected = true;
 			this.everConnected = true;
@@ -348,8 +403,14 @@ export class PtyAttachComponent implements Component {
 			this.scheduleRender();
 			this.startAttachSettle();
 		});
-		socket.on("data", (chunk) => this.onSocketData(chunk.toString("utf8")));
+		socket.on("data", (chunk) => {
+			if (this.socket !== socket) return;
+			this.onSocketData(chunk.toString("utf8"));
+		});
 		socket.on("close", () => {
+			// A failed socket can close after a replacement connection has already
+			// succeeded. Never let that stale event clear the replacement state.
+			if (this.socket !== socket) return;
 			this.socket = null;
 			this.connected = false;
 			this.disconnectedAt ??= Date.now();
@@ -360,8 +421,15 @@ export class PtyAttachComponent implements Component {
 			if (!this.closed) this.scheduleRender();
 		});
 		socket.on("error", (err) => {
+			// The error may belong to an old socket after reconnect. Dispose that
+			// socket, but do not alter the state of the current connection.
+			if (this.socket !== socket) {
+				try { socket.destroy(); } catch {}
+				return;
+			}
 			this.socket = null;
 			this.connected = false;
+			try { socket.destroy(); } catch {}
 			this.disconnectedAt ??= Date.now();
 			if (this.closed) return;
 			this.status = `waiting for host… ${err.message}`;
@@ -476,12 +544,20 @@ export class PtyAttachComponent implements Component {
 		this.retryTimer = null;
 	}
 
+	private clearGracefulSocketCloseTimer(): void {
+		if (!this.gracefulSocketCloseTimer) return;
+		clearTimeout(this.gracefulSocketCloseTimer);
+		this.gracefulSocketCloseTimer = null;
+	}
+
 	private enableMouseScroll(): void {
 		if (!this.mouseScrollEnabled()) return;
 		try {
 			this.tui.terminal.write(XTSHIFTESCAPE_SELECT);
 			this.tui.terminal.write(MOUSE_ENABLE);
-		} catch {}
+		} catch {
+			/* best-effort: some terminals reject these sequences; mouse reporting is optional */
+		}
 	}
 
 	private mouseScrollEnabled(): boolean {
@@ -507,7 +583,9 @@ export class PtyAttachComponent implements Component {
 	private disableMouseScroll(): void {
 		try {
 			this.tui.terminal.write(MOUSE_DISABLE);
-		} catch {}
+		} catch {
+			/* best-effort: terminal may already be gone at teardown */
+		}
 	}
 
 	private handleMouseInputChunk(events: Array<{ raw: string; mouse: { button: number; row: number; col: number; action: string } }>): boolean {
@@ -721,7 +799,9 @@ export class PtyAttachComponent implements Component {
 		if (seq) {
 			try {
 				this.tui.terminal.write(seq);
-			} catch {}
+			} catch {
+				/* best-effort: OSC52 clipboard support is optional */
+			}
 		}
 		// Also mirror the selection into the X11 PRIMARY selection so the rest of the
 		// desktop can middle-click-paste it — closes the loop with pastePrimarySelection().
@@ -742,7 +822,9 @@ export class PtyAttachComponent implements Component {
 			const timer = setTimeout(() => {
 				try {
 					child.kill("SIGKILL");
-				} catch {}
+				} catch {
+					/* the child may have already exited before the timeout fired */
+				}
 			}, 800);
 			child.stdout?.on("data", (chunk: Buffer) => {
 				out += chunk.toString("utf8");
@@ -752,7 +834,9 @@ export class PtyAttachComponent implements Component {
 				clearTimeout(timer);
 				if (!this.closed && out) this.send({ type: "input", data: out });
 			});
-		} catch {}
+		} catch {
+			/* silent no-op when xclip is absent — documented contract of this helper */
+		}
 	}
 
 	/** Write `text` to the X11 PRIMARY selection so other apps can middle-click-paste it. */
@@ -763,7 +847,9 @@ export class PtyAttachComponent implements Component {
 			child.stdin?.on("error", () => {});
 			child.on("error", () => {});
 			child.stdin?.end(text);
-		} catch {}
+		} catch {
+			/* silent no-op when xclip is absent */
+		}
 	}
 
 	private selectionText(): string {
@@ -792,6 +878,9 @@ export class PtyAttachComponent implements Component {
 	}
 
 	private currentSize(): { cols: number; rows: number } {
+		// SAFETY: duck-typed read — Pi TUI's Terminal type does not consistently expose
+		// cols/columns/rows across versions (see resizeIfNeeded below). Runtime
+		// fallbacks (120/24) keep this safe when the fields are absent.
 		const term = this.tui.terminal as unknown as { cols?: number; columns?: number; rows?: number } | undefined;
 		return {
 			cols: Math.max(20, term?.cols ?? term?.columns ?? 120),
@@ -893,8 +982,12 @@ export class PtyAttachComponent implements Component {
 					this.checkClearSequence(msg.data);
 					continue;
 				}
-				if (msg.type === "hello" || msg.type === "status") this.status = "attached";
-				else if (msg.type === "exit") {
+				if (msg.type === "hello" || msg.type === "status") {
+					this.status = "attached";
+					if (msg.type === "hello") this.editorEmpty = typeof msg.editorEmpty === "boolean" ? msg.editorEmpty : null;
+				} else if (msg.type === "editor_state") {
+					this.editorEmpty = typeof msg.empty === "boolean" ? msg.empty : null;
+				} else if (msg.type === "exit") {
 					this.status = "host exited";
 					this.done({ action: "closed", exitCode: msg.exitCode ?? null });
 				} else if (msg.type === "error") this.status = `error: ${msg.message ?? "host error"}`;
@@ -921,7 +1014,9 @@ export class PtyAttachComponent implements Component {
 		for (const seq of toWrite) {
 			try {
 				this.tui.terminal.write(seq);
-			} catch {}
+			} catch {
+				/* best-effort: forwarded sequences are enhancements, never critical */
+			}
 		}
 	}
 
@@ -948,7 +1043,9 @@ export class PtyAttachComponent implements Component {
 			} finally {
 				closeSync(fd);
 			}
-		} catch {}
+		} catch {
+			/* best-effort: a missing or racing screen.log must not block attach */
+		}
 	}
 
 	private pushOutput(data: string, opts: { forwardProtocols?: boolean } = {}): void {
@@ -967,7 +1064,7 @@ export class PtyAttachComponent implements Component {
 		});
 	}
 
-	private project(height: number, width: number): { lines: string[]; cursor: { row: number; col: number } | null } {
+	private project(height: number): { lines: string[]; cursor: { row: number; col: number } | null } {
 		const out: string[] = [];
 		const buf = this.term.buffer.active;
 		const selection = normalizeSelection(this.selection);
@@ -986,7 +1083,13 @@ export class PtyAttachComponent implements Component {
 		return { lines: out.slice(-height), cursor };
 	}
 
-	private close(): void {
+	private close(gracefulSocket = false): void {
+		if (this.closed && !this.socket) {
+			// Already closed (e.g. dispose() after detach()); a pending graceful-close
+			// fallback timer stays armed on purpose — it self-clears on socket close
+			// or destroys the socket after the grace window.
+			return;
+		}
 		this.closed = true;
 		this.imeCoalesceUninstall?.();
 		this.jiggleRetry.restoreAndStop();
@@ -1005,11 +1108,24 @@ export class PtyAttachComponent implements Component {
 			clearTimeout(this.attachHardTimeout);
 			this.attachHardTimeout = null;
 		}
-		try {
-			this.socket?.destroy();
-		} catch {}
+		this.clearGracefulSocketCloseTimer();
+		const socket = this.socket;
 		this.socket = null;
 		this.connected = false;
+		if (!socket) return;
+		if (!gracefulSocket) {
+			try { socket.destroy(); } catch {}
+			return;
+		}
+		// socket.end() preserves the ordering of the already-buffered restore and
+		// detach packets. destroy() would discard buffered writes under backpressure.
+		socket.once("close", () => this.clearGracefulSocketCloseTimer());
+		try { socket.end(); } catch {}
+		this.gracefulSocketCloseTimer = setTimeout(() => {
+			this.gracefulSocketCloseTimer = null;
+			try { socket.destroy(); } catch {}
+		}, GRACEFUL_SOCKET_CLOSE_MS);
+		this.gracefulSocketCloseTimer.unref?.();
 	}
 }