pi-jar 0.2.8 → 0.3.0

package/src/mascot.ts

@@ -2,35 +2,142 @@ import { FLAME_RAMP, rgb, supportsTruecolor } from "./flame.ts";
 import type { WorkingPhase } from "./working.ts";
 
 /**
- * Ember, the composer's mascot: a tiny flame that perches on the input's top border.
- * Its face sits inside the border and its flickering tips sit on the row above.
+ * Ember's activity state drives a shaded 11×10 pixel pet above the composer.
+ * Short/narrow terminals retain a five-column icon and crown; both layouts have fixed dimensions.
  */
 export type MascotMood = "idle" | "blink" | "happy" | "thinking" | "tool" | "waiting" | "sleepy" | "error" | "complete" | "poke";
 export type MascotPaint = (color: "accent" | "warning" | "error" | "muted" | "dim", text: string) => string;
 
 const FACES: Record<MascotMood, string> = {
-  idle: "•ᴗ•", blink: "-ᴗ-", happy: "^ᴗ^", thinking: "°ᴗ°", tool: ">ᴗ<",
-  waiting: "•o•", sleepy: "-ω-", error: "×_×", complete: "★ᴗ★", poke: "^o^"
+  idle: "▪▄▪", blink: "─▄─", happy: "▀▄▀", thinking: "▪─▪", tool: ">▄<",
+  waiting: "▪o▪", sleepy: "─_─", error: "×_×", complete: "✦▄✦", poke: "▀o▀"
 };
-/** Five-column flame tips drawn above the face; `*` is a spark, `z` a sleepy puff. */
+/** Hand-authored pixel crowns; animation selects frames, never changes layout or allocates a canvas. */
 const TIPS: Record<MascotMood, readonly string[]> = {
-  idle: [" ▴▲▴ ", "  ▲▴ ", " ▴▲  "],
-  blink: [" ▴▲▴ "],
-  happy: [" ▴▲▴ ", "▴ ▲ ▴"],
-  thinking: [" ▴▲∙ ", " ▴▲ ∙", "∙ ▲▴ ", " ∙▲▴ "],
-  tool: [" *▲* ", " ·▲· ", "* ▲ *"],
-  waiting: [" ▴▲▴?", " ▴▲▴ "],
-  sleepy: ["  ▴ z", "  ▴  "],
-  error: [" ˇ▲ˇ ", " ˇ▴ˇ "],
-  complete: [" *★* ", "* ★ *"],
-  poke: ["▴ ▲ ▴", " ▴▲▴ "]
+  idle: [" ▄█▄ ", " ▄▀█ ", " █▀▄ "],
+  blink: [" ▄█▄ "],
+  happy: [" ▄█▄ ", "▄ █ ▄"],
+  thinking: [" ▄█· ", " ▄█ ·", "· █▄ ", " ·█▄ "],
+  tool: [" ·█· ", " ▄█▄ ", "· █ ·"],
+  waiting: [" ▄█▄?", " ▄█▄ "],
+  sleepy: [" ▄zzz"],
+  error: [" ▄▀▄ ", " ▄▄▄ "],
+  complete: [" ·█· ", "· █ ·"],
+  poke: ["▄ █ ▄", " ▄█▄ "]
 };
 export const MASCOT_FACE_WIDTH = 5;
 export const MASCOT_TIP_WIDTH = 5;
 export const SLEEPY_AFTER_MS = 120_000;
+export const MASCOT_FRAME_MS = 600;
 const BLINK_MS = 180;
 
-export function mascotFace(mood: MascotMood): string { return "(" + FACES[mood] + ")"; }
+export function mascotFace(mood: MascotMood): string { return "▐" + FACES[mood] + "▌"; }
+
+/** A static crown for the selected mood; motion-off must not consult mutable activity/timers. */
+export function mascotTip(mood: MascotMood, frame = 0): string {
+  const tips = TIPS[mood];
+  return tips[((frame % tips.length) + tips.length) % tips.length]!;
+}
+
+export const MASCOT_SPRITE_WIDTH = 11;
+export const MASCOT_SPRITE_HEIGHT = 10;
+
+/** A fixed-width mood marker above the pet; an empty row keeps its position stable. */
+export function mascotSpark(mood: MascotMood, frame = 0): string {
+  if (mood === "sleepy") return Math.abs(frame % 2) ? "      zzz  " : "       zzz ";
+  if (mood === "complete") return Math.abs(frame % 2) ? "  ✦     ✦  " : "   ✦   ✦   ";
+  if (mood === "waiting") return "        ?  ";
+  return " ".repeat(MASCOT_SPRITE_WIDTH);
+}
+/** Original Ember artwork: a round, soft ember with a curled flame tuft. Dots are transparent. */
+const BODY = [
+  ".....o.....",
+  "....oho....",
+  "...ohhbo...",
+  "..ohhffbo..",
+  ".ohfffffbo.",
+  "ohfffffffbo",
+  "ohfffffffbo",
+  "offfffffbso",
+  ".osfffffso.",
+  "..ooooooo.."
+] as const;
+/** Outline, shadow, orange body, golden face, highlight, blush, eye, glint and mouth. */
+export const EMBER_PALETTE: Readonly<Record<string, readonly [number, number, number]>> = {
+  o: [113, 42, 18], s: [198, 76, 24], b: [255, 139, 38], f: [255, 197, 79],
+  h: [255, 231, 154], c: [255, 128, 112], k: [58, 28, 20], w: [255, 249, 230], m: [196, 62, 52]
+};
+const EMBER_256: Readonly<Record<string, number>> = { o: 94, s: 166, b: 208, f: 221, h: 229, c: 210, k: 52, w: 230, m: 160 };
+/** Left-eye 3×2 patches; the right eye mirrors them. Idle eyes are small 1×2 beans. */
+const EYES: Record<MascotMood, readonly string[]> = {
+  idle: [".k.", ".k."], blink: ["...", ".k."],
+  happy: [".k.", "k.k"], thinking: ["..k", "..k"],
+  tool: ["kk.", ".k."], waiting: [".k.", ".k."],
+  sleepy: ["...", "kkk"], error: ["k..", ".k."],
+  complete: [".k.", "k.k"], poke: ["kkk", "..."]
+};
+const hopMood = (mood: MascotMood) => mood === "happy" || mood === "complete" || mood === "poke";
+const poseFrame = (frame: number) => ((frame % 4) + 4) % 4;
+const mirror = (rows: readonly string[]) => rows.map(row => [...row].reverse().join(""));
+
+/** Pixel-space frames shared by the terminal renderer and the visual comparison artifact. */
+export function mascotPixels(mood: MascotMood, frame = 0): string[] {
+  const grid = BODY.map(row => [...row]);
+  const stamp = (x: number, y: number, rows: readonly string[]) => {
+    rows.forEach((row, dy) => [...row].forEach((pixel, dx) => {
+      if (pixel !== "." && grid[y + dy]?.[x + dx] !== undefined) grid[y + dy]![x + dx] = pixel;
+    }));
+  };
+  const pose = poseFrame(frame);
+  // The tuft sways while active; the face stays put.
+  if (!["idle", "blink", "sleepy"].includes(mood) && pose % 2 === 1) {
+    for (let y = 0; y < 3; y++) grid[y] = [".", ...grid[y]!.slice(0, -1)];
+  }
+  // Thinking glances right, then left; both eyes look the same way.
+  const eyes = mood === "thinking" && pose >= 2 ? mirror(EYES.thinking) : EYES[mood];
+  const eyeRow = mood === "waiting" ? 4 : 5;
+  stamp(2, eyeRow, eyes);
+  stamp(6, eyeRow, mood === "thinking" ? eyes : mirror(eyes));
+  if (mood === "error") { stamp(1, 7, ["cc"]); stamp(8, 7, ["cc"]); }
+  else { stamp(2, 7, ["c"]); stamp(8, 7, ["c"]); }
+  stamp(5, 7, [hopMood(mood) ? "m" : "k"]);
+  if (mood === "complete") stamp(5, 1, ["w"]);
+  // Squash before a hop; pouting gives a small grounded huff. Never grow the canvas.
+  if ((hopMood(mood) && pose === 1) || (mood === "error" && pose % 2 === 1)) {
+    for (let y = 3; y > 0; y--) grid[y] = [...grid[y - 1]!];
+    grid[0] = Array(MASCOT_SPRITE_WIDTH).fill(".");
+  }
+  return grid.map(row => row.join(""));
+}
+
+/** Two square pixels per terminal cell, like pixel-pet: colored half-blocks, not text-face glyphs. */
+export function mascotSprite(mood: MascotMood, frame = 0, truecolor = supportsTruecolor()): string[] {
+  const pixels = mascotPixels(mood, frame);
+  const color = (pixel: string, background: boolean) => truecolor
+    ? `\x1b[${background ? 48 : 38};2;${EMBER_PALETTE[pixel]!.join(";")}m`
+    : `\x1b[${background ? 48 : 38};5;${EMBER_256[pixel]}m`;
+  const rows: string[] = [];
+  for (let y = 0; y < MASCOT_SPRITE_HEIGHT; y += 2) {
+    let row = "";
+    for (let x = 0; x < MASCOT_SPRITE_WIDTH; x++) {
+      const top = pixels[y]![x]!, bottom = pixels[y + 1]![x]!;
+      row += top === "." && bottom === "." ? " "
+        : top === "." ? color(bottom, false) + "▄\x1b[0m"
+        : bottom === "." ? color(top, false) + "▀\x1b[0m"
+        : color(top, false) + color(bottom, true) + "▀\x1b[0m";
+    }
+    rows.push(row);
+  }
+  return rows;
+}
+
+/** A hop uses the existing spark row as headroom, never moving the editor below it. */
+export function mascotPerch(mood: MascotMood, frame = 0, paint?: MascotPaint, truecolor = supportsTruecolor()): string[] {
+  const sprite = mascotSprite(mood, frame, truecolor);
+  if (hopMood(mood) && poseFrame(frame) === 2) return [...sprite, " ".repeat(MASCOT_SPRITE_WIDTH)];
+  const spark = mascotSpark(mood, frame);
+  return [paint ? paint(mood === "sleepy" ? "dim" : "accent", spark) : spark, ...sprite];
+}
 
 export class Mascot {
   private phase: WorkingPhase = "idle";
@@ -75,8 +182,7 @@ export class Mascot {
   face(now = Date.now()): string { return mascotFace(this.mood(now)); }
 
   tip(now = Date.now(), frame = 0): string {
-    const tips = TIPS[this.mood(now)];
-    return tips[((frame % tips.length) + tips.length) % tips.length]!;
+    return mascotTip(this.mood(now), frame);
   }
 
   /**
@@ -85,7 +191,10 @@ export class Mascot {
    */
   nextTransitionDelay(now = Date.now()): number | undefined {
     const current = this.mood(now);
-    if (this.flashMood && now < this.flashMood.until) return Math.max(16, this.flashMood.until - now);
+    if (this.flashMood && now < this.flashMood.until) {
+      // Only transient reactions need timed pose frames while Pi is idle; stop on expiry.
+      return Math.max(16, Math.min(this.flashMood.until - now, MASCOT_FRAME_MS - now % MASCOT_FRAME_MS));
+    }
     if (this.phase !== "idle") return undefined;
     const sleepyAt = this.lastActive + SLEEPY_AFTER_MS;
     if (now >= sleepyAt) return undefined;
@@ -94,7 +203,10 @@ export class Mascot {
   }
 
   /** Visual identity for change detection (avoids needless renders). */
-  key(now = Date.now(), frame = 0): string { return this.mood(now) + ":" + this.tip(now, frame); }
+  key(now = Date.now(), frame = Math.floor(now / MASCOT_FRAME_MS)): string {
+    const mood = this.mood(now);
+    return mood + ":" + mascotTip(mood, frame) + ":" + mascotPerch(mood, frame).join("");
+  }
 }
 
 /** Colorize the face; truecolor terminals get the flame palette, others theme colors. */
@@ -109,8 +221,8 @@ export function paintTip(tip: string, mood: MascotMood, paint?: MascotPaint, tru
   if (!truecolor) return paint ? paint(mood === "sleepy" ? "dim" : "warning", tip) : tip;
   return [...tip].map((char) => {
     if (char === " ") return char;
-    if (char === "▲" || char === "★") return rgb(mood === "error" ? FLAME_RAMP[5]! : FLAME_RAMP[8]!, char);
-    if (char === "*" || char === "∙" || char === "·") return rgb(FLAME_RAMP[9]!, char);
+    if (char === "█" || char === "▀") return rgb(mood === "error" ? FLAME_RAMP[5]! : FLAME_RAMP[8]!, char);
+    if (char === "·") return rgb(FLAME_RAMP[9]!, char);
     if (char === "z" || char === "?") return rgb(FLAME_RAMP[7]!, char);
     return rgb(mood === "sleepy" ? FLAME_RAMP[4]! : FLAME_RAMP[6]!, char);
   }).join("");

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, parseContextBudget, DEFAULT_CONTEXT_BUDGET, type JarVisualSettings } from "./settings.ts";
+import { isMaxSubagents, defaultVisualSettings, loadVisualSettings, 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,9 +41,7 @@ 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")
     || (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"
@@ -53,9 +51,10 @@ 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;
-  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) };
+  // Removed context controls must not survive a profile switch or subsequent save.
+  const { contextDiet: _diet, contextBudget: _budget, ...supported } = settings;
+  return { id: raw.id as string, name: raw.name, theme: raw.theme, settings: { ...supported,
+    cacheDiagnostics: settings.cacheDiagnostics ?? true, 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/settings-ui.ts

@@ -2,9 +2,8 @@ import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { popup } from "./popup.ts";
 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 { CONTEXT_BUDGET_ACTIONS, CONTEXT_BUDGET_CHOICES, GOAL_ROUND_CHOICES, MAX_SUBAGENT_CHOICES, type JarAccent, type JarVisualSettings } from "./settings.ts";
+import { 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> = {
@@ -41,11 +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" | "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;
+    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" ? 8 : 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 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 explainPool = () => choosing === "maxSubagents" || (page === "pi" && !choosing && selected === 3);
     const pageSize = () => Math.min(fields(), Math.max(4, (process.stdout.rows ?? 24) - (explainPool() ? 10 : 9)));
@@ -55,7 +54,6 @@ 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") {
@@ -78,17 +76,8 @@ 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 === 6) update({ ...state, cacheDiagnostics: !state.cacheDiagnostics });
+        else if (index === 7) 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]! });
@@ -164,10 +153,9 @@ 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 chosen = choosing ? state[choosing] : undefined;
         const allRows = choosing
-          ? choices().map((choice, index) => row(index, choosing === "contextBudget" ? formatTokens(choice) + " tokens" : String(choice), chosen === choice ? "CURRENT" : "", true))
+          ? choices().map((choice, index) => row(index, 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" ? [
@@ -177,11 +165,8 @@ 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(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)
+            row(6, "Cache diagnostics (explain cache breaks)", state.cacheDiagnostics ? "ON" : "OFF", state.cacheDiagnostics),
+            row(7, "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)
@@ -198,14 +183,12 @@ 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" ? (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 === "pi" ? (selected === 6 ? " Names what changed when a call re-sent cached context (/cache-breaks)"
+              : selected === 7 ? " 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

@@ -23,12 +23,8 @@ export interface JarVisualSettings {
   advisor: boolean;
   /** Consult the advisor automatically when the agent repeats a tool call or keeps failing. */
   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. */
@@ -36,20 +32,6 @@ export interface JarVisualSettings {
   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];
@@ -59,7 +41,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: 2, advisor: true, advisorGates: false, contextDiet: false, cacheDiagnostics: true, contextBudget: { ...DEFAULT_CONTEXT_BUDGET }, readCache: 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, cacheDiagnostics: true, readCache: false, icons: "unicode", footer: { ...footer } };
 }
 
 /** Legacy footer choices are imported only while the new file is absent. Never modify the old file. */
@@ -92,9 +74,7 @@ export function loadVisualSettings(directory: string): JarVisualSettings {
     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,
-    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,

package/src/subagent-tools.ts

@@ -1,9 +1,32 @@
-import { readFileSync } from "node:fs";
+import { lstatSync, readFileSync, realpathSync, statSync } from "node:fs";
 import { homedir } from "node:os";
-import { isAbsolute, join, resolve } from "node:path";
+import { basename, dirname, isAbsolute, join, resolve } from "node:path";
 import { workspacePathAllowed } from "./delegate-worktree.ts";
 
 export const CHILD_TOOLS_ENV = "PI_JAR_CHILD_TOOLS";
+export const CHILD_SKILL_READS_ENV = "PI_JAR_CHILD_SKILL_READS";
+
+/** Trusted skill instructions and their relative references; never extension/package roots. */
+export function skillReadRoots(paths: readonly string[]): string[] {
+  return [...new Set(paths.map(path => {
+    const canonical = realpathSync(path);
+    // Retain the trusted spelling: /var and /private/var (or a symlinked skill
+    // install) must both work. workspacePathAllowed resolves its physical boundary.
+    const spelling = resolve(path);
+    return statSync(canonical).isDirectory() || basename(path) !== "SKILL.md" || lstatSync(path).isSymbolicLink()
+      ? spelling : dirname(spelling);
+  }))];
+}
+
+/** Malformed inherited grants fail closed. Parent-owned roots are absolute; the guard resolves their canonical boundary. */
+export function childSkillReadRoots(value: string | undefined): readonly string[] {
+  if (value === undefined) return [];
+  try {
+    const parsed: unknown = JSON.parse(value);
+    if (!Array.isArray(parsed) || parsed.some(path => typeof path !== "string" || !isAbsolute(path) || path.includes("\0"))) return [];
+    return parsed;
+  } catch { return []; }
+}
 export const WEB_TOOLS = ["web_enable", "web_search", "fetch_content", "get_search_content", "source_check"] as const;
 export const RECURSIVE_TOOLS = new Set(["jar_delegate", "jar_subagent", "jar_council"]);
 export const SHELL_TOOLS = new Set(["bash", "powershell", "jar_shell"]);
@@ -71,14 +94,15 @@ export function loadSubagentConfig(directory: string, home = homedir()): Subagen
 }
 
 /** Multi-file tools must validate each effective target, not just the top-level default path. */
-export function worktreeToolViolation(root: string, cwd: string, name: string, args: unknown): string | undefined {
+export function worktreeToolViolation(root: string, cwd: string, name: string, args: unknown, skillRoots: readonly string[] = []): string | undefined {
   if (SHELL_TOOLS.has(name)) return "Sandboxed worktree subagents cannot run shell tools.";
   const pathTools = new Set(["read", "edit", "write", "grep", "find", "ls", "multi_file_edit"]);
   if (!pathTools.has(name)) return;
   if (!workspacePathAllowed(root, cwd, ".")) return "Sandboxed worktree subagent working directory is outside its workspace.";
   const input = args && typeof args === "object" ? args as Record<string, unknown> : {};
   const validate = (value: unknown): string | undefined => {
-    if (typeof value !== "string" || !value || !workspacePathAllowed(root, cwd, value, name === "read")) {
+    const grantedRead = name === "read" && typeof value === "string" && skillRoots.some(skill => workspacePathAllowed(skill, cwd, value, true));
+    if (typeof value !== "string" || !value || (!workspacePathAllowed(root, cwd, value, name === "read") && !grantedRead)) {
       return "Sandboxed worktree subagent cannot access outside its workspace or use an invalid path: " + String(value);
     }
   };

package/src/task-tool.ts

@@ -90,7 +90,8 @@ export function registerTaskTool(
     description: "Maintain session tasks. write sets the complete current plan (omitted tasks are removed; each item has content, status, optional activeForm and one level of `subtasks`, whose completion completes the parent; progress counts leaves). update changes one task by stable id, append adds genuinely new work mid-run (not a new plan), remove deletes one task tree; start/done/open/edit are concise status operations. Stable IDs are returned for every task.",
     promptSnippet: "Track work with 3+ steps or several requests in jar_todo (skip trivial requests and questions): write the complete plan for a new request, start fresh once the old list is completed.",
     promptGuidelines: [
-      "Keep exactly one leaf in_progress; mark it completed right after verifying it. Never batch completions or complete partial, failing or blocked work: keep it open and add a task for the blocker."
+      "Keep exactly one leaf in_progress; mark it completed right after verifying it. Never batch completions or complete partial, failing or blocked work: keep it open and add a task for the blocker.",
+      "After automatic compaction, resume unfinished authorized work from the tracked task state (use jar_todo list when needed). A compaction summary or background-job notification is not task completion. Respect the latest user instructions, explicit stops or pauses, and blockers."
     ],
     parameters: Parameters,
     async execute(_toolCallId, params, _signal, _onUpdate, ctx) {

package/themes/pi-jar-dark-amber.json

@@ -1,6 +1,7 @@
 {
-  "$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+  "$schema": "https://pi.dev/schemas/theme.schema.json",
   "name": "pi-jar-dark-amber",
+  "appearance": "dark",
   "vars": {
     "accent": "#F7B955",
     "blue": "#8DB9FF",

package/themes/pi-jar-dark-azure.json

@@ -1,6 +1,7 @@
 {
-  "$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+  "$schema": "https://pi.dev/schemas/theme.schema.json",
   "name": "pi-jar-dark-azure",
+  "appearance": "dark",
   "vars": {
     "accent": "#75BCFF",
     "blue": "#8DB9FF",

package/themes/pi-jar-dark-gray.json

@@ -1,6 +1,7 @@
 {
-  "$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+  "$schema": "https://pi.dev/schemas/theme.schema.json",
   "name": "pi-jar-dark-gray",
+  "appearance": "dark",
   "vars": {
     "accent": "#D0D9E5",
     "blue": "#8DB9FF",

package/themes/pi-jar-dark-pink.json

@@ -1,6 +1,7 @@
 {
-  "$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+  "$schema": "https://pi.dev/schemas/theme.schema.json",
   "name": "pi-jar-dark-pink",
+  "appearance": "dark",
   "vars": {
     "accent": "#FF88C6",
     "blue": "#8DB9FF",

package/themes/pi-jar-dark-teal.json

@@ -1,6 +1,7 @@
 {
-  "$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+  "$schema": "https://pi.dev/schemas/theme.schema.json",
   "name": "pi-jar-dark-teal",
+  "appearance": "dark",
   "vars": {
     "accent": "#45DDD1",
     "blue": "#8DB9FF",

package/themes/pi-jar-dark-violet.json

@@ -1,6 +1,7 @@
 {
-  "$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+  "$schema": "https://pi.dev/schemas/theme.schema.json",
   "name": "pi-jar-dark-violet",
+  "appearance": "dark",
   "vars": {
     "accent": "#BCA0FF",
     "blue": "#8DB9FF",

package/themes/pi-jar-dark.json

@@ -1,6 +1,7 @@
 {
-  "$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+  "$schema": "https://pi.dev/schemas/theme.schema.json",
   "name": "pi-jar-dark",
+  "appearance": "dark",
   "vars": {
     "accent": "#2DDED0",
     "blue": "#8DB9FF",