pi-jar 0.1.9 → 0.2.0

package/src/model-roles.ts

@@ -139,7 +139,12 @@ function writeConfig(file: string, config: RoleConfig): void {
   }
 }
 
-export const projectRoleFile = (cwd: string) => join(cwd, ".pi", ROLE_FILE);
+function profileRolePath(directory: string, profileId = "default"): string {
+  if (!/^[a-z0-9-]+$/.test(profileId)) throw new Error("Invalid profile ID");
+  return profileId === "default" ? join(directory, ROLE_FILE) : join(directory, "pi-jar-profiles", `${profileId}-roles.json`);
+}
+export const profileRoleFile = (directory: string, profileId?: string) => profileRolePath(directory, profileId);
+export const projectRoleFile = (cwd: string, profileId?: string) => profileRolePath(join(cwd, ".pi"), profileId);
 
 export function describeRole(row: RoleRow): string {
   const target = row.error ? "⚠ " + row.error
@@ -152,6 +157,7 @@ export class ModelRoleManager {
   private global: RoleConfig = readConfig(join(getAgentDir(), ROLE_FILE));
   private project: RoleConfig = { version: 2, roles: {} };
   private cwd: string | undefined;
+  private profileId = "default";
   private active: string | undefined;
   private readonly pi: ExtensionAPI;
   /** True while pi-jar itself is switching models, so its own changes are not seen as manual. */
@@ -166,11 +172,21 @@ export class ModelRoleManager {
   }
 
   /** Reload global and project files; project assignments override global ones per role. */
-  load(cwd?: string): void {
-    this.global = readConfig(join(getAgentDir(), ROLE_FILE));
+  load(cwd?: string, profileRoles?: RoleConfig, profileId = "default"): void {
+    const profileFile = profileRoleFile(getAgentDir(), profileId);
+    this.global = profileRoles && !existsSync(profileFile) ? parseRoleConfig(profileRoles) : readConfig(profileFile);
     this.cwd = cwd;
-    this.project = cwd ? readConfig(projectRoleFile(cwd)) : { version: 2, roles: {} };
+    this.profileId = profileId;
+    this.project = cwd ? readConfig(projectRoleFile(cwd, profileId)) : { version: 2, roles: {} };
+  }
+  activeProfileId(): string { return this.profileId; }
+  /** Restore the label only, after a failed profile transaction restored model and effort. */
+  restoreActiveRole(role: string | undefined, ctx: ExtensionContext): void {
+    if (role !== undefined && !isRoleName(role)) throw new Error("Invalid role name");
+    this.active = role;
+    this.status(ctx);
   }
+  profileRoleConfig(): RoleConfig { return structuredClone(this.global); }
 
   private merged(): Record<string, string> { return { ...this.global.roles, ...this.project.roles }; }
   activeRole(): string | undefined { return this.active; }
@@ -288,7 +304,7 @@ export class ModelRoleManager {
     const epoch = this.manualEpoch;
     return async () => {
       // A model or effort the user picked during the workflow wins over the saved one.
-      if (this.manualEpoch !== epoch) { this.active = undefined; this.status(ctx); return; }
+      if (this.manualEpoch !== epoch) return;
       this.applying = true;
       try { if (previousModel) await this.pi.setModel(previousModel); this.pi.setThinkingLevel(previousThinking); }
       finally { this.applying = false; }
@@ -310,6 +326,9 @@ export class ModelRoleManager {
     return await this.activate(next, ctx) ? next : undefined;
   }
 
+  /** Invalidate temporary role restorations after a profile change. */
+  invalidateTemporaryRestores(): void { this.manualEpoch++; this.active = undefined; }
+
   /** Assign (or clear with undefined) a role in the chosen scope. */
   update(role: string, spec: string | undefined, scope: RoleScope = this.scopeOf(role) ?? "global"): void {
     if (!isRoleName(role)) throw new Error("Invalid role name: " + role);
@@ -320,7 +339,7 @@ export class ModelRoleManager {
     const roles = { ...target.roles };
     if (normalized) roles[role] = normalized; else delete roles[role];
     const next: RoleConfig = { ...target, version: 2, roles };
-    writeConfig(scope === "project" ? projectRoleFile(this.cwd!) : join(getAgentDir(), ROLE_FILE), next);
+    writeConfig(scope === "project" ? projectRoleFile(this.cwd!, this.profileId) : profileRoleFile(getAgentDir(), this.profileId), next);
     if (scope === "project") this.project = next; else this.global = next;
   }
 
@@ -346,11 +365,11 @@ export class ModelRoleManager {
     if (scope === "project" && !this.cwd) throw new Error("Project roles need a working directory");
     const target = scope === "project" ? this.project : this.global;
     const next: RoleConfig = { ...target, fallbacks: { ...target.fallbacks, [role]: [...new Set(normalized)] } };
-    writeConfig(scope === "project" ? projectRoleFile(this.cwd!) : join(getAgentDir(), ROLE_FILE), next);
+    writeConfig(scope === "project" ? projectRoleFile(this.cwd!, this.profileId) : profileRoleFile(getAgentDir(), this.profileId), next);
     if (scope === "project") this.project = next; else this.global = next;
   }
 
-  register(openUi?: (ctx: ExtensionContext) => Promise<void>, options: { activateDefault?: () => boolean } = {}): void {
+  register(openUi?: (ctx: ExtensionContext) => Promise<void>, options: { activateDefault?: () => boolean; beforeSessionStart?: (ctx: ExtensionContext) => { roles?: RoleConfig; profileId?: string } | undefined } = {}): void {
     const manual = (_event: unknown, ctx: ExtensionContext) => {
       if (this.applying) return;
       this.manualEpoch++;
@@ -359,7 +378,8 @@ export class ModelRoleManager {
     this.pi.on("model_select", manual);
     this.pi.on("thinking_level_select", manual);
     this.pi.on("session_start", async (_event, ctx) => {
-      this.load(ctx.cwd);
+      const profile = options.beforeSessionStart?.(ctx);
+      this.load(ctx.cwd, profile?.roles, profile?.profileId);
       this.active = undefined;
       // Delegated children already received their role model/effort via CLI arguments.
       if (options.activateDefault?.() !== false && this.resolveCandidates("default").length) await this.activate("default", ctx, true);

package/src/profile-wizard.ts

@@ -0,0 +1,61 @@
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { JarVisualSettings } from "./settings.ts";
+import type { JarProfile, ProfileStore } from "./profiles.ts";
+import { isRoleName, normalizeSpec, type RoleConfig, type ModelRoleManager } from "./model-roles.ts";
+
+export interface ProfileWizardOptions {
+  themes: readonly string[];
+  settings: JarVisualSettings;
+  roles: RoleConfig;
+  roleManager?: ModelRoleManager;
+  create(name: string, theme: string, settings: JarVisualSettings, roles: RoleConfig): JarProfile;
+}
+
+/** Every step is cancellable; creation happens only after the final confirmation. */
+export async function createProfileWizard(ctx: ExtensionContext, store: ProfileStore, options: ProfileWizardOptions): Promise<JarProfile | undefined> {
+  if (!ctx.hasUI || ctx.mode !== "tui") return undefined;
+  const name = await ctx.ui.input("New profile name (1–32 characters)", "");
+  if (name === undefined) return undefined;
+  if (/[\u0000-\u001f\u007f-\u009f]/.test(name)) { ctx.ui.notify("Profile name cannot contain control characters", "warning"); return undefined; }
+  const normalized = name.trim().replace(/\s+/g, " ");
+  if (!normalized || normalized.length > 32 || /[\\/\0]/.test(normalized)) {
+    ctx.ui.notify("Profile name must be 1–32 characters and cannot contain slashes", "warning"); return undefined;
+  }
+  if (store.list().some((profile) => profile.name.toLocaleLowerCase() === normalized.toLocaleLowerCase())) {
+    ctx.ui.notify("A profile with that name already exists", "warning"); return undefined;
+  }
+  if (!options.themes.length) { ctx.ui.notify("No themes are available for profiles", "warning"); return undefined; }
+  const selectedTheme = await ctx.ui.select("Choose a theme for " + normalized, ["Follow Pi", ...options.themes.filter((item) => item !== "follow")]);
+  if (!selectedTheme) return undefined;
+  const theme = selectedTheme === "Follow Pi" ? "follow" : selectedTheme;
+  const roles = structuredClone(options.roles);
+  const roleNames = options.roleManager?.list().map((role) => role.role) ?? [];
+  if (options.roleManager) {
+    for (const role of roleNames) {
+      const current = roles.roles[role];
+      const answer = await ctx.ui.input(`${role} role assignment (blank keeps current${current ? `: ${current}` : ""}; none clears)`, "");
+      if (answer === undefined) return undefined;
+      if (!answer.trim()) continue;
+      if (answer.trim().toLowerCase() === "none") { delete roles.roles[role]; continue; }
+      const model = normalizeSpec(answer.trim());
+      if (!model) { ctx.ui.notify("Enter a valid provider/model, @role, *, or none for " + role, "warning"); return undefined; }
+      roles.roles[role] = model;
+    }
+  } else {
+    const roleInput = await ctx.ui.input("Role assignments as role=provider/model, comma-separated (optional)", "");
+    if (roleInput === undefined) return undefined;
+    for (const assignment of roleInput.split(",").map((item) => item.trim()).filter(Boolean)) {
+    const split = assignment.indexOf("=");
+    if (split <= 0) { ctx.ui.notify("Use role=provider/model for each assignment", "warning"); return undefined; }
+    const role = assignment.slice(0, split).trim().toLowerCase();
+    const model = normalizeSpec(assignment.slice(split + 1).trim());
+    if (!isRoleName(role) || !model) { ctx.ui.notify("Invalid role assignment: " + assignment, "warning"); return undefined; }
+    roles.roles[role] = model;
+    }
+  }
+  const roleSummary = Object.entries(roles.roles).map(([role, target]) => `${role} → ${target}`).join("\n") || "No roles assigned";
+  const confirmed = await ctx.ui.confirm("Create profile", `${normalized}\nTheme: ${theme === "follow" ? "Follow Pi" : theme}\n${roleSummary}`);
+  if (!confirmed) return undefined;
+  try { return options.create(normalized, theme, options.settings, roles); }
+  catch (error) { ctx.ui.notify("Could not create profile: " + (error as Error).message, "error"); return undefined; }
+}

package/src/profiles.ts

@@ -0,0 +1,148 @@
+import { mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+import { isRoleName, normalizeSpec, parseRoleConfig, type RoleConfig } from "./model-roles.ts";
+import { isMaxSubagents, defaultVisualSettings, loadVisualSettings, type JarVisualSettings } from "./settings.ts";
+import { ACCENT_NAMES } from "./accent.ts";
+import { FOOTER_FIELDS } from "./footer-settings.ts";
+import { ICON_SETS } from "./icons.ts";
+
+export interface JarProfile { id: string; name: string; theme: string; settings: JarVisualSettings; roles: RoleConfig }
+interface ProfileDocument { version: 1; active: string; profiles: JarProfile[] }
+export const PROFILE_FILE = "pi-jar-profiles.json";
+export const DEFAULT_PROFILE = "Default";
+export const PROFILE_ENTRY = "pi-jar.profile";
+export function conversationStarted(entries: readonly unknown[]): boolean {
+  return entries.some((entry) => isPlainObject(entry) && (entry.role === "user"
+    || (entry.type === "message" && isPlainObject(entry.message) && entry.message.role === "user")));
+}
+export function pinnedProfileId(entries: readonly unknown[]): string | undefined {
+  for (const entry of [...entries].reverse()) {
+    if (isPlainObject(entry) && entry.type === "custom" && entry.customType === PROFILE_ENTRY
+      && isPlainObject(entry.data) && entry.data.version === 1 && typeof entry.data.id === "string") return entry.data.id;
+  }
+  return undefined;
+}
+const safeName = (value: string) => value.trim().replace(/\s+/g, " ");
+const profileId = () => `profile-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
+const isPlainObject = (value: unknown): value is Record<string, unknown> => !!value && typeof value === "object" && !Array.isArray(value);
+
+function validProfileName(value: unknown): value is string {
+  return typeof value === "string" && value.length > 0 && value.length <= 32 && !/[\\/\0\u0001-\u001f\u007f-\u009f]/.test(value) && value.trim() === value;
+}
+function normalizeProfile(value: unknown): JarProfile | undefined {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return undefined;
+  const raw = value as Record<string, unknown>;
+  if (!validProfileName(raw.name) || typeof raw.theme !== "string" || !raw.theme || !isPlainObject(raw.settings)
+    || raw.settings.version !== 1 || !isPlainObject(raw.roles) || raw.roles.version !== 2 || !isPlainObject(raw.roles.roles)) return undefined;
+  const settings = raw.settings;
+  const footer = settings.footer;
+  if (!["accent", "animations", "ui", "composer", "mascot", "suggestions", "goalRounds", "maxSubagents", "advisor", "advisorGates", "icons", "footer"].every((key) => key in settings)
+    || !isPlainObject(settings.footer) || typeof settings.animations !== "boolean" || typeof settings.ui !== "boolean"
+    || typeof settings.composer !== "boolean" || typeof settings.mascot !== "boolean" || typeof settings.suggestions !== "boolean"
+    || typeof settings.advisor !== "boolean" || typeof settings.advisorGates !== "boolean"
+    || (settings.contextDiet !== undefined && typeof settings.contextDiet !== "boolean") || !Number.isInteger(settings.goalRounds)
+    || (settings.goalRounds as number) < 1 || (settings.goalRounds as number) > 50
+    || !isMaxSubagents(settings.maxSubagents) || typeof settings.accent !== "string"
+    || !(settings.accent === "follow" || settings.accent === "default" || ACCENT_NAMES.includes(settings.accent as never))
+    || !ICON_SETS.includes(settings.icons as never)
+    || !isPlainObject(footer) || !FOOTER_FIELDS.every((field) => typeof footer[field] === "boolean")) return undefined;
+  if (raw.name === DEFAULT_PROFILE && raw.id !== "default") return undefined;
+  if (raw.name !== DEFAULT_PROFILE && (typeof raw.id !== "string" || !/^profile-[a-z0-9-]{8,64}$/.test(raw.id))) return undefined;
+  for (const [role, spec] of Object.entries(raw.roles.roles)) if (!isRoleName(role) || typeof spec !== "string" || !normalizeSpec(spec)) return undefined;
+  return { id: raw.id as string, name: raw.name, theme: raw.theme, settings: { ...raw.settings, contextDiet: settings.contextDiet ?? false } as unknown as JarVisualSettings, roles: parseRoleConfig(raw.roles) };
+}
+function atomicSave(file: string, document: ProfileDocument): string {
+  mkdirSync(join(file, ".."), { recursive: true });
+  const temporary = `${file}.${process.pid}.${Math.random().toString(36).slice(2)}.tmp`;
+  const text = JSON.stringify(document, null, 2) + "\n";
+  try { writeFileSync(temporary, text, { flag: "wx" }); renameSync(temporary, file); }
+  catch (error) { try { unlinkSync(temporary); } catch {} throw error; }
+  return text;
+}
+
+export class ProfileStore {
+  private document: ProfileDocument;
+  private savedContents: string | undefined;
+  readonly directory: string;
+  constructor(directory: string, initialTheme = "pi-jar-dark", initialRoles: RoleConfig = { version: 2, roles: {} }) {
+    this.directory = directory;
+    const file = join(directory, PROFILE_FILE);
+    let loaded: ProfileDocument | undefined;
+    let missing = false;
+    try {
+      this.savedContents = readFileSync(file, "utf8");
+      const raw: unknown = JSON.parse(this.savedContents);
+      if (!isPlainObject(raw) || raw.version !== 1 || !Array.isArray(raw.profiles) || typeof raw.active !== "string") throw new Error("Unsupported or malformed pi-jar profiles file");
+      const profiles: JarProfile[] = [];
+      const names = new Set<string>(); const ids = new Set<string>();
+      for (const entry of raw.profiles) {
+        const profile = normalizeProfile(entry);
+        if (!profile) throw new Error("Malformed profile entry");
+        const name = profile.name.toLocaleLowerCase();
+        if (names.has(name) || ids.has(profile.id)) throw new Error("Duplicate profile name or id");
+        names.add(name); ids.add(profile.id); profiles.push(profile);
+      }
+      if (profiles.filter((profile) => profile.name === DEFAULT_PROFILE && profile.id === "default").length !== 1) throw new Error("Missing or invalid Default profile");
+      const active = profiles.find((profile) => profile.name === raw.active || profile.id === raw.active)?.name;
+      if (!active) throw new Error("Active profile does not exist");
+      loaded = { version: 1, active, profiles };
+    } catch (error) {
+      if ((error as NodeJS.ErrnoException).code === "ENOENT") missing = true;
+      else throw new Error(`Cannot load ${PROFILE_FILE}: ${(error as Error).message}`);
+    }
+    if (!loaded && missing) {
+      let legacy = defaultVisualSettings();
+      try { legacy = loadVisualSettings(directory); } catch { /* default settings */ }
+      loaded = { version: 1, active: DEFAULT_PROFILE, profiles: [{ id: "default", name: DEFAULT_PROFILE, theme: initialTheme, settings: legacy, roles: parseRoleConfig(initialRoles) }] };
+    }
+    this.document = loaded!;
+    if (missing) this.persist();
+  }
+  private persist(next = this.document): void {
+    const file = join(this.directory, PROFILE_FILE);
+    let current: string | undefined;
+    try { current = readFileSync(file, "utf8"); }
+    catch (error) { if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error; }
+    if (current !== this.savedContents) throw new Error("Profiles changed in another session or externally; reload before saving");
+    this.savedContents = atomicSave(file, next);
+  }
+  list(): JarProfile[] { return this.document.profiles.map((profile) => structuredClone(profile)); }
+  active(): JarProfile { return structuredClone(this.document.profiles.find((profile) => profile.name === this.document.active)!); }
+  get activeName(): string { return this.document.active; }
+  update(name: string, patch: Partial<Pick<JarProfile, "theme" | "settings">>): JarProfile {
+    const index = this.document.profiles.findIndex((profile) => profile.name === name);
+    if (index < 0) throw new Error("Unknown profile: " + name);
+    const profiles = [...this.document.profiles];
+    const profile = normalizeProfile(structuredClone({ ...profiles[index]!, ...patch }));
+    if (!profile) throw new Error("Invalid profile settings or theme");
+    profiles[index] = profile;
+    const next = { ...this.document, profiles };
+    this.persist(next);
+    this.document = next;
+    return structuredClone(profile);
+  }
+  add(name: string, theme: string, settings: JarVisualSettings, roles: RoleConfig = { version: 2, roles: {} }): JarProfile {
+    if (typeof name !== "string" || /[\u0000-\u001f\u007f-\u009f]/.test(name)) throw new Error("Profile name cannot contain control characters");
+    const normalized = safeName(name);
+    if (!validProfileName(normalized)) throw new Error("Profile name must be 1–32 characters and cannot contain slashes");
+    if (this.document.profiles.some((profile) => profile.name.toLocaleLowerCase() === normalized.toLocaleLowerCase())) throw new Error("A profile with that name already exists");
+    const id = profileId();
+    const profile = normalizeProfile({ id, name: normalized, theme, settings: structuredClone(settings), roles });
+    if (!profile) throw new Error("Invalid profile settings, theme, or roles");
+    const next = { ...this.document, profiles: [...this.document.profiles, profile] };
+    this.persist(next);
+    this.document = next;
+    return structuredClone(profile);
+  }
+  activate(name: string): JarProfile {
+    if (!this.document.profiles.some((profile) => profile.name === name)) throw new Error("Unknown profile: " + name);
+    const next = { ...this.document, active: name };
+    this.persist(next);
+    this.document = next;
+    return this.active();
+  }
+  cycle(): JarProfile {
+    const index = this.document.profiles.findIndex((profile) => profile.name === this.document.active);
+    return this.activate(this.document.profiles[(index + 1) % this.document.profiles.length]!.name);
+  }
+}

package/src/settings-ui.ts

@@ -3,6 +3,9 @@ import { Key, matchesKey, truncateToWidth, visibleWidth, type TuiMouseEvent } fr
 import { FOOTER_FIELDS, type FooterField } from "./footer-settings.ts";
 import { ICON_SETS } from "./icons.ts";
 import { GOAL_ROUND_CHOICES, MAX_SUBAGENT_CHOICES, type JarAccent, type JarVisualSettings } from "./settings.ts";
+import { createProfileWizard } from "./profile-wizard.ts";
+import type { JarProfile, ProfileStore } from "./profiles.ts";
+import type { RoleConfig, ModelRoleManager } from "./model-roles.ts";
 
 const LABELS: Record<FooterField, string> = {
   model: "Model", effort: "Model effort", sessionName: "Session name", cwd: "Working directory",
@@ -10,8 +13,7 @@ const LABELS: Record<FooterField, string> = {
   extras: "Extension statuses", branch: "Git branch"
 };
 
-type Page = "appearance" | "footer" | "pi";
-const PAGES: Page[] = ["appearance", "footer", "pi"];
+type Page = "appearance" | "footer" | "pi" | "profiles";
 
 /** Pi-level preferences pi-jar can toggle (written to Pi's own settings). */
 export interface PiPreferences {
@@ -26,18 +28,22 @@ export async function openJarSettings(
   current: () => JarVisualSettings,
   update: (settings: JarVisualSettings) => void,
   availableAccents: readonly string[],
-  pi?: PiPreferences
+  pi?: PiPreferences,
+  profiles?: { store: ProfileStore; themes: readonly string[]; roles: () => RoleConfig; roleManager?: ModelRoleManager; create: (name: string, theme: string, settings: JarVisualSettings, roles: RoleConfig) => JarProfile; select(name: string): Promise<void>; setTheme(name: string): void }
 ): Promise<void> {
   if (!ctx.hasUI || ctx.mode !== "tui") return;
-  await ctx.ui.custom<void>((tui, theme, _keys, done) => {
-    let page: Page = "appearance";
+  const PAGES: Page[] = profiles ? ["appearance", "footer", "pi", "profiles"] : ["appearance", "footer", "pi"];
+  let lastPage: Page = "appearance";
+  while (true) {
+  const action = await ctx.ui.custom<"create" | "switch" | "theme" | undefined>((tui, theme, _keys, done) => {
+    let page: Page = lastPage;
     let selected = 0;
     let width = 64;
     const accents: JarAccent[] = ["follow", ...availableAccents.filter((name): name is JarAccent =>
       name === "default" || ["gray", "pink", "teal", "azure", "violet", "amber"].includes(name))];
     let choosing: "goalRounds" | "maxSubagents" | undefined;
     const choices = () => choosing === "maxSubagents" ? MAX_SUBAGENT_CHOICES : GOAL_ROUND_CHOICES;
-    const fields = () => choosing ? choices().length : page === "footer" ? FOOTER_FIELDS.length : page === "pi" ? 6 : 7;
+    const fields = () => choosing ? choices().length : page === "footer" ? FOOTER_FIELDS.length : page === "pi" ? 7 : page === "profiles" ? 3 : 7;
     const finishChoice = () => { selected = choosing === "maxSubagents" ? 3 : 2; choosing = undefined; };
     const piError = (error: unknown) => ctx.ui.notify("Could not change Pi setting: " + (error as Error).message, "error");
     const explainPool = () => choosing === "maxSubagents" || (page === "pi" && !choosing && selected === 3);
@@ -50,6 +56,10 @@ export async function openJarSettings(
         if (choosing === "maxSubagents") update({ ...state, maxSubagents: MAX_SUBAGENT_CHOICES[index]! });
         else update({ ...state, goalRounds: GOAL_ROUND_CHOICES[index]! });
         finishChoice();
+      } else if (page === "profiles") {
+        lastPage = page;
+        done(index === 0 ? "switch" : index === 1 ? "theme" : "create");
+        return;
       } else if (page === "footer") {
         const field = FOOTER_FIELDS[index];
         if (field) update({ ...state, footer: { ...state.footer, [field]: !state.footer[field] } });
@@ -66,6 +76,7 @@ export async function openJarSettings(
         }
         else if (index === 4) update({ ...state, advisor: !state.advisor });
         else if (index === 5) update({ ...state, advisorGates: !state.advisorGates });
+        else if (index === 6) update({ ...state, contextDiet: !state.contextDiet });
       } else if (index === 0) {
         const at = Math.max(0, accents.indexOf(state.accent));
         update({ ...state, accent: accents[(at + 1) % accents.length]! });
@@ -90,7 +101,7 @@ export async function openJarSettings(
       invalidate() {},
       handleInput(data: string) {
         if (matchesKey(data, Key.escape) || data === "q") {
-          if (choosing) { finishChoice(); tui.requestRender(); } else done();
+          if (choosing) { finishChoice(); tui.requestRender(); } else done(undefined);
           return;
         }
         if (choosing && (matchesKey(data, Key.tab) || matchesKey(data, Key.right)
@@ -112,19 +123,20 @@ export async function openJarSettings(
           tui.requestRender(); return { handled: true };
         }
         if (event.type !== "click" || event.button !== "left") return;
-        if (event.y === 0 && event.x >= width - 4) { done(); return { handled: true }; }
+        if (event.y === 0 && event.x >= width - 4) { done(undefined); return { handled: true }; }
         if (event.y === 1) {
           choosing = undefined;
           if (event.x >= 2 && event.x < Math.min(width - 2, 19)) { page = "appearance"; selected = 0; }
           else if (event.x >= 19 && event.x < Math.min(width - 2, 32)) { page = "footer"; selected = 0; }
-          else if (event.x >= 32 && event.x < width - 2) { page = "pi"; selected = 0; }
+          else if (event.x >= 32 && event.x < Math.min(width - 2, 41)) { page = "pi"; selected = 0; }
+          else if (profiles && event.x >= 41 && event.x < width - 2) { page = "profiles"; selected = 0; }
           else return;
           tui.requestRender(); return { handled: true, focus: true };
         }
         if (event.y >= 5 && event.y < 5 + visibleCount() && event.x >= 2 && event.x < width - 2) {
           selected = firstVisible() + event.y - 5; apply(selected); return { handled: true, focus: true };
         }
-        if (event.y === 5 + visibleCount() && event.x >= 2 && event.x < width - 2) { done(); return { handled: true }; }
+        if (event.y === 5 + visibleCount() && event.x >= 2 && event.x < width - 2) { done(undefined); return { handled: true }; }
       },
       render(available: number): string[] {
         width = Math.max(8, available);
@@ -136,7 +148,8 @@ export async function openJarSettings(
           + "─".repeat(Math.max(0, width - 4 - visibleWidth(title))) + "×╮");
         const tabs = line(theme.fg(page === "appearance" ? "accent" : "muted", "[ Appearance ]")
           + "   " + theme.fg(page === "footer" ? "accent" : "muted", "[ Footer ]")
-          + "   " + theme.fg(page === "pi" ? "accent" : "muted", "[ Pi ]"));
+          + "   " + theme.fg(page === "pi" ? "accent" : "muted", "[ Pi ]")
+          + (profiles ? "   " + theme.fg(page === "profiles" ? "accent" : "muted", "[ Profiles ]") : ""));
         const prefs = pi?.get();
         const divider = theme.fg("dim", "├" + "─".repeat(Math.max(0, width - 2)) + "┤");
         const allRows = choosing
@@ -149,7 +162,12 @@ export async function openJarSettings(
             row(2, "Goal auto rounds", String(state.goalRounds), true),
             row(3, "Max subagents (retained live pool)", String(state.maxSubagents), true),
             row(4, "Advisor (jar_advisor, /advisor)", state.advisor ? "ON" : "OFF", state.advisor),
-            row(5, "Advisor gates (loops, repeated failures)", state.advisorGates ? "ON" : "OFF", state.advisorGates)
+            row(5, "Advisor gates (loops, repeated failures)", state.advisorGates ? "ON" : "OFF", state.advisorGates),
+          row(6, "Context diet (prior-turn reasoning)", state.contextDiet ? "ON" : "OFF", state.contextDiet)
+          ] : page === "profiles" ? [
+            row(0, "Active profile", profiles!.store.activeName, true),
+            row(1, "Theme", profiles!.store.active().theme, true),
+            row(2, "Create profile…", "OPEN", true)
           ] : [
             row(0, "Accent", state.accent === "follow" ? "FOLLOW PI" : state.accent.toUpperCase(), true),
             row(1, "Motion", state.animations ? "ON" : "OFF", state.animations),
@@ -163,11 +181,12 @@ export async function openJarSettings(
         const rows = allRows.slice(start, start + pageSize());
         return [top, tabs, divider,
           line(theme.fg("accent", choosing === "maxSubagents" ? " MAX SUBAGENTS · RETAINED LIVE POOL"
-            : choosing === "goalRounds" ? " GOAL AUTO ROUNDS" : page === "footer" ? " FOOTER VISIBILITY" : page === "pi" ? " PI & WORKFLOWS" : " APPEARANCE & MOTION")),
+            : choosing === "goalRounds" ? " GOAL AUTO ROUNDS" : page === "footer" ? " FOOTER VISIBILITY" : page === "pi" ? " PI & WORKFLOWS" : page === "profiles" ? " PROFILES" : " APPEARANCE & MOTION")),
           line(theme.fg("dim", explainPool() ? " Live pool includes idle/paused subagents"
             : choosing ? " Select a value; Enter/click to save, Esc to cancel"
             : page === "footer" ? ` Footer fields ${start + 1}–${start + rows.length}/${fields()}`
-            : page === "pi" ? " Fullscreen mode enables clicks and copy-on-select" : " Accent cycles through loaded themes")),
+            : page === "pi" ? " Fullscreen mode enables clicks and copy-on-select"
+            : page === "profiles" ? " Switch only in a fresh, idle session" : " Accent cycles through loaded themes")),
           ...rows,
           line(theme.fg("dim", choosing ? " ↑↓: choose · Enter/click: save · Esc: cancel"
             : " Tab: section · ↑↓: choose · Enter/click: change · Esc")),
@@ -176,4 +195,17 @@ export async function openJarSettings(
       }
     };
   });
+  if (!action || !profiles) return;
+  try {
+    if (action === "create") {
+      await createProfileWizard(ctx, profiles.store, { themes: profiles.themes, settings: { ...current(), accent: "follow" }, roles: profiles.roles(), roleManager: profiles.roleManager, create: profiles.create });
+    } else if (action === "switch") {
+      const name = await ctx.ui.select("Choose a profile", profiles.store.list().map((profile) => profile.name));
+      if (name) await profiles.select(name);
+    } else {
+      const name = await ctx.ui.select("Profile theme", ["Follow Pi", ...profiles.themes.filter((name) => name !== "follow")]);
+      if (name) profiles.setTheme(name === "Follow Pi" ? "follow" : name);
+    }
+  } catch (error) { ctx.ui.notify("Could not change profile: " + (error as Error).message, "error"); }
+  }
 }

package/src/settings.ts

@@ -23,6 +23,8 @@ export interface JarVisualSettings {
   advisor: boolean;
   /** Consult the advisor automatically when the agent repeats a tool call or keeps failing. */
   advisorGates: boolean;
+  /** Opt-in provider-context pruning of reasoning from completed earlier user turns. */
+  contextDiet: boolean;
   /** Glyph set for footer, composer and views: unicode, Nerd Font icons, or plain ascii. */
   icons: IconSet;
   footer: FooterSettings;
@@ -37,7 +39,7 @@ export function isMaxSubagents(value: unknown): value is MaxSubagents {
 
 export const SETTINGS_FILE = "pi-jar-settings.json";
 export function defaultVisualSettings(footer: FooterSettings = DEFAULT_FOOTER_SETTINGS): JarVisualSettings {
-  return { version: 1, accent: "follow", animations: true, ui: true, composer: true, mascot: true, suggestions: true, goalRounds: 8, maxSubagents: 4, advisor: true, advisorGates: true, icons: "unicode", footer: { ...footer } };
+  return { version: 1, accent: "follow", animations: true, ui: true, composer: true, mascot: true, suggestions: true, goalRounds: 8, maxSubagents: 4, advisor: true, advisorGates: true, contextDiet: false, icons: "unicode", footer: { ...footer } };
 }
 
 /** Legacy footer choices are imported only while the new file is absent. Never modify the old file. */
@@ -70,6 +72,7 @@ export function loadVisualSettings(directory: string): JarVisualSettings {
     maxSubagents: isMaxSubagents(value.maxSubagents) ? value.maxSubagents : fallback.maxSubagents,
     advisor: typeof value.advisor === "boolean" ? value.advisor : fallback.advisor,
     advisorGates: typeof value.advisorGates === "boolean" ? value.advisorGates : fallback.advisorGates,
+    contextDiet: typeof value.contextDiet === "boolean" ? value.contextDiet : fallback.contextDiet,
     icons: ICON_SETS.some((set) => set === value.icons) ? value.icons as IconSet : fallback.icons,
     footer: Object.fromEntries(FOOTER_FIELDS.map((field) => [field,
       typeof footer[field] === "boolean" ? footer[field] : fallback.footer[field]])) as FooterSettings

package/src/shell-notifications.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI, CustomMessageEntryDraft } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext, CustomMessageEntryDraft } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
 import { cleanText } from "./status.ts";
 import { describe, SHELL_MESSAGE, type ShellEvent, type ShellManager } from "./shells.ts";
@@ -34,14 +34,40 @@ export function registerShellNotifications(pi: ExtensionAPI, manager: () => Shel
   let interrupted = false;
   let deliveryFailures = 0;
   let timer: ReturnType<typeof setTimeout> | undefined;
+  let feedbackTimer: ReturnType<typeof setTimeout> | undefined;
+  let context: ExtensionContext | undefined;
+  const shown = new Set<string>();
+  const eventKey = (event: ShellEvent) => `${event.kind}:${event.job.id}`;
   const warned = new Set<string>();
-  const cancelTimer = () => { clearTimeout(timer); timer = undefined; };
+  const cancelTimer = () => { clearTimeout(timer); timer = undefined; clearTimeout(feedbackTimer); feedbackTimer = undefined; };
   const take = () => {
     cancelTimer();
     const events = manager()?.takeNotifications() ?? [];
+    shown.clear();
     return events.length ? shellNotification(events) : undefined;
   };
   const notify = () => {
+    // UI feedback must not wait for the remote model to finish reasoning. Keep model transport
+    // boundary-safe and acknowledgeable: this preview does not consume or enqueue a follow-up.
+    if (active && !interrupted && context?.hasUI && !feedbackTimer && manager()?.pendingNotifications()) {
+      const owner = manager(), ctx = context;
+      feedbackTimer = setTimeout(() => {
+        feedbackTimer = undefined;
+        if (!active || interrupted || owner !== manager() || ctx !== context) return;
+        const snapshot = owner?.notificationSnapshot() ?? [];
+        const known = new Set(snapshot.map(eventKey));
+        for (const key of shown) if (!known.has(key)) shown.delete(key);
+        const events = snapshot.filter(event => !shown.has(eventKey(event)));
+        if (!events.length) return;
+        const summary = shellNotification(events).details as ShellNotificationDetails;
+        const text = `${summary.summary}: ${events.slice(0, 3).map(event => describe(event.job)).join("; ")}. Model delivery waits for a safe turn boundary.`;
+        try {
+          ctx.ui.notify(cleanText(text, 420), events.some(event => event.job.exitCode !== 0 && event.kind === "exit") ? "warning" : "info");
+          for (const event of events) shown.add(eventKey(event));
+        } catch (error) { console.error("pi-jar: could not show shell completion", error); }
+      }, 300);
+      feedbackTimer.unref?.();
+    }
     if (active || interrupted || timer || !manager()?.pendingNotifications()) return;
     const owner = manager();
     timer = setTimeout(() => {
@@ -59,16 +85,17 @@ export function registerShellNotifications(pi: ExtensionAPI, manager: () => Shel
     }, 300);
     timer.unref?.();
   };
-  const reset = () => { cancelTimer(); active = false; interrupted = false; deliveryFailures = 0; warned.clear(); };
+  const reset = () => { cancelTimer(); active = false; interrupted = false; context = undefined; deliveryFailures = 0; warned.clear(); shown.clear(); };
 
   pi.registerMessageRenderer?.<ShellNotificationDetails>(SHELL_MESSAGE, (message, { expanded }, theme) => {
     const text = typeof message.content === "string" ? message.content : "Background shells";
     const summary = message.details?.summary ?? text.split("\n", 1)[0] ?? "Background shells";
     return new Text(expanded ? text : theme.fg("accent", cleanText(summary, 160)) + theme.fg("dim", " · expand for status"), 0, 0);
   });
-  pi.on?.("session_start", reset);
+  pi.on?.("session_start", (_event, ctx) => { reset(); context = ctx; });
   pi.on?.("session_shutdown", reset);
-  pi.on?.("before_agent_start", () => {
+  pi.on?.("before_agent_start", (_event, ctx) => {
+    context = ctx;
     active = true;
     interrupted = false;
     const entry = take();
@@ -76,7 +103,7 @@ export function registerShellNotifications(pi: ExtensionAPI, manager: () => Shel
     const { type: _type, ...message } = entry;
     return { message };
   });
-  pi.on?.("agent_start", () => { active = true; cancelTimer(); });
+  pi.on?.("agent_start", (_event, ctx) => { context = ctx; active = true; cancelTimer(); });
   pi.on?.("turn_end", event => {
     if (event.outcome !== "completed" || event.context?.canContinue === false) return;
     const entry = take();

package/src/shells.ts

@@ -125,6 +125,8 @@ export class ShellManager {
     for (const event of events) if (this.jobs.has(event.job.id) && !this.pending.has(event.job.id)) this.pending.set(event.job.id, event);
   }
   pendingNotifications(): number { return this.pending.size; }
+  /** Non-consuming status snapshots for immediate UI feedback; never copy or expose log lines. */
+  notificationSnapshot(): ShellEvent[] { return [...this.pending.values()].map(event => ({ ...event, job: { ...event.job, lines: [] } })); }
   verificationPending(): Array<Omit<ShellJob, "lines">> {
     return [...this.jobs.values()].filter(entry => !entry.finished && entry.job.purpose !== "service").map(({ job }) => {
       const { lines: _lines, ...summary } = job;
@@ -438,6 +440,7 @@ export function registerShells(pi: ExtensionAPI, shells: () => ShellManager | un
     promptGuidelines: [
       "Use jar_shell start for servers, watchers and slow commands; set watch to a regex for the line you are waiting for (e.g. \"listening|ready|error\").",
       "Do not poll: work while commands run, then use wait with explicit ids for relevant checks before the final summary. A bounded wait returns pending jobs honestly; never claim success without their exit codes. Do not wait for services/watchers. output, peek, list and wait acknowledge observed events, preventing stale replay.",
+      "Completion events cannot interrupt an in-flight model response. If no useful work remains, call wait for the relevant finite jobs immediately instead of thinking or waiting for an automatic wake-up.",
       "Notifications contain coalesced status, not log dumps. Inspect output only for relevant diagnostics. Mark never-ending jobs purpose: service and kill shells you no longer need."
     ],
     parameters: Parameters,
@@ -453,7 +456,7 @@ export function registerShells(pi: ExtensionAPI, shells: () => ShellManager | un
           case "start": {
             const job = manager.start({ command: params.command ?? "", cwd: ctx.cwd, ...(params.name ? { name: params.name } : {}), ...(params.watch ? { watch: params.watch } : {}),
               ...(params.notify !== undefined ? { notify: params.notify } : {}), ...(params.purpose ? { purpose: params.purpose } : {}) });
-            return reply(`Started ${describe(job)} (pid ${job.pid ?? "?"}). ${job.notify ? "You will be woken when it " + (job.watch ? "matches or " : "") + "exits." : "Notifications are off; check it with output."}`);
+            return reply(`Started ${describe(job)} (pid ${job.pid ?? "?"}). ${job.notify ? "Completion reaches the model at the next safe turn boundary (or wakes it when idle). If no other useful work remains, use wait now." : "Notifications are off; check it with output."}`);
           }
           case "output": {
             if (!params.id) return reply("output needs an id.");

package/src/side-model.ts

@@ -30,7 +30,7 @@ export interface SideAnswer { text: string; model: string }
  * Ask the model assigned to `role` (or the current model) a one-shot question outside the
  * conversation. Tries configured fallbacks in order on failure; cancellation never retries.
  */
-export async function askRole(ctx: ExtensionContext, roles: ModelRoleManager, usage: SideUsage | undefined, role: string,
+export async function askRole(ctx: ExtensionContext, roles: ModelRoleManager, usage: Pick<SideUsage, "add"> | undefined, role: string,
   systemPrompt: string, prompt: string, signal?: AbortSignal): Promise<SideAnswer> {
   const fallbacks = roles.fallbackSpecs?.(role) ?? [];
   const failures: string[] = [];
@@ -52,6 +52,8 @@ export async function askRole(ctx: ExtensionContext, roles: ModelRoleManager, us
       const result = await ctx.modelRegistry.streamSimple(model,
         { systemPrompt, messages: [{ role: "user", content: prompt, timestamp: Date.now() }] },
         { ...(reasoning ? { reasoning } : {}), ...(signal ? { signal } : {}) }).result();
+      // Callers with detached work can supply a session-generation-safe usage sink.
+      // Returned attempts (including cancelled attempts) still account for actual usage.
       const cost = result.usage?.cost?.total;
       usage?.add({ role, model: name, input: result.usage?.input ?? 0, output: result.usage?.output ?? 0, cacheRead: result.usage?.cacheRead ?? 0,
         cacheWrite: result.usage?.cacheWrite ?? 0, cost: Number.isFinite(cost) ? cost! : 0, at: Date.now() });