@zhuxixi/pi-agent-board 0.5.1 → 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/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";
@@ -158,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.
@@ -246,7 +249,7 @@ export class PtyAttachComponent implements Component {
 			// 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())) {
+			if (shouldEscapeAttach(this.connected, resolveEditorEmpty(this.editorEmpty, this.childInputLooksEmpty()))) {
 				this.detach();
 				return;
 			}
@@ -320,12 +323,53 @@ export class PtyAttachComponent implements Component {
 		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 {
@@ -938,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"}`;