@gavin-hu/my-pi-agent 0.16.0 → 0.18.0

package/extensions/plan/tui.ts

@@ -6,9 +6,11 @@
  * the active Markdown theme, so headings, lists, code, links, and quotes match
  * the rest of the application; plan-authored control characters are stripped
  * first so the file cannot drive the terminal. Task checkboxes are recolored
- * and the footer colors the primary actions. It returns the chosen action
- * through `onClose` so the caller can act
- * only after the screen is gone and input focus is free again.
+ * and the footer colors the primary actions. Approving leaves plan mode and
+ * starts the work, so it asks `y/N` first through the shared `ConfirmState`;
+ * the plan stays mounted, and `Esc` backs out of the question before it backs
+ * out of the review. It returns the chosen action through `onClose` so the
+ * caller can act only after the screen is gone and input focus is free again.
  */
 
 import { basename } from "node:path";
@@ -27,6 +29,7 @@ import {
 	type TuiMouseEventResult,
 } from "@earendil-works/pi-tui";
 import { sanitizeLine } from "../../lib/format.ts";
+import { renderTeam, type PlanUnit } from "../../lib/plans/team.ts";
 import {
 	editorTheme,
 	screenHint,
@@ -35,17 +38,18 @@ import {
 	type ViewportRowsSource,
 } from "../../lib/tui/chrome.ts";
 import { isCloseKey } from "../../lib/tui/cursor.ts";
+import { ConfirmState } from "../../lib/tui/confirm.ts";
 import { gaugeBar } from "../../lib/tui/gauge.ts";
 import { GLYPHS } from "../../lib/tui/glyphs.ts";
-import { titleRule } from "../../lib/tui/rules.ts";
+import { plainRule, titleRule } from "../../lib/tui/rules.ts";
 import { emptyState, checkbox } from "../../lib/tui/rows.ts";
 import { paint } from "../../lib/tui/tokens.ts";
 import { planTitle, type StoredPlan } from "./plans.ts";
-import { changedSections, sanitizePlanText, type SectionDigest } from "./plan-text.ts";
+import { changedSections, planDisplayText, type SectionDigest } from "./plan-text.ts";
 import { extractPlanSections } from "./steps.ts";
 
 /** What the user chose from the read/review screen. */
-export type PlanViewAction = "approve" | "refine" | "keep" | "browser";
+export type PlanViewAction = "approve" | "refine" | "keep" | "browser" | "cancel";
 
 /** A plan section's rendered start line, for navigation and the current-section label. */
 interface SectionOffset {
@@ -83,11 +87,16 @@ export interface PlanViewOptions {
 	tui?: TUI;
 	/** Markdown theme for the body; defaults to Pi's active theme. */
 	markdownTheme?: MarkdownTheme;
+	/**
+	 * The split approval would write. Rendered as a read-only section after the
+	 * plan, because the `## Team` section itself only exists after approval.
+	 */
+	split?: { lead: string; units: readonly PlanUnit[]; verdict: "pair" | "team" };
 }
 
 /** Rows the screen shows when the terminal height is unknown. */
 const DEFAULT_ROWS = 20;
-/** Header, blanks, footer, and trailing rows around a non-empty plan. */
+/** Header, blanks, footer, and closing rule around a non-empty plan. */
 const CHROME_ROWS = 5;
 /** Narrowest width where Markdown's 2-column padding still fits the body. */
 const MIN_PADDED_WIDTH = 6;
@@ -97,13 +106,14 @@ const BODY_PADDING = 2;
 const GAUGE_SEGMENTS = 10;
 /** Footer hints shared by the review and the inline editor's primary actions. */
 const PRIMARY_HINTS: ScreenHint[] = [
-	"Esc keep planning",
-	{ text: "a approve & run", color: "success" },
+	"Esc keep plan",
+	{ text: "a approve", color: "success" },
 	{ text: "r refine", color: "accent" },
 	{ text: "w browser", color: "accent" },
+	{ text: "x exit plan", color: "warning" },
 ];
 /** Scroll keys appended to the review footer while the plan overflows. */
-const SCROLL_HINTS: ScreenHint[] = ["↑/↓ or k/j scroll", "space/b page", "g/G ends"];
+const SCROLL_HINTS: ScreenHint[] = ["j/k scroll", "space page", "g/G ends"];
 /** Section-jump hint, shown when the plan has more than one heading section. */
 const SECTION_HINTS: ScreenHint[] = ["n/p section"];
 
@@ -174,6 +184,8 @@ export class PlanViewComponent implements Component {
 	private cache: BodyCache | null = null;
 	/** True while the inline refine editor owns the keyboard. */
 	private editing = false;
+	/** The y/N approval question, shared with the other destructive screens. */
+	private readonly confirm = new ConfirmState();
 	/** The inline refine editor, built lazily once a TUI handle is available. */
 	private editor: Editor | null = null;
 
@@ -194,7 +206,7 @@ export class PlanViewComponent implements Component {
 		const padding = width >= MIN_PADDED_WIDTH ? BODY_PADDING : 0;
 		const base = this.options.markdownTheme ?? getMarkdownTheme();
 		const theme = planMarkdownTheme(this.theme, base);
-		const current = sanitizePlanText(this.options.plan.content);
+		const current = planDisplayText(this.options.plan.content);
 		const changed = changedSections(this.options.baseline, current);
 		const chunks = extractPlanSections(current);
 		const lines: string[] = [];
@@ -215,10 +227,31 @@ export class PlanViewComponent implements Component {
 			// chunk omits before the next section.
 			if (index < chunks.length - 1 && lines.length > 0 && lines[lines.length - 1] !== "") lines.push("");
 		});
+		const split = this.splitSection();
+		if (split !== undefined) {
+			if (lines.length > 0 && lines[lines.length - 1] !== "") lines.push("");
+			const rendered = new Markdown(split, padding, 0, theme)
+				.render(width)
+				.map((line) => truncateToWidth(line.trimEnd(), width));
+			sections.push({ title: "Split", offset: lines.length });
+			lines.push(...rendered);
+		}
 		this.cache = { width, lines, sections, changedCount: changed.filter(Boolean).length };
 		return this.cache;
 	}
 
+	/**
+	 * The split as a read-only section: the same table approval writes, so what the
+	 * user approves is what the plan file will carry.
+	 */
+	private splitSection(): string | undefined {
+		const split = this.options.split;
+		if (split === undefined) return undefined;
+		const owners = split.units.filter((unit) => !unit.lead).length;
+		const summary = `${split.verdict} · lead + ${owners} owner${owners === 1 ? "" : "s"} · written on approval`;
+		return ["## Split", "", summary, "", renderTeam({ lead: split.lead, units: [...split.units] })].join("\n");
+	}
+
 	/** The section whose heading is at or above the viewport top. */
 	private currentSection(sections: SectionOffset[]): SectionOffset | undefined {
 		let current: SectionOffset | undefined;
@@ -313,6 +346,12 @@ export class PlanViewComponent implements Component {
 			this.options.requestRender();
 			return;
 		}
+		// A pending question owns the keyboard, so a scroll key cannot slip past it
+		// and `Esc` backs out of the question rather than the review.
+		if (this.confirm.pending) {
+			if (this.confirm.resolve(data) !== undefined) this.options.requestRender();
+			return;
+		}
 		if (isCloseKey(data)) {
 			this.options.onClose("keep");
 			return;
@@ -329,9 +368,12 @@ export class PlanViewComponent implements Component {
 		else if (matchesKey(data, Key.end) || data === "G") this.scrollTo(this.maxOffset);
 		else if (data === "n") this.jumpSection(1);
 		else if (data === "p") this.jumpSection(-1);
-		else if (data === "a") this.options.onClose("approve");
-		else if (data === "r") this.startRefine();
+		else if (data === "a") {
+			this.confirm.ask("Approve and run the plan? y/N", () => this.options.onClose("approve"));
+			this.options.requestRender();
+		} else if (data === "r") this.startRefine();
 		else if (data === "w") this.options.onClose("browser");
+		else if (data === "x") this.options.onClose("cancel");
 	}
 
 	/** Wheel scrolling in fullscreen; regular mode leaves the wheel to the terminal. */
@@ -398,12 +440,15 @@ export class PlanViewComponent implements Component {
 		} else {
 			if (this.maxOffset > 0) lines.push(scrollRow(theme, w, this.offset, end, body.length, sectionLabel));
 			else lines.push("");
+			const pending = this.confirm.pending;
 			const sectionHints = sections.length > 1 ? SECTION_HINTS : [];
 			const hints: ScreenHint[] =
 				this.maxOffset > 0 ? [...PRIMARY_HINTS, ...SCROLL_HINTS, ...sectionHints] : PRIMARY_HINTS;
-			lines.push(screenHint(theme, w, hints));
+			lines.push(
+				pending ? truncateToWidth(`  ${paint(theme, "warn", pending.prompt)}`, w) : screenHint(theme, w, hints),
+			);
 		}
-		lines.push("");
+		lines.push(plainRule(theme, w));
 		return lines;
 	}
 }

package/extensions/plan/types.ts

@@ -6,6 +6,32 @@ import type { PlanAnnotation } from "./feedback.ts";
 import type { SectionDigest } from "./plan-text.ts";
 import type { StepUpdate } from "./steps.ts";
 
+/**
+ * Who is looking at a running review: the session that opened it (`owner`, the
+ * only role that can approve), or someone the link was shared with (`reviewer`,
+ * who may comment).
+ */
+export type ReviewRole = "owner" | "reviewer";
+
+/**
+ * What a review token names: its role, and — for a reviewer — the name it posts
+ * under, bound the first time that link writes.
+ */
+export interface ReviewCaller {
+	role: ReviewRole;
+	/** The reviewer's name, once this link has written; absent for the owner and
+	 * for a reviewer that has not commented yet. */
+	name?: string;
+}
+
+/**
+ * One frame on the review's event stream. `comment`, `plan`, and `share` say a
+ * page should re-read the island; `closed` ends the review for everyone, and
+ * `revoked` tells a reviewer the owner stopped sharing. The frame carries no
+ * state of its own, so the island stays the one contract.
+ */
+export type ReviewFrame = "comment" | "plan" | "share" | "closed" | "revoked";
+
 /** Persisted (custom entry) plan-mode state. */
 export interface PlanModeEntry {
 	enabled: boolean;
@@ -38,7 +64,7 @@ export interface EnterPlanModeDetails {
 export interface WritePlanDetails {
 	/** Absolute path of the written plan file. */
 	path: string;
-	/** Path relative to the working directory, when inside it. */
+	/** How the path is shown: `~`-shortened, since plans live outside the project. */
 	relativePath: string;
 	/** Size of the written plan in bytes. */
 	bytes: number;
@@ -48,7 +74,7 @@ export interface WritePlanDetails {
 export interface SetPlanStepsDetails {
 	/** Absolute path of the plan file that was updated. */
 	path: string;
-	/** Path relative to the working directory, for transcript display. */
+	/** How the path is shown: `~`-shortened. */
 	relativePath: string;
 	/** The checkbox changes that were applied, in call order. */
 	updates: StepUpdate[];
@@ -66,7 +92,7 @@ export interface ExitPlanModeDetails {
 	plan: string;
 	/** Absolute path of the reviewed plan file. */
 	planPath?: string;
-	/** Path relative to the working directory, for transcript display. */
+	/** How the path is shown: `~`-shortened. */
 	relativePath?: string;
 	/** True when the user asked to refine the plan instead of approving. */
 	refined?: boolean;
@@ -74,6 +100,22 @@ export interface ExitPlanModeDetails {
 	refinement?: string;
 	/** Comments the review carried when it approved or requested a refinement. */
 	annotations?: PlanAnnotation[];
+	/** True when the user left plan mode without approving the plan. */
+	cancelled?: boolean;
 	/** True when no interactive UI was available to ask for approval. */
 	unavailable?: boolean;
+	/** The team approval wrote into the plan, when the plan was split. */
+	team?: {
+		lead: string;
+		units: Array<{ name: string; paths: string[]; test: string; dependsOn: string[] }>;
+		verdict: "pair" | "team";
+	};
+	/** True when the model proposed a split while `plan.split` was off. */
+	splitOff?: boolean;
+}
+
+/** Structured result carried in `cancel_plan_mode`'s `details`. */
+export interface CancelPlanModeDetails {
+	/** True when plan mode was on and has now been turned off. */
+	cancelled: boolean;
 }

package/extensions/plan/web-chrome.ts

@@ -0,0 +1,102 @@
+/**
+ * The review page's chrome: what the page says about itself.
+ *
+ * It is a fragment of the same IIFE `web-client.ts` ships (`WEB_CHROME_JS` is
+ * interpolated into `REVIEW_CLIENT_JS`), kept in its own module so the state
+ * chip, the status line, and the header are read together and away from the
+ * document rendering. It paints only text it was handed.
+ */
+
+export const WEB_CHROME_JS = String.raw`  function setStatus(text, kind) {
+    if (!statusEl) return;
+    statusEl.textContent = text || "";
+    statusEl.title = text || "";
+    statusEl.className = kind ? "bf-status bf-status--" + kind : "bf-status";
+  }
+
+  // The always-visible header chip: connection, comment count, and whether
+  // there are edits the file does not have yet.
+  function updateState() {
+    if (!stateEl) return;
+    var label;
+    var tone = "";
+    if (approved) {
+      label = "Approved";
+      tone = "success";
+    } else if (saved) {
+      label = "Saved";
+      tone = "success";
+    } else if (closed) {
+      // Settled by the user, not by a dropped stream: never flash Offline.
+      label = "Closed";
+    } else if (connected === true) {
+      label = "Connected";
+      tone = "success";
+    } else if (everConnected) {
+      // Only after the stream has opened once: an error before that is a
+      // transient initial connect, so keep showing Connecting rather than Offline.
+      label = "Offline";
+      tone = "danger";
+    } else {
+      label = "Connecting\u2026";
+    }
+    var count = annotations.length;
+    label += " \u00b7 " + count + (count === 1 ? " comment" : " comments");
+    if (dirty && !saved && !approved && !closed) {
+      label += " \u00b7 " + (role === "reviewer" ? "unposted" : "unsaved");
+      if (!tone) tone = "warn";
+    }
+    stateEl.textContent = label;
+    stateEl.className = "bf-chip bf-chip--accent review-state" + (tone ? " bf-chip--" + tone : "");
+  }
+
+  function renderHeader() {
+    var titleEl = document.getElementById("plan-title");
+    if (titleEl && data.title) {
+      titleEl.textContent = data.title;
+      titleEl.title = data.title;
+    }
+    if (data.title) document.title = "Plan review \u00b7 " + data.title;
+  }
+
+  function updateProgress() {
+    if (!progressEl) return;
+    var doc = document.scrollingElement || document.documentElement;
+    var top = doc ? doc.scrollTop : 0;
+    var height = doc ? doc.scrollHeight : 0;
+    var view = doc ? doc.clientHeight : 0;
+    if (planEl && planEl.scrollHeight > planEl.clientHeight + 4) {
+      top = planEl.scrollTop; height = planEl.scrollHeight; view = planEl.clientHeight;
+    }
+    var max = height - view;
+    var percent = max > 0 ? Math.min(100, Math.max(0, (top / max) * 100)) : 0;
+    progressEl.style.width = percent + "%";
+  }
+
+  function lockActions() {
+    if (approveButton) approveButton.disabled = true;
+    if (saveButton) saveButton.disabled = true;
+    if (postButton) postButton.disabled = true;
+    if (cancelButton) cancelButton.disabled = true;
+  }
+
+  // A conflict means the file moved under the page; only a reload can re-anchor.
+  function offerReload() {
+    if (document.getElementById("reload")) return;
+    var controls = document.querySelector(".review-controls");
+    if (!controls) return;
+    var reload = el("button");
+    reload.type = "button";
+    reload.id = "reload";
+    reload.className = "bf-btn bf-btn--primary";
+    reload.textContent = "Reload";
+    reload.addEventListener("click", function () { window.location.reload(); });
+    controls.appendChild(reload);
+  }
+
+  // The stream exists only to notice a closed tab. Once the review is settled it
+  // has no job, and leaving it open retries a dead port until the tab closes.
+  function settleStream() {
+    if (stream && stream.close) { stream.close(); stream = null; }
+  }
+`;