@zhuxixi/pi-agent-board 0.4.3 → 0.5.1

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;
 	}
@@ -1362,8 +1366,9 @@ export class DashboardComponent implements Component {
 		const contentWidth = Math.max(20, width - indent);
 		const glyph = stateGlyph(rv.state, rv.alive, rv.hostAlive, rv.unread);
 		const marker = stageFg(rv.state, selected ? `›${glyph}` : ` ${glyph}`);
-		const statusBadges = `${rv.reviewReady ? "✓ " : ""}${rv.diagnosticStalled ? "⏳ " : ""}${rv.evidenceErrorCount || rv.diagnosticErrorCount ? "! " : ""}${rv.followUpCount ? `q${rv.followUpCount} ` : ""}${rv.steeringState && rv.steeringState !== "none" ? "π " : ""}`;
-		const badge = `${this.mode === "select" ? `${this.isSelectedForBatch(rv.id) ? "◉" : "○"} ` : ""}${rv.pinned ? "★ " : ""}${rv.worktree ? "⌥ " : ""}${statusBadges}`;
+		const statusBadges = `${rv.reviewReady ? "✓ " : ""}${rv.diagnosticStalled ? "⏳ " : ""}${rv.staleHost ? "⌁ " : ""}${rv.evidenceErrorCount || rv.diagnosticErrorCount ? "! " : ""}${rv.followUpCount ? `q${rv.followUpCount} ` : ""}${rv.steeringState && rv.steeringState !== "none" ? "π " : ""}`;
+		const refsBadge = rv.refsBadge ? (rv.refsLowConfidence ? t.fg("dim", rv.refsBadge) : rv.refsBadge) : "";
+		const badge = `${this.mode === "select" ? `${this.isSelectedForBatch(rv.id) ? "◉" : "○"} ` : ""}${rv.pinned ? "★ " : ""}${rv.worktree ? "⌥ " : ""}${statusBadges}${refsBadge ? `${refsBadge} ` : ""}`;
 		const ageRaw = ` ${rv.age}`;
 		const nameW = clamp(Math.floor(contentWidth * 0.34), 18, 30);
 		const folderW = opts.showFolder !== false ? (contentWidth >= 72 ? clamp(Math.floor(contentWidth * 0.16), 10, 22) : contentWidth >= 56 ? 10 : 0) : 0;
@@ -1396,6 +1401,17 @@ export class DashboardComponent implements Component {
 			out.push(t.fg("muted", "Auto-state"));
 			out.push(clip(`  ${auto.kind} · ${auto.confidence} · ${auto.source}${auto.reason ? ` — ${auto.reason}` : ""}`, width));
 		}
+		if (row.codeRefs && row.codeRefs.allRefs.length > 0) {
+			const codeRefs = row.codeRefs;
+			out.push("");
+			out.push(t.fg("muted", "Refs"));
+			if (codeRefs.provider) out.push(clip(`  ${codeRefs.provider}`, width));
+			for (const ref of codeRefs.allRefs) {
+				const prefix = ref.kind === "pr" ? (codeRefs.prPrefix ?? "▸#") : (codeRefs.issuePrefix ?? "#");
+				const line = `  ${ref.kind} ${prefix}${ref.number} · ${ref.confidence} · ${ref.source}${ref.url ? ` · ${ref.url}` : ""}`;
+				out.push(clip(line, width));
+			}
+		}
 		if (row.state?.question) {
 			out.push("");
 			out.push(t.fg("warning", "Question / blocker"));

package/src/ui/pty-attach.ts

@@ -8,6 +8,7 @@ import { CURSOR_MARKER, Key, matchesKey, truncateToWidth, visibleWidth } from "@
 import { isProbablyEmptyPiInputLine } 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";
 import { installImeCursorCoalesce } from "../core/ime-cursor-coalesce.mjs";
 import { createJiggleRetryController } from "../core/pty-attach-jiggle-controller.mjs";
 import { clampInt, parseMouseInputChunk, resolveWheelLines, scrollViewportTop, selectionDragScrollLines } from "../core/pty-scroll.mjs";
@@ -28,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";
@@ -39,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. */
@@ -133,6 +136,13 @@ export class PtyAttachComponent implements Component {
 	private osc52Carry = "";
 	private passthroughCarry = "";
 	private readonly connectStartedAt = Date.now();
+	// Set once the first socket connect succeeds; drives the reconnect give-up
+	// policy (short window after a live session dies, long window during cold
+	// host start — see pty-attach-reconnect.mjs).
+	private everConnected = false;
+	// Timestamp of the first disconnect that started the current reconnect
+	// cycle; reset on every successful (re)connect.
+	private disconnectedAt: number | null = null;
 	// Lines scrolled per mouse-wheel event; configurable via $AGENT_BOARD_WHEEL_LINES.
 	private readonly mouseWheelLines = resolveWheelLines();
 	private readonly term: XtermLike;
@@ -158,6 +168,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.
@@ -230,12 +241,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 (this.childInputLooksEmpty()) {
+		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). Note: ctrl+] is NOT
+			// a detach key — it passes through to Pi (tui.editor.jumpForward).
+			if (shouldEscapeAttach(this.connected, this.childInputLooksEmpty())) {
 				this.detach();
 				return;
 			}
@@ -257,7 +268,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 {
@@ -265,7 +276,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))];
 	}
 
@@ -281,14 +292,14 @@ 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);
 	}
 
 	private loadingDetail(elapsedSeconds: number): string {
 		if (this.status === "attached") return "Attached · waiting for the session to render…";
-		if (this.status.startsWith("error") || this.status === "host exited") return this.status;
+		if (this.status.startsWith("error") || this.status === "host exited" || this.status === "host not reachable") return this.status;
 		if (this.status === "disconnected") return `Reconnecting to the session host… ${elapsedSeconds}s`;
 		return `Starting the session host… ${elapsedSeconds}s`;
 	}
@@ -300,8 +311,12 @@ 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" });
 	}
 
@@ -315,16 +330,28 @@ export class PtyAttachComponent implements Component {
 
 	private connect(): void {
 		if (this.closed || this.connected || this.socket) return;
-		if (!existsSync(this.opts.socketPath)) {
+		// On Windows the control socket is a named pipe — it never exists as a
+		// filesystem entry, so existsSync can't gate the connect; a missing pipe
+		// surfaces as an error event on the socket and retries via scheduleReconnect.
+		if (process.platform !== "win32" && !existsSync(this.opts.socketPath)) {
 			this.status = `starting host… ${Math.ceil((Date.now() - this.connectStartedAt) / 1000)}s`;
 			this.scheduleReconnect();
 			return;
 		}
 		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;
+			this.disconnectedAt = null;
 			this.status = "attached";
 			this.send({ type: "hello", clientId: `ui-${Date.now()}`, wantOutput: true });
 			this.jiggleRetry.start(this.cols, this.rows);
@@ -332,10 +359,17 @@ 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();
 			if (!this.closed && this.status !== "host exited") {
 				this.status = "disconnected";
 				this.scheduleReconnect();
@@ -343,8 +377,16 @@ 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}`;
 			this.scheduleReconnect();
@@ -365,6 +407,17 @@ export class PtyAttachComponent implements Component {
 
 	private scheduleReconnect(): void {
 		if (this.closed || this.retryTimer) return;
+		const verdict = evaluateAttachReconnect({
+			everConnected: this.everConnected,
+			disconnectedAt: this.disconnectedAt,
+			connectStartedAt: this.connectStartedAt,
+			now: Date.now(),
+		});
+		if (verdict.giveUp) {
+			this.status = verdict.status ?? "host exited";
+			this.scheduleRender();
+			return;
+		}
 		this.retryTimer = setTimeout(() => {
 			this.retryTimer = null;
 			this.connect();
@@ -447,12 +500,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 {
@@ -478,7 +539,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 {
@@ -692,7 +755,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().
@@ -713,7 +778,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");
@@ -723,7 +790,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. */
@@ -734,7 +803,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 {
@@ -763,6 +834,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),
@@ -892,7 +966,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 */
+			}
 		}
 	}
 
@@ -919,7 +995,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 {
@@ -938,7 +1016,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);
@@ -957,7 +1035,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();
@@ -976,11 +1060,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?.();
 	}
 }