pi-jar 0.1.8 → 0.2.0

package/extensions/index.ts

@@ -1,5 +1,5 @@
 import { getAgentDir, SessionManager, SettingsManager, type ExtensionAPI, type ExtensionCommandContext, type ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { basename } from "node:path";
+import { basename, join } from "node:path";
 import { execFile } from "node:child_process";
 import { existsSync, readFileSync } from "node:fs";
 import { Key, truncateToWidth, type TUI, type TuiMouseEvent } from "@earendil-works/pi-tui";
@@ -16,13 +16,15 @@ import { openJarHistory } from "../src/history-ui.ts";
 import { GOAL_ENTRY, GoalStore } from "../src/goals.ts";
 import { GoalLoop } from "../src/goal-loop.ts";
 import { FOOTER_FIELDS } from "../src/footer-settings.ts";
-import { defaultVisualSettings, loadVisualSettings, migrateLegacySettings, saveVisualSettings, type JarVisualSettings } from "../src/settings.ts";
+import { defaultVisualSettings, loadVisualSettings, saveVisualSettings, type JarVisualSettings } from "../src/settings.ts";
+import { ProfileStore, PROFILE_FILE, PROFILE_ENTRY, conversationStarted, pinnedProfileId } from "../src/profiles.ts";
 import { openJarSettings, type PiPreferences } from "../src/settings-ui.ts";
 import { pickSession } from "../src/session-ui.ts";
 import { fetchQuota, QuotaCache, type QuotaProvider } from "../src/quota.ts";
 import { ModelRoleManager } from "../src/model-roles.ts";
 import { jarCommit } from "../src/commit.ts";
 import { registerAdvisor } from "../src/advisor.ts";
+import { registerContextDiet } from "../src/context-diet.ts";
 import { registerInfoPanels } from "../src/info-panels.ts";
 import { SideUsage } from "../src/side-model.ts";
 import { PlanMode } from "../src/plan.ts";
@@ -38,12 +40,13 @@ import { WorkingState } from "../src/working.ts";
 import { ChangeTracker } from "../src/changes.ts";
 import { CHILD_ENV, DelegateRegistry, registerDelegate, SUBAGENT_MESSAGE, type DelegateRun } from "../src/delegate.ts";
 import { CHILD_WORKTREE_ENV, workspacePathAllowed } from "../src/delegate-worktree.ts";
-import { createDiscussionPaper, DISCUSSION_FILE_ENV, disposeDiscussionPaper, registerDiscussionTool, SUBAGENT_NAME_ENV } from "../src/discussion.ts";
+import { DiscussionBroker, DISCUSSION_NOTICE, discussionClientFromEnv, registerDiscussionTool } from "../src/discussion.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, sessionDetails, type RecentSession } from "../src/session-gallery.ts";
 import { clearSessionBranchCache, sessionBranch } from "../src/session-branch.ts";
+import { ContextSampler, formatPerf, LARGE_SESSION_ENTRIES, processRss, RenderScheduler, type RenderKind } from "../src/perf.ts";
 import { registerChangeReview } from "../src/diff-view.ts";
 import { registerShells, ShellManager, type ShellEvent, type ShellJob } from "../src/shells.ts";
 import { registerShellNotifications } from "../src/shell-notifications.ts";
@@ -57,7 +60,6 @@ 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 {
@@ -68,7 +70,7 @@ export default function piJar(pi: ExtensionAPI): void {
     // and handlers are disabled. Remove only parent automation, not task/user context.
     const parentAutomation = new Set([
       "pi-jar.goal-context", "pi-jar.goal-continuation",
-      "pi-jar.plan-context", "pi-jar.plan-reminder", "pi-jar.moderator-context", SUBAGENT_MESSAGE
+      "pi-jar.plan-context", "pi-jar.plan-reminder", "pi-jar.moderator-context", SUBAGENT_MESSAGE, DISCUSSION_NOTICE
     ]);
     pi.on("context", (event) => {
       const messages = event.messages.filter((message) => !parentAutomation.has((message as { customType?: string }).customType ?? ""));
@@ -97,22 +99,35 @@ export default function piJar(pi: ExtensionAPI): void {
   installCompactBuiltinTools(pi);
   let demo = false;
   let visualSettings = defaultVisualSettings();
+  let profileStore: ProfileStore | undefined;
   let animations = visualSettings.animations;
   let enabled = visualSettings.ui;
   let disposeFooter: (() => void) | undefined;
   let footerTui: { requestRender(): void } | undefined;
-  /** Footer facts that walk the session to compute; refreshed on the events that change them, never per frame. */
-  let footerContext = "ctx ?";
+  /**
+   * Per-session render budget and context-usage cache (src/perf.ts): created on session_start and
+   * disposed on shutdown, so no repaint or sampling timer outlives its session.
+   */
+  let renders: RenderScheduler | undefined;
+  let contextUsage: ContextSampler | undefined;
+  /** Only an installed footer in a live session is repainted; user actions and transitions stay prompt. */
+  const repaint = (source: string, kind: RenderKind = "foreground") => { if (footerTui) renders?.request(source, kind); };
   let footerSessionName: string | undefined;
+  /** Boundaries refresh the footer facts that walk the session; message ends only mark context dirty. */
   const sampleFooter = (ctx: ExtensionContext) => {
-    try {
-      const usage = ctx.getContextUsage();
-      footerContext = usage?.percent == null || !Number.isFinite(usage.percent) ? "ctx ?" : `ctx ${Math.round(usage.percent)}%`;
-    } catch { footerContext = "ctx ?"; }
+    contextUsage?.refresh(() => ctx.getContextUsage());
     try { footerSessionName = ctx.sessionManager?.getSessionName?.(); } catch { footerSessionName = undefined; }
-    footerTui?.requestRender();
+    repaint("session", "transition");
   };
   let quotaCache: QuotaCache | undefined;
+  let enableQuota: NodeJS.Timeout | undefined;
+  /**
+   * Lookups start on session boundaries, never from a render, and only while an installed footer can
+   * show them (never in RPC children or with the UI off); the cache bounds them to one per TTL.
+   */
+  const refreshQuota = (ctx: ExtensionContext) => {
+    if (footerTui && footerSettings.quota) quotaCache?.refresh(ctx.model?.provider, welcomeStatuses(), Date.now());
+  };
   let cost = 0;
   let welcomeInterval: ReturnType<typeof setInterval> | undefined;
   let welcomeFrame = 0;
@@ -133,8 +148,9 @@ export default function piJar(pi: ExtensionAPI): void {
   let workingIndicatorKey = "";
   let openSettings: (ctx: ExtensionContext) => Promise<void> = async () => {};
   let settingsOpen = false;
-  let discussionFile: string | undefined = process.env[DISCUSSION_FILE_ENV];
-  registerDiscussionTool(pi, () => discussionFile, () => process.env[SUBAGENT_NAME_ENV] ?? "moderator");
+  const discussionClient = delegatedChild ? discussionClientFromEnv() : undefined;
+  let discussion: DiscussionBroker | undefined;
+  registerDiscussionTool(pi, () => delegatedChild ? discussionClient : discussion?.local());
 
   // A finished list stays visible (all struck through) until the user's next prompt, like Claude.
   let todosAcknowledged = false;
@@ -182,38 +198,47 @@ export default function piJar(pi: ExtensionAPI): void {
   let changes: ChangeTracker | undefined;
   let changeCount = 0;
   const refreshChanges = () => {
+    const before = changeCount;
     try { changeCount = changes?.count() ?? 0; } catch { changeCount = 0; }
-    footerTui?.requestRender();
+    if (changeCount !== before) repaint("changes", "transition");
   };
   registerChangeReview(pi, () => changes, refreshChanges);
   let shells: ShellManager | undefined;
   registerShells(pi, () => shells);
   const shellNotifications = registerShellNotifications(pi, () => shells);
+  /** Shell rows show status and watch matches: changing those is a transition, anything else a background delta. */
+  let shellSignature = "";
+  const noteShells = () => {
+    if (!footerTui) return;
+    const signature = (shells?.summaries() ?? []).map((job) => `${job.id}:${job.status}:${job.matched ? 1 : 0}`).join(" ");
+    repaint("shells", signature === shellSignature ? "background" : "transition");
+    shellSignature = signature;
+  };
   const onShellEvent = (event: ShellEvent) => {
-    footerTui?.requestRender();
+    noteShells();
     if (!event.job.notify) return;
     // Queue compact metadata until a model boundary; observed completions are acknowledged.
     shellNotifications.notify();
   };
   /** 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();
   /**
-   * Subagent streams and shell output change the footer many times a second; every requested frame
-   * re-renders the whole transcript, so background sources repaint it at most this often.
+   * Subagent streams notify many times a second, but footer rows only change state rarely: a changed
+   * key/state set is a transition, anything else (tool counts, activity text) a background delta.
    */
-  const BACKGROUND_REPAINT_MS = 250;
-  let backgroundRepaint: NodeJS.Timeout | undefined;
-  const repaintFooterSoon = () => {
-    if (backgroundRepaint) return;
-    backgroundRepaint = setTimeout(() => { backgroundRepaint = undefined; footerTui?.requestRender(); }, BACKGROUND_REPAINT_MS);
-    backgroundRepaint.unref?.();
-  };
-  const subagents = new DelegateRegistry();
-  subagents.subscribe(repaintFooterSoon);
+  let subagentSignature = "";
+  subagents.subscribe(() => {
+    if (!footerTui) return;
+    const signature = subagents.records().map(({ key, run }) => `${key}:${run.state}`).join(" ");
+    repaint("subagents", signature === subagentSignature ? "background" : "transition");
+    subagentSignature = signature;
+  });
   /** Finished work stays visible briefly so a quick run is not a flicker. */
   const ACTIVITY_LINGER_MS = 5000;
+  // A hibernated agent has no live process but resumes on demand: the footer shows it as idle.
   const subagentState = (run: DelegateRun): ActivityState => run.state === "working" ? "running" : run.state === "queued" ? "queued"
-    : run.state === "idle" ? "idle" : run.state === "paused" ? "paused" : run.state === "stopped" ? "stopped"
+    : run.state === "idle" || run.state === "hibernated" ? "idle" : run.state === "paused" ? "paused" : run.state === "stopped" ? "stopped"
       : run.state === "done" ? "done" : "failed";
   const shellActivityState = (job: Omit<ShellJob, "lines">): ActivityState => job.status === "running" ? "running"
     : job.status === "killed" ? "stopped" : job.status === "exited" && job.exitCode === 0 ? "done" : "failed";
@@ -235,17 +260,23 @@ export default function piJar(pi: ExtensionAPI): void {
     return rows;
   };
   let overlayOpen = false;
-  /** Subagents, shells and other extensions' roles in one live split view. */
+  /**
+   * Subagents, shells and other extensions' roles in one live split view. While it is open it
+   * repaints live updates itself (on the tier's focused cadence), so footer background deltas wait.
+   */
   const openActivity = async (ctx: ExtensionContext, initial?: ActivityTarget) => {
     if (!ctx.hasUI || ctx.mode !== "tui" || overlayOpen) return;
     overlayOpen = true;
+    const budget = renders;
+    budget?.setFocused(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 } : {}) }))
+          .map((role) => ({ id: role.id, name: role.name, state: role.state, ...(role.task ? { task: role.task } : {}) })),
+        repaintMs: () => renders?.focusedMs() ?? 100
       }, initial);
-    } finally { overlayOpen = false; }
+    } finally { overlayOpen = false; budget?.setFocused(false); }
   };
   /** Searchable project sessions with a details pane; Enter resumes the selected one. */
   const openSessions = async (ctx: ExtensionContext | ExtensionCommandContext, query = "") => {
@@ -275,12 +306,57 @@ export default function piJar(pi: ExtensionAPI): void {
   registerAskTool(pi);
   const modelRoles = new ModelRoleManager(pi);
   const sideUsage = new SideUsage();
-  registerAdvisor(pi, modelRoles, { enabled: () => visualSettings.advisor, gates: () => visualSettings.advisorGates, usage: sideUsage });
+  registerContextDiet(pi, () => visualSettings.contextDiet === true);
+  const advisor = registerAdvisor(pi, modelRoles, { enabled: () => !delegatedChild && visualSettings.advisor, gates: () => !delegatedChild && visualSettings.advisorGates, usage: sideUsage });
   registerInfoPanels(pi, { side: sideUsage, quotaEnabled: () => quotaCache?.enabled ?? false,
     quota: (ctx) => quotaCache?.get(ctx.model?.provider, welcomeStatuses(), Date.now()) });
-  modelRoles.register((ctx) => openRolesUi(ctx, modelRoles), { activateDefault: () => !delegatedChild });
+  let followingTheme: string | undefined;
+  const profileEntries = (ctx: ExtensionContext): readonly unknown[] => {
+    try { return ctx.sessionManager.getEntries?.() ?? sessionBranch(ctx); } catch { return sessionBranch(ctx); }
+  };
+  const applyProfileTheme = (name: string, ctx: ExtensionContext) => {
+    if (!ctx.hasUI || ctx.mode !== "tui" || typeof ctx.ui.setTheme !== "function") return;
+    const target = name === "follow" ? followingTheme ?? "system" : name;
+    if (!ctx.ui.getTheme?.(target)) throw new Error(`Theme ${target} is not loaded`);
+    const result = ctx.ui.setTheme(target);
+    if (result && !result.success) throw new Error(result.error ?? `Could not apply theme ${target}`);
+  };
+  const initializeProfiles = (ctx: ExtensionContext) => {
+    const previousTheme = ctx.ui.theme?.name;
+    followingTheme ??= previousTheme ?? "system";
+    try {
+      if (!existsSync(join(getAgentDir(), PROFILE_FILE))
+        && (!ctx.hasUI || ctx.mode !== "tui" || typeof ctx.ui.getAllThemes !== "function")) {
+        profileStore = undefined; visualSettings = loadVisualSettings(getAgentDir()); return undefined;
+      }
+      modelRoles.load(ctx.cwd);
+      const legacyAccent = loadVisualSettings(getAgentDir()).accent;
+      const legacyTheme = accentTheme(legacyAccent);
+      const initialTheme = legacyAccent !== "follow" && ctx.ui.getTheme?.(legacyTheme) ? legacyTheme : previousTheme ?? "system";
+      const store = new ProfileStore(getAgentDir(), initialTheme, modelRoles.profileRoleConfig());
+      const entries = profileEntries(ctx);
+      const id = pinnedProfileId(entries) ?? (conversationStarted(entries) ? "default" : store.active().id);
+      const profile = store.list().find((item) => item.id === id);
+      if (!profile) throw new Error("This session's profile is no longer available");
+      applyProfileTheme(profile.theme, ctx);
+      if (store.activeName !== profile.name) store.activate(profile.name);
+      profileStore = store;
+      visualSettings = profile.settings;
+      composer.setProfile(profile.name);
+      return { roles: profile.roles, profileId: profile.id };
+    } catch (error) {
+      if (previousTheme) { try { applyProfileTheme(previousTheme, ctx); } catch {} }
+      profileStore = undefined; visualSettings = loadVisualSettings(getAgentDir()); composer.setProfile("Default");
+      ctx.ui.notify(`Could not load profiles: ${(error as Error).message}`, "warning");
+      return undefined;
+    }
+  };
+  modelRoles.register((ctx) => openRolesUi(ctx, modelRoles), { activateDefault: () => !delegatedChild, beforeSessionStart: initializeProfiles });
   let delegateController: DelegateController | undefined;
-  registerDelegate(pi, modelRoles, subagents, { changes: () => changes, changed: refreshChanges, discussionFile: () => discussionFile,
+  registerDelegate(pi, modelRoles, subagents, { changes: () => changes, changed: refreshChanges,
+    discussionEnv: (key, name) => discussion?.childEnv(key, name),
+    discussionRetire: (key) => discussion?.retire(key),
+    discussionUnread: (key) => discussion?.unreadFor(key) ?? 0,
     getMaxSubagents: () => visualSettings.maxSubagents, onController: (controller) => { delegateController = controller; } });
   if (!delegatedChild) registerDemocracy(pi, () => delegateController, () => visualSettings.maxSubagents);
   const planMode = new PlanMode(pi, () => todos, modelRoles, updateTaskWidget);
@@ -289,7 +365,7 @@ export default function piJar(pi: ExtensionAPI): void {
     goals: () => goals, todos: () => todos, roles: modelRoles, planActive: () => planMode.isEnabled(),
     maxRounds: () => visualSettings.goalRounds,
     subagentMode: (agent) => subagents.resolve(agent)?.run.mode,
-    changed: (ctx) => { footerTui?.requestRender(); welcomeTui?.requestRender(); updateTaskWidget(ctx); },
+    changed: (ctx) => { repaint("goal", "transition"); welcomeTui?.requestRender(); updateTaskWidget(ctx); },
     completed: () => composer.flash("complete", 4000)
   });
   if (!delegatedChild) goalLoop.register();
@@ -372,9 +448,8 @@ export default function piJar(pi: ExtensionAPI): void {
     welcomeFrame = 0;
     welcomeDismiss = 0;
     try {
-      const contextUsage = ctx.getContextUsage();
-      const context = contextUsage?.percent != null && Number.isFinite(contextUsage.percent)
-        ? `ctx ${Math.round(contextUsage.percent)}%` : "ctx ?";
+      // The cached sample: the welcome never forces its own walk of the session.
+      const context = contextUsage?.label ?? "ctx ?";
       const commands = pi.getCommands().filter((item) => item.source === "extension");
       const managers: ("tasks" | "subagents")[] = [];
       if (commands.some((item) => item.name === "tasks")) managers.push("tasks");
@@ -448,7 +523,7 @@ export default function piJar(pi: ExtensionAPI): void {
           const quota = footerSettings.quota ? quotaCache?.get(ctx.model?.provider, statuses, Date.now()) : undefined;
           const open = todos?.all().filter((item) => !item.done) ?? [];
           const lines = welcomeLines(width, welcomeFrame, (color, text) => (ctx.ui.theme ?? theme).fg(color, text), {
-            ...info, settingsClickable: tui.mode !== "regular", roles: live.roles,
+            ...info, model: ctx.model?.id, profile: profileStore?.activeName ?? "Default", settingsClickable: tui.mode !== "regular", roles: live.roles,
             quota: quota?.week?.used ?? quota?.fiveHour?.used,
             effort: ctx.model?.reasoning === false ? "off" : pi.getThinkingLevel?.(),
             ...(modelRoles.activeRole() ? { activeRole: modelRoles.activeRole()! } : {}),
@@ -498,7 +573,7 @@ export default function piJar(pi: ExtensionAPI): void {
         let disposed = false;
         let hits: FooterHit[] = [];
         let pressed: { target: FooterTarget; at: number } | undefined;
-        const unsubscribe = footerData.onBranchChange(() => tui.requestRender());
+        const unsubscribe = footerData.onBranchChange(() => repaint("branch", "transition"));
         const dispose = () => {
           if (disposed) return;
           disposed = true;
@@ -527,6 +602,8 @@ export default function piJar(pi: ExtensionAPI): void {
           },
           render(width: number): string[] {
             try {
+              // Whatever background state was waiting for a repaint is drawn by this frame, ours or Pi's.
+              renders?.painted();
               const now = Date.now();
               const statuses = footerData.getExtensionStatuses();
               const live = collectStatuses(statuses, now);
@@ -539,7 +616,7 @@ export default function piJar(pi: ExtensionAPI): void {
                 expiryTimer = undefined;
                 expiryAt = nearest;
                 if (nearest != null) {
-                  expiryTimer = setTimeout(() => { expiryTimer = undefined; expiryAt = undefined; tui.requestRender(); }, Math.max(1, nearest - now));
+                  expiryTimer = setTimeout(() => { expiryTimer = undefined; expiryAt = undefined; repaint("roles", "transition"); }, Math.max(1, nearest - now));
                   expiryTimer.unref?.();
                 }
               }
@@ -557,7 +634,7 @@ export default function piJar(pi: ExtensionAPI): void {
                 model: ctx.model?.id ?? "no-model", effort: ctx.model?.reasoning === false ? "off" : (pi.getThinkingLevel?.() ?? "off"),
                 sessionName: footerSessionName,
                 cwd: ctx.cwd, settings: footerSettings, branch: footerData.getGitBranch(),
-                context: footerContext, goal: goalLoop.progress(), chips: footerChips(), activity: footerActivity(now),
+                context: contextUsage?.label ?? "ctx ?", 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);
@@ -580,10 +657,26 @@ export default function piJar(pi: ExtensionAPI): void {
     }
   };
 
-  const applyVisualSettings = (next: JarVisualSettings, ctx: ExtensionContext) => {
+  const persistVisualPreferences = (next: JarVisualSettings, ctx: ExtensionContext, theme?: string) => {
+    if (profileStore) {
+      try { profileStore.update(profileStore.activeName, { settings: next, ...(theme ? { theme } : {}) }); }
+      catch (error) { ctx.ui.notify("Profile preferences changed for this session but could not be saved: " + (error as Error).message, "warning"); return; }
+    }
+    if (!profileStore || profileStore.active().id === "default") {
+      try { saveVisualSettings(getAgentDir(), next); }
+      catch { ctx.ui.notify("Visual preferences changed for this session but could not be saved", "warning"); }
+    }
+  };
+  const accentTheme = (accent: JarVisualSettings["accent"]) => accent === "follow" ? "follow" : accent === "default" ? "pi-jar-dark" : `pi-jar-dark-${accent}`;
+  const applyVisualSettings = (next: JarVisualSettings, ctx: ExtensionContext, options: { persist?: boolean; accent?: boolean } = {}) => {
     const wasEnabled = enabled;
     const hadMotion = animations;
-    if (next.accent !== visualSettings.accent && next.accent !== "follow" && !selectAccent(ctx, next.accent)) {
+    const accentChanged = next.accent !== visualSettings.accent;
+    const quotaShown = !!footerTui && footerSettings.quota;
+    if (options.accent !== false && accentChanged && next.accent === "follow") {
+      try { applyProfileTheme("follow", ctx); } catch (error) { ctx.ui.notify(String(error), "warning"); return; }
+    }
+    if (options.accent !== false && accentChanged && next.accent !== "follow" && !selectAccent(ctx, next.accent)) {
       ctx.ui.notify(`Accent ${next.accent} is not loaded`, "warning");
       return;
     }
@@ -609,23 +702,85 @@ export default function piJar(pi: ExtensionAPI): void {
     else if (!hadMotion && animations && welcomeTui && !welcomeInterval) {
       { welcomeInterval = setInterval(() => { welcomeFrame++; welcomeTui?.requestRender(); }, WELCOME_INTERVAL_MS); welcomeInterval.unref?.(); }
     }
-    footerTui?.requestRender();
+    repaint("settings");
     welcomeTui?.requestRender();
-    try { saveVisualSettings(getAgentDir(), next); }
-    catch { ctx.ui.notify("Visual preferences changed for this session but could not be saved", "warning"); }
+    // Quota shown again (field or UI back on): hiding it stopped lookups and dropped the cache.
+    if (!quotaShown) refreshQuota(ctx);
+    if (options.persist !== false) persistVisualPreferences(next, ctx, accentChanged ? accentTheme(next.accent) : undefined);
   };
 
+  let switchingProfile = false;
+  const canSwitchProfile = (ctx: ExtensionContext) => {
+    if (switchingProfile || advisor.isBusy() || !ctx.isIdle?.() || working.phase !== "idle" || planMode.isEnabled() || goals?.isActive() || subagents.running() > 0) {
+      ctx.ui.notify("Finish the active agent/workflow before switching profiles", "warning"); return false;
+    }
+    if (conversationStarted(profileEntries(ctx)) || pinnedProfileId(profileEntries(ctx)) !== undefined) {
+      ctx.ui.notify("This session's profile is locked. Open a new session to switch profiles", "warning"); return false;
+    }
+    return true;
+  };
+  const switchProfile = async (name: string, ctx: ExtensionContext) => {
+    if (!profileStore || name === profileStore.activeName || !canSwitchProfile(ctx)) return;
+    const store = profileStore;
+    const previous = store.active();
+    const previousTheme = ctx.ui.theme?.name;
+    const previousModel = ctx.model;
+    const previousRole = modelRoles.activeRole();
+    const previousThinking = pi.getThinkingLevel();
+    const next = store.list().find((profile) => profile.name === name);
+    if (!next) { ctx.ui.notify("Unknown profile: " + name, "warning"); return; }
+    switchingProfile = true;
+    try {
+      applyProfileTheme(next.theme, ctx);
+      store.activate(name);
+      modelRoles.invalidateTemporaryRestores();
+      modelRoles.load(ctx.cwd, next.roles, next.id);
+      composer.setProfile(next.name);
+      applyVisualSettings(next.settings, ctx, { persist: false, accent: false });
+      if (!await modelRoles.activate("default", ctx, true)) ctx.ui.notify("Profile loaded, but its default model is unavailable; keeping the current model", "warning");
+      repaint("profile"); welcomeTui?.requestRender();
+      ctx.ui.notify(`Profile: ${next.name}`, "info");
+    } catch (error) {
+      try { if (store.activeName !== previous.name) store.activate(previous.name); } catch {}
+      if (previousTheme) { try { applyProfileTheme(previousTheme, ctx); } catch {} }
+      modelRoles.load(ctx.cwd, previous.roles, previous.id);
+      try {
+        if (previousModel && ctx.model !== previousModel && !await pi.setModel(previousModel)) throw new Error("Previous model is unavailable");
+        pi.setThinkingLevel(previousThinking);
+        modelRoles.restoreActiveRole(previousRole, ctx);
+      } catch { ctx.ui.notify("Could not restore the previous model after the failed profile switch", "warning"); }
+      composer.setProfile(previous.name);
+      applyVisualSettings(previous.settings, ctx, { persist: false, accent: false });
+      ctx.ui.notify(`Could not switch profile: ${(error as Error).message}`, "warning");
+    } finally { switchingProfile = false; }
+  };
   openSettings = async (ctx) => {
     if (settingsOpen) return;
     settingsOpen = true;
     try { await openJarSettings(ctx, () => visualSettings,
-      (next) => applyVisualSettings(next, ctx), loadedAccents(ctx), piPreferences(ctx)); }
+      (next) => applyVisualSettings(next, ctx), loadedAccents(ctx), piPreferences(ctx), profileStore ? {
+        store: profileStore, themes: ctx.ui.getAllThemes?.().map((theme) => theme.name) ?? [],
+        roles: () => modelRoles.profileRoleConfig(), roleManager: modelRoles,
+        create: (name, theme, settings, roles) => { const profile = profileStore!.add(name, theme, { ...settings, accent: "follow" }, roles); ctx.ui.notify(`Created profile ${name}; select it in a fresh session`, "info"); return profile; },
+        select: (name) => switchProfile(name, ctx),
+        setTheme: (name) => {
+          const previousTheme = ctx.ui.theme?.name;
+          const next = { ...visualSettings, accent: "follow" as const };
+          try { applyProfileTheme(name, ctx); profileStore!.update(profileStore!.activeName, { theme: name, settings: next }); }
+          catch (error) { if (previousTheme) applyProfileTheme(previousTheme, ctx); throw error; }
+          applyVisualSettings(next, ctx, { persist: false, accent: false });
+          if (profileStore!.active().id === "default") {
+            try { saveVisualSettings(getAgentDir(), next); }
+            catch { ctx.ui.notify("Theme saved, but legacy Default preferences could not be updated", "warning"); }
+          }
+        }
+      } : undefined); }
     finally { settingsOpen = false; }
   };
 
+  /** Callers are lifecycle handlers that repaint once through sampleFooter. */
   const updateCost = (ctx: ExtensionContext) => {
     try { cost = sessionCost(ctx); } catch { cost = 0; }
-    footerTui?.requestRender();
   };
   const addMessageCost = (message: { usage?: { cost?: { total?: number } } }) => {
     const value = message.usage?.cost?.total;
@@ -637,12 +792,11 @@ export default function piJar(pi: ExtensionAPI): void {
   };
   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());
+    if (!profileStore) initializeProfiles(ctx);
+    composer.setProfile(profileStore?.activeName ?? "Default");
     setIconSet(visualSettings.icons);
     animations = visualSettings.animations;
     enabled = visualSettings.ui;
@@ -652,20 +806,37 @@ export default function piJar(pi: ExtensionAPI): void {
     workingIndicatorKey = "";
     working.end();
     quotaCache?.stop();
+    clearTimeout(enableQuota);
+    // Render and sampling counters are session-scoped; nothing from a previous session may fire.
+    renders?.dispose();
+    contextUsage?.dispose();
     todos = new TodoStore((entry) => pi.appendEntry(TASK_ENTRY, entry));
     changes = new ChangeTracker(() => ctx.cwd);
     changeCount = 0;
     shells?.dispose();
-    subagents.clear();
+    const preserved = subagents.clear();
+    if (preserved.length) ctx.ui.notify(`Unresolved subagent worktrees preserved on disk:\n${preserved.join("\n")}`, "warning");
+    const previousDiscussion = discussion;
     if (!delegatedChild) {
-      disposeDiscussionPaper(discussionFile);
-      discussionFile = createDiscussionPaper();
+      discussion = new DiscussionBroker();
+      discussion.onChange = () => repaint("discussion", "background");
     }
+    renders = new RenderScheduler(() => {
+      const tui = footerTui;
+      if (!tui) return false;
+      tui.requestRender();
+      return true;
+    });
+    contextUsage = new ContextSampler(() => repaint("context", "background"));
+    subagentSignature = "";
+    shellSignature = "";
     shells = new ShellManager(onShellEvent);
-    shells.onChange = repaintFooterSoon;
+    shells.onChange = noteShells;
     goals = new GoalStore((entry) => pi.appendEntry(GOAL_ENTRY, entry));
     let branch: readonly unknown[] = [];
     try { branch = sessionBranch(ctx); } catch { /* keep empty */ }
+    // Counted from here on per message_end: no per-event branch walk.
+    renders.setEntries(branch.length);
     if (delegatedChild) {
       todos.restore([]);
       goals.restore([]);
@@ -676,12 +847,15 @@ export default function piJar(pi: ExtensionAPI): void {
     // 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),
-      () => footerTui?.requestRender()
+      () => repaint("quota", "transition")
     );
     // Hold the network lookup until startup settles; the footer shows it once it arrives.
     quotaCache.enabled = false;
     const cache = quotaCache;
-    const enableQuota = setTimeout(() => { if (quotaCache === cache && !quotaDisabledByUser) { cache.enabled = true; footerTui?.requestRender(); } }, STARTUP_GRACE_MS);
+    enableQuota = setTimeout(() => {
+      enableQuota = undefined;
+      if (quotaCache === cache && !quotaDisabledByUser) { cache.enabled = true; refreshQuota(ctx); }
+    }, STARTUP_GRACE_MS);
     enableQuota.unref?.();
     quotaDisabledByUser = false;
     updateCost(ctx);
@@ -690,7 +864,7 @@ export default function piJar(pi: ExtensionAPI): void {
     composer.setMascot(visualSettings.mascot);
     if (visualSettings.composer && enabled) composer.enable(ctx);
     suggest.sync();
-    if (visualSettings.accent !== "follow") selectAccent(ctx, visualSettings.accent);
+    if (!profileStore && visualSettings.accent !== "follow") selectAccent(ctx, visualSettings.accent);
     if (branch.length >= LARGE_SESSION_ENTRIES) {
       try {
         const prefs = piPreferences(ctx)?.get();
@@ -705,6 +879,11 @@ export default function piJar(pi: ExtensionAPI): void {
     const resumed = branch.some((entry) => !(typeof entry === "object" && entry !== null && "type" in entry
       && typeof entry.type === "string" && SESSION_SETUP_ENTRIES.has(entry.type)));
     if (!delegatedChild && !resumed) showWelcome(ctx);
+    if (discussion) {
+      const current = discussion;
+      return (previousDiscussion ? previousDiscussion.close().then(() => current.start()) : current.start())
+        .catch((error) => { ctx.ui.notify("Discussion broker unavailable: " + String(error), "warning"); });
+    }
   });
   // Any real prompt dismisses the welcome. Slash commands bypass `input`, so `agent_start` covers them.
   const dismissWelcome = (ctx: ExtensionContext) => {
@@ -720,19 +899,31 @@ export default function piJar(pi: ExtensionAPI): void {
     welcomeTui.requestRender();
   };
   pi.on("input", (event, ctx) => {
+    if (profileStore && !conversationStarted(profileEntries(ctx))) {
+      const id = profileStore.active().id;
+      if (pinnedProfileId(profileEntries(ctx)) !== id) pi.appendEntry?.(PROFILE_ENTRY, { version: 1, id });
+    }
     if (event.source !== "interactive") return;
     dismissWelcome(ctx);
     if (!todosAcknowledged && todos?.all().every((item) => item.done)) { todosAcknowledged = true; updateTaskWidget(ctx); }
   });
-  pi.on("agent_start", (_event, ctx) => { dismissWelcome(ctx); working.start(); applyWorking(ctx); });
+  pi.on("agent_start", (_event, ctx) => {
+    if (profileStore && pinnedProfileId(profileEntries(ctx)) !== profileStore.active().id) {
+      pi.appendEntry?.(PROFILE_ENTRY, { version: 1, id: profileStore.active().id });
+    }
+    dismissWelcome(ctx); working.start(); applyWorking(ctx); refreshQuota(ctx);
+  });
   pi.on("turn_start", (_event, ctx) => { working.start(); applyWorking(ctx); });
   pi.on("message_end", (event, ctx) => {
-    // Every message (user, assistant, tool result) moves the context window.
-    sampleFooter(ctx);
+    // Every message (user, assistant, tool result) moves the context window, and a tool-heavy turn
+    // ends many: count the entry and let the sampler recompute once per window, not per message.
+    renders?.addEntries(1);
+    contextUsage?.markDirty(() => ctx.getContextUsage());
     if (event.message.role === "assistant") {
       working.reportOutputTokens(event.message.usage?.output ?? 0);
       addMessageCost(event.message);
       applyWorking(ctx);
+      repaint("cost", "background");
     }
   });
   pi.on("tool_execution_start", (event, ctx) => { working.toolStart(event.toolCallId, event.toolName); applyWorking(ctx); });
@@ -740,13 +931,15 @@ 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); });
-  pi.on("agent_end", (_event, ctx) => { working.end(); applyWorking(ctx); });
+  pi.on("turn_end", (_event, ctx) => { applyWorking(ctx); refreshQuota(ctx); });
+  pi.on("agent_end", (_event, ctx) => { working.end(); applyWorking(ctx); sampleFooter(ctx); });
   pi.on("agent_before_settle", (event) => { if (event.outcome === "error") composer.flash("error"); });
-  pi.on("agent_settled", (_event, ctx) => { working.end(); applyWorking(ctx); });
+  // Retries or compaction after agent_end may have added messages; otherwise the agent_end sample stands.
+  pi.on("agent_settled", (_event, ctx) => { working.end(); applyWorking(ctx); if (contextUsage?.dirty) sampleFooter(ctx); refreshQuota(ctx); });
   pi.on("session_tree", (_event, ctx) => {
     let branch: readonly unknown[] = [];
     try { branch = sessionBranch(ctx); } catch { /* keep empty */ }
+    renders?.setEntries(branch.length);
     if (!delegatedChild) {
       restoreTodos(ctx, branch);
       restoreGoal(ctx, branch);
@@ -756,12 +949,15 @@ export default function piJar(pi: ExtensionAPI): void {
     sampleFooter(ctx);
   });
   pi.on("session_compact", (_event, ctx) => {
-    if (!delegatedChild) { restoreTodos(ctx); restoreGoal(ctx); }
+    let branch: readonly unknown[] = [];
+    try { branch = sessionBranch(ctx); } catch { /* keep empty */ }
+    renders?.setEntries(branch.length);
+    if (!delegatedChild) { restoreTodos(ctx, branch); restoreGoal(ctx, branch); }
     updateCost(ctx);
     sampleFooter(ctx);
   });
-  pi.on("model_select", (_event, ctx) => sampleFooter(ctx));
-  pi.on("thinking_level_select", (_event, _ctx) => footerTui?.requestRender());
+  pi.on("model_select", (_event, ctx) => { sampleFooter(ctx); refreshQuota(ctx); });
+  pi.on("thinking_level_select", (_event, _ctx) => repaint("effort"));
   pi.on("session_info_changed", (_event, ctx) => { composer.refreshSession(ctx); sampleFooter(ctx); });
   pi.on("session_shutdown", (_event, ctx) => {
     clearSessionBranchCache(ctx);
@@ -772,17 +968,27 @@ export default function piJar(pi: ExtensionAPI): void {
     try { if (ctx.hasUI && ctx.mode === "tui") { ctx.ui.setWorkingMessage?.(); ctx.ui.setWorkingIndicator(); ctx.ui.setWidget("pi-jar.todos", undefined); } } catch {}
     quotaCache?.stop();
     quotaCache = undefined;
-    if (!delegatedChild) { disposeDiscussionPaper(discussionFile); discussionFile = undefined; }
+    clearTimeout(enableQuota);
+    enableQuota = undefined;
+    // Late notifications (draining children, shell disposal) find no scheduler and start no timer.
+    renders?.dispose();
+    renders = undefined;
+    contextUsage?.dispose();
+    contextUsage = undefined;
     todos = undefined;
     changes = undefined;
     changeCount = 0;
     shells?.dispose();
     shells = undefined;
-    subagents.clear();
+    const preserved = subagents.clear();
+    if (preserved.length) ctx.ui.notify(`Unresolved subagent worktrees preserved on disk:\n${preserved.join("\n")}`, "warning");
+    const closingDiscussion = discussion;
+    discussion = undefined;
     goals = undefined;
     disposeFooter?.();
     disposeFooter = undefined;
     demo = false;
+    return closingDiscussion?.close();
   });
 
   pi.registerShortcut?.(Key.ctrlAlt("r"), {
@@ -806,9 +1012,18 @@ export default function piJar(pi: ExtensionAPI): void {
       if (picked !== undefined) ctx.ui.setEditorText(picked);
     }
   });
+  pi.registerShortcut?.(Key.ctrlShift("tab"), {
+    description: "Switch pi-jar profile",
+    handler: async (ctx) => {
+      if (!ctx.hasUI || ctx.mode !== "tui" || !profileStore || settingsOpen) return;
+      const profiles = profileStore.list();
+      const index = profiles.findIndex((profile) => profile.name === profileStore!.activeName);
+      if (profiles.length > 1) await switchProfile(profiles[(index + 1) % profiles.length]!.name, ctx);
+    }
+  });
   pi.registerShortcut?.(Key.ctrlAlt("m"), {
     description: "Cycle pi-jar model roles",
-    handler: async (ctx) => { await modelRoles.cycle(ctx); footerTui?.requestRender(); }
+    handler: async (ctx) => { await modelRoles.cycle(ctx); repaint("roles"); }
   });
   pi.registerShortcut?.(Key.ctrlAlt("a"), {
     description: "Subagents and background shells (pi-jar)",
@@ -835,6 +1050,20 @@ export default function piJar(pi: ExtensionAPI): void {
         ctx.ui.notify(`pi-jar: UI ${enabled ? "on" : "off"}; animations ${animations ? "on" : "off"}; quota ${quotaCache?.enabled ? "on" : "off"} (session-only); composer ${composer.enabled ? "on" : "off"}; mascot ${visualSettings.mascot ? "on" : "off"}; suggestions ${visualSettings.suggestions ? "on" : "off"}; ${todos?.all().length ?? 0} to-dos; demo ${demo ? "on" : "off"}`, "info");
         return;
       }
+      if (command === "perf") {
+        // On demand only: one `ps` call for live children; everything else is an in-memory counter.
+        const subagentStats = subagents.stats();
+        const childRssBytes = await processRss(subagentStats.pids);
+        ctx.ui.notify(formatPerf({
+          entries: renders?.entries ?? 0, context: contextUsage?.label ?? "ctx ?", rssBytes: process.memoryUsage.rss(),
+          ...(renders ? { render: renders.stats() } : {}), ...(contextUsage ? { sampling: contextUsage.stats() } : {}),
+          subagents: subagentStats, ...(childRssBytes !== undefined ? { childRssBytes } : {}),
+          ...(shells ? { shells: shells.stats() } : {}), ...(discussion ? { discussion: discussion.stats() } : {}),
+          ...(quotaCache ? { quota: quotaCache.stats() } : {}),
+          sideCalls: sideUsage.all().length, now: Date.now()
+        }), "info");
+        return;
+      }
       // `/jar resume` without a number opens the same searchable picker.
       if (command === "sessions" || command.startsWith("sessions ") || command === "resume") {
         await openSessions(ctx, command === "resume" ? "" : args.trim().slice(8).trim());
@@ -879,7 +1108,7 @@ export default function piJar(pi: ExtensionAPI): void {
           return;
         }
         footerSettings = visualSettings.footer;
-        footerTui?.requestRender();
+        repaint("settings");
         const labels: Record<(typeof FOOTER_FIELDS)[number], string> = {
           model: "Model", effort: "Model effort", sessionName: "Session name", cwd: "Working directory", context: "Context",
           memory: "Process RAM (RSS)", cost: "Session cost", quota: "Quota", roles: "Roles", extras: "Extension statuses", branch: "Git branch"
@@ -907,8 +1136,7 @@ export default function piJar(pi: ExtensionAPI): void {
         const applied = selectAccent(ctx, selected);
         if (applied) {
           visualSettings = { ...visualSettings, accent: selected as JarVisualSettings["accent"] };
-          try { saveVisualSettings(getAgentDir(), visualSettings); }
-          catch { ctx.ui.notify("Accent changed for this session but could not be saved", "warning"); }
+          persistVisualPreferences(visualSettings, ctx, accentTheme(visualSettings.accent));
           applyWorking(ctx);
         }
         const valid = selected === "default" || ACCENT_NAMES.some((name) => name === selected);
@@ -974,10 +1202,10 @@ export default function piJar(pi: ExtensionAPI): void {
       else if (command === "animations off") applyVisualSettings({ ...visualSettings, animations: false }, ctx);
       else if (command === "ui on") applyVisualSettings({ ...visualSettings, ui: true }, ctx);
       else if (command === "ui off") applyVisualSettings({ ...visualSettings, ui: false }, ctx);
-      else if (command === "quota on" && quotaCache) { quotaCache.enabled = true; quotaDisabledByUser = false; }
+      else if (command === "quota on" && quotaCache) { quotaCache.enabled = true; quotaDisabledByUser = false; refreshQuota(ctx); }
       else if (command === "quota off" && quotaCache) { quotaCache.enabled = false; quotaDisabledByUser = true; quotaCache.stop(); }
       else {
-        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");
+        ctx.ui.notify("Usage: /jar [status|perf|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);