pi-jar 0.1.1 → 0.1.3

package/extensions/index.ts

@@ -1,4 +1,4 @@
-import { getAgentDir, SessionManager, SettingsManager, type ExtensionAPI, type ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { getAgentDir, SessionManager, SettingsManager, type ExtensionAPI, type ExtensionCommandContext, type ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { basename } from "node:path";
 import { execFile } from "node:child_process";
 import { existsSync, readFileSync } from "node:fs";
@@ -9,7 +9,7 @@ import { ComposerStyle } from "../src/composer.ts";
 import { installCompactBuiltinTools } from "../src/compact-tools.ts";
 import { WELCOME_INTERVAL_MS } from "../src/animations.ts";
 import { promptText } from "../src/dialogs.ts";
-import { renderFooter } from "../src/footer.ts";
+import { renderFooterLayout, type ActivityState, type FooterActivity, type FooterHit, type FooterTarget } from "../src/footer.ts";
 import { openJarHistory } from "../src/history-ui.ts";
 import { GOAL_ENTRY, GoalStore } from "../src/goals.ts";
 import { GoalLoop } from "../src/goal-loop.ts";
@@ -27,18 +27,21 @@ import { PlanMode } from "../src/plan.ts";
 import { openRolesUi } from "../src/roles-ui.ts";
 import { registerSuggestions, SuggestionState } from "../src/suggest.ts";
 import { createDemoRoles } from "../src/roles.ts";
-import { ACTIVE_STATES, collectStatuses, type JarRole } from "../src/status.ts";
+import { ACTIVE_STATES, cleanText, collectStatuses, type JarRole } from "../src/status.ts";
 import { manageTasks } from "../src/tasks-ui.ts";
 import { registerTaskTool, todoRow } from "../src/task-tool.ts";
 import { TASK_ENTRY, TodoStore } from "../src/tasks.ts";
 import { formatCost, sessionCost } from "../src/usage.ts";
 import { WorkingState } from "../src/working.ts";
 import { ChangeTracker } from "../src/changes.ts";
-import { registerDelegate } from "../src/delegate.ts";
+import { DelegateRegistry, registerDelegate, type DelegateRun } from "../src/delegate.ts";
+import { openActivityView, type ActivityTarget } from "../src/activity-view.ts";
+import { ICON_SETS, setIconSet, withIcon } from "../src/icons.ts";
 import { collectPrompts, openPromptSearch } from "../src/prompt-search.ts";
-import { ago, recentSessions, type RecentSession } from "../src/session-gallery.ts";
+import { ago, recentSessions, sessionDetails, type RecentSession } from "../src/session-gallery.ts";
+import { clearSessionBranchCache, sessionBranch } from "../src/session-branch.ts";
 import { registerChangeReview } from "../src/diff-view.ts";
-import { openShellsView, registerShells, SHELL_MESSAGE, shellEventMessage, ShellManager, type ShellEvent } from "../src/shells.ts";
+import { registerShells, SHELL_MESSAGE, shellEventMessage, ShellManager, type ShellEvent, type ShellJob } from "../src/shells.ts";
 import { hopefulWelcomeMessage, welcomeHit, welcomeLines, type WelcomeAction } from "../src/welcome.ts";
 
 const WELCOME_KEY = "pi-jar.welcome";
@@ -48,6 +51,9 @@ const VERSION = (() => {
 })();
 /** Ignore the click Pi may synthesize right after a press we already acted on. */
 const WELCOME_CLICK_DEDUPE_MS = 400;
+const LARGE_SESSION_ENTRIES = 800;
+/** Entries Pi writes when a fresh session starts; a branch holding only these has no transcript yet. */
+const SESSION_SETUP_ENTRIES = new Set(["thinking_level_change", "model_change", "session_info"]);
 export default function piJar(pi: ExtensionAPI): void {
   installCompactBuiltinTools(pi);
   let demo = false;
@@ -74,9 +80,7 @@ export default function piJar(pi: ExtensionAPI): void {
   let footerSettings = visualSettings.footer;
   let welcomeStatuses = (): ReadonlyMap<string, string> => new Map();
   const working = new WorkingState();
-  let workingClock: ReturnType<typeof setInterval> | undefined;
   let workingIndicatorKey = "";
-  const stopWorkingClock = () => { if (workingClock) clearInterval(workingClock); workingClock = undefined; };
   let openSettings: (ctx: ExtensionContext) => Promise<void> = async () => {};
   let settingsOpen = false;
 
@@ -131,12 +135,71 @@ export default function piJar(pi: ExtensionAPI): void {
         { triggerTurn: true, deliverAs: "followUp" });
     } catch (error) { console.error("pi-jar: could not deliver shell event", error); }
   };
-  /** Footer indicators owned by pi-jar. */
-  const footerChips = () => {
-    const running = shells?.running() ?? 0;
-    return [...(changeCount ? [`± ${changeCount} file${changeCount === 1 ? "" : "s"} · /diff`] : []),
-      ...(running ? [`⚙ ${running} shell${running === 1 ? "" : "s"}`] : [])];
+  /** Footer indicators owned by pi-jar; live subagents and shells get their own rows. */
+  const footerChips = () => changeCount ? [withIcon("changes", `${changeCount} file${changeCount === 1 ? "" : "s"} · /diff`)] : [];
+  const subagents = new DelegateRegistry();
+  subagents.subscribe(() => footerTui?.requestRender());
+  /** Finished work stays visible briefly so a quick run is not a flicker. */
+  const ACTIVITY_LINGER_MS = 5000;
+  const subagentState = (run: DelegateRun): ActivityState => run.state === "working" ? "running" : run.state === "queued" ? "queued"
+    : run.state === "done" ? "done" : run.error === "stopped" ? "stopped" : "failed";
+  const shellActivityState = (job: Omit<ShellJob, "lines">): ActivityState => job.status === "running" ? "running"
+    : job.status === "killed" ? "stopped" : job.status === "exited" && job.exitCode === 0 ? "done" : "failed";
+  const seconds = (ms: number) => { const s = Math.max(0, Math.round(ms / 1000)); return s < 60 ? `${s}s` : `${Math.floor(s / 60)}m ${s % 60}s`; };
+  const footerActivity = (now: number): FooterActivity[] => {
+    const rows: FooterActivity[] = [];
+    for (const { key, run } of subagents.records()) {
+      if (run.endedAt && now - run.endedAt > ACTIVITY_LINGER_MS) continue;
+      rows.push({ kind: "subagent", id: key, name: run.name, state: subagentState(run),
+        detail: run.error ?? run.activity ?? cleanText(run.task, 120),
+        stats: [run.tools ? `${run.tools} tools` : "", run.startedAt ? seconds((run.endedAt ?? now) - run.startedAt) : ""].filter(Boolean).join(" · ") });
+    }
+    for (const job of shells?.summaries() ?? []) {
+      if (job.endedAt && now - job.endedAt > ACTIVITY_LINGER_MS) continue;
+      // Shell output does not repaint the footer, so show stable facts rather than a stale clock.
+      rows.push({ kind: "shell", id: job.id, name: `${job.id} ${job.name}`, state: shellActivityState(job), detail: job.command,
+        ...(job.watch ? { stats: `watch /${cleanText(job.watch, 20)}/` + (job.matched ? " ✓" : "") } : {}) });
+    }
+    return rows;
+  };
+  let overlayOpen = false;
+  /** Subagents, shells and other extensions' roles in one live split view. */
+  const openActivity = async (ctx: ExtensionContext, initial?: ActivityTarget) => {
+    if (!ctx.hasUI || ctx.mode !== "tui" || overlayOpen) return;
+    overlayOpen = true;
+    try {
+      await openActivityView(ctx, {
+        subagents, ...(shells ? { shells } : {}),
+        roles: () => collectStatuses(welcomeStatuses(), Date.now()).roles.filter((role) => !role.id.startsWith("delegate-"))
+          .map((role) => ({ id: role.id, name: role.name, state: role.state, ...(role.task ? { task: role.task } : {}) }))
+      }, initial);
+    } finally { overlayOpen = false; }
+  };
+  /** Searchable project sessions with a details pane; Enter resumes the selected one. */
+  const openSessions = async (ctx: ExtensionContext | ExtensionCommandContext, query = "") => {
+    if (!ctx.hasUI || ctx.mode !== "tui") { ctx.ui.notify("Session search requires the interactive TUI", "warning"); return; }
+    if (overlayOpen) return;
+    let sessions;
+    try { sessions = (await SessionManager.list(ctx.cwd)).sort((a, b) => b.modified.getTime() - a.modified.getTime()); }
+    catch (error) { ctx.ui.notify("Could not search sessions: " + String(error), "error"); return; }
+    if (!sessions.length) { ctx.ui.notify("No sessions found for this project", "info"); return; }
+    overlayOpen = true;
+    let selected: string | undefined;
+    try { selected = await pickSession(ctx, sessions, query, (session) => sessionDetails(session.path)); }
+    finally { overlayOpen = false; }
+    if (!selected || selected === ctx.sessionManager.getSessionFile()) return;
+    if (!("switchSession" in ctx)) {
+      // Clicks and shortcuts get a plain context; switching needs a command, so stage it.
+      ctx.ui.setEditorText(`/jar resume ${selected}`);
+      ctx.ui.notify("Press Enter to resume that session", "info");
+      return;
+    }
+    // Never access the old command context after a successful switch.
+    const result = await ctx.switchSession(selected);
+    if (result.cancelled) ctx.ui.notify("Session switch cancelled", "info");
   };
+  const openFooterTarget = (ctx: ExtensionContext, target: FooterTarget) => target.kind === "session" ? openSessions(ctx)
+    : openActivity(ctx, target.kind === "activity" ? undefined : target);
   registerAskTool(pi);
   const modelRoles = new ModelRoleManager(pi);
   const sideUsage = new SideUsage();
@@ -144,7 +207,7 @@ export default function piJar(pi: ExtensionAPI): void {
   registerInfoPanels(pi, { side: sideUsage, quotaEnabled: () => quotaCache?.enabled ?? false,
     quota: (ctx) => quotaCache?.get(ctx.model?.provider, welcomeStatuses(), Date.now()) });
   modelRoles.register((ctx) => openRolesUi(ctx, modelRoles));
-  registerDelegate(pi, modelRoles);
+  registerDelegate(pi, modelRoles, subagents);
   const planMode = new PlanMode(pi, () => todos, modelRoles, updateTaskWidget);
   planMode.register();
   const goalLoop = new GoalLoop(pi, {
@@ -158,8 +221,7 @@ export default function piJar(pi: ExtensionAPI): void {
   const suggestions = new SuggestionState();
   composer.attachSuggestions(suggestions);
   const suggest = registerSuggestions(pi, suggestions, {
-    enabled: () => enabled && visualSettings.composer && visualSettings.suggestions && composer.enabled,
-    skip: () => planMode.isEnabled() || !!goals?.isActive()
+    enabled: () => enabled && visualSettings.composer && visualSettings.suggestions && composer.enabled
   });
   let liveTui: { setCopyOnSelect?: (enabled: boolean) => void } | undefined;
   /** Pi's own settings (TUI mode, copy-on-select); written through Pi's SettingsManager. */
@@ -175,8 +237,6 @@ export default function piJar(pi: ExtensionAPI): void {
   };
 
   const applyWorking = (ctx: ExtensionContext) => {
-    const active = enabled && working.phase !== "idle";
-    if (!active || !ctx.hasUI || ctx.mode !== "tui") stopWorkingClock();
     if (!ctx.hasUI || ctx.mode !== "tui") return;
     composer.setActivity(enabled ? working.phase : "idle", animations);
     try {
@@ -187,14 +247,12 @@ export default function piJar(pi: ExtensionAPI): void {
       ctx.ui.setWorkingMessage?.(view.message);
       const indicatorKey = `${working.phase}:${animations}`;
       if (indicatorKey !== workingIndicatorKey) {
-        ctx.ui.setWorkingIndicator({ frames: view.frames, intervalMs: 600 });
+        // Pi's normal streaming/tool lifecycle already causes renders. A static indicator avoids
+        // forcing the entire transcript to repaint on a timer in long sessions.
+        ctx.ui.setWorkingIndicator({ frames: [view.frames[0] ?? "✢"] });
         workingIndicatorKey = indicatorKey;
       }
-      if (active && !workingClock) {
-        workingClock = setInterval(() => applyWorking(ctx), 1000);
-        workingClock.unref?.();
-      }
-    } catch { stopWorkingClock(); /* Working decoration must never interrupt a Pi turn. */ }
+    } catch { /* Working decoration must never interrupt a Pi turn. */ }
   };
 
   const stopWelcome = (ctx?: ExtensionContext) => {
@@ -358,32 +416,22 @@ export default function piJar(pi: ExtensionAPI): void {
         welcomeStatuses = () => footerData.getExtensionStatuses();
         welcomeBranch = () => footerData.getGitBranch();
         let frame = 0;
-        let memory = `ram ${Math.round(process.memoryUsage.rss() / 1048576)} MiB`;
-        let memoryTimer: ReturnType<typeof setTimeout> | undefined;
-        const MEMORY_SAMPLE_MS = 10_000;
-        const sampleMemory = () => {
-          if (disposed) return;
-          const next = `ram ${Math.round(process.memoryUsage.rss() / 1048576)} MiB`;
-          if (next !== memory) { memory = next; tui.requestRender(); }
-          memoryTimer = setTimeout(sampleMemory, MEMORY_SAMPLE_MS);
-          memoryTimer.unref?.();
-        };
-        if (footerSettings.memory) {
-          memoryTimer = setTimeout(sampleMemory, MEMORY_SAMPLE_MS);
-          memoryTimer.unref?.();
-        }
-        let timer: ReturnType<typeof setInterval> | undefined;
         let expiryTimer: ReturnType<typeof setTimeout> | undefined;
+        let expiryAt: number | undefined;
+        let memory = `ram ${Math.round(process.memoryUsage.rss() / 1048576)} MiB`;
+        let memorySampledAt = 0;
+        let context = "ctx ?";
+        let contextSampledAt = 0;
         let disposed = false;
+        let hits: FooterHit[] = [];
+        let pressed: { target: FooterTarget; at: number } | undefined;
         const unsubscribe = footerData.onBranchChange(() => tui.requestRender());
         const dispose = () => {
           if (disposed) return;
           disposed = true;
-          if (memoryTimer) clearTimeout(memoryTimer);
-          if (timer) clearInterval(timer);
           if (expiryTimer) clearTimeout(expiryTimer);
-          timer = undefined;
           expiryTimer = undefined;
+          expiryAt = undefined;
           if (footerTui === tui) { footerTui = undefined; welcomeStatuses = () => new Map<string, string>(); welcomeBranch = () => null; }
           unsubscribe();
         };
@@ -391,38 +439,67 @@ export default function piJar(pi: ExtensionAPI): void {
         return {
           dispose,
           invalidate() {},
+          handleMouse(event: TuiMouseEvent) {
+            if (event.button !== "left") return;
+            const hit = hits.find((item) => item.y === event.y && event.x >= item.x0 && event.x < item.x1);
+            if (!hit) return;
+            if (event.type !== "press" && event.type !== "click") return { handled: true };
+            // Act on press (click synthesis is not guaranteed through multiplexers); drop the echo click.
+            const now = Date.now();
+            const same = pressed && JSON.stringify(pressed.target) === JSON.stringify(hit.target);
+            if (event.type === "click" && same && now - pressed!.at < WELCOME_CLICK_DEDUPE_MS) return { handled: true };
+            pressed = { target: hit.target, at: now };
+            queueMicrotask(() => { void openFooterTarget(ctx, hit.target).catch((error) => ctx.ui.notify("pi-jar: " + String(error), "error")); });
+            return { handled: true, capture: event.type === "press" };
+          },
           render(width: number): string[] {
             try {
               const now = Date.now();
               const statuses = footerData.getExtensionStatuses();
               const live = collectStatuses(statuses, now);
-              const roles: JarRole[] = demo ? createDemoRoles() : live.roles;
-              if (expiryTimer) clearTimeout(expiryTimer);
-              expiryTimer = undefined;
+              // jar_delegate runs get their own activity rows; other extensions' roles stay as chips.
+              const roles: JarRole[] = demo ? createDemoRoles() : live.roles.filter((role) => !role.id.startsWith("delegate-"));
               const nearest = demo ? undefined : roles.reduce<number | undefined>((min, role) =>
                 role.expiresAt != null ? Math.min(min ?? Infinity, role.expiresAt) : min, undefined);
-              if (nearest != null) expiryTimer = setTimeout(() => tui.requestRender(), Math.max(1, nearest - now));
+              if (nearest !== expiryAt) {
+                if (expiryTimer) clearTimeout(expiryTimer);
+                expiryTimer = undefined;
+                expiryAt = nearest;
+                if (nearest != null) {
+                  expiryTimer = setTimeout(() => { expiryTimer = undefined; expiryAt = undefined; tui.requestRender(); }, Math.max(1, nearest - now));
+                  expiryTimer.unref?.();
+                }
+              }
+              // Do not schedule cosmetic footer repaints. Role state still updates on Pi's native
+              // stream/tool renders, which keeps long transcripts responsive.
               const active = animations && footerSettings.roles && roles.some((role) => ACTIVE_STATES.has(role.state));
-              if (active && !timer) {
-                timer = setInterval(() => { frame += 1; tui.requestRender(); }, 600);
-                timer.unref?.();
-              } else if (!active && timer) { clearInterval(timer); timer = undefined; }
-              const usage = ctx.getContextUsage();
-              const context = usage?.percent == null || !Number.isFinite(usage.percent)
-                ? "ctx ?" : `ctx ${Math.round(usage.percent)}%`;
+              if (active) frame++;
+              if (now - contextSampledAt >= 1000) {
+                const usage = ctx.getContextUsage();
+                context = usage?.percent == null || !Number.isFinite(usage.percent)
+                  ? "ctx ?" : `ctx ${Math.round(usage.percent)}%`;
+                contextSampledAt = now;
+              }
+              if (now - memorySampledAt >= 5000) {
+                memory = `ram ${Math.round(process.memoryUsage.rss() / 1048576)} MiB`;
+                memorySampledAt = now;
+              }
               const quota = footerSettings.quota ? quotaCache?.get(ctx.model?.provider, statuses, now) : undefined;
-              return renderFooter({
+              const layout = renderFooterLayout({
                 model: ctx.model?.id ?? "no-model", effort: ctx.model?.reasoning === false ? "off" : (pi.getThinkingLevel?.() ?? "off"),
                 sessionName: ctx.sessionManager?.getSessionName?.(),
                 cwd: ctx.cwd, settings: footerSettings, branch: footerData.getGitBranch(),
-                context, goal: goalLoop.progress(), chips: footerChips(), memory, cost: formatCost(cost), quota, roles, extras: live.extras,
+                context, goal: goalLoop.progress(), chips: footerChips(), activity: footerActivity(now),
+                memory, cost: formatCost(cost), quota, roles, extras: live.extras,
                 demo, animations, frame, motionBudget: ctx.isIdle() ? 2 : 1
               }, width, ctx.ui.theme ?? theme);
+              hits = layout.hits;
+              return layout.lines;
             } catch {
-              if (timer) clearInterval(timer);
+              hits = [];
               if (expiryTimer) clearTimeout(expiryTimer);
-              timer = undefined;
               expiryTimer = undefined;
+              expiryAt = undefined;
               return width > 0 ? ["pi-jar: UI unavailable (run /jar ui off)".slice(0, width)] : [];
             }
           }
@@ -443,6 +520,7 @@ export default function piJar(pi: ExtensionAPI): void {
       return;
     }
     visualSettings = next;
+    setIconSet(next.icons);
     enabled = next.ui;
     animations = next.animations;
     if (footerSettings.quota && !next.footer.quota) quotaCache?.stop();
@@ -481,24 +559,28 @@ export default function piJar(pi: ExtensionAPI): void {
     try { cost = sessionCost(ctx); } catch { cost = 0; }
     footerTui?.requestRender();
   };
-  const restoreTodos = (ctx: ExtensionContext) => {
-    try { todos?.restore(ctx.sessionManager.getBranch()); } catch { todos?.restore([]); }
+  const addMessageCost = (message: { usage?: { cost?: { total?: number } } }) => {
+    const value = message.usage?.cost?.total;
+    if (typeof value === "number" && Number.isFinite(value) && value >= 0) cost += value;
+  };
+  const restoreTodos = (ctx: ExtensionContext, branch?: readonly unknown[]) => {
+    try { todos?.restore(branch ?? sessionBranch(ctx)); } catch { todos?.restore([]); }
     updateTaskWidget(ctx);
   };
-  const restoreGoal = (ctx: ExtensionContext) => {
-    try { goals?.restore(ctx.sessionManager.getBranch()); } catch { goals?.restore([]); }
+  const restoreGoal = (ctx: ExtensionContext, branch?: readonly unknown[]) => {
+    try { goals?.restore(branch ?? sessionBranch(ctx)); } catch { goals?.restore([]); }
     footerTui?.requestRender();
   };
   pi.on("session_start", (_event, ctx) => {
     sideUsage.clear();
     migrateLegacySettings(getAgentDir());
     visualSettings = loadVisualSettings(getAgentDir());
+    setIconSet(visualSettings.icons);
     animations = visualSettings.animations;
     enabled = visualSettings.ui;
     footerSettings = visualSettings.footer;
     demo = false;
     composer.disable(ctx);
-    stopWorkingClock();
     workingIndicatorKey = "";
     working.end();
     quotaCache?.stop();
@@ -506,11 +588,14 @@ export default function piJar(pi: ExtensionAPI): void {
     changes = new ChangeTracker(() => ctx.cwd);
     changeCount = 0;
     shells?.dispose();
+    subagents.clear();
     shells = new ShellManager(onShellEvent);
     shells.onChange = () => footerTui?.requestRender();
     goals = new GoalStore((entry) => pi.appendEntry(GOAL_ENTRY, entry));
-    restoreTodos(ctx);
-    restoreGoal(ctx);
+    let branch: readonly unknown[] = [];
+    try { branch = sessionBranch(ctx); } catch { /* keep empty */ }
+    restoreTodos(ctx, branch);
+    restoreGoal(ctx, branch);
     // Quota is enabled per session; no credentials or consent are persisted.
     quotaCache = new QuotaCache(
       (provider: QuotaProvider, signal) => fetchQuota(provider, (id) => ctx.modelRegistry.getProviderAuth(id), signal),
@@ -528,7 +613,20 @@ export default function piJar(pi: ExtensionAPI): void {
     if (visualSettings.composer && enabled) composer.enable(ctx);
     suggest.sync();
     if (visualSettings.accent !== "follow") selectAccent(ctx, visualSettings.accent);
-    showWelcome(ctx);
+    if (branch.length >= LARGE_SESSION_ENTRIES) {
+      try {
+        const prefs = piPreferences(ctx)?.get();
+        if (prefs && !prefs.fullscreen) {
+          ctx.ui.notify(`Large session (${branch.length} entries): regular TUI redraw cost grows with history. Enable Fullscreen in /jar settings for smoother rendering.`, "warning");
+        }
+      } catch { /* Performance hint is optional. */ }
+    }
+    // Resumed sessions already have a transcript to paint. Rebuilding the animated welcome and
+    // scanning other session files competes with that expensive initial render for no real benefit.
+    // A fresh session is not empty: Pi records the startup thinking level/model as entries.
+    const resumed = branch.some((entry) => !(typeof entry === "object" && entry !== null && "type" in entry
+      && typeof entry.type === "string" && SESSION_SETUP_ENTRIES.has(entry.type)));
+    if (!resumed) showWelcome(ctx);
   });
   // Any real prompt dismisses the welcome. Slash commands bypass `input`, so `agent_start` covers them.
   const dismissWelcome = (ctx: ExtensionContext) => {
@@ -553,6 +651,7 @@ export default function piJar(pi: ExtensionAPI): void {
   pi.on("message_end", (event, ctx) => {
     if (event.message.role === "assistant") {
       working.reportOutputTokens(event.message.usage?.output ?? 0);
+      addMessageCost(event.message);
       applyWorking(ctx);
     }
   });
@@ -561,19 +660,26 @@ export default function piJar(pi: ExtensionAPI): void {
   pi.on("ui_prompt_start", (_event, ctx) => { working.prompt(true); applyWorking(ctx); });
   pi.on("ui_prompt_end", (_event, ctx) => { working.prompt(false); applyWorking(ctx); });
   // A request may span several tool turns; keep its elapsed time and reported tokens until agent_end.
-  pi.on("turn_end", (_event, ctx) => { applyWorking(ctx); updateCost(ctx); });
+  pi.on("turn_end", (_event, ctx) => { applyWorking(ctx); });
   pi.on("agent_end", (_event, ctx) => { working.end(); applyWorking(ctx); });
   pi.on("agent_before_settle", (event) => { if (event.outcome === "error") composer.flash("error"); });
   pi.on("agent_settled", (_event, ctx) => { working.end(); applyWorking(ctx); });
-  pi.on("session_tree", (_event, ctx) => { restoreTodos(ctx); restoreGoal(ctx); updateCost(ctx); composer.refreshSession(ctx); });
+  pi.on("session_tree", (_event, ctx) => {
+    let branch: readonly unknown[] = [];
+    try { branch = sessionBranch(ctx); } catch { /* keep empty */ }
+    restoreTodos(ctx, branch);
+    restoreGoal(ctx, branch);
+    updateCost(ctx);
+    composer.refreshSession(ctx);
+  });
   pi.on("session_compact", (_event, ctx) => { restoreTodos(ctx); restoreGoal(ctx); updateCost(ctx); });
   pi.on("model_select", (_event, _ctx) => footerTui?.requestRender());
   pi.on("thinking_level_select", (_event, _ctx) => footerTui?.requestRender());
   pi.on("session_info_changed", (_event, ctx) => { composer.refreshSession(ctx); footerTui?.requestRender(); });
   pi.on("session_shutdown", (_event, ctx) => {
+    clearSessionBranchCache(ctx);
     stopWelcome(ctx);
     composer.disable(ctx);
-    stopWorkingClock();
     workingIndicatorKey = "";
     working.end();
     try { if (ctx.hasUI && ctx.mode === "tui") { ctx.ui.setWorkingMessage?.(); ctx.ui.setWorkingIndicator(); ctx.ui.setWidget("pi-jar.todos", undefined); } } catch {}
@@ -584,6 +690,7 @@ export default function piJar(pi: ExtensionAPI): void {
     changeCount = 0;
     shells?.dispose();
     shells = undefined;
+    subagents.clear();
     goals = undefined;
     disposeFooter?.();
     disposeFooter = undefined;
@@ -607,7 +714,7 @@ export default function piJar(pi: ExtensionAPI): void {
         earlier = (await SessionManager.list(ctx.cwd)).filter((session) => session.path !== current)
           .sort((a, b) => b.modified.getTime() - a.modified.getTime()).slice(0, 50);
       } catch (error) { ctx.ui.notify("pi-jar: earlier sessions unavailable: " + String(error), "warning"); }
-      const picked = await openPromptSearch(ctx, collectPrompts(ctx.sessionManager.getEntries(), earlier));
+      const picked = await openPromptSearch(ctx, collectPrompts(sessionBranch(ctx), earlier));
       if (picked !== undefined) ctx.ui.setEditorText(picked);
     }
   });
@@ -615,6 +722,10 @@ export default function piJar(pi: ExtensionAPI): void {
     description: "Cycle pi-jar model roles",
     handler: async (ctx) => { await modelRoles.cycle(ctx); footerTui?.requestRender(); }
   });
+  pi.registerShortcut?.(Key.ctrlAlt("a"), {
+    description: "Subagents and background shells (pi-jar)",
+    handler: async (ctx) => { await openActivity(ctx); }
+  });
   pi.registerShortcut?.(Key.ctrlAlt("s"), {
     description: "Open pi-jar settings",
     handler: async (ctx) => {
@@ -638,25 +749,24 @@ export default function piJar(pi: ExtensionAPI): void {
       }
       // `/jar resume` without a number opens the same searchable picker.
       if (command === "sessions" || command.startsWith("sessions ") || command === "resume") {
-        if (!ctx.hasUI || ctx.mode !== "tui") { ctx.ui.notify("Session search requires the interactive TUI", "warning"); return; }
-        let sessions;
-        try { sessions = (await SessionManager.list(ctx.cwd)).sort((a, b) => b.modified.getTime() - a.modified.getTime()); }
-        catch (error) { ctx.ui.notify("Could not search sessions: " + String(error), "error"); return; }
-        if (!sessions.length) { ctx.ui.notify("No sessions found for this project", "info"); return; }
-        const selected = await pickSession(ctx, sessions, command === "resume" ? "" : args.trim().slice(8).trim());
-        if (selected && selected !== ctx.sessionManager.getSessionFile()) {
-          // Never access the old command context after a successful switch.
-          const result = await ctx.switchSession(selected);
-          if (result.cancelled) ctx.ui.notify("Session switch cancelled", "info");
-        }
+        await openSessions(ctx, command === "resume" ? "" : args.trim().slice(8).trim());
         return;
       }
       if (command.startsWith("resume ")) {
-        const index = Number(command.slice(7).trim());
+        const arg = args.trim().slice(7).trim();
+        const index = Number(arg);
         let recent = welcomeRecent;
-        try { if (!recent.length) recent = await loadRecent(ctx); } catch (error) { ctx.ui.notify("Could not list sessions: " + String(error), "error"); return; }
-        const target = Number.isInteger(index) && index >= 1 ? recent[index - 1] : undefined;
-        if (!target) { ctx.ui.notify(`No recent session ${command.slice(7).trim()}; try /jar sessions`, "warning"); return; }
+        let target: { path: string } | undefined;
+        try {
+          if (arg.endsWith(".jsonl")) {
+            // Clicks stage a path in the editor; restrict it to Pi's sessions for this project.
+            target = (await SessionManager.list(ctx.cwd)).find((session) => session.path === arg);
+          } else {
+            if (!recent.length) recent = await loadRecent(ctx);
+            target = Number.isInteger(index) && index >= 1 ? recent[index - 1] : undefined;
+          }
+        } catch (error) { ctx.ui.notify("Could not list sessions: " + String(error), "error"); return; }
+        if (!target) { ctx.ui.notify(`No recent session ${arg}; try /jar sessions`, "warning"); return; }
         const result = await ctx.switchSession(target.path);
         if (result.cancelled) ctx.ui.notify("Session switch cancelled", "info");
         return;
@@ -751,10 +861,23 @@ export default function piJar(pi: ExtensionAPI): void {
       }
       if (command === "welcome") { showWelcome(ctx); return; }
       if (command === "commit" || command.startsWith("commit ")) { await jarCommit(pi, ctx, modelRoles, sideUsage, args.trim().slice(6).trim()); return; }
-      if (command === "shells") {
-        if (!shells) return;
-        if (!ctx.hasUI || ctx.mode !== "tui") { ctx.ui.notify(shells.list().map((job) => `${job.id} ${job.name} ${job.status}`).join("\n") || "No background shells", "info"); return; }
-        await openShellsView(ctx, shells);
+      if (command === "shells" || command === "activity" || command === "agents") {
+        if (!ctx.hasUI || ctx.mode !== "tui") {
+          const lines = [...subagents.records().map(({ run }) => `${run.name} ${run.state}`), ...(shells?.summaries() ?? []).map((job) => `${job.id} ${job.name} ${job.status}`)];
+          ctx.ui.notify(lines.join("\n") || "Nothing running", "info");
+          return;
+        }
+        const shell = command === "shells" ? shells?.summaries().find((job) => job.status === "running") ?? shells?.summaries()[0] : undefined;
+        await openActivity(ctx, shell ? { kind: "shell", id: shell.id } : undefined);
+        return;
+      }
+      if (command === "icons" || command.startsWith("icons ")) {
+        const requested = command.slice(5).trim();
+        const next = ICON_SETS.find((set) => set === requested)
+          ?? (requested ? undefined : ICON_SETS[(ICON_SETS.indexOf(visualSettings.icons) + 1) % ICON_SETS.length]);
+        if (!next) { ctx.ui.notify(`Icons: ${ICON_SETS.join(" | ")} (nerd needs a Nerd Font)`, "error"); return; }
+        applyVisualSettings({ ...visualSettings, icons: next }, ctx);
+        ctx.ui.notify(`pi-jar icons: ${next}`, "info");
         return;
       }
       if (command === "demo") demo = true;
@@ -766,7 +889,7 @@ export default function piJar(pi: ExtensionAPI): void {
       else if (command === "quota on" && quotaCache) { quotaCache.enabled = true; quotaDisabledByUser = false; }
       else if (command === "quota off" && quotaCache) { quotaCache.enabled = false; quotaDisabledByUser = true; quotaCache.stop(); }
       else {
-        ctx.ui.notify("Usage: /jar [status|settings|commit [note]|sessions [search]|name <title>|history|footer|tasks|ask|composer on/off|accent [preset]|hub|welcome|demo|reset|animations on/off|ui on/off|quota on/off]", "error");
+        ctx.ui.notify("Usage: /jar [status|settings|activity|shells|sessions [search]|icons [unicode|nerd|ascii]|commit [note]|name <title>|history|footer|tasks|ask|composer on/off|accent [preset]|hub|welcome|demo|reset|animations on/off|ui on/off|quota on/off]", "error");
         return;
       }
       if (!["animations on", "animations off", "ui on", "ui off"].includes(command)) installUi(ctx);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-jar",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "A warm, role-aware Pi terminal workspace with animated UI, plan and goal workflows, tasks, change review, model roles, background shells and subagents.",
   "type": "module",
   "license": "MIT",