pi-jar 0.2.9 → 0.3.0

package/src/compact-tools.ts

@@ -13,7 +13,29 @@ import {
 } from "@earendil-works/pi-coding-agent";
 import { Box, Container, Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
-import { isReadStub, readRangeKey, resolveToolPath, type ReadStubDetails } from "./context-diet.ts";
+import { homedir } from "node:os";
+import { join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
+interface ReadStubDetails { unchangedSinceRead: number }
+const isReadStub = (details: unknown): details is ReadStubDetails => !!details && typeof details === "object"
+  && typeof (details as ReadStubDetails).unchangedSinceRead === "number";
+
+/** Match Pi's native read path spelling without probing the filesystem. */
+function resolveToolPath(path: string, cwd: string): string | undefined {
+  let value = path.replace(/[\u00A0\u2000-\u200A\u202F\u205F\u3000]/g, " ");
+  if (value.startsWith("@")) value = value.slice(1);
+  if (value === "~" || value.startsWith("~/")) value = join(homedir(), value.slice(2));
+  else if (value.startsWith("file://")) {
+    try { value = fileURLToPath(value); } catch { return undefined; }
+  }
+  return resolve(cwd, value);
+}
+function readRangeKey(offset: unknown, limit: unknown): string | undefined {
+  const start = offset === undefined ? 1 : typeof offset === "number" ? Math.max(offset, 1) : undefined;
+  if (start === undefined || (limit !== undefined && typeof limit !== "number")) return undefined;
+  return `${start}:${limit ?? ""}`;
+}
 
 type ToolResult = { content: Array<{ type: string; text?: string }>; details?: unknown };
 

package/src/composer.ts

@@ -1,6 +1,6 @@
 import { CustomEditor, type ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { Key, matchesKey, stripTerminalSequences, truncateToWidth, visibleWidth, type EditorComponent, type EditorTheme, type TUI, type TuiMouseEvent } from "@earendil-works/pi-tui";
-import { Mascot, MASCOT_FACE_WIDTH, mascotFace, paintFace, paintTip, type MascotMood } from "./mascot.ts";
+import { Mascot, MASCOT_FACE_WIDTH, MASCOT_SPRITE_WIDTH, MASCOT_FRAME_MS, mascotFace, mascotTip, mascotPerch, paintFace, paintTip, type MascotMood } from "./mascot.ts";
 import type { SuggestionState } from "./suggest.ts";
 import type { WorkingPhase } from "./working.ts";
 import { imageChip, imageInfo, imagePaths } from "./attachments.ts";
@@ -18,7 +18,7 @@ type MouseEvent = Parameters<NonNullable<EditorComponent["handleMouse"]>>[0];
 const PHASE_MOODS: Record<WorkingPhase, readonly MascotMood[]> = {
   idle: ["idle"], generating: ["happy", "thinking"], tool: ["tool"], waiting: ["waiting"]
 };
-export const COMPOSER_ACTIVE_INTERVAL_MS = 600;
+export const COMPOSER_ACTIVE_INTERVAL_MS = MASCOT_FRAME_MS;
 /** How long composer image chips trust a previous filesystem check for the same draft. */
 const ATTACHMENT_RECHECK_MS = 1000;
 /** Plain one-line face for a phase; every phase has the same width. */
@@ -69,7 +69,7 @@ function bottomBorderIndex(lines: readonly string[], visibleRows?: number): numb
 const overflowLabel = (line: string | undefined) => /[↑↓]\s*\d+\s*more/.exec(stripTerminalSequences(line ?? ""))?.[0];
 
 export interface RoundedInputOptions {
-  /** Active profile shown between the mascot and human session title. */
+  /** Active profile shown beside the human session title. */
   profile?: string;
   /** Dim inline suggestion shown after the cursor when the draft is empty. */
   ghost?: string;
@@ -108,9 +108,10 @@ export function roundedInput(lines: string[], width: number, focused: boolean, t
   if (lastFrame?.key === key && lastFrame.border === border && lastFrame.dim === options.dim && sameLines(lastFrame.lines, lines)) return lastFrame.framed.slice();
   const bottom = bottomBorderIndex(lines, options.visibleRows);
   const inner = width - 2;
+  const prefix = icon ? `${icon} · ` : "";
   const meta = profile !== undefined
-    ? `${icon} · (${profile})${session ? " " + cleanText(session, 120) : ""}`
-    : session ? `${icon} · session ${session}` : icon;
+    ? `${prefix}(${profile})${session ? " " + cleanText(session, 120) : ""}`
+    : session ? `${prefix}session ${session}` : icon;
   const title = truncateToWidth(` ${meta} `, width - 3);
   const paintedTitle = options.paintedIcon && title.includes(icon) ? title.replace(icon, options.paintedIcon) : title;
   const above = overflowLabel(lines[0]);
@@ -146,11 +147,11 @@ export function roundedInput(lines: string[], width: number, focused: boolean, t
 
 export interface ComposerDecor {
   /** Title icon width source (plain text). */
-  icon(): string;
+  icon(width: number): string;
   /** Painted icon, or undefined to use theme border colors. */
-  paintedIcon(): string | undefined;
-  /** Flame-tip row above the frame, or undefined when there is no room. */
-  tip(width: number): string | undefined;
+  paintedIcon(width: number): string | undefined;
+  /** Pixel sprite (or compact crown) above the frame, omitted when there is no room. */
+  perch(width: number): readonly string[] | undefined;
   session(): string;
   profile?(): string;
   ghost(): string | undefined;
@@ -180,13 +181,13 @@ class RoundedEditor extends CustomEditor {
   }
 
   /** Let drafts grow to ~60% of the terminal (Pi's editor caps at 30%) before scrolling. */
-  private renderTall(width: number): string[] {
+  private renderTall(width: number, perchRows: number): string[] {
     const self = this as unknown as { tui?: { terminal?: { rows?: number } } };
     const tui = self.tui;
     const rows = tui?.terminal?.rows;
     if (!tui || !rows || !Number.isFinite(rows)) return super.render(width);
     const tall = new Proxy(tui, { get: (target, key, receiver) => key === "terminal"
-      ? new Proxy(target.terminal!, { get: (term, name) => name === "rows" ? rows * 2 : Reflect.get(term, name, term) })
+      ? new Proxy(target.terminal!, { get: (term, name) => name === "rows" ? Math.max(rows, (rows - (perchRows > 1 ? perchRows : 0)) * 2) : Reflect.get(term, name, term) })
       : Reflect.get(target, key, receiver) });
     try {
       self.tui = tall;
@@ -197,26 +198,25 @@ class RoundedEditor extends CustomEditor {
   }
 
   override render(width: number): string[] {
-    const inner = this.renderTall(width < 8 ? width : width - 2);
+    const perch = width >= 8 ? this.decor.perch(width) ?? [] : [];
+    this.tipRows = perch.length;
+    const inner = this.renderTall(width < 8 ? width : width - 2, perch.length);
     const text = this.getText();
     const empty = text === "";
     const below = this.decor.attachments(text);
     const ghost = empty && !this.isShowingAutocomplete() ? this.decor.ghost() : undefined;
     this.ghostShown = !!ghost;
     const visibleRows = (this as unknown as { renderedVisibleLineCount?: number }).renderedVisibleLineCount;
-    const icon = this.decor.icon();
+    const icon = this.decor.icon(width);
     const session = this.decor.session();
     const hint = this.decor.hint();
-    const paintedIcon = this.decor.paintedIcon();
+    const paintedIcon = this.decor.paintedIcon(width);
     const framed = roundedInput(inner, width, this.focused, this.colors, this.paint, icon, session, {
       ...(ghost ? { ghost } : {}), ...(hint ? { hint } : {}), ...(paintedIcon ? { paintedIcon } : {}),
       ...(visibleRows != null ? { visibleRows } : {}), profile: this.decor.profile?.(), dim: this.decor.dim,
       ...(below ? { below } : {})
     });
-    const tip = width >= 8 ? this.decor.tip(width) : undefined;
-    this.tipRows = tip ? 1 : 0;
-    // The tip is a few painted cells; measuring (cached) skips re-segmenting it on every frame.
-    return tip ? [visibleWidth(tip) <= width ? tip : truncateToWidth(tip, width), ...framed] : framed;
+    return [...perch.map(row => visibleWidth(row) <= width ? row : truncateToWidth(row, width)), ...framed];
   }
 
   override handleInput(data: string): void {
@@ -230,7 +230,9 @@ class RoundedEditor extends CustomEditor {
 
   override handleMouse(event: MouseEvent) {
     const y = event.y - this.tipRows;
-    if ((y === 0 || y < 0) && faceColumns(event.x)) {
+    const inPet = y < 0 ? event.x >= 3 && event.x < 3 + (this.tipRows > 1 ? MASCOT_SPRITE_WIDTH : MASCOT_FACE_WIDTH)
+      : y === 0 && this.decor.icon(event.width).startsWith("▐") && faceColumns(event.x);
+    if (inPet) {
       if (event.type === "click" && event.button === "left") { this.decor.poke(); return { handled: true, focus: true }; }
       return undefined;
     }
@@ -278,16 +280,16 @@ class ThemedEditor implements EditorComponent {
     const text = this.base.getText();
     const ghost = text === "" ? this.decor.ghost() : undefined;
     const below = this.decor.attachments(text);
-    const icon = this.decor.icon();
+    const icon = this.decor.icon(width);
     const session = this.decor.session();
-    const paintedIcon = this.decor.paintedIcon();
+    const paintedIcon = this.decor.paintedIcon(width);
     const framed = roundedInput(this.base.render(width < 8 ? width : width - 2), width, this.focused, this.theme, this.paint, icon, session, {
       ...(ghost ? { ghost } : {}), ...(paintedIcon ? { paintedIcon } : {}), profile: this.decor.profile?.(), dim: this.decor.dim,
       ...(below ? { below } : {})
     });
-    const tip = width >= 8 ? this.decor.tip(width) : undefined;
-    this.tipRows = tip ? 1 : 0;
-    return tip ? [visibleWidth(tip) <= width ? tip : truncateToWidth(tip, width), ...framed] : framed;
+    const perch = width >= 8 ? this.decor.perch(width) ?? [] : [];
+    this.tipRows = perch.length;
+    return [...perch.map(row => visibleWidth(row) <= width ? row : truncateToWidth(row, width)), ...framed];
   }
   addToHistory(text: string) { this.base.addToHistory?.(text); }
   insertTextAtCursor(text: string) { this.base.insertTextAtCursor?.(text); }
@@ -297,8 +299,13 @@ class ThemedEditor implements EditorComponent {
   setAutocompleteMaxVisible(value: number) { this.base.setAutocompleteMaxVisible?.(value); }
   handleMouse(event: MouseEvent) {
     const y = event.y - this.tipRows;
+    if ((y < 0 && event.x >= 3 && event.x < 3 + (this.tipRows > 1 ? MASCOT_SPRITE_WIDTH : MASCOT_FACE_WIDTH))
+      || (y === 0 && this.decor.icon(event.width).startsWith("▐") && faceColumns(event.x))) {
+      if (event.type === "click" && event.button === "left") { this.decor.poke(); return { handled: true, focus: true }; }
+      return undefined;
+    }
     if (y < 0) return undefined;
-    return this.base.handleMouse?.({ ...event, y, x: event.x - 1, width: Math.max(1, event.width - 2) });
+    return this.base.handleMouse?.({ ...event, y, x: event.x - 1, width: Math.max(1, event.width - 2), height: Math.max(1, event.height - this.tipRows) });
   }
 }
 
@@ -309,7 +316,6 @@ export class ComposerStyle {
   private tui?: TUI;
   private timer?: ReturnType<typeof setTimeout>;
   private phase: WorkingPhase = "idle";
-  private frame = 0;
   private animations = true;
   private mascotOn = true;
   private session = "";
@@ -324,18 +330,23 @@ export class ComposerStyle {
   private chips?: { text: string; cwd: string; at: number; chips: string[] };
 
   private readonly decor: ComposerDecor = {
-    icon: () => this.mascotOn ? mascotFace(this.animations ? this.mascot.mood() : "idle") : "pi",
-    paintedIcon: () => {
+    icon: (width) => !this.mascotOn ? "pi" : this.fullSprite(width) ? ""
+      : mascotFace(this.animations ? this.mascot.mood() : "idle"),
+    paintedIcon: (width) => {
       if (!this.mascotOn) return undefined;
+      if (this.fullSprite(width)) return undefined;
       const mood = this.animations ? this.mascot.mood() : "idle";
       return paintFace(mascotFace(mood), mood, this.colors ? (color, text) => this.colors!.fg(color, text) : undefined);
     },
-    tip: (width) => {
+    perch: (width) => {
       if (!this.mascotOn || width < 40) return undefined;
       const mood = this.animations ? this.mascot.mood() : "idle";
-      const animationFrame = this.phase === "idle" ? this.frame : Math.floor(Date.now() / COMPOSER_ACTIVE_INTERVAL_MS);
-      const tip = this.animations ? this.mascot.tip(Date.now(), animationFrame) : this.mascot.tip(0, 0);
-      return " ".repeat(3) + paintTip(tip, mood, this.colors ? (color, text) => this.colors!.fg(color, text) : undefined);
+      const frame = this.animations ? Math.floor(Date.now() / COMPOSER_ACTIVE_INTERVAL_MS) : 0;
+      if (this.fullSprite(width)) {
+        return mascotPerch(mood, frame, this.colors ? (color, text) => this.colors!.fg(color, text) : undefined)
+          .map(row => "   " + row);
+      }
+      return ["   " + paintTip(mascotTip(mood, frame), mood, this.colors ? (color, text) => this.colors!.fg(color, text) : undefined)];
     },
     session: () => this.session,
     profile: () => this.profile,
@@ -363,6 +374,11 @@ export class ComposerStyle {
     }
   };
 
+  /** Keep short/narrow terminals usable; the pet and mood spark reserve six rows. */
+  private fullSprite(width: number): boolean {
+    return width >= 60 && (this.tui?.terminal?.rows ?? process.stdout.rows ?? 24) >= 24;
+  }
+
   /** Share the suggestion state rendered as ghost text. */
   attachSuggestions(state: SuggestionState): void {
     this.unsubscribe?.();
@@ -398,7 +414,6 @@ export class ComposerStyle {
     if (!changed) return;
     this.phase = phase;
     this.animations = animations;
-    this.frame = 0;
     this.restartTimer();
     if (this.enabled) this.tui?.requestRender();
   }
@@ -406,12 +421,12 @@ export class ComposerStyle {
   /**
    * Pi's own streaming/tool updates already repaint active sessions. Never add another active
    * animation loop: active frames derive from wall time when Pi naturally renders. Idle only
-   * schedules exact blink/sleep/flash transitions.
+   * schedules exact blink/sleep transitions and bounded reaction frames until a flash expires.
    */
   private restartTimer(): void {
     this.stopTimer();
     if (!this.enabled || !this.animations || !this.mascotOn) return;
-    this.lastKey = this.mascot.key(Date.now(), this.frame);
+    this.lastKey = this.mascot.key();
     this.scheduleTimer();
   }
   private scheduleTimer(): void {
@@ -420,8 +435,7 @@ export class ComposerStyle {
     if (delay === undefined) return;
     this.timer = setTimeout(() => {
       this.timer = undefined;
-      this.frame++;
-      const key = this.mascot.key(Date.now(), this.frame);
+      const key = this.mascot.key();
       if (key !== this.lastKey) {
         this.lastKey = key;
         this.tui?.requestRender();
@@ -471,7 +485,6 @@ export class ComposerStyle {
     this.stopTimer();
     this.tui = undefined;
     this.phase = "idle";
-    this.frame = 0;
     this.session = "";
     try {
       if (ctx.hasUI && ctx.mode === "tui" && this.owner && ctx.ui.getEditorComponent() === this.owner) {

package/src/delegate.ts

@@ -1,6 +1,6 @@
 import { spawn, type ChildProcess } from "node:child_process";
 import { signalProcessTree } from "./async-process.ts";
-import { CHILD_TOOLS_ENV, EMPTY_SUBAGENT_CONFIG, parseRules, RECURSIVE_TOOLS, SHELL_TOOLS, SUBAGENT_CONFIG_FILE, WEB_TOOLS, type RuleList, type SubagentConfig } from "./subagent-tools.ts";
+import { CHILD_SKILL_READS_ENV, CHILD_TOOLS_ENV, skillReadRoots, EMPTY_SUBAGENT_CONFIG, parseRules, RECURSIVE_TOOLS, SHELL_TOOLS, SUBAGENT_CONFIG_FILE, WEB_TOOLS, type RuleList, type SubagentConfig } from "./subagent-tools.ts";
 import { planExtensions, planSkills, type ExtensionPlan, type ResourceCatalog } from "./subagent-resources.ts";
 import { existsSync, mkdtempSync, realpathSync } from "node:fs";
 import { rm } from "node:fs/promises";
@@ -710,7 +710,7 @@ export function startDelegate(run: DelegateRun, args: string[], prompt: string,
     let child: ChildProcess;
     try {
       const env = { ...process.env };
-      for (const key of [CHILD_BASELINE_ENV, CHILD_WORKTREE_ENV, CHILD_TOOLS_ENV, ...DISCUSSION_ENV_KEYS]) delete env[key];
+      for (const key of [CHILD_BASELINE_ENV, CHILD_WORKTREE_ENV, CHILD_TOOLS_ENV, CHILD_SKILL_READS_ENV, ...DISCUSSION_ENV_KEYS]) delete env[key];
       child = spawnProcess(invocation.command, invocation.args, { cwd, shell: false, detached: process.platform !== "win32", stdio: ["pipe", "pipe", "pipe"], env: { ...env, ...hooks.env?.(), [CHILD_ENV]: "1" } });
     } catch (error) {
       finish("failed", error instanceof Error ? error.message : String(error));
@@ -1387,12 +1387,20 @@ export function registerDelegate(pi: ExtensionAPI, roles: ModelRoleManager, regi
   pi.on?.("before_agent_start", (_event, ctx) => {
     controllerContext = ctx;
     const retained = registry.records().filter((record) => isRetained(record.run.state));
-    if (!retained.length) return;
+    // Give routing guidance before the first delegation, not only after a fleet exists.
+    // Stable system text avoids accumulating another hidden transcript message on every prompt.
+    const systemPrompt = _event.systemPrompt + "\n\n" + [
+      "[PI-JAR DELEGATION]",
+      "For substantial work, identify independent, bounded tasks before starting tool-heavy implementation. Use jar_delegate when parallel ownership saves work; do small, tightly coupled tasks directly. Do not invent a tool-call count or delegate merely to fill the pool.",
+      "Use scout for fresh research, external documentation and cross-repository discovery; fork for read-only review with conversation context; worktree only for isolated implementation. Worktrees cannot use shells or arbitrary paths outside their workspace. Research inaccessible references with a scout or the main agent, then send relevant findings to the worker.",
+      "Grant needed active tools and skills per task, respecting user allowlists/disallows. Reuse retained agents, avoid duplicate work and polling, and stop worktree agents to reconcile changes before verifying them."
+    ].join("\n");
+    if (!retained.length) return { systemPrompt };
     const fleet = retained.map((record) => {
       const unread = discussionUnread(record.key);
       return `- ${record.key} · ${record.run.name} · ${record.run.state}${unread ? ` · ${plural(unread, "unread discussion message")}` : ""} · ${record.run.role}: ${cleanText(record.run.task, 140)}`;
     }).join("\n");
-    return { message: { customType: "pi-jar.moderator-context", display: false, content: [
+    return { systemPrompt, message: { customType: "pi-jar.moderator-context", display: false, content: [
       "[PI-JAR MODERATOR MODE]",
       "Retained subagents own their delegated tasks: don't duplicate their work. Their turn ends and ask/pause/stop results arrive as pi-jar.subagent events; an accepted receipt is not completion, so keep working and never poll peek.",
       "Hibernated agents are idle with the process closed; resume and ask relaunch them intact. Stop finished workers to reconcile worktree changes into /diff, then synthesize from their reports.",
@@ -1491,7 +1499,7 @@ export function registerDelegate(pi: ExtensionAPI, roles: ModelRoleManager, regi
     description: `Start retained subagents and return immediately; the pool limit counts idle, paused and hibernated agents. fork and worktree inherit this conversation; a worktree's isolated Git changes reach /diff only when you stop it, and at most ${RECOVERY_LIMIT} worktree workspaces may be active or awaiting recovery (resolve with jar_subagent stop or discard). Turn completions arrive as pi-jar.subagent events with a short summary and changed files; jar_subagent report returns a full report. Settled agents hibernate (process closed, context kept) until resumed.`,
     promptSnippet: "Start retained parallel subagents: scout (cheap read-only discovery), fork (read-only review with your context), worktree (isolated implementation).",
     promptGuidelines: [
-      "Delegate only when there are ≥2 independent chunks that each need ≥10 tool calls; otherwise do the work yourself.",
+      "Delegate substantial independent tasks when parallel ownership saves work; handle small or tightly coupled tasks directly. Choose scout for external research, fork for contextual read-only review, and worktree for isolated edits; worktree agents cannot use shells or arbitrary external paths.",
       "After delegating, moderate: completions arrive as pi-jar.subagent events, so keep working and never poll; don't redo delegated work; reuse retained agents (jar_subagent resume) instead of spawning; stop finished workers to apply worktree changes into /diff."
     ],
     parameters: Parameters,
@@ -1564,7 +1572,8 @@ export function registerDelegate(pi: ExtensionAPI, roles: ModelRoleManager, regi
       let extensionPlan: ExtensionPlan | undefined;
       const skillPlans: Array<readonly string[] | undefined> = requested.map(() => undefined);
       const ruled = (rules: RuleList) => rules.allow.length > 0 || rules.deny.length > 0;
-      if (ruled(config.extensions) || ruled(config.skills) || skillRules.some(Boolean)) {
+      if (ruled(config.extensions) || ruled(config.skills) || skillRules.some(Boolean)
+        || (options.loadResources && requested.some(item => (item.mode ?? params.mode) === "worktree"))) {
         if (!options.loadResources) {
           return { content: [{ type: "text", text: "This Pi host cannot resolve extensions/skills for subagents; remove extension/skill rules." }], details: { runs: [], write: false }, isError: true };
         }
@@ -1576,7 +1585,11 @@ export function registerDelegate(pi: ExtensionAPI, roles: ModelRoleManager, regi
           return { content: [{ type: "text", text: `Cannot plan subagent extensions: ${(error as Error).message}` }], details: { runs: [], write: false }, isError: true };
         }
         for (const [index, rules] of skillRules.entries()) {
-          try { skillPlans[index] = planSkills(config.skills, rules, catalog, SUBAGENT_CONFIG_FILE); }
+          try {
+            skillPlans[index] = planSkills(config.skills, rules, catalog, SUBAGENT_CONFIG_FILE);
+            if ((requested[index]!.mode ?? params.mode) === "worktree" && skillPlans[index] === undefined)
+              skillPlans[index] = catalog.skills.filter(resource => resource.enabled).map(resource => resource.path);
+          }
           catch (error) {
             return { content: [{ type: "text", text: `Task ${index + 1}: ${(error as Error).message}` }], details: { runs: [], write: false }, isError: true };
           }
@@ -1751,6 +1764,7 @@ export function registerDelegate(pi: ExtensionAPI, roles: ModelRoleManager, regi
             run.workspace = worktree.root;
             cwd = worktree.cwd;
             env[CHILD_WORKTREE_ENV] = worktree.root;
+            env[CHILD_SKILL_READS_ENV] = JSON.stringify(skillReadRoots(skillPlans[run.index - 1] ?? []));
           } catch (error) {
             await cleanupPrivate(run.index, true);
             if (discarded.has(index) || stopRequested.has(index)) markStartStopped(run);

package/src/diff-inline.ts

@@ -61,20 +61,28 @@ const INVERSE_ON = "\x1b[7m";
 const INVERSE_OFF = "\x1b[27m";
 
 /**
- * Insert inverse-video markers around `spans` of the visible text inside an SGR-styled string.
+ * Insert emphasis markers around `spans` of the visible text inside an SGR-styled string.
+ * Defaults to inverse video; background markers can restore the surrounding line tint on exit.
  * Offsets count visible code units, so styling (syntax colours) never shifts the emphasis.
  */
-export function emphasize(styled: string, spans: readonly Span[]): string {
+export function emphasize(styled: string, spans: readonly Span[], markers = { on: INVERSE_ON, off: INVERSE_OFF }): string {
   if (!spans.length) return styled;
   let out = "", visible = 0, span = 0, open = false;
   for (let at = 0; at < styled.length;) {
     SGR.lastIndex = at;
     const escape = SGR.exec(styled);
-    if (escape) { out += escape[0]; at += escape[0].length; continue; }
-    while (span < spans.length && open && visible >= spans[span]![1]) { out += INVERSE_OFF; open = false; span++; }
-    if (span < spans.length && !open && visible >= spans[span]![0]) { out += INVERSE_ON; open = true; }
+    if (escape) {
+      out += escape[0];
+      // Syntax highlighters reset SGR between tokens; keep the changed span visible across them.
+      if (open && (escape[0] === "\x1b[0m" || escape[0] === "\x1b[m"
+        || escape[0] === (markers.on === INVERSE_ON ? INVERSE_OFF : "\x1b[49m"))) out += markers.on;
+      at += escape[0].length;
+      continue;
+    }
+    while (span < spans.length && open && visible >= spans[span]![1]) { out += markers.off; open = false; span++; }
+    if (span < spans.length && !open && visible >= spans[span]![0]) { out += markers.on; open = true; }
     out += styled[at++];
     visible++;
   }
-  return open ? out + INVERSE_OFF : out;
+  return open ? out + markers.off : out;
 }

package/src/diff-view.ts

@@ -57,6 +57,23 @@ export interface DiffPaint {
   syntax?: (text: string) => string | undefined;
   /** SGR background sequence that tints a changed line's text. */
   tint?: (kind: "add" | "remove") => string;
+  /** Stronger SGR background for changed words; absent hooks keep inverse-video emphasis. */
+  strongTint?: (kind: "add" | "remove") => string;
+}
+
+/** OMP-style soft/strong backgrounds, derived from native theme truecolor sequences when available. */
+export function diffBackgrounds(canvas: string, added: string, removed: string): Pick<DiffPaint, "tint" | "strongTint"> | undefined {
+  const rgb = (ansi: string) => {
+    const match = /\x1b\[(?:38|48);2;(\d+);(\d+);(\d+)m/.exec(ansi);
+    return match ? match.slice(1).map(Number) : undefined;
+  };
+  const base = rgb(canvas), add = rgb(added), remove = rgb(removed);
+  if (!base || !add || !remove || [...base, ...add, ...remove].some(value => value > 255)) return undefined;
+  const light = base[0]! * 0.2126 + base[1]! * 0.7152 + base[2]! * 0.0722 > 127;
+  const mix = (color: number[], amount: number) => `\x1b[48;2;${base.map((value, index) => Math.round(value + (color[index]! - value) * amount)).join(";")}m`;
+  const soft = { add: mix(add, light ? 0.24 : 0.18), remove: mix(remove, light ? 0.24 : 0.18) };
+  const strong = { add: mix(add, light ? 0.48 : 0.42), remove: mix(remove, light ? 0.48 : 0.42) };
+  return { tint: kind => soft[kind], strongTint: kind => strong[kind] };
 }
 
 /** Context sizes cycled by ←/→ (and [/]); Infinity shows whole files. */
@@ -93,7 +110,7 @@ export function renderDiffWindow(change: FileChange, width: number, fg: (color:
   const rows = Math.max(1, Math.min(options.rows ?? PREVIEW_WINDOW, PREVIEW_WINDOW));
   const scroll = Math.max(0, options.scroll ?? 0);
   const context = options.context ?? 3;
-  const unified = options.unified !== false;
+  const unified = options.unified === true || width < MIN_SPLIT_WIDTH;
   const wrap = options.wrap === true;
   const paint = options.paint ?? {};
   const total = unified ? diffRowCount(ops, context) : diffSplitRowCount(ops, context);
@@ -113,10 +130,12 @@ export function renderDiffWindow(change: FileChange, width: number, fg: (color:
     const styled = paint.syntax?.(display) ?? fg(KIND_COLOR[kind], display);
     if (bounded || kind === "context" || pair === undefined) return styled;
     const changes = kind === "remove" ? inlineChanges(display, safeLine(pair)) : inlineChanges(safeLine(pair), display);
-    return changes ? emphasize(styled, kind === "remove" ? changes.before : changes.after) : styled;
+    const strong = paint.strongTint?.(kind);
+    return changes ? emphasize(styled, kind === "remove" ? changes.before : changes.after,
+      strong ? { on: strong, off: paint.tint?.(kind) ?? "\x1b[49m" } : undefined) : styled;
   };
   // Rail, numbers and sign, then text truncated or wrapped into the cell; continuation lines keep
-  // the rail only. Truncation emits full resets, so a tint is re-applied after each one.
+  // the rail only. Syntax/wrapping/truncation resets re-apply the surrounding soft tint.
   const cell = (kind: Kind, lead: string, text: string, width: number, pair?: string): string[] => {
     const leadWidth = visibleWidth(lead);
     const textWidth = Math.max(1, width - leadWidth - 2);
@@ -126,7 +145,7 @@ export function renderDiffWindow(change: FileChange, width: number, fg: (color:
     return (wrap ? wrapTextWithAnsi(styled, textWidth) : [truncateToWidth(styled, textWidth, "…")]).map((body, index) => {
       const prefix = index ? " ".repeat(leadWidth + 1) : fg("dim", lead) + fg(KIND_COLOR[kind], SIGN[kind]);
       const content = body + " ".repeat(Math.max(0, textWidth - visibleWidth(body)));
-      return rail + prefix + (tint ? tint + content.replaceAll(RESET, RESET + tint) : content) + RESET;
+      return rail + prefix + (tint ? tint + content.replace(/\x1b\[(?:0|49)?m/g, reset => reset + tint) : content) + RESET;
     });
   };
   const hunkLine = (text: string, hidden: number | undefined) => truncateToWidth(
@@ -149,7 +168,7 @@ export function renderDiffWindow(change: FileChange, width: number, fg: (color:
     : "Coarse preview: replacement groups are approximate."));
   if (!unified) {
     const column = Math.max(8, Math.floor((width - 3) / 2));
-    lines.push(truncateToWidth(fg("accent", "Original"), column, "…", true) + fg("dim", " │ ") + fg("accent", "Updated"));
+    lines.push(truncateToWidth(fg("accent", "Before"), column, "…", true) + fg("dim", " │ ") + fg("accent", "After"));
   }
   // Fill the viewport with whole logical rows; a first row taller than the viewport is clipped.
   let used = 0, shown = 0;
@@ -180,7 +199,7 @@ export async function openDiffView(ctx: ExtensionContext, tracker: ChangeTracker
     let query = "";
     let searchMode = false;
     let fullReview = false;
-    let unified = true;
+    let unified = false;
     let contextIndex = CONTEXT_STEPS.indexOf(3);
     let wrap = false;
     let bodyRows = 0;
@@ -216,7 +235,11 @@ export async function openDiffView(ctx: ExtensionContext, tracker: ChangeTracker
     const paintFor = (change: FileChange): DiffPaint => {
       if (paintCache?.path !== change.path) {
         const language = getLanguageFromPath(change.path);
-        const bg = (theme as { getBgAnsi?: (color: "toolSuccessBg" | "toolErrorBg") => string }).getBgAnsi?.bind(theme);
+        const native = theme as { getBgAnsi?: (color: "toolPendingBg" | "toolSuccessBg" | "toolErrorBg") => string;
+          getFgAnsi?: (color: "toolDiffAdded" | "toolDiffRemoved") => string };
+        const bg = native.getBgAnsi?.bind(theme);
+        const foreground = native.getFgAnsi?.bind(theme);
+        const backgrounds = bg && foreground ? diffBackgrounds(bg("toolPendingBg"), foreground("toolDiffAdded"), foreground("toolDiffRemoved")) : undefined;
         paintCache = { path: change.path, paint: {
           // Per-line highlighting is bounded; very long lines, or a host without Pi's highlighter
           // theme initialised, keep plain diff colours instead of failing the review.
@@ -224,7 +247,7 @@ export async function openDiffView(ctx: ExtensionContext, tracker: ChangeTracker
             if (text.length > 1000) return undefined;
             try { return highlightCode(text, language)[0]; } catch { return undefined; }
           } } : {}),
-          ...(bg ? { tint: (kind: "add" | "remove") => bg(kind === "add" ? "toolSuccessBg" : "toolErrorBg") } : {})
+          ...(backgrounds ?? (bg ? { tint: (kind: "add" | "remove") => bg(kind === "add" ? "toolSuccessBg" : "toolErrorBg") } : {}))
         } };
       }
       return paintCache.paint;
@@ -378,7 +401,7 @@ export async function openDiffView(ctx: ExtensionContext, tracker: ChangeTracker
           ...optionList(theme, ACTIONS.map((item) => item.label), -1, ACTIONS.map((item) => item.key)),
           fg(searchMode ? "accent" : "dim", searchMode ? `/${query} · Enter apply · Esc clear`
             : query ? `/${query} · n/N next match · / new search`
-            : `${SEARCH_HINT} · n/p hunk · t split · ←/→ context (${contextLabel()}) · w wrap${wrap ? " on" : ""} · v full`),
+            : `${SEARCH_HINT} · n/p hunk · t ${unified ? "split" : "unified"} · ←/→ context (${contextLabel()}) · w wrap${wrap ? " on" : ""} · v full`),
           message ? fg(armed ? "warning" : "dim", message) : fg("dim", "↑↓ file · PgUp/PgDn/Home/End scroll · a accept · r revert · Esc close")
         ];
         const split = splitFrame(theme, width, title, list, content.slice(0, bodyRows), footer, bodyRows, listWidth);

package/src/footer.ts

@@ -18,8 +18,6 @@ export interface FooterView extends JarStatus {
   cwd?: string;
   settings?: FooterSettings;
   context: string;
-  /** The last call's prompt is past the context budget: the context metric turns amber. */
-  overBudget?: boolean;
   goal?: string;
   /** pi-jar's own short indicators (changes to review), shown before extras. */
   chips?: readonly string[];
@@ -153,8 +151,6 @@ function footerLines(view: FooterView, width: number, theme: FooterTheme, hits:
   // Context is never dropped; optional metrics move to a second line on medium widths.
   const metrics = [...(show.context ? [context] : []), ...(show.memory && contentWidth >= 90 && memory ? [memory] : []), ...(show.cost && contentWidth >= 52 && cost ? [cost] : []), ...(show.quota && contentWidth >= 90 ? windows : [])];
   let right = theme.fg("dim", metrics.join("  ·  "));
-  // Context always leads the metrics when shown, so only its own color changes past the budget.
-  if (view.overBudget && show.context) right = theme.fg("warning", context) + (metrics.length > 1 ? theme.fg("dim", "  ·  " + metrics.slice(1).join("  ·  ")) : "");
   if (contentWidth < 52 && attention && contentWidth >= 26) {
     const room = Math.max(0, contentWidth - Math.min(visibleWidth(left), 12) - visibleWidth(right) - 4);
     right = theme.fg(primary?.state === "failed" ? "error" : "warning", truncateToWidth(attention, Math.min(room, 14))) + " " + right;