@yaag/tui 0.4.0 → 0.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yaag/tui",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "publishConfig": {
     "access": "public"
   },
@@ -19,6 +19,6 @@
   },
   "dependencies": {
     "@earendil-works/pi-tui": "^0.84.0",
-    "@yaag/runtime": "0.4.0"
+    "@yaag/runtime": "0.5.0"
   }
 }

package/src/drill-controller.ts

@@ -21,12 +21,9 @@ import {
 import type { NamedKeybindings } from "./key-router.ts";
 import { renderActionsMenu } from "./node-actions.ts";
 import { agentOfPath } from "./node-path-parse.ts";
+import { overlayContentRows, overlayPanelRows } from "./overlay-geometry.ts";
 import { extractSystemPrompt } from "./session-transcript.ts";
-import {
-  renderSystemPromptOverlay,
-  systemPromptContentRows,
-  systemPromptLines,
-} from "./system-prompt-overlay.ts";
+import { renderSystemPromptOverlay, systemPromptLines } from "./system-prompt-overlay.ts";
 import { nodeTranscriptLines } from "./transcript-content.ts";
 import { renderTranscriptOverlay } from "./transcript-overlay.ts";
 import { NO_TRANSCRIPT_STUB } from "./transcript-render.ts";
@@ -48,6 +45,12 @@ export interface DrillHost {
   agentInfo(agent: string): AgentInfo | undefined;
   /** Reads an Agent's session file body, or null when it is missing. */
   readSession(agent: string): Promise<string | null>;
+  /**
+   * Reads the system-prompt sidecar the Agent's own pi wrote, or null when
+   * there is none — an Agent of a replayed Run, or a session that predates the
+   * sidecar.
+   */
+  readSystemPromptSidecar(agent: string): Promise<string | null>;
   /** An Agent's session file path, or null when the spawn reported none. */
   sessionPath(agent: string): string | null;
   copyPath(text: string): Promise<void>;
@@ -105,7 +108,7 @@ export class DrillController {
           nodePath: state.path,
           content: this.#linesFor(state),
           scroll: state.scroll,
-          rows: this.#host.rows(),
+          rows: this.#panelRows(),
           width,
         });
       case "systemPrompt":
@@ -113,12 +116,20 @@ export class DrillController {
           nodePath: state.path,
           content: this.#linesFor(state),
           scroll: state.scroll,
-          rows: this.#host.rows(),
+          rows: this.#panelRows(),
           width,
         });
     }
   }
 
+  /**
+   * The total panel height both overlays draw at, derived from the host's row
+   * budget by the shared geometry so pi's own chrome keeps its rows.
+   */
+  #panelRows(): number {
+    return overlayPanelRows(this.#host.rows());
+  }
+
   /** Routes one input byte string; returns whether a layer consumed it. */
   handleInput(data: string): boolean {
     const action = this.#route(data);
@@ -226,12 +237,14 @@ export class DrillController {
   }
 
   /**
-   * The page height the open layer scrolls by. The system-prompt modal spends
-   * three rows on its frame, so its page is smaller than the row budget.
+   * The page height the open layer scrolls by. Both overlays draw the same
+   * panel and spend the same frame rows, so both page by its content rows and
+   * scrolling matches what is drawn.
    */
   #pageRows(state: DrillState): number {
-    const rows = this.#host.rows();
-    return state.kind === "systemPrompt" ? systemPromptContentRows(rows) : rows;
+    return state.kind === "tree" || state.kind === "menu"
+      ? this.#host.rows()
+      : overlayContentRows(this.#panelRows());
   }
 
   /** Drops retained content and voids every in-flight read. */
@@ -266,8 +279,8 @@ export class DrillController {
    * closed or replaced modal.
    */
   async #loadSystemPrompt(nodePath: string, generation: number): Promise<void> {
-    const session = await this.#readSession(agentOfPath(nodePath));
-    const prompt = session === null ? null : extractSystemPrompt(session);
+    const agent = agentOfPath(nodePath);
+    const prompt = await this.#readPrompt(agent);
     if (generation !== this.#generation) return;
     const state = this.#state;
     if (state.kind !== "systemPrompt" || state.path !== nodePath) return;
@@ -275,6 +288,29 @@ export class DrillController {
     this.#host.requestRender();
   }
 
+  /**
+   * The Agent's system prompt, from the sidecar its own pi wrote, or else from
+   * the session file, or null when neither records one.
+   *
+   * The sidecar wins because it holds the prompt pi really assembled; the
+   * session file is read only for a session written before the sidecar existed.
+   */
+  async #readPrompt(agent: string): Promise<string | null> {
+    const sidecar = await this.#readSidecar(agent);
+    if (sidecar !== null && sidecar !== "") return sidecar;
+    const session = await this.#readSession(agent);
+    return session === null ? null : extractSystemPrompt(session);
+  }
+
+  /** A sidecar that cannot be read degrades to the session file. */
+  async #readSidecar(agent: string): Promise<string | null> {
+    try {
+      return await this.#host.readSystemPromptSidecar(agent);
+    } catch {
+      return null;
+    }
+  }
+
   /** A session file that cannot be read degrades to the labelled stub. */
   async #readSession(agent: string): Promise<string | null> {
     try {

package/src/index.ts

@@ -40,6 +40,11 @@ export {
 export { agentOfPath, type NodePathSegment, parseNodePath } from "./node-path-parse.ts";
 export { renderNodeTable } from "./node-table.ts";
 export { type FramedBoxOptions, renderFramedBox } from "./overlay-frame.ts";
+export {
+  OVERLAY_CHROME_ROWS,
+  overlayContentRows,
+  overlayPanelRows,
+} from "./overlay-geometry.ts";
 export {
   initialScroll,
   maxOffset,

package/src/overlay-geometry.ts

@@ -0,0 +1,44 @@
+/**
+ * Shared height geometry for the drill-in overlays (ADR-0034).
+ *
+ * The Run view is a non-overlay `ctx.ui.custom()` component: pi draws its own
+ * chrome — the editor box and the status line — below the component, and it
+ * gives the component no height budget. A panel as tall as the terminal
+ * therefore pushes that chrome off the screen. These two pure helpers give
+ * every overlay one contract: `overlayPanelRows` turns a terminal row budget
+ * into the TOTAL panel height, and `overlayContentRows` turns that total into
+ * the content rows the panel can draw.
+ */
+
+/** Frame rows a panel spends on its title, its footer, and its bottom border. */
+export const OVERLAY_CHROME_ROWS = 3;
+
+/** Fraction of the row budget a panel takes on a tall terminal. */
+const HEIGHT_FRACTION = 0.9;
+
+/** Rows kept free for pi chrome below the component, on a short terminal. */
+const HOST_CHROME_ROWS = 6;
+
+/** The shortest panel that still draws one content row. */
+const MIN_PANEL_ROWS = 4;
+
+/**
+ * The total panel height for a terminal row budget of `budget`.
+ *
+ * The fraction keeps a margin on a tall terminal; the absolute reserve keeps
+ * one on a short terminal, where a fraction alone leaves too little. A budget
+ * smaller than both floors to the shortest drawable panel. Failure mode: a
+ * budget that is not a finite number degrades to that same floor.
+ */
+export function overlayPanelRows(budget: number): number {
+  if (!Number.isFinite(budget)) return MIN_PANEL_ROWS;
+  const rows = Math.floor(budget);
+  const fitted = Math.min(Math.round(rows * HEIGHT_FRACTION), rows - HOST_CHROME_ROWS);
+  return Math.max(MIN_PANEL_ROWS, fitted);
+}
+
+/** The content rows a panel of `panelRows` total height draws. */
+export function overlayContentRows(panelRows: number): number {
+  const rows = Number.isFinite(panelRows) ? Math.floor(panelRows) : 0;
+  return Math.max(1, rows - OVERLAY_CHROME_ROWS);
+}

package/src/system-prompt-overlay.ts

@@ -12,6 +12,7 @@
  */
 
 import { renderFramedBox } from "./overlay-frame.ts";
+import { overlayContentRows } from "./overlay-geometry.ts";
 import { resolveOffset, type Scroll } from "./overlay-scroll.ts";
 import { wrapLines } from "./wrap-text.ts";
 
@@ -20,9 +21,6 @@ const FOOTER = " ↑↓ scroll  c copy path  esc back";
 /** Fraction of the terminal width the centered panel takes. */
 const WIDTH_FRACTION = 0.9;
 
-/** Frame rows the panel spends on its title, footer, and bottom border. */
-const CHROME_ROWS = 3;
-
 /** Frame columns one content row loses to the borders and their padding. */
 const CHROME_COLUMNS = 4;
 
@@ -49,11 +47,6 @@ export interface SystemPromptOverlayOptions {
   readonly width: number;
 }
 
-/** The content rows a panel of `rows` total height draws. */
-export function systemPromptContentRows(rows: number): number {
-  return Math.max(1, floor(rows) - CHROME_ROWS);
-}
-
 /**
  * Wraps a prompt body to the panel drawn at `width`.
  *
@@ -70,7 +63,7 @@ export function renderSystemPromptOverlay(options: SystemPromptOverlayOptions):
   const width = frameWidth(options.width);
   const panel = panelWidth(width);
   const margin = " ".repeat(Math.max(0, Math.floor((width - panel) / 2)));
-  const rows = systemPromptContentRows(options.rows);
+  const rows = overlayContentRows(options.rows);
   const offset = resolveOffset(options.scroll, options.content.length, rows);
   const visible = options.content.slice(offset, offset + rows);
   return renderFramedBox({
@@ -104,7 +97,3 @@ function blankRows(count: number): readonly string[] {
 function padding(columns: number): string {
   return " ".repeat(Math.max(0, columns));
 }
-
-function floor(value: number): number {
-  return Math.floor(Number.isFinite(value) ? value : 0);
-}

package/src/transcript-overlay.ts

@@ -6,6 +6,7 @@
  */
 
 import { renderFramedBox } from "./overlay-frame.ts";
+import { overlayContentRows } from "./overlay-geometry.ts";
 import { resolveOffset, type Scroll } from "./overlay-scroll.ts";
 
 const FOOTER = " ↑↓ scroll  c copy path  esc back";
@@ -14,7 +15,8 @@ const FOOTER = " ↑↓ scroll  c copy path  esc back";
  * One transcript-overlay render request.
  *
  * Contract: `content` and `scroll` decide the visible slice; `rows` is the
- * content row budget; `width` is the exact visible width of every returned
+ * TOTAL panel height, frame chrome included, and the overlay derives its
+ * content rows from it; `width` is the exact visible width of every returned
  * line. Failure mode: empty `content`, a `rows` of zero or less, and a scroll
  * offset past the end all draw a valid frame instead of throwing.
  */
@@ -24,14 +26,14 @@ export interface TranscriptOverlayOptions {
   /** Already-rendered content lines, from `nodeTranscriptLines`. */
   readonly content: readonly string[];
   readonly scroll: Scroll;
-  /** Content rows the overlay may draw; a zero or negative value draws one. */
+  /** Panel height, chrome included; a value under four draws one content row. */
   readonly rows: number;
   readonly width: number;
 }
 
 /** Draws the framed, scrolled overlay for one node's transcript. */
 export function renderTranscriptOverlay(options: TranscriptOverlayOptions): readonly string[] {
-  const rows = Math.max(1, Math.floor(options.rows));
+  const rows = overlayContentRows(options.rows);
   const offset = resolveOffset(options.scroll, options.content.length, rows);
   return renderFramedBox({
     title: `${options.nodePath} ─ transcript`,