pi-jar 0.1.3 → 0.1.5

package/src/settings-ui.ts

@@ -2,7 +2,7 @@ import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { Key, matchesKey, truncateToWidth, visibleWidth, type TuiMouseEvent } from "@earendil-works/pi-tui";
 import { FOOTER_FIELDS, type FooterField } from "./footer-settings.ts";
 import { ICON_SETS } from "./icons.ts";
-import { GOAL_ROUND_CHOICES, type JarAccent, type JarVisualSettings } from "./settings.ts";
+import { GOAL_ROUND_CHOICES, MAX_SUBAGENT_CHOICES, type JarAccent, type JarVisualSettings } from "./settings.ts";
 
 const LABELS: Record<FooterField, string> = {
   model: "Model", effort: "Model effort", sessionName: "Session name", cwd: "Working directory",
@@ -35,25 +35,37 @@ export async function openJarSettings(
     let width = 64;
     const accents: JarAccent[] = ["follow", ...availableAccents.filter((name): name is JarAccent =>
       name === "default" || ["gray", "pink", "teal", "azure", "violet", "amber"].includes(name))];
-    const fields = () => page === "footer" ? FOOTER_FIELDS.length : page === "pi" ? 5 : 7;
+    let choosing: "goalRounds" | "maxSubagents" | undefined;
+    const choices = () => choosing === "maxSubagents" ? MAX_SUBAGENT_CHOICES : GOAL_ROUND_CHOICES;
+    const fields = () => choosing ? choices().length : page === "footer" ? FOOTER_FIELDS.length : page === "pi" ? 6 : 7;
+    const finishChoice = () => { selected = choosing === "maxSubagents" ? 3 : 2; choosing = undefined; };
     const piError = (error: unknown) => ctx.ui.notify("Could not change Pi setting: " + (error as Error).message, "error");
-    const pageSize = () => Math.min(fields(), Math.max(4, (process.stdout.rows ?? 24) - 9));
+    const explainPool = () => choosing === "maxSubagents" || (page === "pi" && !choosing && selected === 3);
+    const pageSize = () => Math.min(fields(), Math.max(4, (process.stdout.rows ?? 24) - (explainPool() ? 10 : 9)));
     const firstVisible = () => Math.min(Math.max(0, selected - pageSize() + 1), Math.max(0, fields() - pageSize()));
     const visibleCount = () => Math.min(pageSize(), fields());
     const apply = (index: number) => {
       const state = current();
-      if (page === "footer") {
+      if (choosing) {
+        if (choosing === "maxSubagents") update({ ...state, maxSubagents: MAX_SUBAGENT_CHOICES[index]! });
+        else update({ ...state, goalRounds: GOAL_ROUND_CHOICES[index]! });
+        finishChoice();
+      } else if (page === "footer") {
         const field = FOOTER_FIELDS[index];
         if (field) update({ ...state, footer: { ...state.footer, [field]: !state.footer[field] } });
       } else if (page === "pi") {
         if (index === 0 && pi) { try { pi.setFullscreen(!pi.get().fullscreen); ctx.ui.notify("Pi TUI mode saved; restart Pi to apply", "info"); } catch (error) { piError(error); } }
         else if (index === 1 && pi) { try { pi.setCopyOnSelect(!pi.get().copyOnSelect); } catch (error) { piError(error); } }
         else if (index === 2) {
-          const at = GOAL_ROUND_CHOICES.indexOf(state.goalRounds as never);
-          update({ ...state, goalRounds: GOAL_ROUND_CHOICES[(at + 1) % GOAL_ROUND_CHOICES.length]! });
+          choosing = "goalRounds";
+          selected = Math.max(0, GOAL_ROUND_CHOICES.indexOf(state.goalRounds as never));
         }
-        else if (index === 3) update({ ...state, advisor: !state.advisor });
-        else if (index === 4) update({ ...state, advisorGates: !state.advisorGates });
+        else if (index === 3) {
+          choosing = "maxSubagents";
+          selected = Math.max(0, MAX_SUBAGENT_CHOICES.indexOf(state.maxSubagents));
+        }
+        else if (index === 4) update({ ...state, advisor: !state.advisor });
+        else if (index === 5) update({ ...state, advisorGates: !state.advisorGates });
       } else if (index === 0) {
         const at = Math.max(0, accents.indexOf(state.accent));
         update({ ...state, accent: accents[(at + 1) % accents.length]! });
@@ -77,7 +89,12 @@ export async function openJarSettings(
     return {
       invalidate() {},
       handleInput(data: string) {
-        if (matchesKey(data, Key.escape) || data === "q") { done(); return; }
+        if (matchesKey(data, Key.escape) || data === "q") {
+          if (choosing) { finishChoice(); tui.requestRender(); } else done();
+          return;
+        }
+        if (choosing && (matchesKey(data, Key.tab) || matchesKey(data, Key.right)
+          || matchesKey(data, Key.shift("tab")) || matchesKey(data, Key.left))) return;
         if (matchesKey(data, Key.tab) || matchesKey(data, Key.right)) {
           page = PAGES[(PAGES.indexOf(page) + 1) % PAGES.length]!;
           selected = 0;
@@ -97,6 +114,7 @@ export async function openJarSettings(
         if (event.type !== "click" || event.button !== "left") return;
         if (event.y === 0 && event.x >= width - 4) { done(); return { handled: true }; }
         if (event.y === 1) {
+          choosing = undefined;
           if (event.x >= 2 && event.x < Math.min(width - 2, 19)) { page = "appearance"; selected = 0; }
           else if (event.x >= 19 && event.x < Math.min(width - 2, 32)) { page = "footer"; selected = 0; }
           else if (event.x >= 32 && event.x < width - 2) { page = "pi"; selected = 0; }
@@ -111,12 +129,8 @@ export async function openJarSettings(
       render(available: number): string[] {
         width = Math.max(8, available);
         const state = current();
-        const fit = (text: string) => truncateToWidth(text, width);
-        const line = (text: string) => {
-          const inner = Math.max(0, width - 5);
-          const content = truncateToWidth(text, inner);
-          return fit(theme.fg("dim", "│  ") + content + " ".repeat(Math.max(0, inner - visibleWidth(content))) + theme.fg("dim", " │"));
-        };
+        // Rows are assembled from exact-width parts, so one truncate-and-pad pass per row is enough.
+        const line = (text: string) => theme.fg("dim", "│  ") + truncateToWidth(text, Math.max(0, width - 5), "...", true) + theme.fg("dim", " │");
         const title = " pi-jar · settings ";
         const top = theme.fg("accent", "╭─" + truncateToWidth(title, Math.max(0, width - 6))
           + "─".repeat(Math.max(0, width - 4 - visibleWidth(title))) + "×╮");
@@ -125,14 +139,17 @@ export async function openJarSettings(
           + "   " + theme.fg(page === "pi" ? "accent" : "muted", "[ Pi ]"));
         const prefs = pi?.get();
         const divider = theme.fg("dim", "├" + "─".repeat(Math.max(0, width - 2)) + "┤");
-        const allRows = page === "footer"
+        const allRows = choosing
+          ? choices().map((choice, index) => row(index, String(choice), state[choosing!] === choice ? "CURRENT" : "", true))
+          : page === "footer"
           ? FOOTER_FIELDS.map((field, index) => row(index, LABELS[field], state.footer[field] ? "ON" : "OFF", state.footer[field]))
           : page === "pi" ? [
             row(0, "Mouse clicks (Pi fullscreen, restart)", !prefs ? "N/A" : prefs.fullscreen ? "ON" : "OFF", !!prefs?.fullscreen),
             row(1, "Copy on select", !prefs ? "N/A" : prefs.copyOnSelect ? "ON" : "OFF", !!prefs?.copyOnSelect),
             row(2, "Goal auto rounds", String(state.goalRounds), true),
-            row(3, "Advisor (jar_advisor, /advisor)", state.advisor ? "ON" : "OFF", state.advisor),
-            row(4, "Advisor gates (loops, repeated failures)", state.advisorGates ? "ON" : "OFF", state.advisorGates)
+            row(3, "Max subagents (retained live pool)", String(state.maxSubagents), true),
+            row(4, "Advisor (jar_advisor, /advisor)", state.advisor ? "ON" : "OFF", state.advisor),
+            row(5, "Advisor gates (loops, repeated failures)", state.advisorGates ? "ON" : "OFF", state.advisorGates)
           ] : [
             row(0, "Accent", state.accent === "follow" ? "FOLLOW PI" : state.accent.toUpperCase(), true),
             row(1, "Motion", state.animations ? "ON" : "OFF", state.animations),
@@ -144,13 +161,18 @@ export async function openJarSettings(
           ];
         const start = firstVisible();
         const rows = allRows.slice(start, start + pageSize());
-        return [fit(top), tabs, divider,
-          line(theme.fg("accent", page === "footer" ? " FOOTER VISIBILITY" : page === "pi" ? " PI & WORKFLOWS" : " APPEARANCE & MOTION")),
-          line(theme.fg("dim", page === "footer" ? ` Footer fields ${start + 1}–${start + rows.length}/${fields()}`
+        return [top, tabs, divider,
+          line(theme.fg("accent", choosing === "maxSubagents" ? " MAX SUBAGENTS · RETAINED LIVE POOL"
+            : choosing === "goalRounds" ? " GOAL AUTO ROUNDS" : page === "footer" ? " FOOTER VISIBILITY" : page === "pi" ? " PI & WORKFLOWS" : " APPEARANCE & MOTION")),
+          line(theme.fg("dim", explainPool() ? " Live pool includes idle/paused subagents"
+            : choosing ? " Select a value; Enter/click to save, Esc to cancel"
+            : page === "footer" ? ` Footer fields ${start + 1}–${start + rows.length}/${fields()}`
             : page === "pi" ? " Fullscreen mode enables clicks and copy-on-select" : " Accent cycles through loaded themes")),
-          ...rows.map(fit),
-          line(theme.fg("dim", " Tab: section · ↑↓: choose · Enter/click: change · Esc")),
-          fit(theme.fg("dim", "╰" + "─".repeat(Math.max(0, width - 2)) + "╯"))];
+          ...rows,
+          line(theme.fg("dim", choosing ? " ↑↓: choose · Enter/click: save · Esc: cancel"
+            : " Tab: section · ↑↓: choose · Enter/click: change · Esc")),
+          ...(explainPool() ? [line(theme.fg("dim", " Lowering does not terminate existing subagents"))] : []),
+          theme.fg("dim", "╰" + "─".repeat(Math.max(0, width - 2)) + "╯")];
       }
     };
   });

package/src/settings.ts

@@ -17,6 +17,8 @@ export interface JarVisualSettings {
   suggestions: boolean;
   /** Automatic implement/audit rounds per user message while a goal is active. */
   goalRounds: number;
+  /** Retained live subagent pool, including idle/paused agents; lowering does not terminate them. */
+  maxSubagents: MaxSubagents;
   /** The jar_advisor second-opinion tool and /advisor. */
   advisor: boolean;
   /** Consult the advisor automatically when the agent repeats a tool call or keeps failing. */
@@ -27,10 +29,15 @@ export interface JarVisualSettings {
 }
 
 export const GOAL_ROUND_CHOICES = [4, 8, 12, 20] as const;
+export const MAX_SUBAGENT_CHOICES = [2, 4, 6, 8, 16] as const;
+export type MaxSubagents = (typeof MAX_SUBAGENT_CHOICES)[number];
+export function isMaxSubagents(value: unknown): value is MaxSubagents {
+  return MAX_SUBAGENT_CHOICES.some((choice) => choice === value);
+}
 
 export const SETTINGS_FILE = "pi-jar-settings.json";
 export function defaultVisualSettings(footer: FooterSettings = DEFAULT_FOOTER_SETTINGS): JarVisualSettings {
-  return { version: 1, accent: "follow", animations: true, ui: true, composer: true, mascot: true, suggestions: true, goalRounds: 8, advisor: true, advisorGates: true, icons: "unicode", footer: { ...footer } };
+  return { version: 1, accent: "follow", animations: true, ui: true, composer: true, mascot: true, suggestions: true, goalRounds: 8, maxSubagents: 4, advisor: true, advisorGates: true, icons: "unicode", footer: { ...footer } };
 }
 
 /** Legacy footer choices are imported only while the new file is absent. Never modify the old file. */
@@ -60,6 +67,7 @@ export function loadVisualSettings(directory: string): JarVisualSettings {
     suggestions: typeof value.suggestions === "boolean" ? value.suggestions : fallback.suggestions,
     goalRounds: typeof value.goalRounds === "number" && Number.isInteger(value.goalRounds) && value.goalRounds >= 1 && value.goalRounds <= 50
       ? value.goalRounds : fallback.goalRounds,
+    maxSubagents: isMaxSubagents(value.maxSubagents) ? value.maxSubagents : fallback.maxSubagents,
     advisor: typeof value.advisor === "boolean" ? value.advisor : fallback.advisor,
     advisorGates: typeof value.advisorGates === "boolean" ? value.advisorGates : fallback.advisorGates,
     icons: ICON_SETS.some((set) => set === value.icons) ? value.icons as IconSet : fallback.icons,

package/src/shells.ts

@@ -53,10 +53,11 @@ export class ShellManager {
   constructor(onEvent: (event: ShellEvent) => void, spawnShell: typeof spawn = spawn) { this.onEvent = onEvent; this.spawnShell = spawnShell; }
 
   list(): ShellJob[] { return [...this.jobs.values()].map(({ job }) => ({ ...job, lines: [...job.lines] })); }
+  /** Read by the footer on every render: one shallow copy per job, never the output lines. */
   summaries(): Array<Omit<ShellJob, "lines">> {
     return [...this.jobs.values()].map(({ job }) => {
       const { lines: _lines, ...summary } = job;
-      return { ...summary };
+      return summary;
     });
   }
   get(id: string): ShellJob | undefined { const entry = this.jobs.get(id); return entry && { ...entry.job, lines: [...entry.job.lines] }; }

package/src/side-model.ts

@@ -28,33 +28,53 @@ export interface SideAnswer { text: string; model: string }
 
 /**
  * Ask the model assigned to `role` (or the current model) a one-shot question outside the
- * conversation. Throws on a missing model, provider error or empty answer.
+ * conversation. Tries configured fallbacks in order on failure; cancellation never retries.
  */
 export async function askRole(ctx: ExtensionContext, roles: ModelRoleManager, usage: SideUsage | undefined, role: string,
   systemPrompt: string, prompt: string, signal?: AbortSignal): Promise<SideAnswer> {
-  const assigned = roles.resolve(role);
-  const model = assigned ? ctx.modelRegistry.find(assigned.provider, assigned.model) : ctx.model;
-  if (!model) throw new Error(assigned ? `model not found for role ${role}: ${assigned.provider}/${assigned.model}` : "no model selected");
-  const thinking: ThinkingLevel | undefined = assigned?.thinking;
-  const reasoning = thinking && thinking !== "off" ? thinking : undefined;
-  const result = await ctx.modelRegistry.streamSimple(model,
-    { systemPrompt, messages: [{ role: "user", content: prompt, timestamp: Date.now() }] },
-    { ...(reasoning ? { reasoning } : {}), ...(signal ? { signal } : {}) }).result();
-  const name = `${model.provider}/${model.id}`;
-  const cost = result.usage?.cost?.total;
-  usage?.add({ role, model: name, input: result.usage?.input ?? 0, output: result.usage?.output ?? 0, cacheRead: result.usage?.cacheRead ?? 0,
-    cacheWrite: result.usage?.cacheWrite ?? 0, cost: Number.isFinite(cost) ? cost! : 0, at: Date.now() });
-  if (result.stopReason === "error" || result.stopReason === "aborted") throw new Error(result.errorMessage || `${name} ${result.stopReason}`);
-  const MAX_ANSWER_CHARS = 32 * 1024;
-  let text = "";
-  for (const part of result.content) {
-    if (part.type !== "text") continue;
-    const value = (part as { text: string }).text;
-    const room = MAX_ANSWER_CHARS - text.length;
-    if (room <= 0) break;
-    text += value.slice(0, room);
+  const fallbacks = roles.fallbackSpecs?.(role) ?? [];
+  const failures: string[] = [];
+  const tried = new Set<string>();
+  for (const spec of [undefined, ...fallbacks]) {
+    signal?.throwIfAborted();
+    let name = spec ?? role;
+    let aborted = false;
+    try {
+      const assigned = spec === undefined ? roles.resolve(role) : roles.resolveSpec(spec);
+      const model = assigned ? ctx.modelRegistry.find(assigned.provider, assigned.model) : ctx.model;
+      if (!model) throw new Error(assigned ? `model not found for role ${role}: ${assigned.provider}/${assigned.model}` : "no model selected");
+      name = `${model.provider}/${model.id}`;
+      const key = name + ":" + (assigned?.thinking ?? "off");
+      if (tried.has(key)) continue;
+      tried.add(key);
+      const thinking: ThinkingLevel | undefined = assigned?.thinking;
+      const reasoning = thinking && thinking !== "off" ? thinking : undefined;
+      const result = await ctx.modelRegistry.streamSimple(model,
+        { systemPrompt, messages: [{ role: "user", content: prompt, timestamp: Date.now() }] },
+        { ...(reasoning ? { reasoning } : {}), ...(signal ? { signal } : {}) }).result();
+      const cost = result.usage?.cost?.total;
+      usage?.add({ role, model: name, input: result.usage?.input ?? 0, output: result.usage?.output ?? 0, cacheRead: result.usage?.cacheRead ?? 0,
+        cacheWrite: result.usage?.cacheWrite ?? 0, cost: Number.isFinite(cost) ? cost! : 0, at: Date.now() });
+      signal?.throwIfAborted();
+      aborted = result.stopReason === "aborted";
+      if (result.stopReason === "error" || aborted) throw new Error(result.errorMessage || `${name} ${result.stopReason}`);
+      const MAX_ANSWER_CHARS = 32 * 1024;
+      let text = "";
+      for (const part of result.content) {
+        if (part.type !== "text") continue;
+        const value = (part as { text: string }).text;
+        const room = MAX_ANSWER_CHARS - text.length;
+        if (room <= 0) break;
+        text += value.slice(0, room);
+      }
+      text = text.trim();
+      if (!text) throw new Error(`${name} returned an empty answer`);
+      return { text, model: name };
+    } catch (error) {
+      signal?.throwIfAborted();
+      if (aborted || (error instanceof Error && error.name === "AbortError") || !fallbacks.length) throw error;
+      failures.push(`${name}: ${error instanceof Error ? error.message : String(error)}`);
+    }
   }
-  text = text.trim();
-  if (!text) throw new Error(`${name} returned an empty answer`);
-  return { text, model: name };
+  throw new Error(`All models for role ${role} failed:\n${failures.join("\n")}`);
 }

package/src/split-view.ts

@@ -1,4 +1,5 @@
 import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import { RowCache } from "./row-cache.ts";
 
 export interface SplitTheme { fg(color: string, text: string): string }
 
@@ -15,9 +16,14 @@ export interface SplitLayout {
   footerTop: number;
 }
 
-const pad = (text: string, width: number) => {
-  const value = truncateToWidth(text, Math.max(0, width));
-  return value + " ".repeat(Math.max(0, width - visibleWidth(value)));
+/** Padded pane rows: scrolling or one live row re-pads only what changed. */
+const padded = { left: new RowCache(), right: new RowCache(), footer: new RowCache() };
+
+/** The last frame: overlays repaint on every Pi render (including each streamed token) with unchanged rows. */
+let previous: { key: string; left: string[]; right: string[]; footer: string[]; lines: string[]; layout: SplitLayout } | undefined;
+const sameRows = (a: readonly string[], b: readonly string[], rows: number) => {
+  for (let row = 0; row < rows; row++) if ((a[row] ?? "") !== (b[row] ?? "")) return false;
+  return true;
 };
 
 /** Sidebar width for a split view, or 0 when the terminal is too narrow for two panes. */
@@ -34,25 +40,36 @@ export function splitFrame(theme: SplitTheme, width: number, title: string, left
   footer: readonly string[], rows: number, leftWidth = sidebarWidth(width)): { lines: string[]; layout: SplitLayout } {
   const w = Math.max(12, width);
   const dim = (text: string) => theme.fg("dim", text);
-  const heading = " " + title + " ";
-  const top = theme.fg("accent", "╭─" + truncateToWidth(heading, Math.max(0, w - 6)) + "─".repeat(Math.max(0, w - 4 - visibleWidth(truncateToWidth(heading, Math.max(0, w - 6))))) + "×╮");
+  const key = `${w}\0${title}\0${rows}\0${leftWidth}\0${dim("│")}${theme.fg("accent", "╭")}`;
+  if (previous?.key === key && footer.length === previous.footer.length && sameRows(footer, previous.footer, footer.length)
+    && sameRows(left, previous.left, rows) && sameRows(right, previous.right, rows)) {
+    return { lines: previous.lines.slice(), layout: { ...previous.layout } };
+  }
+  const heading = truncateToWidth(" " + title + " ", Math.max(0, w - 6));
+  const top = theme.fg("accent", "╭─" + heading + "─".repeat(Math.max(0, w - 4 - visibleWidth(heading))) + "×╮");
   const lines = [top];
   const split = leftWidth > 0;
   const bodyWidth = split ? w - leftWidth - 6 : w - 4;
+  padded.left.begin(String(leftWidth));
+  padded.right.begin(String(bodyWidth));
+  padded.footer.begin(String(w - 4));
+  // truncateToWidth pads in the pass that measures, so each new row is scanned once.
+  const pad = (cache: RowCache, text: string, cells: number) => cache.get(text, (value) => truncateToWidth(value, Math.max(0, cells), "...", true));
   for (let row = 0; row < rows; row++) {
-    const body = pad(right[row] ?? "", bodyWidth);
+    const body = pad(padded.right, right[row] ?? "", bodyWidth);
     lines.push(split
-      ? dim("│ ") + pad(left[row] ?? "", leftWidth) + dim("│ ") + body + dim(" │")
+      ? dim("│ ") + pad(padded.left, left[row] ?? "", leftWidth) + dim("│ ") + body + dim(" │")
       : dim("│ ") + body + dim(" │"));
   }
   lines.push(dim("├" + (split ? "─".repeat(leftWidth + 1) + "┴" + "─".repeat(Math.max(0, w - leftWidth - 4)) : "─".repeat(w - 2)) + "┤"));
   const footerTop = lines.length;
-  for (const line of footer) lines.push(dim("│ ") + pad(line, w - 4) + dim(" │"));
+  for (const line of footer) lines.push(dim("│ ") + pad(padded.footer, line, w - 4) + dim(" │"));
   lines.push(dim("╰" + "─".repeat(w - 2) + "╯"));
-  return {
-    lines: lines.map((line) => truncateToWidth(line, w)),
-    layout: { top: 1, rows, leftWidth: split ? leftWidth : 0, bodyX: split ? leftWidth + 4 : 2, footerTop }
-  };
+  // Every row is assembled from exact-width parts; only a sidebar too wide for the frame can overflow.
+  const fitted = bodyWidth < 0 ? lines.map((line) => truncateToWidth(line, w)) : lines;
+  const layout = { top: 1, rows, leftWidth: split ? leftWidth : 0, bodyX: split ? leftWidth + 4 : 2, footerTop };
+  previous = { key, left: left.slice(0, rows), right: right.slice(0, rows), footer: footer.slice(), lines: fitted, layout };
+  return { lines: fitted.slice(), layout: { ...layout } };
 }
 
 /** Available content rows for a full-height overlay with `chrome` fixed rows. */

package/src/status.ts

@@ -73,7 +73,8 @@ export function collectStatuses(statuses: ReadonlyMap<string, string>, now: numb
     const id = rawKey.slice(ROLE_PREFIX.length);
     if (!/^[a-z0-9][a-z0-9-]{0,31}$/.test(id)) continue;
     const role = cachedRole(id, rawValue);
-    if (!role || role.expiresAt == null || role.expiresAt <= now || role.expiresAt > now + ROLE_TTL_MS) {
+    const ttl = id.startsWith("delegate-") ? 24 * 60 * 60_000 : ROLE_TTL_MS;
+    if (!role || role.expiresAt == null || role.expiresAt <= now || role.expiresAt > now + ttl) {
       extras.push(`${id}: unavailable`);
       continue;
     }