pi-jar 0.2.2 → 0.2.4

package/src/model-roles.ts

@@ -153,6 +153,30 @@ export function describeRole(row: RoleRow): string {
   return row.role + "  ·  " + (row.spec?.startsWith("@") ? row.spec + " → " : "") + target + (row.scope === "project" ? "  · project" : "");
 }
 
+/** Delegated roles meant for a cheaper model than the main session: scouts discover, reviewers check. */
+export const ECONOMY_ROLES = ["scout", "reviewer"] as const;
+
+/**
+ * Economy roles whose subagents run on the main session model although a cheaper model is available, as
+ * jar_delegate picks it: the role's first available candidate, then the default role's, then the current
+ * model. The fix names @smol when the Fast role already points at a cheaper available model.
+ */
+export function premiumRoleWarnings(roles: Pick<ModelRoleManager, "resolveCandidates">, ctx: Pick<ExtensionContext, "model" | "modelRegistry">): string[] {
+  const main = ctx.model;
+  if (!main) return [];
+  const mainId = main.provider + "/" + main.id;
+  const mainPrice = main.cost.input + main.cost.output;
+  const models = ctx.modelRegistry.getAvailable();
+  const cheaper = new Set(models.filter((model) => model.cost.input + model.cost.output < mainPrice).map((model) => model.provider + "/" + model.id));
+  // Without a cheaper option there is nothing to recommend: a main model that is already economical is fine.
+  if (!cheaper.size) return [];
+  const available = new Set(models.map((model) => model.provider + "/" + model.id));
+  const pick = (role: string) => roles.resolveCandidates(role).map((item) => item.provider + "/" + item.model).find((id) => available.has(id));
+  const fix = cheaper.has(pick("smol") ?? "") ? "@smol" : "provider/model";
+  return ECONOMY_ROLES.filter((role) => (pick(role) ?? pick("default") ?? mainId) === mainId)
+    .map((role) => `⚠ ${role} subagents run on the main model ${mainId}; use a mini/haiku-class model: /roles set ${role} ${fix}`);
+}
+
 export class ModelRoleManager {
   private global: RoleConfig = readConfig(join(getAgentDir(), ROLE_FILE));
   private project: RoleConfig = { version: 2, roles: {} };
@@ -392,8 +416,8 @@ export class ModelRoleManager {
         const verb = (parts[0] ?? "").toLowerCase();
         if (!verb || verb === "list") {
           if (!verb && ctx.hasUI && ctx.mode === "tui" && openUi) { await openUi(ctx); return; }
-          ctx.ui.notify(this.list().map((row) => describeRole(row) + (this.fallbackSpecs(row.role).length
-            ? "  · fallbacks: " + this.fallbackSpecs(row.role).join(" → ") : "")).join("\n"), "info");
+          ctx.ui.notify([...this.list().map((row) => describeRole(row) + (this.fallbackSpecs(row.role).length
+            ? "  · fallbacks: " + this.fallbackSpecs(row.role).join(" → ") : "")), ...premiumRoleWarnings(this, ctx)].join("\n"), "info");
           return;
         }
         if (verb === "fallback") {

package/src/panel.ts

@@ -5,7 +5,7 @@ import { RowCache } from "./row-cache.ts";
 export type Paint = (color: string, text: string) => string;
 export interface PanelTab { name: string; render(width: number, fg: Paint): string[] }
 
-/** Tabbed, scrollable info panel (Usage / Context). Tab or click switches tabs; Esc closes. */
+/** Tabbed, scrollable info panel (Usage / Context / Cache). Tab or click switches tabs; Esc closes. */
 export async function openPanel(ctx: ExtensionContext, tabs: readonly PanelTab[], initial = 0): Promise<void> {
   if (!ctx.hasUI || ctx.mode !== "tui") return;
   await ctx.ui.custom<void>((tui, theme, _keys, done) => {

package/src/plan.ts

@@ -11,6 +11,7 @@ import { extractApproachSteps, isSafePlanCommand, PLAN_TEMPLATE, planTextFromSte
 import { cleanText } from "./status.ts";
 import { sessionBranch } from "./session-branch.ts";
 import { type TodoStore } from "./tasks.ts";
+import { setToolActive } from "./tool-activation.ts";
 import { projectWorkflowMessages } from "./workflow-context.ts";
 
 export const PLAN_ENTRY = "pi-jar.plan";
@@ -139,7 +140,8 @@ export class PlanMode {
     this.enabled = true;
     this.pendingReview = false;
     this.reminders = 0;
-    this.toolsBefore = this.pi.getActiveTools();
+    // The submit tool is active only in plan mode; never restore it with the pre-plan loadout.
+    this.toolsBefore = this.pi.getActiveTools().filter((name) => name !== PLAN_SUBMIT_TOOL);
     this.pi.setActiveTools(this.planTools(this.toolsBefore));
     this.onEnter?.(ctx);
     this.restoreRole = await this.roles.activateTemporary("plan", ctx);
@@ -414,7 +416,7 @@ export class PlanMode {
     });
 
     this.pi.on("before_agent_start", async () => {
-      if (!this.enabled) return;
+      if (!this.enabled) { setToolActive(this.pi, PLAN_SUBMIT_TOOL, false); return; }
       return { message: { customType: "pi-jar.plan-context", content: this.context(), display: false } };
     });
 

package/src/profile-ui.ts

@@ -1,5 +1,6 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { JarProfile, ProfileStore } from "./profiles.ts";
+import type { JarVisualSettings } from "./settings.ts";
 
 export type ProfileAction = "create" | "switch";
 
@@ -14,11 +15,16 @@ export interface ProfileUiOptions {
   openRoles(): Promise<void>;
 }
 
+/** Opt-in preset for heavy parallel work: the current settings with a larger retained subagent pool. */
+export const SWARM_SETTINGS = { maxSubagents: 4 } as const satisfies Partial<JarVisualSettings>;
 const CREATE = "+ Create profile…";
+const SWARM = `+ Create Swarm profile (${SWARM_SETTINGS.maxSubagents} subagents)…`;
 const FOLLOW = "Follow Pi";
 
-/** Name and theme are the only creation questions; roles are configured afterwards in the roles UI. */
-export async function promptNewProfile(ctx: ExtensionContext, options: Pick<ProfileUiOptions, "store" | "themes" | "create">): Promise<JarProfile | undefined> {
+/** Name and theme are the only creation questions; roles are configured afterwards in the roles UI.
+ *  A preset patches the copied settings once the copy is saved. */
+export async function promptNewProfile(ctx: ExtensionContext, options: Pick<ProfileUiOptions, "store" | "themes" | "create">,
+  preset?: Partial<JarVisualSettings>): Promise<JarProfile | undefined> {
   const name = await ctx.ui.input("New profile name (1–32 characters)", "");
   if (name === undefined) return undefined;
   if (/[\u0000-\u001f\u007f-\u009f]/.test(name)) { ctx.ui.notify("Profile name cannot contain control characters", "warning"); return undefined; }
@@ -31,21 +37,30 @@ export async function promptNewProfile(ctx: ExtensionContext, options: Pick<Prof
   }
   const selected = await ctx.ui.select("Choose a theme for " + normalized, [FOLLOW, ...options.themes.filter((item) => item !== "follow")]);
   if (!selected) return undefined;
-  try { return options.create(normalized, selected === FOLLOW ? "follow" : selected); }
+  let profile: JarProfile;
+  try { profile = options.create(normalized, selected === FOLLOW ? "follow" : selected); }
   catch (error) { ctx.ui.notify("Could not create profile: " + (error as Error).message, "error"); return undefined; }
+  if (!preset) return profile;
+  try { return options.store.update(profile.name, { settings: { ...profile.settings, ...preset } }); }
+  catch (error) {
+    ctx.ui.notify(`Created profile ${profile.name}, but could not apply its preset: ${(error as Error).message}`, "warning");
+    return profile;
+  }
 }
 
 /** /profiles and the settings Profiles tab: create a profile or switch to one, nothing else. */
 export async function openProfiles(ctx: ExtensionContext, options: ProfileUiOptions, action?: ProfileAction): Promise<void> {
   if (!ctx.hasUI || ctx.mode !== "tui") return;
   const active = options.store.activeName;
+  let preset: Partial<JarVisualSettings> | undefined;
   if (action !== "create") {
     const labels = new Map(options.store.list().map((profile) => [profile.name === active ? `${profile.name} (active)` : profile.name, profile.name]));
-    const choice = await ctx.ui.select(action === "switch" ? "Switch profile" : "Profiles", action === "switch" ? [...labels.keys()] : [CREATE, ...labels.keys()]);
+    const choice = await ctx.ui.select(action === "switch" ? "Switch profile" : "Profiles", action === "switch" ? [...labels.keys()] : [CREATE, SWARM, ...labels.keys()]);
     if (!choice) return;
-    if (choice !== CREATE) { await options.select(labels.get(choice)!); return; }
+    if (choice !== CREATE && choice !== SWARM) { await options.select(labels.get(choice)!); return; }
+    if (choice === SWARM) preset = SWARM_SETTINGS;
   }
-  const profile = await promptNewProfile(ctx, options);
+  const profile = await promptNewProfile(ctx, options, preset);
   if (!profile) return;
   if (options.switchBlocked()) {
     ctx.ui.notify(`Created profile ${profile.name} with ${active}'s model roles. Switch to it in a fresh session with /profiles, then set its roles with /roles.`, "info");

package/src/profiles.ts

@@ -1,7 +1,7 @@
 import { mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { isRoleName, normalizeSpec, parseRoleConfig, type RoleConfig } from "./model-roles.ts";
-import { isMaxSubagents, defaultVisualSettings, loadVisualSettings, type JarVisualSettings } from "./settings.ts";
+import { isMaxSubagents, defaultVisualSettings, loadVisualSettings, parseContextBudget, DEFAULT_CONTEXT_BUDGET, type JarVisualSettings } from "./settings.ts";
 import { ACCENT_NAMES } from "./accent.ts";
 import { FOOTER_FIELDS } from "./footer-settings.ts";
 import { ICON_SETS } from "./icons.ts";
@@ -41,7 +41,10 @@ function normalizeProfile(value: unknown): JarProfile | undefined {
     || !isPlainObject(settings.footer) || typeof settings.animations !== "boolean" || typeof settings.ui !== "boolean"
     || typeof settings.composer !== "boolean" || typeof settings.mascot !== "boolean" || typeof settings.suggestions !== "boolean"
     || typeof settings.advisor !== "boolean" || typeof settings.advisorGates !== "boolean"
-    || (settings.contextDiet !== undefined && typeof settings.contextDiet !== "boolean") || !Number.isInteger(settings.goalRounds)
+    || (settings.contextDiet !== undefined && typeof settings.contextDiet !== "boolean")
+    || (settings.cacheDiagnostics !== undefined && typeof settings.cacheDiagnostics !== "boolean")
+    || (settings.contextBudget !== undefined && !parseContextBudget(settings.contextBudget))
+    || (settings.readCache !== undefined && typeof settings.readCache !== "boolean") || !Number.isInteger(settings.goalRounds)
     || (settings.goalRounds as number) < 1 || (settings.goalRounds as number) > 50
     || !isMaxSubagents(settings.maxSubagents) || typeof settings.accent !== "string"
     || !(settings.accent === "follow" || settings.accent === "default" || ACCENT_NAMES.includes(settings.accent as never))
@@ -50,7 +53,9 @@ function normalizeProfile(value: unknown): JarProfile | undefined {
   if (raw.name === DEFAULT_PROFILE && raw.id !== "default") return undefined;
   if (raw.name !== DEFAULT_PROFILE && (typeof raw.id !== "string" || !/^profile-[a-z0-9-]{8,64}$/.test(raw.id))) return undefined;
   for (const [role, spec] of Object.entries(raw.roles.roles)) if (!isRoleName(role) || typeof spec !== "string" || !normalizeSpec(spec)) return undefined;
-  return { id: raw.id as string, name: raw.name, theme: raw.theme, settings: { ...raw.settings, contextDiet: settings.contextDiet ?? false } as unknown as JarVisualSettings, roles: parseRoleConfig(raw.roles) };
+  const contextBudget = parseContextBudget(settings.contextBudget) ?? { ...DEFAULT_CONTEXT_BUDGET };
+  return { id: raw.id as string, name: raw.name, theme: raw.theme, settings: { ...raw.settings, contextDiet: settings.contextDiet ?? false,
+    cacheDiagnostics: settings.cacheDiagnostics ?? true, contextBudget, readCache: settings.readCache ?? false } as unknown as JarVisualSettings, roles: parseRoleConfig(raw.roles) };
 }
 function atomicSave(file: string, document: ProfileDocument): string {
   mkdirSync(join(file, ".."), { recursive: true });

package/src/quota.ts

@@ -69,57 +69,70 @@ function codexAccountId(token: string): string | undefined {
   } catch { return undefined; }
 }
 
-/** Never persist credentials; resolve through Pi's public model registry only on explicit opt-in. */
+/**
+ * Never persist credentials; resolve through Pi's public model registry only on explicit opt-in.
+ * Resolves undefined only when cancelled; every other miss throws a short, user-facing reason.
+ */
 export async function fetchQuota(provider: QuotaProvider, resolveAuth: (provider: string) => Promise<{ auth: { apiKey?: string }; source?: string } | undefined>, signal: AbortSignal): Promise<Quota | undefined> {
+  const resolved = await resolveAuth(provider);
+  if (signal.aborted) return undefined;
+  if (!resolved?.source?.toLowerCase().includes("oauth") || !resolved.auth.apiKey) throw new Error("needs a subscription login (/login), not an API key");
+  const token = resolved.auth.apiKey;
+  const headers: Record<string, string> = { Authorization: `Bearer ${token}`, Accept: "application/json" };
+  let url: string;
+  if (provider === "openai-codex") {
+    const id = codexAccountId(token);
+    if (!id) throw new Error("login token has no ChatGPT account id");
+    headers["ChatGPT-Account-Id"] = id;
+    url = "https://chatgpt.com/backend-api/wham/usage";
+  } else {
+    headers["anthropic-beta"] = "oauth-2025-04-20";
+    url = "https://api.anthropic.com/api/oauth/usage";
+  }
+  let response: Response;
   try {
-    const resolved = await resolveAuth(provider);
-    if (signal.aborted || !resolved?.source?.toLowerCase().includes("oauth") || !resolved.auth.apiKey) return undefined;
-    const token = resolved.auth.apiKey;
-    const headers: Record<string, string> = { Authorization: `Bearer ${token}`, Accept: "application/json" };
-    let url: string;
-    if (provider === "openai-codex") {
-      const id = codexAccountId(token);
-      if (!id) return undefined;
-      headers["ChatGPT-Account-Id"] = id;
-      url = "https://chatgpt.com/backend-api/wham/usage";
-    } else {
-      headers["anthropic-beta"] = "oauth-2025-04-20";
-      url = "https://api.anthropic.com/api/oauth/usage";
-    }
-    const response = await fetch(url, { method: "GET", headers, signal: AbortSignal.any([signal, AbortSignal.timeout(5000)]) });
-    if (!response.ok) return undefined;
-    const data: unknown = await response.json();
-    if (!data || typeof data !== "object") return undefined;
-    const body = data as Record<string, unknown>;
-    if (provider === "openai-codex") {
-      const rate = body.rate_limit && typeof body.rate_limit === "object" ? body.rate_limit as Record<string, unknown> : {};
-      const parse = (window: unknown): QuotaWindow | undefined => {
-        if (!window || typeof window !== "object") return undefined;
-        const item = window as Record<string, unknown>;
-        return windowValue({ used: item.used_percent, resetsAt: typeof item.reset_at === "number" ? item.reset_at * 1000 : undefined });
-      };
-      // Window slots are not fixed: Plus accounts get a single weekly `primary_window` and a null
-      // secondary. Classify by `limit_window_seconds` (≤ 1 day is the short window), falling back
-      // to position only when the duration is absent.
-      const quota: Quota = {};
-      for (const [window, fallback] of [[rate.primary_window, "fiveHour"], [rate.secondary_window, "week"]] as const) {
-        const value = parse(window);
-        if (!value) continue;
-        const seconds = (window as Record<string, unknown>).limit_window_seconds;
-        const slot = typeof seconds === "number" && seconds > 0 ? (seconds <= 24 * 60 * 60 ? "fiveHour" : "week") : fallback;
-        if (!quota[slot]) quota[slot] = value;
-      }
-      return parseQuota(quota);
+    response = await fetch(url, { method: "GET", headers, signal: AbortSignal.any([signal, AbortSignal.timeout(5000)]) });
+  } catch (error) {
+    if (signal.aborted) return undefined;
+    throw new Error(error instanceof Error && error.name === "TimeoutError" ? "request timed out" : "request failed: " + String(error instanceof Error ? error.message : error));
+  }
+  // The Anthropic usage endpoint is shared with Claude Code and rate-limits aggressively.
+  if (!response.ok) throw new Error(response.status === 429 ? "rate limited by the provider (HTTP 429)" : `HTTP ${response.status}`);
+  const data: unknown = await response.json().catch(() => undefined);
+  if (!data || typeof data !== "object") throw new Error("unreadable usage response");
+  const body = data as Record<string, unknown>;
+  let quota: Quota | undefined;
+  if (provider === "openai-codex") {
+    const rate = body.rate_limit && typeof body.rate_limit === "object" ? body.rate_limit as Record<string, unknown> : {};
+    const parse = (window: unknown): QuotaWindow | undefined => {
+      if (!window || typeof window !== "object") return undefined;
+      const item = window as Record<string, unknown>;
+      return windowValue({ used: item.used_percent, resetsAt: typeof item.reset_at === "number" ? item.reset_at * 1000 : undefined });
+    };
+    // Window slots are not fixed: Plus accounts get a single weekly `primary_window` and a null
+    // secondary. Classify by `limit_window_seconds` (≤ 1 day is the short window), falling back
+    // to position only when the duration is absent.
+    const windows: Quota = {};
+    for (const [window, fallback] of [[rate.primary_window, "fiveHour"], [rate.secondary_window, "week"]] as const) {
+      const value = parse(window);
+      if (!value) continue;
+      const seconds = (window as Record<string, unknown>).limit_window_seconds;
+      const slot = typeof seconds === "number" && seconds > 0 ? (seconds <= 24 * 60 * 60 ? "fiveHour" : "week") : fallback;
+      if (!windows[slot]) windows[slot] = value;
     }
+    quota = parseQuota(windows);
+  } else {
+    // `utilization` is already a percentage (7.0 means 7%), not a fraction.
     const parse = (window: unknown): QuotaWindow | undefined => {
       if (!window || typeof window !== "object") return undefined;
       const item = window as Record<string, unknown>;
-      const utilization = item.utilization;
       const resetsAt = typeof item.resets_at === "string" ? Date.parse(item.resets_at) : undefined;
-      return windowValue({ used: typeof utilization === "number" && utilization <= 1 ? utilization * 100 : utilization, resetsAt });
+      return windowValue({ used: item.utilization, resetsAt });
     };
-    return parseQuota({ fiveHour: parse(body.five_hour), week: parse(body.seven_day) });
-  } catch { return undefined; }
+    quota = parseQuota({ fiveHour: parse(body.five_hour), week: parse(body.seven_day) });
+  }
+  if (!quota) throw new Error("no plan limits in the usage response");
+  return quota;
 }
 
 /**
@@ -128,7 +141,7 @@ export async function fetchQuota(provider: QuotaProvider, resolveAuth: (provider
  * lookups start only from `refresh` at session boundaries.
  */
 export class QuotaCache {
-  private entries = new Map<QuotaProvider, { value?: Quota; requestedAt: number; expiresAt: number; failures: number }>();
+  private entries = new Map<QuotaProvider, { value?: Quota; error?: string; requestedAt: number; expiresAt: number; failures: number }>();
   private pending = new Map<QuotaProvider, AbortController>();
   private requests = 0;
   private failures = 0;
@@ -147,6 +160,12 @@ export class QuotaCache {
     const cached = this.entries.get(provider);
     return cached && cached.expiresAt > now ? cached.value : undefined;
   }
+  /** Why the last lookup failed and when the next may start; undefined while pending, fresh, or never tried. */
+  failure(provider: string | undefined, now: number): { error: string; retryInMs: number } | undefined {
+    if (provider !== "openai-codex" && provider !== "anthropic" || !this.enabled || this.pending.has(provider)) return undefined;
+    const cached = this.entries.get(provider);
+    return cached?.error !== undefined && cached.expiresAt > now ? { error: cached.error, retryInMs: cached.expiresAt - now } : undefined;
+  }
   /** Start one background lookup when nothing fresh is cached and no retry delay is pending; true if it started. */
   refresh(provider: string | undefined, statuses: ReadonlyMap<string, string>, now: number): boolean {
     if (provider !== "openai-codex" && provider !== "anthropic" || !this.enabled) return false;
@@ -167,15 +186,18 @@ export class QuotaCache {
         if (this.pending.get(provider) === controller) this.pending.delete(provider);
         return;
       }
-      // A rejected lookup is a failure like an empty one: both back off instead of retrying at once.
-      void this.fetcher(provider, controller.signal).catch(() => undefined).then((value) => {
+      // A rejected lookup backs off instead of retrying at once; its reason is kept for the usage panel.
+      void this.fetcher(provider, controller.signal).then(
+        (value) => ({ value, error: value ? undefined : "no usage returned" }),
+        (error: unknown) => ({ value: undefined, error: error instanceof Error ? error.message : String(error) })
+      ).then(({ value, error }) => {
         if (controller.signal.aborted) return;
         const failures = value ? 0 : (this.entries.get(provider)?.failures ?? 0) + 1;
         if (!value) this.failures++;
         const ttl = value ? QUOTA_TTL_MS : Math.min(QUOTA_MAX_BACKOFF_MS, QUOTA_TTL_MS * 2 ** (failures - 1));
-        this.entries.set(provider, { ...(value ? { value } : {}), requestedAt: now, expiresAt: now + ttl, failures });
-        // An expired value was already hidden, so only a new value changes what renders show.
-        if (value) this.changed();
+        this.entries.set(provider, { ...(value ? { value } : { error: error ?? "no usage returned" }), requestedAt: now, expiresAt: now + ttl, failures });
+        // Either outcome replaces the "loading" state renders show.
+        this.changed();
       }).finally(() => {
         if (this.pending.get(provider) === controller) this.pending.delete(provider);
       });

package/src/roles-ui.ts

@@ -1,7 +1,7 @@
 import type { ExtensionContext, ThemeColor } from "@earendil-works/pi-coding-agent";
 import { Key, matchesKey, stripTerminalSequences, type TuiMouseEvent } from "@earendil-works/pi-tui";
 import { promptText } from "./dialogs.ts";
-import { isRoleName, normalizeSpec, THINKING, type ModelRoleManager, type RoleRow } from "./model-roles.ts";
+import { isRoleName, normalizeSpec, premiumRoleWarnings, THINKING, type ModelRoleManager, type RoleRow } from "./model-roles.ts";
 import { contentRows, optionList, sidebarWidth, splitFrame } from "./split-view.ts";
 
 type RoleAction = "model" | "fallback" | "alias" | "thinking" | "scope" | "activate" | "clear" | "new" | "delete";
@@ -44,6 +44,8 @@ async function roleScreen(ctx: ExtensionContext, roles: ModelRoleManager, initia
     let layout = { top: 1, rows: 0, leftWidth: 0, bodyX: 2, footerTop: 0 };
     let width = 80;
     const rows = () => roles.list();
+    // Read once per screen: every action closes the screen, and reopening it re-checks against the current model.
+    const warnings = premiumRoleWarnings(roles, ctx);
     const finish = (action: RoleAction) => done({ action, index: selected });
     return {
       invalidate() {},
@@ -98,7 +100,7 @@ async function roleScreen(ctx: ExtensionContext, roles: ModelRoleManager, initia
         const header = narrow ? [theme.fg("accent", `‹ ${selected + 1}/${list.length} ${row.role} ›`)] : [];
         const actions = optionList(theme, ACTIONS.map((item) => item.label), -1, ACTIONS.map((item) => item.hint))
           .map((line, at) => ACTIONS[at]!.action === "delete" && !row.custom ? theme.fg("dim", stripTerminalSequences(line)) : line);
-        const body = [...header, ...info];
+        const body = [...header, ...warnings.map((text) => theme.fg("warning", text)), ...info];
         const split = splitFrame(theme, width, "pi-jar · roles", narrow ? [] : left, body, [
           ...actions,
           theme.fg("dim", "↑↓ choose role · press a key or click an action · Esc close")

package/src/settings-ui.ts

@@ -1,8 +1,9 @@
 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 { formatTokens } from "./context-budget.ts";
 import { ICON_SETS } from "./icons.ts";
-import { GOAL_ROUND_CHOICES, MAX_SUBAGENT_CHOICES, type JarAccent, type JarVisualSettings } from "./settings.ts";
+import { CONTEXT_BUDGET_ACTIONS, CONTEXT_BUDGET_CHOICES, GOAL_ROUND_CHOICES, MAX_SUBAGENT_CHOICES, type JarAccent, type JarVisualSettings } from "./settings.ts";
 import type { ProfileAction } from "./profile-ui.ts";
 
 const LABELS: Record<FooterField, string> = {
@@ -39,10 +40,11 @@ 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))];
-    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" ? 7 : page === "profiles" ? 2 : 7;
-    const finishChoice = () => { selected = choosing === "maxSubagents" ? 3 : 2; choosing = undefined; };
+    let choosing: "goalRounds" | "maxSubagents" | "contextBudget" | undefined;
+    const choices = () => choosing === "maxSubagents" ? MAX_SUBAGENT_CHOICES : choosing === "contextBudget" ? CONTEXT_BUDGET_CHOICES : GOAL_ROUND_CHOICES;
+    const fields = () => choosing ? choices().length : page === "footer" ? FOOTER_FIELDS.length : page === "pi" ? 11 : page === "profiles" ? 2 : 7;
+    // Back on the row that opened the picker.
+    const finishChoice = () => { selected = choosing === "maxSubagents" ? 3 : choosing === "contextBudget" ? 9 : 2; choosing = undefined; };
     const piError = (error: unknown) => ctx.ui.notify("Could not change Pi setting: " + (error as Error).message, "error");
     const explainPool = () => choosing === "maxSubagents" || (page === "pi" && !choosing && selected === 3);
     const pageSize = () => Math.min(fields(), Math.max(4, (process.stdout.rows ?? 24) - (explainPool() ? 10 : 9)));
@@ -52,6 +54,7 @@ export async function openJarSettings(
       const state = current();
       if (choosing) {
         if (choosing === "maxSubagents") update({ ...state, maxSubagents: MAX_SUBAGENT_CHOICES[index]! });
+        else if (choosing === "contextBudget") update({ ...state, contextBudget: { ...state.contextBudget, softTokens: CONTEXT_BUDGET_CHOICES[index]! } });
         else update({ ...state, goalRounds: GOAL_ROUND_CHOICES[index]! });
         finishChoice();
       } else if (page === "profiles") {
@@ -75,6 +78,16 @@ export async function openJarSettings(
         else if (index === 4) update({ ...state, advisor: !state.advisor });
         else if (index === 5) update({ ...state, advisorGates: !state.advisorGates });
         else if (index === 6) update({ ...state, contextDiet: !state.contextDiet });
+        else if (index === 7) update({ ...state, cacheDiagnostics: !state.cacheDiagnostics });
+        else if (index === 8) {
+          const at = CONTEXT_BUDGET_ACTIONS.indexOf(state.contextBudget.action);
+          update({ ...state, contextBudget: { ...state.contextBudget, action: CONTEXT_BUDGET_ACTIONS[(at + 1) % CONTEXT_BUDGET_ACTIONS.length]! } });
+        }
+        else if (index === 9) {
+          choosing = "contextBudget";
+          selected = Math.max(0, CONTEXT_BUDGET_CHOICES.indexOf(state.contextBudget.softTokens as never));
+        }
+        else if (index === 10) update({ ...state, readCache: !state.readCache });
       } else if (index === 0) {
         const at = Math.max(0, accents.indexOf(state.accent));
         update({ ...state, accent: accents[(at + 1) % accents.length]! });
@@ -150,8 +163,10 @@ export async function openJarSettings(
           + (profiles ? "   " + theme.fg(page === "profiles" ? "accent" : "muted", "[ Profiles ]") : ""));
         const prefs = pi?.get();
         const divider = theme.fg("dim", "├" + "─".repeat(Math.max(0, width - 2)) + "┤");
+        const budgetOn = state.contextBudget.action !== "off";
+        const chosen = choosing === "contextBudget" ? state.contextBudget.softTokens : choosing ? state[choosing] : undefined;
         const allRows = choosing
-          ? choices().map((choice, index) => row(index, String(choice), state[choosing!] === choice ? "CURRENT" : "", true))
+          ? choices().map((choice, index) => row(index, choosing === "contextBudget" ? formatTokens(choice) + " tokens" : String(choice), chosen === choice ? "CURRENT" : "", true))
           : page === "footer"
           ? FOOTER_FIELDS.map((field, index) => row(index, LABELS[field], state.footer[field] ? "ON" : "OFF", state.footer[field]))
           : page === "pi" ? [
@@ -161,7 +176,11 @@ export async function openJarSettings(
             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(6, "Context diet (prior-turn reasoning)", state.contextDiet ? "ON" : "OFF", state.contextDiet)
+          row(6, "Context diet (prior-turn reasoning)", state.contextDiet ? "ON" : "OFF", state.contextDiet),
+            row(7, "Cache diagnostics (explain cache breaks)", state.cacheDiagnostics ? "ON" : "OFF", state.cacheDiagnostics),
+            row(8, "Context budget (past the limit)", state.contextBudget.action.toUpperCase(), budgetOn),
+            row(9, "Context budget limit", formatTokens(state.contextBudget.softTokens), budgetOn),
+            row(10, "Repeated-read stub (unchanged re-reads)", state.readCache ? "ON" : "OFF", state.readCache)
           ] : page === "profiles" ? [
             row(0, "Switch profile…", profiles!.activeName(), true),
             row(1, "Create profile…", "OPEN", true)
@@ -178,11 +197,14 @@ export async function openJarSettings(
         const rows = allRows.slice(start, start + pageSize());
         return [top, tabs, divider,
           line(theme.fg("accent", choosing === "maxSubagents" ? " MAX SUBAGENTS · RETAINED LIVE POOL"
+            : choosing === "contextBudget" ? " CONTEXT BUDGET · SOFT LIMIT"
             : choosing === "goalRounds" ? " GOAL AUTO ROUNDS" : page === "footer" ? " FOOTER VISIBILITY" : page === "pi" ? " PI & WORKFLOWS" : page === "profiles" ? " PROFILES" : " 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"
+            : page === "pi" ? (selected === 7 ? " Names what changed when a call re-sent cached context (/cache-breaks)"
+              : selected === 8 || selected === 9 ? " Past the limit: suggest /compact or /new, or compact at a safe point"
+              : selected === 10 ? " An unchanged re-read of the same range returns a short stub" : " Fullscreen mode enables clicks and copy-on-select")
             : page === "profiles" ? " Switch only in a fresh, idle session; roles via /roles" : " Accent cycles through loaded themes")),
           ...rows,
           line(theme.fg("dim", choosing ? " ↑↓: choose · Enter/click: save · Esc: cancel"

package/src/settings.ts

@@ -25,11 +25,31 @@ export interface JarVisualSettings {
   advisorGates: boolean;
   /** Opt-in provider-context pruning of reasoning from completed earlier user turns. */
   contextDiet: boolean;
+  /** Explain prompt-cache breaks: which tool, system section or message changed when a call re-sent cached context. */
+  cacheDiagnostics: boolean;
+  /** Context-size guard: past softTokens, suggest /compact or /new, or compact at the next safe point. */
+  contextBudget: ContextBudget;
+  /** Opt-in: an unchanged repeated `read` of the same range returns a short stub instead of the content. */
+  readCache: boolean;
   /** Glyph set for footer, composer and views: unicode, Nerd Font icons, or plain ascii. */
   icons: IconSet;
   footer: FooterSettings;
 }
 
+export const CONTEXT_BUDGET_ACTIONS = ["off", "suggest", "compact"] as const;
+export type ContextBudgetAction = (typeof CONTEXT_BUDGET_ACTIONS)[number];
+export interface ContextBudget { softTokens: number; action: ContextBudgetAction }
+export const CONTEXT_BUDGET_CHOICES = [80_000, 120_000, 160_000, 200_000] as const;
+export const DEFAULT_CONTEXT_BUDGET: ContextBudget = { softTokens: 120_000, action: "suggest" };
+/** Accepts any stored integer budget in a sane range, not only the picker's choices. */
+export function parseContextBudget(value: unknown): ContextBudget | undefined {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return undefined;
+  const { softTokens, action } = value as Record<string, unknown>;
+  if (typeof softTokens !== "number" || !Number.isInteger(softTokens) || softTokens < 10_000 || softTokens > 2_000_000) return undefined;
+  if (!CONTEXT_BUDGET_ACTIONS.some((choice) => choice === action)) return undefined;
+  return { softTokens, action: action as ContextBudgetAction };
+}
+
 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];
@@ -39,7 +59,7 @@ export function isMaxSubagents(value: unknown): value is MaxSubagents {
 
 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, maxSubagents: 4, advisor: true, advisorGates: true, contextDiet: false, icons: "unicode", footer: { ...footer } };
+  return { version: 1, accent: "follow", animations: true, ui: true, composer: true, mascot: true, suggestions: true, goalRounds: 8, maxSubagents: 2, advisor: true, advisorGates: false, contextDiet: false, cacheDiagnostics: true, contextBudget: { ...DEFAULT_CONTEXT_BUDGET }, readCache: false, icons: "unicode", footer: { ...footer } };
 }
 
 /** Legacy footer choices are imported only while the new file is absent. Never modify the old file. */
@@ -73,6 +93,9 @@ export function loadVisualSettings(directory: string): JarVisualSettings {
     advisor: typeof value.advisor === "boolean" ? value.advisor : fallback.advisor,
     advisorGates: typeof value.advisorGates === "boolean" ? value.advisorGates : fallback.advisorGates,
     contextDiet: typeof value.contextDiet === "boolean" ? value.contextDiet : fallback.contextDiet,
+    cacheDiagnostics: typeof value.cacheDiagnostics === "boolean" ? value.cacheDiagnostics : fallback.cacheDiagnostics,
+    contextBudget: parseContextBudget(value.contextBudget) ?? fallback.contextBudget,
+    readCache: typeof value.readCache === "boolean" ? value.readCache : fallback.readCache,
     icons: ICON_SETS.some((set) => set === value.icons) ? value.icons as IconSet : fallback.icons,
     footer: Object.fromEntries(FOOTER_FIELDS.map((field) => [field,
       typeof footer[field] === "boolean" ? footer[field] : fallback.footer[field]])) as FooterSettings