@aragon-agent/cli 0.6.4 → 0.6.7

package/dist/ui/TeamPanel.js

@@ -5,7 +5,7 @@ import { pickGlyphs } from './glyphs.js';
 import { formatDuration } from '../agent/usage.js';
 import { describeToolActivity, sanitizeActivity } from '../team/activity.js';
 import { TEAM_LIMITS } from '../team/limits.js';
-import { selectPanelRows } from '../team/panel-rows.js';
+import { buildTeamPanelLayout } from './layout/team-panel.js';
 function isRunning(run) {
     return run.phase === 'starting' || run.phase === 'thinking' || run.phase === 'tool' ||
         run.phase === 'waiting';
@@ -101,24 +101,28 @@ export function activityLine(run, cols) {
             return 'aborted';
     }
 }
-export function TeamPanel({ snapshot, rows, cols, reducedMotion, theme, caps, now, }) {
+export function TeamPanel({ snapshot, rows, cols, reducedMotion, theme, caps, now, layout, }) {
+    const projection = layout ?? buildTeamPanelLayout({
+        snapshot, terminalRows: rows, availableRows: Infinity,
+    });
+    if (projection.rowCount === 0)
+        return null;
     const glyphs = pickGlyphs(caps);
     const at = now ?? Date.now();
     const running = snapshot.runs.filter(isRunning).length;
     const done = snapshot.runs.filter(isSettled).length;
     const elapsed = formatDuration(Math.max(0, at - snapshot.startedAt));
     const header = (_jsxs(Box, { flexDirection: "row", justifyContent: "space-between", children: [_jsxs(Text, { wrap: "truncate", color: theme.accent, bold: true, children: [glyphs.teamAgent, " team", '  ', _jsxs(Text, { color: theme.muted, children: [running, " running ", glyphs.midDot, " ", done, " done ", glyphs.midDot, " ", elapsed] })] }), snapshot.messageCount > 0 && (_jsxs(Text, { wrap: "truncate", color: theme.muted, children: [glyphs.teamMail, " ", snapshot.messageCount] }))] }));
-    // Below 20 rows the roster is more expensive than the transcript it displaces,
-    // so the panel degrades to the one line that still answers "is something
-    // running, and for how long" (§6.4).
-    if (rows < TEAM_LIMITS.panelCollapseRows) {
+    // Short terminals or a long draft leave only the shared header projection,
+    // which still answers whether anything is running and for how long.
+    if (projection.collapsed) {
         return _jsx(Box, { flexDirection: "column", flexShrink: 0, children: header });
     }
     // RANKED, not sliced by array index (F-2). The slot pool hands out indices in
     // order, so `slice(0, 5)` showed the five children that finished FIRST and hid
     // everything still working behind `+N more` - at exactly the fan-out widths
     // the requirement permits.
-    const { visible, hiddenTotal, hiddenRunning } = selectPanelRows(snapshot.runs, TEAM_LIMITS.panelMaxRows);
+    const { visible, hiddenTotal, hiddenRunning } = projection;
     return (_jsxs(Box, { flexDirection: "column", flexShrink: 0, children: [header, visible.map((run) => {
                 const color = statusColor(run, theme);
                 // One spinner per RUNNING row, and the row cap is 5 precisely because
@@ -126,8 +130,8 @@ export function TeamPanel({ snapshot, rows, cols, reducedMotion, theme, caps, no
                 // `reducedMotion` and a non-Unicode terminal fall back to the same
                 // static marker, exactly as `AssistantEntry` and `ToolCard` already do.
                 const animate = isRunning(run) && !reducedMotion && caps.unicode;
-                return (_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { color: color, children: [' ', animate ? _jsx(Spinner, { type: "dots" }) : marker(run, glyphs), ' '] }), _jsx(Text, { color: theme.primary, children: `${run.label}${run.tier === 'fast' ? '~' : ''}`.padEnd(8).slice(0, 8) }), _jsx(Box, { flexGrow: 1, flexShrink: 1, overflow: "hidden", children: _jsx(Text, { wrap: "truncate", color: theme.muted, children: run.description }) }), _jsx(Box, { flexShrink: 1, overflow: "hidden", children: _jsxs(Text, { wrap: "truncate", color: color, children: ['  ', activityLine(run, cols)] }) }), _jsxs(Text, { wrap: "truncate", color: theme.muted, children: ['  ', run.startedAt ? formatDuration(Math.max(0, (run.endedAt ?? at) - run.startedAt)) : ''] })] }, run.label));
-            }), hiddenTotal > 0 && (_jsxs(Text, { wrap: "truncate", color: theme.muted, children: ['  ', "+", hiddenTotal, " more", hiddenRunning > 0 ? ` (${hiddenRunning} running)` : ''] })), snapshot.lastMessage && (_jsxs(Text, { wrap: "truncate", color: theme.muted, children: [' ', glyphs.teamMail, " ", snapshot.lastMessage.from, " ", glyphs.arrowRight, " ", snapshot.lastMessage.to, ": ", snapshot.lastMessage.subject] }))] }));
+                return (_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { color: color, children: [' ', animate ? _jsx(Spinner, { type: "dots" }) : marker(run, glyphs), ' '] }), _jsx(Text, { color: theme.primary, children: `${run.label}${run.tier === 'fast' ? '~' : ''}`.padEnd(8).slice(0, 8) }), _jsx(Box, { flexGrow: 1, flexShrink: 1, overflow: "hidden", children: _jsx(Text, { wrap: "truncate", color: theme.muted, children: run.description.replace(/\s+/g, ' ') }) }), _jsx(Box, { flexShrink: 1, overflow: "hidden", children: _jsxs(Text, { wrap: "truncate", color: color, children: ['  ', activityLine(run, cols)] }) }), _jsxs(Text, { wrap: "truncate", color: theme.muted, children: ['  ', run.startedAt ? formatDuration(Math.max(0, (run.endedAt ?? at) - run.startedAt)) : ''] })] }, run.label));
+            }), hiddenTotal > 0 && (_jsxs(Text, { wrap: "truncate", color: theme.muted, children: ['  ', "+", hiddenTotal, " more", hiddenRunning > 0 ? ` (${hiddenRunning} running)` : ''] })), snapshot.lastMessage && (_jsxs(Text, { wrap: "truncate", color: theme.muted, children: [' ', glyphs.teamMail, " ", snapshot.lastMessage.from, " ", glyphs.arrowRight, " ", snapshot.lastMessage.to, ": ", snapshot.lastMessage.subject.replace(/\s+/g, ' ')] }))] }));
 }
 function marker(run, glyphs) {
     if (run.phase === 'done')

package/dist/ui/TodoPanel.d.ts

@@ -14,13 +14,13 @@
  * stop being a rail and start eating viewport height, growing and shrinking the
  * transcript every time the list changed length.
  *
- * WIDTH IS MEASURED IN COLUMNS, NEVER IN CODE UNITS (P2-3). This rail is 18-36
+ * WIDTH IS MEASURED IN COLUMNS, NEVER IN CODE UNITS (P2-3). This rail is 14-36
  * columns wide and the system prompt's last line is "Respond in the language the
  * user writes in", so CJK item text in an 18-column rail is the NORMAL case
  * rather than the edge case. Every text cell is `wrap="truncate"` and Ink's
  * truncation is display-width aware, so nothing can overflow the box — and NO
- * ARITHMETIC HERE MAY BUDGET USER TEXT BY `.length`. The `padEnd(3)` /
- * `padStart(2)` cells below are ASCII markers and indices, which is why they are
+ * ARITHMETIC HERE MAY BUDGET USER TEXT BY `.length`. The count string and
+ * `padStart(2)` cells below are ASCII counts and indices, which is why they are
  * safe; a "characters that fit" calculation over `content` would not be. That is
  * the whole of the lesson `TeamPanel`'s `WIDE_CHAR_ALLOWANCE` records at length,
  * and the mitigation here is to have no such budget at all.
@@ -34,7 +34,7 @@ export interface TodoPanelProps {
     /** From `todoRailWidth(cols)`. The rail's whole column budget, separator included. */
     width: number;
     /**
-     * From `todoRailRows(viewportBudget, teamActive)` — NOT `viewportBudget`
+     * From `buildTodoRailLayout` after actual team/menu rows are subtracted.
      * (I-10 / P1-3). The gate that mounts this component and the number it lays
      * out against are ONE value computed once in `App`: a panel that mounts on one
      * number and lays out against another renders nothing and reports nothing.
@@ -46,4 +46,4 @@ export interface TodoPanelProps {
     theme: Theme;
     caps: TermCapabilities;
 }
-export declare function TodoPanel({ snapshot, width, rows, running, reducedMotion, theme, caps, }: TodoPanelProps): React.ReactElement;
+export declare function TodoPanel({ snapshot, width, rows, running, reducedMotion, theme, caps, }: TodoPanelProps): React.ReactElement | null;

package/dist/ui/TodoPanel.js

@@ -1,4 +1,32 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * TodoPanel — the right rail (todo-plan-execution §6.1).
+ *
+ * ASCII ONLY: every glyph comes from `pickGlyphs`; a literal here bypasses the
+ * capability probe and shows mojibake on a legacy console (`glyphs.ts` header).
+ *
+ * MOUNTED ONLY WHEN A LIST EXISTS. `App` passes `null` the rest of the time and
+ * this component is not rendered at all, so a session that never plans has zero
+ * columns and zero layout shift (R-g's "no furniture when idle" / AC-24).
+ *
+ * IT MUST BE MOUNTED IN `AppShell`'s MIDDLE BAND, NEVER IN THE BOTTOM CHROME
+ * (C-6 / I-4). This is a COLUMN BESIDE the viewport, and the middle band is the
+ * only row-wrapped region there is; moved down into the bottom chrome it would
+ * stop being a rail and start eating viewport height, growing and shrinking the
+ * transcript every time the list changed length.
+ *
+ * WIDTH IS MEASURED IN COLUMNS, NEVER IN CODE UNITS (P2-3). This rail is 14-36
+ * columns wide and the system prompt's last line is "Respond in the language the
+ * user writes in", so CJK item text in an 18-column rail is the NORMAL case
+ * rather than the edge case. Every text cell is `wrap="truncate"` and Ink's
+ * truncation is display-width aware, so nothing can overflow the box — and NO
+ * ARITHMETIC HERE MAY BUDGET USER TEXT BY `.length`. The count string and
+ * `padStart(2)` cells below are ASCII counts and indices, which is why they are
+ * safe; a "characters that fit" calculation over `content` would not be. That is
+ * the whole of the lesson `TeamPanel`'s `WIDE_CHAR_ALLOWANCE` records at length,
+ * and the mitigation here is to have no such budget at all.
+ */
+import { useMemo } from 'react';
 import { Box, Text } from 'ink';
 import Spinner from 'ink-spinner';
 import { pickGlyphs } from './glyphs.js';
@@ -6,7 +34,7 @@ import { buildGauge } from './gauge.js';
 import { railBorderProps } from './layout/Gutter.js';
 import { TODO_RAIL_INDEX_MIN_COLS } from './layout/rail.js';
 import { TODO_LIMITS } from '../todo/limits.js';
-import { selectTodoRows } from '../todo/panel-rows.js';
+import { selectCompactTodoRows, selectTodoRows } from '../todo/panel-rows.js';
 /** Header row + the blank row under the gauge. */
 const FIXED_ROWS = 2;
 /** The gauge is the one purely decorative element, so it is the first to go. */
@@ -19,8 +47,11 @@ const MARKER_COLS = 3;
 /** Index cell: two digits plus the space that separates it from the text. */
 const INDEX_COLS = 3;
 function marker(item, glyphs) {
-    if (item.status === 'completed')
-        return glyphs.todoDone;
+    // Ink's tokenizer otherwise treats the bare emoji-capable check as one cell,
+    // while string-width counts two, adding an extra visible space to each row.
+    if (item.status === 'completed') {
+        return glyphs.todoDone.length === 1 ? `${glyphs.todoDone}\uFE0F` : glyphs.todoDone;
+    }
     if (item.status === 'in_progress')
         return glyphs.todoActive;
     return glyphs.todoPending;
@@ -34,41 +65,42 @@ function rowColor(item, theme) {
 }
 export function TodoPanel({ snapshot, width, rows, running, reducedMotion, theme, caps, }) {
     const glyphs = pickGlyphs(caps);
+    // Ink reapplies all four Yoga borders when the borderStyle object changes,
+    // but unchanged borderTop/Bottom=false props are not reapplied on that update.
+    const border = useMemo(() => railBorderProps(glyphs.railVertical), [glyphs.railVertical]);
+    if (snapshot.items.length === 0 || rows < TODO_LIMITS.panelMinRows)
+        return null;
+    const compact = rows < TODO_LIMITS.panelFullRows;
     const showGauge = width >= GAUGE_MIN_COLS && rows >= GAUGE_MIN_ROWS;
-    const showIndex = width >= TODO_RAIL_INDEX_MIN_COLS;
-    const itemRows = Math.max(1, rows - FIXED_ROWS - (showGauge ? 1 : 0));
-    const { visible, hiddenAbove, hiddenBelow } = selectTodoRows(snapshot.items, itemRows);
+    const showIndex = !compact && width >= TODO_RAIL_INDEX_MIN_COLS;
+    const compactFooter = compact && snapshot.items.length > rows - 1;
+    const itemRows = compact ? rows - 1 - Number(compactFooter)
+        : rows - FIXED_ROWS - Number(showGauge);
+    const { visible, hiddenAbove, hiddenBelow } = compact
+        ? selectCompactTodoRows(snapshot.items, itemRows)
+        : selectTodoRows(snapshot.items, itemRows);
     const pct = snapshot.total > 0 ? Math.round((snapshot.doneCount / snapshot.total) * 100) : 0;
     const gauge = buildGauge(pct, Math.max(4, width - CHROME_COLS - 2), theme, caps);
     const complete = snapshot.doneCount === snapshot.total;
+    const countText = `${snapshot.doneCount}/${snapshot.total}`;
+    const showDone = complete
+        && width - CHROME_COLS >= 'TODO '.length + countText.length + ' done'.length;
+    const count = `${countText}${showDone ? ' done' : ''}`;
     return (
     // `flexShrink={0}` IS LOAD-BEARING (P1-4). Ink's `Box.defaultProps` is
     // `{ flexWrap:'nowrap', flexDirection:'row', flexGrow:0, flexShrink:1 }`, so
     // a `width={n}` box inside a shrinking row is SQUEEZED under pressure — and
     // every piece of arithmetic in `rail.ts` silently becomes a suggestion at
     // exactly the narrow widths where the guarantee matters. `ScrollIndicator`
-    // spells the same pair one level down. Cross-axis height needs no prop:
-    // `alignItems` is unset in this tree and yoga's default is `stretch`.
-    _jsxs(Box, { flexDirection: "column", flexShrink: 0, width: width, overflow: "hidden", paddingLeft: 1, ...railBorderProps(glyphs.railVertical, theme.border), children: [_jsxs(Box, { flexDirection: "row", justifyContent: "space-between", children: [_jsx(Text, { wrap: "truncate", color: theme.accent, bold: true, children: "TODO" }), _jsxs(Text, { wrap: "truncate", color: complete ? theme.toolDone : theme.muted, children: [snapshot.doneCount, "/", snapshot.total, complete ? ' done' : ''] })] }), showGauge && (_jsxs(Text, { wrap: "truncate", children: [_jsx(Text, { color: gauge.fillColor, children: gauge.filled }), _jsx(Text, { color: gauge.trackColor, children: gauge.empty })] })), _jsx(Text, { children: " " }), hiddenAbove > 0 && (_jsxs(Text, { wrap: "truncate", color: theme.muted, children: ['   ', "+", hiddenAbove, " above"] })), visible.map(({ item, index }) => {
+    // spells the same pair one level down. Height uses the same row budget as
+    // selection, so content cannot silently enlarge the middle band.
+    _jsxs(Box, { flexDirection: "column", flexShrink: 0, width: width, height: rows, overflow: "hidden", paddingLeft: 1, ...border, borderColor: theme.border, children: [_jsxs(Box, { flexDirection: "row", justifyContent: "space-between", children: [_jsx(Box, { flexGrow: 1, flexShrink: 1, overflow: "hidden", children: _jsx(Text, { wrap: "truncate", color: theme.accent, bold: true, children: "TODO" }) }), _jsx(Box, { width: count.length, flexShrink: 0, children: _jsx(Text, { wrap: "truncate", color: complete ? theme.toolDone : theme.muted, children: count }) })] }), showGauge && (_jsxs(Text, { wrap: "truncate", children: [_jsx(Text, { color: gauge.fillColor, children: gauge.filled }), _jsx(Text, { color: gauge.trackColor, children: gauge.empty })] })), !compact && _jsx(Text, { children: " " }), !compact && hiddenAbove > 0 && (_jsxs(Text, { wrap: "truncate", color: theme.muted, children: ['   ', "+", hiddenAbove, " above"] })), visible.map(({ item, index }) => {
                 const active = item.status === 'in_progress';
                 // The spinner is gated on `running`: a spinner while the agent is idle
                 // is a lie about the state of the world, and this panel outlives the run
                 // that filled it. Reduced motion and a non-Unicode terminal fall back to
                 // the same static marker, exactly as `AssistantEntry` and `TeamPanel` do.
                 const animate = active && running && !reducedMotion && caps.unicode;
-                return (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { flexShrink: 0, width: MARKER_COLS, children: _jsx(Text, { color: rowColor(item, theme), bold: active, children: animate ? _jsx(Spinner, { type: "dots" }) : marker(item, glyphs) }) }), showIndex && (_jsx(Box, { flexShrink: 0, width: INDEX_COLS, children: _jsx(Text, { color: theme.muted, children: String(index + 1).padStart(2) }) })), _jsx(Box, { flexGrow: 1, flexShrink: 1, overflow: "hidden", children: _jsx(Text, { wrap: active ? 'wrap' : 'truncate', color: rowColor(item, theme), bold: active, children: active ? clampWrapped(item.activeForm, width) : item.content }) })] }, `${index}-${item.content}`));
-            }), hiddenBelow > 0 && (_jsxs(Text, { wrap: "truncate", color: theme.muted, children: ['   ', "+", hiddenBelow, " more"] }))] }));
-}
-/**
- * Keep the wrapping row inside `TODO_LIMITS.activeWrapRows`.
- *
- * A CHARACTER BUDGET IS NOT A COLUMN BUDGET (P2-3), so this is deliberately
- * generous rather than exact: it exists to stop a maximum-length `activeForm`
- * from claiming five rows of an 18-column rail, and Ink's display-width-aware
- * truncation is what actually keeps the row inside the box. Erring long costs
- * nothing — the surrounding `overflow="hidden"` clips it.
- */
-function clampWrapped(text, width) {
-    const budget = Math.max(1, width - CHROME_COLS) * TODO_LIMITS.activeWrapRows;
-    return text.length > budget ? text.slice(0, budget) : text;
+                return (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { flexShrink: 0, width: MARKER_COLS, children: _jsx(Text, { color: rowColor(item, theme), bold: active, children: animate ? _jsx(Spinner, { type: "dots" }) : marker(item, glyphs) }) }), showIndex && (_jsx(Box, { flexShrink: 0, width: INDEX_COLS, children: _jsx(Text, { color: theme.muted, children: String(index + 1).padStart(2) }) })), _jsx(Box, { flexGrow: 1, flexShrink: 1, overflow: "hidden", children: _jsx(Text, { wrap: "truncate", color: rowColor(item, theme), bold: active, children: active ? item.activeForm : item.content }) })] }, `${index}-${item.content}`));
+            }), compactFooter && (_jsxs(Text, { wrap: "truncate", color: theme.muted, children: ["-", hiddenAbove, " +", hiddenBelow] })), !compact && hiddenBelow > 0 && (_jsxs(Text, { wrap: "truncate", color: theme.muted, children: ['   ', "+", hiddenBelow, " more"] }))] }, glyphs.railVertical));
 }

package/dist/ui/UpdateLine.d.ts

@@ -9,7 +9,7 @@
  * still truthy. Taking that branch would emit a box of ZERO rows - the frame
  * keeps its fixed height, Yoga hands the row to the transcript, and
  * `viewportRows()` goes on reporting the old number to `ScrollViewport`,
- * `selectWindow`, `overlayMaxRows`, `popupMaxRows` and `todoRailRows`. The
+ * `selectWindow`, `overlayMaxRows`, `popupMaxRows` and `buildTodoRailLayout`. The
  * transcript would gain a row while the updater is idle and lose it the moment
  * it has news. Presence is the CALLER's decision, through
  * `shouldRenderUpdateLine`, exactly as `App.tsx` already decides the activity

package/dist/ui/capabilities.js

@@ -15,10 +15,6 @@ function detectColorLevel(env) {
         return 0;
     if (env.TERM === 'dumb')
         return 0;
-    // A truecolor-capable terminal advertises itself.
-    const colorterm = env.COLORTERM?.toLowerCase();
-    if (colorterm === 'truecolor' || colorterm === '24bit')
-        return 3;
     // FORCE_COLOR is an explicit override of the auto-detected depth.
     const force = env.FORCE_COLOR;
     if (force !== undefined) {
@@ -30,6 +26,10 @@ function detectColorLevel(env) {
             return 3;
         return 1; // '1' | 'true' | '' → at least basic color
     }
+    // A truecolor-capable terminal advertises itself.
+    const colorterm = env.COLORTERM?.toLowerCase();
+    if (colorterm === 'truecolor' || colorterm === '24bit')
+        return 3;
     // Fall back to chalk's own platform detection.
     const level = chalk.level;
     return level >= 0 && level <= 3 ? level : 0;
@@ -42,7 +42,7 @@ function detectUnicode(env) {
     if (env.WT_SESSION)
         return true; // Windows Terminal
     const program = env.TERM_PROGRAM;
-    if (program === 'vscode' || program === 'iTerm.app' || program === 'Apple_Terminal')
+    if (program === 'aragonmesh' || program === 'vscode' || program === 'iTerm.app' || program === 'Apple_Terminal')
         return true;
     // Legacy cmd.exe (no TERM, no WT_SESSION) and unknown terminals fall back to ASCII.
     return false;

package/dist/ui/exit-snapshot.d.ts

@@ -14,6 +14,15 @@
 import type { Entry, UsageTotal } from '../agent/reducer.js';
 export interface ExitSnapshot {
     entries: Entry[];
+    /**
+     * The session total, FORWARDED not copied.
+     *
+     * It gained `cacheReadTokens` / `cacheWriteTokens`
+     * (context-usage-gauge-accuracy §3.6) and this file needed no change for it,
+     * which is the point of referencing the reducer's type rather than restating
+     * its fields: `renderTranscriptText` reads the total through `promptTokensOf`,
+     * so the exit summary and the status bar cannot drift apart.
+     */
     usageTotal: UsageTotal;
     provider: string;
     model: string;

package/dist/ui/layout/ScrollViewport.d.ts

@@ -76,7 +76,7 @@ export interface ScrollViewportProps {
      * This component is the ONLY one inside the viewport subtree that reads
      * `stdout.columns` directly, and the place it uses the number — the
      * `MIN_INDICATOR_COLS` gate — is about how much room THIS BOX has, not how
-     * wide the terminal is. Once the todo rail takes a fifth of the frame those two
+     * wide the terminal is. Once the todo rail takes its responsive share of the frame those two
      * stop being the same number. Optional so every existing caller (and every
      * test) is unchanged.
      */

package/dist/ui/layout/autocomplete.d.ts

@@ -0,0 +1,18 @@
+export interface AutocompleteLayoutInput {
+    itemCount: number;
+    selected: number;
+    maxRows?: number;
+    maxHeight?: number;
+}
+export interface AutocompleteLayout {
+    start: number;
+    count: number;
+    moreBelow: number;
+    showMore: boolean;
+    rowCount: number;
+}
+/** Window suggestions within a total row budget including borders and footer.
+ * Only omitted maxHeight is unlimited. Explicit invalid numbers become zero.
+ * Selection is clamped to the available items; no input is mutated or rejected.
+ */
+export declare function buildAutocompleteLayout(input: AutocompleteLayoutInput): AutocompleteLayout;

package/dist/ui/layout/autocomplete.js

@@ -0,0 +1,26 @@
+/** Window suggestions within a total row budget including borders and footer.
+ * Only omitted maxHeight is unlimited. Explicit invalid numbers become zero.
+ * Selection is clamped to the available items; no input is mutated or rejected.
+ */
+export function buildAutocompleteLayout(input) {
+    const total = nonNegativeInt(input.itemCount);
+    const maxRows = input.maxRows === undefined ? 6 : nonNegativeInt(input.maxRows);
+    const height = input.maxHeight === undefined ? Infinity : nonNegativeInt(input.maxHeight);
+    if (total === 0 || maxRows === 0 || height < 3) {
+        return { start: 0, count: 0, moreBelow: 0, showMore: false, rowCount: 0 };
+    }
+    const selected = Math.min(total - 1, nonNegativeInt(input.selected));
+    let count = Math.min(total, maxRows, height - 2);
+    const windowStart = () => Math.max(0, Math.min(selected - count + 1, total - count));
+    let start = windowStart();
+    if (count >= 2 && start + count < total && count + 3 > height) {
+        count--;
+        start = windowStart();
+    }
+    const moreBelow = total - start - count;
+    const showMore = moreBelow > 0 && count + 3 <= height;
+    return { start, count, moreBelow, showMore, rowCount: 2 + count + Number(showMore) };
+}
+function nonNegativeInt(value) {
+    return Number.isFinite(value) ? Math.max(0, Math.floor(value)) : 0;
+}

package/dist/ui/layout/rail.d.ts

@@ -1,56 +1,7 @@
-/**
- * Rail geometry (todo-plan-execution §3.9) — the ONE place that says how wide
- * and how tall the todo rail is allowed to be.
- *
- * Pure and React-free, mirroring `budget.ts`, so `todo-rail.test.ts` can pin the
- * arithmetic without mounting anything. Deliberately NOT part of `budget.ts`:
- * that module answers "how many ROWS does the viewport get" and stays a function
- * of `rows` alone; the rail spends COLUMNS.
- *
- * NAMED FOR ITS POSITION, NOT ITS CONTENT, like `AppShellProps.rail` (D-18):
- * this is a layout primitive and `viewportRows` is its neighbour, not
- * `TodoPanel`.
- */
-/** Below this the marker + a two-word title do not fit and the column is noise. */
-export declare const TODO_RAIL_MIN_COLS = 18;
-/**
- * Above this, 20% is being spent on whitespace: at 36 columns a step title
- * already fits on one line, and the transcript is the surface that benefits from
- * a 200-column terminal. A deliberate, revertible deviation from a literal
- * reading of R-e; it only binds above 180 columns.
- */
+export declare const TODO_RAIL_MIN_COLS = 14;
 export declare const TODO_RAIL_MAX_COLS = 36;
-/** Under 80 columns the transcript needs every column; no rail at all. */
-export declare const TODO_RAIL_MIN_TOTAL_COLS = 80;
-/** Below this rail width the 2-column index prefix is dropped for content. */
+export declare const TODO_TRANSCRIPT_MIN_COLS = 62;
+export declare const TODO_RAIL_MIN_TOTAL_COLS: number;
 export declare const TODO_RAIL_INDEX_MIN_COLS = 22;
-/**
- * Two properties are pinned by tests, for the reason `budget.ts` records about
- * the viewport being non-monotonic before anyone measured it:
- *
- *  - NON-DECREASING in `cols` across [40, 300]. A user dragging a window wider
- *    must never see the rail get narrower.
- *  - `cols - todoRailWidth(cols) >= 62` for every `cols >= 80`. Every existing
- *    width heuristic inside the viewport (`TERSE_HINT_COLS` 42,
- *    `MIN_INDICATOR_COLS` 50, the status bar's 60/72 steps) sits below that
- *    floor, so no existing behaviour changes because a rail appeared (R-3).
- */
+/** Return a non-decreasing rail width; invalid or narrow terminals have no rail. */
 export declare function todoRailWidth(cols: number): number;
-/**
- * How many rows the rail may actually draw.
- *
- * IT IS NOT `viewportBudget`, AND THE DIFFERENCE IS NOT COSMETIC (P1-3 / D-23).
- * `viewportRows()` subtracts the STATIC chrome only, and says so; the live team
- * roster is mounted inside `AppShell`'s measured bottom box, where it costs a
- * header row, up to `TEAM_LIMITS.panelMaxRows` child rows, a `+N more` row and a
- * mail row that `viewportBudget` knows nothing about. `ScrollViewport` is immune
- * because it MEASURES itself; the rail does not measure - a second
- * measure -> setState -> measure loop is exactly what §1.2 refuses - so it has
- * to subtract.
- *
- * Ink clips overflow from the BOTTOM, so an over-request does not error: it
- * silently eats the last row, which is the `+N below` marker - the one row whose
- * absence is indistinguishable from "the list is short". That is why this is
- * arithmetic rather than a shrug at `overflow: hidden`.
- */
-export declare function todoRailRows(viewportBudget: number, teamActive: boolean): number;

package/dist/ui/layout/rail.js

@@ -1,68 +1,16 @@
-/**
- * Rail geometry (todo-plan-execution §3.9) — the ONE place that says how wide
- * and how tall the todo rail is allowed to be.
- *
- * Pure and React-free, mirroring `budget.ts`, so `todo-rail.test.ts` can pin the
- * arithmetic without mounting anything. Deliberately NOT part of `budget.ts`:
- * that module answers "how many ROWS does the viewport get" and stays a function
- * of `rows` alone; the rail spends COLUMNS.
- *
- * NAMED FOR ITS POSITION, NOT ITS CONTENT, like `AppShellProps.rail` (D-18):
- * this is a layout primitive and `viewportRows` is its neighbour, not
- * `TodoPanel`.
- */
-import { TODO_LIMITS } from '../../todo/limits.js';
-/** R-e, literally: the rail asks for a fifth of the terminal. */
-const RAIL_FRACTION = 0.2;
-/** Below this the marker + a two-word title do not fit and the column is noise. */
-export const TODO_RAIL_MIN_COLS = 18;
-/**
- * Above this, 20% is being spent on whitespace: at 36 columns a step title
- * already fits on one line, and the transcript is the surface that benefits from
- * a 200-column terminal. A deliberate, revertible deviation from a literal
- * reading of R-e; it only binds above 180 columns.
- */
+/** Responsive TODO rail widths, measured in terminal columns including chrome. */
+const RAIL_FRACTION = 0.15;
+export const TODO_RAIL_MIN_COLS = 14;
 export const TODO_RAIL_MAX_COLS = 36;
-/** Under 80 columns the transcript needs every column; no rail at all. */
-export const TODO_RAIL_MIN_TOTAL_COLS = 80;
-/** Below this rail width the 2-column index prefix is dropped for content. */
+export const TODO_TRANSCRIPT_MIN_COLS = 62;
+export const TODO_RAIL_MIN_TOTAL_COLS = TODO_TRANSCRIPT_MIN_COLS + TODO_RAIL_MIN_COLS;
 export const TODO_RAIL_INDEX_MIN_COLS = 22;
-/**
- * Two properties are pinned by tests, for the reason `budget.ts` records about
- * the viewport being non-monotonic before anyone measured it:
- *
- *  - NON-DECREASING in `cols` across [40, 300]. A user dragging a window wider
- *    must never see the rail get narrower.
- *  - `cols - todoRailWidth(cols) >= 62` for every `cols >= 80`. Every existing
- *    width heuristic inside the viewport (`TERSE_HINT_COLS` 42,
- *    `MIN_INDICATOR_COLS` 50, the status bar's 60/72 steps) sits below that
- *    floor, so no existing behaviour changes because a rail appeared (R-3).
- */
+/** Return a non-decreasing rail width; invalid or narrow terminals have no rail. */
 export function todoRailWidth(cols) {
-    if (!Number.isFinite(cols) || cols < TODO_RAIL_MIN_TOTAL_COLS)
+    if (!Number.isFinite(cols))
         return 0;
-    return Math.min(TODO_RAIL_MAX_COLS, Math.max(TODO_RAIL_MIN_COLS, Math.round(cols * RAIL_FRACTION)));
-}
-/**
- * How many rows the rail may actually draw.
- *
- * IT IS NOT `viewportBudget`, AND THE DIFFERENCE IS NOT COSMETIC (P1-3 / D-23).
- * `viewportRows()` subtracts the STATIC chrome only, and says so; the live team
- * roster is mounted inside `AppShell`'s measured bottom box, where it costs a
- * header row, up to `TEAM_LIMITS.panelMaxRows` child rows, a `+N more` row and a
- * mail row that `viewportBudget` knows nothing about. `ScrollViewport` is immune
- * because it MEASURES itself; the rail does not measure - a second
- * measure -> setState -> measure loop is exactly what §1.2 refuses - so it has
- * to subtract.
- *
- * Ink clips overflow from the BOTTOM, so an over-request does not error: it
- * silently eats the last row, which is the `+N below` marker - the one row whose
- * absence is indistinguishable from "the list is short". That is why this is
- * arithmetic rather than a shrug at `overflow: hidden`.
- */
-export function todoRailRows(viewportBudget, teamActive) {
-    if (!Number.isFinite(viewportBudget))
+    const columns = Math.floor(cols);
+    if (columns < TODO_RAIL_MIN_TOTAL_COLS)
         return 0;
-    const reserved = teamActive ? TODO_LIMITS.railReservedRows : 0;
-    return Math.max(0, viewportBudget - reserved);
+    return Math.min(TODO_RAIL_MAX_COLS, Math.max(TODO_RAIL_MIN_COLS, Math.round(columns * RAIL_FRACTION)));
 }

package/dist/ui/layout/team-panel.d.ts

@@ -0,0 +1,18 @@
+import type { SubagentRun, TeamSnapshot } from '../../team/types.js';
+export interface TeamPanelLayout {
+    collapsed: boolean;
+    rowCount: number;
+    visible: SubagentRun[];
+    hiddenTotal: number;
+    hiddenRunning: number;
+}
+export interface TeamPanelLayoutInput {
+    snapshot: TeamSnapshot | null;
+    terminalRows: number;
+    availableRows: number;
+}
+/** Project actual roster rows, preserving three middle rows when expanded.
+ * Invalid geometry becomes zero; legacy callers may pass positive Infinity
+ * for an unlimited available-row budget. Does not throw or mutate the snapshot.
+ */
+export declare function buildTeamPanelLayout(input: TeamPanelLayoutInput): TeamPanelLayout;

package/dist/ui/layout/team-panel.js

@@ -0,0 +1,22 @@
+import { TEAM_LIMITS } from '../../team/limits.js';
+import { selectPanelRows } from '../../team/panel-rows.js';
+import { TODO_LIMITS } from '../../todo/limits.js';
+/** Project actual roster rows, preserving three middle rows when expanded.
+ * Invalid geometry becomes zero; legacy callers may pass positive Infinity
+ * for an unlimited available-row budget. Does not throw or mutate the snapshot.
+ */
+export function buildTeamPanelLayout(input) {
+    const available = input.availableRows === Infinity ? Infinity : nonNegativeInt(input.availableRows);
+    if (!input.snapshot || available < 1) {
+        return { collapsed: true, rowCount: 0, visible: [], hiddenTotal: 0, hiddenRunning: 0 };
+    }
+    const selection = selectPanelRows(input.snapshot.runs, TEAM_LIMITS.panelMaxRows);
+    const natural = 1 + selection.visible.length + Number(selection.hiddenTotal > 0)
+        + Number(Boolean(input.snapshot.lastMessage));
+    const collapsed = nonNegativeInt(input.terminalRows) < TEAM_LIMITS.panelCollapseRows
+        || available - natural < TODO_LIMITS.panelMinRows;
+    return { ...selection, collapsed, rowCount: collapsed ? 1 : natural };
+}
+function nonNegativeInt(value) {
+    return Number.isFinite(value) ? Math.max(0, Math.floor(value)) : 0;
+}

package/dist/ui/layout/todo-layout.d.ts

@@ -0,0 +1,24 @@
+import type { RenderMode } from './frame.js';
+export interface TodoRailLayoutInput {
+    mode: RenderMode;
+    cols: number;
+    panelEnabled: boolean;
+    overlayOpen: boolean;
+    itemCount: number;
+    viewportBudget: number;
+    teamRows: number;
+    popupRows: number;
+}
+export interface TodoRailLayout {
+    visible: boolean;
+    reason: 'visible' | 'inline' | 'disabled' | 'overlay' | 'empty' | 'narrow' | 'short';
+    width: number;
+    rows: number;
+    contentCols: number;
+    popupMaxHeight: number;
+}
+/** Allocate columns and rows from the same team/menu projections as the renderers.
+ * Invalid geometry becomes zero, excess team/menu rows are clamped. Menu capacity
+ * never depends on menu occupancy or rail visibility, preventing feedback loops.
+ */
+export declare function buildTodoRailLayout(input: TodoRailLayoutInput): TodoRailLayout;

package/dist/ui/layout/todo-layout.js

@@ -0,0 +1,27 @@
+import { TODO_LIMITS } from '../../todo/limits.js';
+import { todoRailWidth } from './rail.js';
+/** Allocate columns and rows from the same team/menu projections as the renderers.
+ * Invalid geometry becomes zero, excess team/menu rows are clamped. Menu capacity
+ * never depends on menu occupancy or rail visibility, preventing feedback loops.
+ */
+export function buildTodoRailLayout(input) {
+    const cols = nonNegativeInt(input.cols);
+    const budget = nonNegativeInt(input.viewportBudget);
+    const teamRows = Math.min(budget, nonNegativeInt(input.teamRows));
+    const popupMaxHeight = Math.max(0, budget - teamRows - TODO_LIMITS.panelMinRows);
+    const popupRows = popupMaxHeight < 3 ? 0 : Math.min(nonNegativeInt(input.popupRows), popupMaxHeight);
+    const rows = budget - teamRows - popupRows;
+    const width = todoRailWidth(cols);
+    const reason = input.mode !== 'fullscreen' ? 'inline'
+        : !input.panelEnabled ? 'disabled'
+            : input.overlayOpen ? 'overlay'
+                : nonNegativeInt(input.itemCount) === 0 ? 'empty'
+                    : width === 0 ? 'narrow'
+                        : rows < TODO_LIMITS.panelMinRows ? 'short'
+                            : 'visible';
+    const visible = reason === 'visible';
+    return { visible, reason, width, rows, contentCols: cols - (visible ? width : 0), popupMaxHeight };
+}
+function nonNegativeInt(value) {
+    return Number.isFinite(value) ? Math.max(0, Math.floor(value)) : 0;
+}

package/dist/ui/transcript-text.js

@@ -6,7 +6,7 @@
  * transcript in the terminal's native scrollback, and replaying there would
  * simply print everything twice.
  */
-import { formatCost, formatDuration, formatTokens } from '../agent/usage.js';
+import { formatCost, formatDuration, formatTokens, promptTokensOf } from '../agent/usage.js';
 import { formatRetryLine } from '../agent/retry-view.js';
 const DEFAULT_MAX_ENTRIES = 200;
 const CONTINUATION_INDENT = '  ';
@@ -199,7 +199,11 @@ function renderEntry(entry, glyphs) {
 export function renderTranscriptText(entries, opts) {
     const turns = entries.filter((e) => e.kind === 'user').length;
     const g = opts.glyphs;
-    const tokens = `${formatTokens(opts.usageTotal.inputTokens)}${g.arrowUp} ${formatTokens(opts.usageTotal.outputTokens)}${g.arrowDown}`;
+    // THE SAME PROMPT-SIDE TOTAL THE STATUS BAR SHOWS (context-usage-gauge-accuracy
+    // §3.6). This line is what a user compares against the bar they were watching a
+    // second earlier, so a different unit here would look like the exit summary
+    // losing tokens.
+    const tokens = `${formatTokens(promptTokensOf(opts.usageTotal))}${g.arrowUp} ${formatTokens(opts.usageTotal.outputTokens)}${g.arrowDown}`;
     const summary = [
         'aragon',
         `${opts.provider}:${opts.model}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aragon-agent/cli",
-  "version": "0.6.4",
+  "version": "0.6.7",
   "description": "AragonAgent CLI — a Claude-Code / Codex-style interactive terminal UI (TUI) on top of the @aragon-agent/core engine. Installable and runnable via npm / npx.",
   "license": "MIT",
   "author": "AragonAgent contributors",
@@ -56,7 +56,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@aragon-agent/core": "^0.2.16",
+    "@aragon-agent/core": "^0.2.19",
     "chalk": "^5.6.2",
     "cli-highlight": "^2.0.0",
     "commander": "^12.1.0",