@giovannijecha/jecode 0.8.4 → 0.8.6

package/dist/tui/components/messages.js

@@ -1,25 +1,32 @@
 import { trailingText } from "../../text-boundary.js";
-import { blank, row } from "../../ui/render.js";
+import { blank, hasColor, row } from "../../ui/render.js";
 import { markdown } from "../../ui/markdown.js";
+import { terminalText } from "../../ui/terminal-text.js";
+import { splitByCells } from "../../ui/width.js";
 import { transcriptLead, transcriptWidth } from "../transcript-grammar.js";
 export const REASONING_PREVIEW_ROWS = 3;
 const MIN_REASONING_PREVIEW_CHARS = 4_096;
 const REASONING_PREVIEW_OVERSCAN = 12;
 export function renderUser(block, width, pal) {
     const inner = transcriptWidth(width);
-    const content = markdown(block.text, inner, pal, inner);
+    const content = terminalText(block.text, { multiline: true }).split("\n")
+        .flatMap((line) => splitByCells(line, inner));
     return [
         "",
-        blank(width, pal.surface.subtle),
-        ...content.map((line, index) => row(width, [
-            ...transcriptLead(width, index === 0
-                ? { text: "❯", fg: pal.accent, bold: true }
-                : undefined),
-            ...line.segs,
+        userEdge(width, pal, "▄"),
+        ...content.map((line) => row(width, [
+            ...transcriptLead(width),
+            { text: line.text, fg: pal.ink.fg },
         ], [], pal.surface.subtle)),
-        blank(width, pal.surface.subtle),
+        userEdge(width, pal, "▀"),
     ];
 }
+/** Half-cell colour keeps the surface light without moving surrounding text. */
+function userEdge(width, pal, half) {
+    if (!hasColor())
+        return blank(width, pal.surface.subtle);
+    return row(width, [{ text: half.repeat(width), fg: pal.surface.subtle }]);
+}
 export function renderAnswer(block, width, pal) {
     return [
         "",

package/dist/tui/components/tool-evidence.js

@@ -0,0 +1,107 @@
+// Selection and rendering of retained tool evidence. Never mutates its source.
+import { row } from "../../ui/render.js";
+import { graphemeCeiling, graphemeFloor } from "../../text-boundary.js";
+import { transcriptLead } from "../transcript-grammar.js";
+// Native exception headings may include a Node error code before the message.
+const ERROR_DIAGNOSTIC = /^\s*\w*Error(?:\s+\[[^\]]+\])?\s*:|\berror\b\s*:|AssertionError/i;
+export function toolEvidence(block) {
+    const all = block.body ?? [];
+    const changed = [];
+    let added = 0, removed = 0, regions = 0, context = 3;
+    for (const detail of all) {
+        if (detail.kind === "keep") {
+            context++;
+            continue;
+        }
+        if (detail.kind !== "add" && detail.kind !== "del") {
+            context = 3;
+            continue;
+        }
+        if (context >= 3)
+            regions++;
+        context = 0;
+        if (detail.kind === "add")
+            added++;
+        else
+            removed++;
+        changed.push(detail);
+    }
+    const counts = changed.length === 0 ? "" : `+${added} −${removed}`;
+    const summary = counts === "" ? "" : `${counts} · ${regions} ${regions === 1 ? "region" : "regions"}`;
+    if (all.length === 0)
+        return { details: [], counts, summary, note: "" };
+    if (block.expanded)
+        return { details: all, counts, summary, note: "ctrl+o collapse" };
+    if (changed.length > 0)
+        return {
+            details: changed.length <= 6 ? changed : [
+                ...changed.slice(0, 3),
+                { kind: "gap", text: `… ${changed.length - 6} more changed ${changed.length === 7 ? "line" : "lines"}` },
+                ...changed.slice(-3),
+            ], counts, summary, note: "ctrl+o full source",
+        };
+    const diagnostic = block.tone === "fail"
+        ? all.find((detail) => ERROR_DIAGNOSTIC.test(detail.text))
+            ?? all.find((detail) => /^not ok\b|^\s*[×✖]/i.test(detail.text)) : undefined;
+    let details = all.slice(-4);
+    if (diagnostic !== undefined && !details.includes(diagnostic))
+        details = [diagnostic, ...all.slice(-3)];
+    const hidden = all.length - details.length;
+    return {
+        details, counts, summary,
+        note: hidden > 0 ? `${hidden} ${diagnostic === undefined ? "earlier" : "other"} ${hidden === 1 ? "line" : "lines"} · ctrl+o`
+            : `${all.length} ${all.length === 1 ? "line" : "lines"}`,
+    };
+}
+export function renderDetail(detail, tone, width, pal, railInk = pal.rule) {
+    const rail = transcriptLead(width, { text: "│", fg: railInk });
+    if (detail.kind === "out") {
+        const base = tone === "fail" || failureLine(detail.text) ? pal.ink.removed : pal.ink.muted;
+        return row(width, [
+            ...rail,
+            { text: detail.text === "" ? " " : detail.text, fg: base },
+        ]);
+    }
+    if (detail.kind === "gap") {
+        return row(width, [
+            ...rail,
+            { text: detail.text, fg: pal.ink.dim, italic: true },
+        ]);
+    }
+    const number = detail.kind === "add" ? detail.newLine : detail.oldLine;
+    const sign = detail.kind === "add" ? "+" : detail.kind === "del" ? "-" : " ";
+    const fg = detail.kind === "add"
+        ? pal.ink.added
+        : detail.kind === "del"
+            ? pal.ink.removed
+            : pal.ink.dim;
+    const tint = detail.kind === "add"
+        ? pal.surface.added
+        : detail.kind === "del"
+            ? pal.surface.removed
+            : undefined;
+    return row(width, [
+        ...rail,
+        { text: sign, fg, bold: detail.kind !== "keep" },
+        { text: `${String(number ?? "").padStart(4)} `, fg: pal.ink.dim },
+        ...emphasized(detail.text, detail.emphasis, fg, tint),
+    ]);
+}
+function emphasized(text, emphasis, fg, bg) {
+    if (emphasis === undefined || emphasis.length <= 0)
+        return [{ text, fg }];
+    const requestedStart = Math.max(0, Math.min(text.length, emphasis.start));
+    const requestedEnd = Math.max(requestedStart, Math.min(text.length, requestedStart + emphasis.length));
+    const start = graphemeFloor(text, requestedStart);
+    const end = graphemeCeiling(text, requestedEnd);
+    if (start === end)
+        return [{ text, fg }];
+    return [
+        ...(start === 0 ? [] : [{ text: text.slice(0, start), fg }]),
+        { text: text.slice(start, end), fg, bg, bold: true },
+        ...(end === text.length ? [] : [{ text: text.slice(end), fg }]),
+    ];
+}
+function failureLine(line) {
+    return line.startsWith("✖") || line.startsWith("×") || line.includes("AssertionError") || /\bfailed\b/i.test(line);
+}

package/dist/tui/components/tool-motion.js

@@ -0,0 +1,32 @@
+// One travelling light on the execution connector; evidence never animates.
+import { hasColor } from "../../ui/render.js";
+export function runningTool(block) {
+    return block.kind === "tool" && block.tone === "pending" &&
+        block.startedAt !== undefined && block.right === "running";
+}
+export function stateInk(block, pal) {
+    if (block.tone === "fail")
+        return pal.ink.removed;
+    if (block.tone === "deny")
+        return pal.ink.attention;
+    if (block.tone === "ok")
+        return pal.ink.added;
+    return runningTool(block) ? pal.accent : pal.ink.dim;
+}
+export function stateMark(block) {
+    return block.tone === "ok" ? "✓" : block.tone === "fail" ? "×" : block.tone === "deny" ? "!" : "○";
+}
+export function connectorInk(block, pal, context, position, length) {
+    if (context.reducedMotion === true || block.expanded === true || !hasColor() || !runningTool(block))
+        return pal.rule;
+    const elapsed = Math.max(0, (context.now ?? Date.now()) - block.startedAt);
+    const head = (elapsed % 2000) / 2000 * (length + 3) - 1.5;
+    const amount = Math.max(0, 1 - Math.abs(position - head) / 1.8);
+    const channel = (index) => Math.round(pal.rule[index] + (pal.accent[index] - pal.rule[index]) * amount);
+    return [channel(0), channel(1), channel(2)];
+}
+export function connector(text, block, pal, context, position, length) {
+    return Array.from(text, (char, index) => ({
+        text: char, fg: connectorInk(block, pal, context, position + index / 3, length),
+    }));
+}

package/dist/tui/components/tool.js

@@ -1,210 +1,56 @@
-// A compact execution trace: state and identity on one semantic rail,
-// bounded evidence below, and motion that never enters durable state.
-import { fitSegs, hasColor, plainLen, row } from "../../ui/render.js";
-import { graphemeCeiling, graphemeFloor } from "../../text-boundary.js";
+// Target-first execution records, connected to bounded, expandable evidence.
+import { plainLen, row } from "../../ui/render.js";
 import { toolDuration } from "../../duration.js";
-import { breathe, easeInOut, easeOut, interval, mix, TOOL_BIRTH_MS, TOOL_LEADER_MAX_MS, TOOL_ROW_ARRIVAL_MS, } from "../motion.js";
-import { transcriptLead } from "../transcript-grammar.js";
-const OUTPUT_ROWS = 8;
-const LIVE_OUTPUT_ROWS = 6;
-const DIFF_ROWS = 15;
-const TOOL_NAME_COLS = 12;
-const TOOL_COLUMNS_AT = 64;
-const SPINNER_MS = 80;
-const SPINNER = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+import { toolEvidence, renderDetail } from "./tool-evidence.js";
+import { connector, connectorInk, runningTool, stateInk, stateMark } from "./tool-motion.js";
 export function renderTool(block, width, pal, context = {}) {
     const now = context.now ?? Date.now();
-    const shown = visibleDetails(block);
-    const ink = stateInk(block, pal, context, now);
-    const nameInk = birthInk(pal.ink.bright, pal.ink.dim, context, now);
+    const clock = { ...context, now };
+    const evidence = toolEvidence(block);
+    const active = runningTool(block);
+    const elapsed = active ? toolDuration(Math.max(0, now - block.startedAt), true)
+        : block.durationMs === undefined ? "" : toolDuration(block.durationMs);
+    const mark = stateMark(block);
+    // The separate change summary already carries these exact counts.
+    const repeatedCount = evidence.counts !== "" && block.right.startsWith(`${evidence.counts} · `);
+    const outcome = repeatedCount ? block.right.slice(evidence.counts.length + 3) : block.right;
+    const result = [`${mark}${outcome === "" ? "" : ` ${outcome}`}`, elapsed].filter(Boolean).join(" · ");
+    const hasEvidence = evidence.details.length > 0;
+    const name = { text: block.name, fg: pal.ink.dim };
+    const right = [{ text: result, fg: stateInk(block, pal) }];
+    const separateStatus = plainLen([name, ...right]) + (hasEvidence ? 2 : 3) + 3 > width;
+    const summaryAt = separateStatus ? 3 : 2;
+    const detailStart = summaryAt + (evidence.summary === "" ? 0 : 1);
+    const length = hasEvidence ? detailStart + evidence.details.length + 1 : summaryAt;
     const left = [
-        ...transcriptLead(width, { text: stateGlyph(block, context, now), fg: ink, bold: true }),
-        { text: toolName(block, width), fg: nameInk, bold: true },
-        ...(block.target === "" ? [] : [{ text: `  ${block.target}`, fg: pal.technical }]),
+        ...connector(hasEvidence || separateStatus ? "│ " : "└─ ", block, pal, clock, 1, length),
+        name,
     ];
-    const right = resultSegments(block, pal, context, now);
-    const leader = movingLeader(width, left, right, pal, context, now);
-    return [
+    const rows = [
         ...(context.continues === true ? [] : [""]),
-        row(width, leader === undefined ? left : [...left, leader], right),
-        ...shown.map(({ detail, sourceIndex }) => renderDetail(detail, block.tone, width, pal, context.reducedMotion === true ? undefined : context.motion?.rowsAt[sourceIndex ?? -1], now)),
+        row(width, [
+            ...connector("┌ ", block, pal, clock, 0, length),
+            { text: block.target || block.name, fg: pal.technical },
+        ]),
+        separateStatus ? row(width, left)
+            : row(Math.min(width, plainLen([...left, ...right]) + 3), left, right),
     ];
-}
-function visibleDetails(block) {
-    const all = block.body ?? [];
-    if (block.expanded === true || all.length === 0) {
-        return all.map((detail, sourceIndex) => ({ detail, sourceIndex }));
-    }
-    if (all.every((detail) => detail.kind === "out")) {
-        const limit = block.tone === "pending" ? LIVE_OUTPUT_ROWS : OUTPUT_ROWS;
-        if (all.length <= limit)
-            return all.map((detail, sourceIndex) => ({ detail, sourceIndex }));
-        const hidden = all.length - limit;
-        const note = block.tone === "pending"
-            ? `… ${all.length} lines so far`
-            : `… ${hidden} earlier lines · ctrl+o expand`;
-        return [
-            { detail: { kind: "gap", text: note } },
-            ...all.slice(-limit).map((detail, index) => ({
-                detail,
-                sourceIndex: all.length - limit + index,
-            })),
-        ];
-    }
-    // A compact transcript audits what changed rather than repeating unchanged
-    // source. One budget covers writes and edits, with both ends retained.
-    const changed = all
-        .map((detail, sourceIndex) => ({ detail, sourceIndex }))
-        .filter(({ detail }) => detail.kind === "add" || detail.kind === "del");
-    if (changed.length <= DIFF_ROWS)
-        return changed;
-    const leading = Math.ceil(DIFF_ROWS / 2);
-    const trailing = DIFF_ROWS - leading;
-    const hidden = changed.length - DIFF_ROWS;
-    return [
-        ...changed.slice(0, leading),
-        {
-            detail: {
-                kind: "gap",
-                text: `… ${hidden} more changed ${hidden === 1 ? "line" : "lines"} · ctrl+o expand`,
-            },
-        },
-        ...changed.slice(-trailing),
-    ];
-}
-function renderDetail(detail, tone, width, pal, arrivedAt, now) {
-    const rail = transcriptLead(width, { text: "│", fg: pal.rule });
-    if (detail.kind === "out") {
-        const base = tone === "fail" || failureLine(detail.text) ? pal.ink.removed : pal.ink.muted;
-        return row(width, [
-            ...rail,
-            { text: detail.text === "" ? " " : detail.text, fg: arrivalInk(base, pal, arrivedAt, now) },
-        ]);
-    }
-    if (detail.kind === "gap") {
-        return row(width, [
-            ...rail,
-            { text: detail.text, fg: arrivalInk(pal.ink.dim, pal, arrivedAt, now), italic: true },
-        ]);
-    }
-    const number = detail.kind === "add" ? detail.newLine : detail.oldLine;
-    const sign = detail.kind === "add" ? "+" : detail.kind === "del" ? "-" : " ";
-    const base = detail.kind === "add"
-        ? pal.ink.added
-        : detail.kind === "del"
-            ? pal.ink.removed
-            : pal.ink.dim;
-    const fg = arrivalInk(base, pal, arrivedAt, now);
-    const tint = detail.kind === "add"
-        ? pal.surface.added
-        : detail.kind === "del"
-            ? pal.surface.removed
-            : undefined;
-    return row(width, [
-        ...rail,
-        { text: sign, fg, bold: detail.kind !== "keep" },
-        { text: `${String(number ?? "").padStart(4)} `, fg: pal.ink.dim },
-        ...emphasized(detail.text, detail.emphasis, fg, tint),
-    ]);
-}
-function emphasized(text, emphasis, fg, bg) {
-    if (emphasis === undefined || emphasis.length <= 0)
-        return [{ text, fg }];
-    const requestedStart = Math.max(0, Math.min(text.length, emphasis.start));
-    const requestedEnd = Math.max(requestedStart, Math.min(text.length, requestedStart + emphasis.length));
-    const start = graphemeFloor(text, requestedStart);
-    const end = graphemeCeiling(text, requestedEnd);
-    if (start === end)
-        return [{ text, fg }];
-    return [
-        ...(start === 0 ? [] : [{ text: text.slice(0, start), fg }]),
-        { text: text.slice(start, end), fg, bg, bold: true },
-        ...(end === text.length ? [] : [{ text: text.slice(end), fg }]),
-    ];
-}
-function toolName(block, width) {
-    if (width < TOOL_COLUMNS_AT || block.target === "")
-        return block.name;
-    return block.name.padEnd(TOOL_NAME_COLS);
-}
-function stateGlyph(block, context, now) {
-    if (block.tone === "pending") {
-        if (block.startedAt === undefined || block.right !== "running")
-            return "○";
-        if (context.reducedMotion === true)
-            return "○";
-        return SPINNER[Math.floor(now / SPINNER_MS) % SPINNER.length] ?? "○";
-    }
-    if (block.tone === "fail")
-        return hasColor() ? "●" : "×";
-    if (block.tone === "deny")
-        return "○";
-    return hasColor() ? "●" : "✓";
-}
-function resultSegments(block, pal, context, now) {
-    const status = block.right;
-    const duration = liveDuration(block, now);
-    if (status === "" && duration === "")
-        return [];
-    const ink = resultInk(block, pal, context, now);
-    return [
-        ...(status === "" ? [] : [{ text: status, fg: ink }]),
-        ...(duration === "" ? [] : [{ text: `${status === "" ? "" : " · "}${duration}`, fg: pal.ink.dim }]),
-    ];
-}
-function liveDuration(block, now) {
-    if (block.tone === "pending" && block.startedAt !== undefined && block.right === "running") {
-        return toolDuration(Math.max(0, now - block.startedAt), true);
-    }
-    return block.durationMs === undefined ? "" : toolDuration(block.durationMs);
-}
-function stateInk(block, pal, context, now) {
-    if (block.tone === "fail")
-        return pal.ink.removed;
-    if (block.tone === "deny")
-        return pal.ink.attention;
-    if (block.tone === "pending") {
-        if (block.startedAt === undefined || context.reducedMotion === true)
-            return pal.ink.attention;
-        return mix(pal.ink.attention, pal.accent, breathe(now));
-    }
-    return pal.ink.added;
-}
-function resultInk(block, pal, context, now) {
-    return block.tone === "ok" ? pal.ink.muted : stateInk(block, pal, context, now);
-}
-function birthInk(final, initial, context, now) {
-    if (context.reducedMotion === true || context.motion === undefined)
-        return final;
-    return mix(initial, final, easeOut(interval(now, context.motion.bornAt, TOOL_BIRTH_MS)));
-}
-function arrivalInk(base, pal, arrivedAt, now) {
-    if (arrivedAt === undefined)
-        return base;
-    return mix(pal.ink.bright, base, easeOut(interval(now, arrivedAt, TOOL_ROW_ARRIVAL_MS)));
-}
-function movingLeader(width, left, right, pal, context, now) {
-    if (context.reducedMotion === true || context.motion === undefined || right.length === 0)
-        return undefined;
-    const progress = interval(now, context.motion.bornAt, TOOL_LEADER_MAX_MS);
-    if (progress >= 1)
-        return undefined;
-    const fittedRight = fitSegs(right, width);
-    const gap = width - plainLen(left) - plainLen(fittedRight) - 1;
-    if (gap < 9)
-        return undefined;
-    const cells = Array.from({ length: gap }, () => " ");
-    const travelCells = gap - 2;
-    const trail = Math.min(7, travelCells);
-    const travel = travelCells + trail;
-    const head = Math.floor(easeInOut(progress) * travel) - trail;
-    for (let offset = 0; offset < trail; offset++) {
-        const at = head + offset;
-        if (at >= 0 && at < travelCells)
-            cells[at + 1] = "·";
-    }
-    return { text: cells.join(""), fg: pal.rule };
-}
-function failureLine(line) {
-    return line.startsWith("✖") || line.startsWith("×") || line.includes("AssertionError") || /\bfailed\b/i.test(line);
+    if (separateStatus)
+        rows.push(row(width, [
+            ...connector(hasEvidence ? "│ " : "└─ ", block, pal, clock, 2, length),
+            ...right,
+        ]));
+    if (!hasEvidence)
+        return rows;
+    if (evidence.summary !== "")
+        rows.push(row(width, [
+            ...connector("│ ", block, pal, clock, summaryAt, length),
+            { text: evidence.summary, fg: pal.ink.muted },
+        ]));
+    rows.push(...evidence.details.map((detail, index) => renderDetail(detail, block.tone, width, pal, block.expanded ? pal.rule : connectorInk(block, pal, clock, detailStart + index, length))));
+    rows.push(row(width, [
+        ...connector("└─", block, pal, clock, length - 1, length),
+        { text: evidence.note === "" ? "" : ` ${evidence.note}`, fg: pal.ink.dim },
+    ]));
+    return rows;
 }

package/dist/tui/feedback.js

@@ -1,4 +1,5 @@
 // Operational feedback belongs in the footer, not in the conversation.
+import { CONVERSATION_LIMITS } from "../conversation.js";
 import { providerLabel } from "../provider-label.js";
 const INFO_MS = 2_200;
 const WARN_MS = 4_200;
@@ -53,6 +54,9 @@ export function turnBlocker(session) {
     if (session.persistence?.failure !== undefined) {
         return { text: "session could not be saved · /new to retry", tone: "error" };
     }
+    if (session.conversation.nodes.length >= CONVERSATION_LIMITS.nodes) {
+        return { text: "conversation reached its session limit · /new to continue", tone: "warn" };
+    }
     const blocked = session.provider.blocked();
     const auth = session.provider.auth;
     const expected = auth.kind === "api-key"

package/dist/tui/help.js

@@ -11,7 +11,7 @@ const CONTROLS = [
     { key: "alt+enter", description: "insert a new line" },
     { key: "esc", description: "close UI or interrupt work" },
     { key: "ctrl+c", description: "interrupt work or exit" },
-    { key: "ctrl+o", description: "toggle reasoning or tool details" },
+    { key: "ctrl+o", description: "expand/collapse reasoning or evidence" },
     { key: "wheel / pgup/dn", description: "scroll the transcript" },
     { key: "ctrl+l", description: "redraw the screen" },
 ];

package/dist/tui/picker-layout.js

@@ -0,0 +1,40 @@
+// Bounded Ribbon composition; filtering and selection remain in picker.ts.
+import { row } from "../ui/render.js";
+import { menuText, renderMenu } from "./components/menu.js";
+import { promptCursor, promptLine } from "./components/prompt.js";
+export function layoutPicker(picker, found, width, pal, maxRows) {
+    const budget = Math.max(0, maxRows);
+    const queryRows = picker.searchable && budget >= 2 ? 1 : 0;
+    const titleRows = picker.title.length > 0 && budget - queryRows >= 2 ? 1 : 0;
+    const controlRows = budget - queryRows - titleRows >= 2 ? 1 : 0;
+    let contextRoom = Math.max(0, budget - queryRows - titleRows - controlRows - 1);
+    const target = menuText(picker.right ?? "", width, Math.min(2, contextRoom));
+    contextRoom -= target.length;
+    const note = menuText(picker.description ?? picker.footer ?? "", width, Math.min(2, contextRoom));
+    const prefix = titleRows + target.length + note.length + queryRows;
+    const menu = renderMenu(found.map(({ option, index }) => ({ ...option, selected: index === picker.index })), width, pal, { maxRows: budget - prefix - controlRows, visible: picker.visible ?? 6 });
+    const progress = found.length > menu.last - menu.first || picker.searchable
+        ? `${found.length === 0 ? "0" : `${menu.first + 1}–${menu.last}`} / ${found.length}` +
+            (found.length === picker.options.length ? "" : ` · ${picker.options.length} total`)
+        : "";
+    const query = picker.query ?? "";
+    const cursor = queryRows === 0 ? undefined : {
+        row: prefix - 1,
+        col: promptCursor(query, query.length, width, { right: progress }).col,
+    };
+    if (pal === undefined)
+        return { rows: [], cursor };
+    const controls = picker.controls ?? (picker.adjust
+        ? "↑↓ move · ←→ change · esc close" : "↑↓ move · enter select · esc close");
+    return {
+        rows: [
+            ...(titleRows === 0 ? [] : [row(width, picker.title, queryRows > 0 || progress === "" ? [] : [{ text: progress, fg: pal.ink.dim }])]),
+            ...[...target, ...note].map((text) => row(width, [{ text, fg: pal.ink.muted }])),
+            ...(queryRows === 0 ? [] : [promptLine(query, query.length, width, pal, {
+                    placeholder: "type to filter", right: progress,
+                }).row]),
+            ...menu.rows,
+            ...(controlRows === 0 ? [] : [row(width, [{ text: controls, fg: pal.ink.dim }])]),
+        ], cursor,
+    };
+}

package/dist/tui/picker.js

@@ -1,9 +1,7 @@
 // One interaction model for every terminal selector.
-import { row } from "../ui/render.js";
-import { elide, graphemes } from "../ui/width.js";
+import { graphemes } from "../ui/width.js";
 import { assertPromptAppend } from "../input-boundary.js";
-import { menuWindow, renderMenuRows } from "./components/menu.js";
-import { promptCursor, promptLine } from "./components/prompt.js";
+import { layoutPicker } from "./picker-layout.js";
 const WINDOW = 6;
 export function move(picker, step) {
     const shown = matches(picker);
@@ -53,74 +51,12 @@ export function byKey(picker, text) {
     const found = picker.options.findIndex((option) => option.key === typed);
     return found === -1 ? undefined : found;
 }
-export function panel(picker, width, pal, maxRows = (picker.visible ?? WINDOW) + 3) {
-    return layout(picker, width, pal, maxRows).rows;
+export function panel(picker, width, pal, maxRows = (picker.visible ?? WINDOW) + 6) {
+    return layoutPicker(picker, matches(picker), width, pal, maxRows).rows;
 }
 /** Caret for the shared query row, relative to the unframed picker body. */
-export function caret(picker, width, maxRows = (picker.visible ?? WINDOW) + 3) {
-    return layout(picker, width, undefined, maxRows).cursor;
-}
-function layout(picker, width, pal, maxRows) {
-    const found = matches(picker);
-    const note = picker.description ?? picker.footer;
-    const hasTitle = picker.title.length > 0;
-    const fixed = (hasTitle ? 1 : 0) +
-        (note === undefined ? 0 : 1) +
-        (picker.searchable === true ? 1 : 0);
-    const optionRoom = Math.max(1, Math.min(picker.visible ?? WINDOW, maxRows - fixed));
-    const selectedAt = Math.max(0, found.findIndex((entry) => entry.index === picker.index));
-    const { first, last } = menuWindow(found.length, selectedAt, optionRoom);
-    const shown = found.slice(first, last);
-    const colors = pal;
-    const options = colors === undefined
-        ? []
-        : shown.length === 0
-            ? [row(width, [{ text: "no matches", fg: colors.ink.muted }])]
-            : renderMenuRows(shown.map(({ option, index }) => ({
-                label: option.label,
-                description: option.description,
-                hint: option.hint,
-                value: option.value,
-                adjustable: option.adjustable,
-                selected: index === picker.index,
-            })), width, colors);
-    const progress = found.length > shown.length || picker.searchable === true
-        ? `${found.length === 0 ? "0" : `${first + 1}–${first + shown.length}`} / ${found.length}` +
-            (found.length === picker.options.length ? "" : ` · ${picker.options.length} total`)
-        : "";
-    const titleRight = hasTitle
-        ? picker.right ?? (picker.searchable === true ? undefined : progress)
-        : undefined;
-    const visibleTitleRight = titleRight === undefined
-        ? undefined
-        : elide(titleRight, Math.max(1, Math.floor(width * 0.55)));
-    const queryRow = picker.searchable === true && colors !== undefined
-        ? promptLine(picker.query ?? "", (picker.query ?? "").length, width, colors, {
-            placeholder: "type to filter",
-            right: progress,
-        })
-        : undefined;
-    const queryCursor = picker.searchable === true
-        ? promptCursor(picker.query ?? "", (picker.query ?? "").length, width, { right: progress })
-        : undefined;
-    const queryOffset = (hasTitle ? 1 : 0) + (note === undefined ? 0 : 1);
-    return {
-        rows: colors === undefined
-            ? []
-            : [
-                ...(hasTitle
-                    ? [row(width, picker.title, visibleTitleRight === undefined || visibleTitleRight === ""
-                            ? []
-                            : [{ text: visibleTitleRight, fg: colors.ink.dim }])]
-                    : []),
-                ...(note === undefined ? [] : [row(width, [{ text: note, fg: colors.ink.muted }])]),
-                ...(queryRow === undefined ? [] : [queryRow.row]),
-                ...options,
-            ],
-        cursor: picker.searchable === true
-            ? { row: queryOffset, col: queryCursor?.col ?? 0 }
-            : undefined,
-    };
+export function caret(picker, width, maxRows = (picker.visible ?? WINDOW) + 6) {
+    return layoutPicker(picker, matches(picker), width, undefined, maxRows).cursor;
 }
 export function heading(label, about, pal) {
     return [
@@ -128,7 +64,7 @@ export function heading(label, about, pal) {
         { text: about, fg: pal.ink.fg },
     ];
 }
-function matches(picker) {
+export function matches(picker) {
     const query = (picker.query ?? "").trim().toLocaleLowerCase();
     return picker.options.flatMap((option, index) => {
         const haystack = `${option.label} ${option.hint ?? ""} ${option.value ?? ""}`.toLocaleLowerCase();

package/dist/tui/session-view.js

@@ -1,6 +1,9 @@
 // Small projections of the live session used by the shell and footer.
 import { credentialSource } from "../credentials.js";
 import { providerFailure } from "../provider-errors.js";
+import { providerRouteLabel } from "../provider-label.js";
+import { providerFailureDetails } from "../providers/failure.js";
+import { requestIdentityForSession } from "../request-identity.js";
 export function controllerOptions(session, contextPolicy, tools = session.tools, steering) {
     return {
         provider: session.provider,
@@ -10,6 +13,7 @@ export function controllerOptions(session, contextPolicy, tools = session.tools,
         maxTokens: session.config.maxTokens,
         contextPolicy,
         effort: session.config.effort,
+        requestIdentity: requestIdentityForSession(session),
         maxModelRequests: session.config.maxModelRequests,
         toolContext: { root: session.config.root },
         ...(steering === undefined ? {} : { steering }),
@@ -18,6 +22,7 @@ export function controllerOptions(session, contextPolicy, tools = session.tools,
 export function footerInfo(session, workspace = session.config.root) {
     return {
         workspace,
+        provider: providerRouteLabel(session.provider),
         model: session.model || "no model",
         effort: session.config.effort,
     };
@@ -26,8 +31,8 @@ export function footerInfo(session, workspace = session.config.root) {
 export function turnFailure(session, error, aborted) {
     if (aborted)
         return { kind: "notice", text: "[interrupted]", tone: "warn" };
-    let text = providerFailure(session.provider, error);
-    if (/\b401\b/.test(text)) {
+    let text = providerFailure(session.provider, error, true);
+    if (providerFailureDetails(session.provider.id, error).kind === "authentication") {
         const auth = session.provider.auth;
         if (auth.kind === "oauth") {
             text += ` · reconnect ${auth.label} in /providers`;