pi-jar 0.1.1 → 0.1.3

package/src/prompt-search.ts

@@ -4,8 +4,21 @@ import { cleanText } from "./status.ts";
 
 export interface PastPrompt { text: string; source: "this session" | "earlier session"; at?: number }
 
-const userText = (message: { content?: unknown }) => typeof message.content === "string" ? message.content
-  : Array.isArray(message.content) ? message.content.filter((part: { type?: string }) => part?.type === "text").map((part: { text?: string }) => part.text ?? "").join("\n") : "";
+const MAX_PROMPT_CHARS = 8000;
+const userText = (message: { content?: unknown }): string => {
+  if (typeof message.content === "string") return message.content.slice(0, MAX_PROMPT_CHARS + 1);
+  if (!Array.isArray(message.content)) return "";
+  let text = "";
+  for (const part of message.content as Array<{ type?: string; text?: string }>) {
+    if (part?.type !== "text" || typeof part.text !== "string") continue;
+    const separator = text ? "\n" : "";
+    const room = MAX_PROMPT_CHARS + 1 - text.length - separator.length;
+    if (room <= 0) break;
+    text += separator + part.text.slice(0, room);
+    if (part.text.length > room) break;
+  }
+  return text;
+};
 
 /**
  * Prompts newest first and deduplicated: every user message in this session file (all branches),
@@ -17,13 +30,17 @@ export function collectPrompts(entries: readonly unknown[], earlier: readonly {
   const add = (text: string, source: PastPrompt["source"], at?: number) => {
     const value = text.trim();
     const key = value.replace(/\s+/g, " ");
-    if (!value || value.length > 8000 || seen.has(key)) return;
+    if (!value || value.length > MAX_PROMPT_CHARS || seen.has(key)) return;
     seen.add(key);
     result.push({ text: value, source, ...(at ? { at } : {}) });
   };
-  const own = entries.filter((raw): raw is { type: string; message: { role: string; content?: unknown }; timestamp?: string } =>
-    !!raw && typeof raw === "object" && (raw as { type?: string }).type === "message" && (raw as { message?: { role?: string } }).message?.role === "user");
-  for (const entry of [...own].reverse()) add(userText(entry.message), "this session", entry.timestamp ? Date.parse(entry.timestamp) : undefined);
+  for (let index = entries.length - 1; index >= 0; index--) {
+    const raw = entries[index];
+    if (!raw || typeof raw !== "object") continue;
+    const entry = raw as { type?: string; message?: { role?: string; content?: unknown }; timestamp?: string };
+    if (entry.type !== "message" || entry.message?.role !== "user") continue;
+    add(userText(entry.message), "this session", entry.timestamp ? Date.parse(entry.timestamp) : undefined);
+  }
   for (const session of earlier) if (session.firstMessage) add(session.firstMessage, "earlier session", session.modified?.getTime());
   return result;
 }
@@ -36,9 +53,11 @@ export async function openPromptSearch(ctx: ExtensionContext, prompts: readonly
     let query = "";
     let selected = 0;
     let first = 0;
-    let visible: PastPrompt[] = [...prompts];
+    // pi-tui's fuzzyFilter takes a mutable array; copy once per overlay, not per keystroke.
+    const pool: PastPrompt[] = prompts.slice();
+    let visible: PastPrompt[] = pool;
     const rows = 10;
-    const filter = () => { visible = query ? fuzzyFilter([...prompts], query, (item) => item.text) : [...prompts]; selected = 0; first = 0; };
+    const filter = () => { visible = query ? fuzzyFilter(pool, query, (item) => item.text) : pool; selected = 0; first = 0; };
     return {
       invalidate() {},
       handleInput(data: string) {

package/src/quota.ts

@@ -20,17 +20,27 @@ function parseQuota(value: unknown): Quota | undefined {
   return fiveHour || week ? { ...(fiveHour ? { fiveHour } : {}), ...(week ? { week } : {}) } : undefined;
 }
 
+const publishedCache = new Map<string, { raw: string; expiresAt?: number; value?: Quota }>();
+
 /** Public statuses are authoritative only when valid and fresh. No arbitrary status prose is parsed. */
 export function publishedQuota(statuses: ReadonlyMap<string, string>, provider: string, now: number): Quota | undefined {
   const raw = statuses.get(QUOTA_PREFIX + provider);
   if (typeof raw !== "string" || raw.length > 2048) return undefined;
+  const cached = publishedCache.get(provider);
+  if (cached?.raw === raw) {
+    const { expiresAt, value } = cached;
+    return value && expiresAt != null && expiresAt > now && expiresAt <= now + QUOTA_TTL_MS ? value : undefined;
+  }
   try {
     const data: unknown = JSON.parse(raw);
-    if (!data || typeof data !== "object") return undefined;
+    if (!data || typeof data !== "object") { publishedCache.set(provider, { raw }); return undefined; }
     const obj = data as Record<string, unknown>;
-    if (typeof obj.expiresAt !== "number" || obj.expiresAt <= now || obj.expiresAt > now + QUOTA_TTL_MS) return undefined;
-    return parseQuota(obj);
-  } catch { return undefined; }
+    const expiresAt = obj.expiresAt;
+    const value = parseQuota(obj);
+    if (typeof expiresAt !== "number" || !Number.isFinite(expiresAt) || !value) { publishedCache.set(provider, { raw }); return undefined; }
+    publishedCache.set(provider, { raw, expiresAt, value });
+    return expiresAt > now && expiresAt <= now + QUOTA_TTL_MS ? value : undefined;
+  } catch { publishedCache.set(provider, { raw }); return undefined; }
 }
 
 function codexAccountId(token: string): string | undefined {

package/src/session-branch.ts

@@ -0,0 +1,24 @@
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+
+type SessionManagerLike = ExtensionContext["sessionManager"] & { getLeafId?: () => string | null | undefined };
+const cache = new WeakMap<object, { leaf: string; branch: readonly unknown[] }>();
+
+/**
+ * Pi's getBranch() walks leaf → root and reverses a new array every call. Reuse that projection
+ * across pi-jar features while the leaf id is unchanged; a new session entry naturally changes
+ * the leaf and invalidates the cache.
+ */
+export function sessionBranch(ctx: Pick<ExtensionContext, "sessionManager">): readonly unknown[] {
+  const manager = ctx.sessionManager as SessionManagerLike;
+  const leaf = manager.getLeafId?.();
+  if (!leaf) return manager.getBranch();
+  const hit = cache.get(manager as object);
+  if (hit?.leaf === leaf) return hit.branch;
+  const branch = manager.getBranch();
+  cache.set(manager as object, { leaf, branch });
+  return branch;
+}
+
+export function clearSessionBranchCache(ctx: Pick<ExtensionContext, "sessionManager">): void {
+  cache.delete(ctx.sessionManager as object);
+}

package/src/session-gallery.ts

@@ -5,8 +5,8 @@ import { GOAL_ENTRY, GoalStore } from "./goals.ts";
 import { cleanText } from "./status.ts";
 
 export const RECENT_SESSIONS = 3;
-/** Larger session files are listed without goal/plan details. */
-const MAX_SCAN_BYTES = 8 * 1024 * 1024;
+/** Welcome metadata is decorative; never parse multi-megabyte old transcripts for it. */
+export const MAX_SCAN_BYTES = 512 * 1024;
 
 export interface RecentSession { path: string; title: string; modified: Date; messages: number; goal?: string; plan?: string }
 
@@ -37,6 +37,13 @@ export function sessionWorkflow(jsonl: string): { goal?: string; plan?: string }
     ...(plan ? { plan } : {}) };
 }
 
+/** Goal and plan recorded in one session file; empty for oversized or unreadable files. */
+export async function sessionDetails(path: string, read: (path: string) => Promise<string> = (file) => readFile(file, "utf8"),
+  size: (path: string) => Promise<number> = async (file) => (await stat(file)).size): Promise<{ goal?: string; plan?: string }> {
+  try { return await size(path) <= MAX_SCAN_BYTES ? sessionWorkflow(await read(path)) : {}; }
+  catch { return {}; }
+}
+
 /** Most recent sessions for the project other than the current one, with their goal and plan. */
 export async function recentSessions(sessions: readonly SessionInfo[], current: string | undefined, limit = RECENT_SESSIONS,
   read: (path: string) => Promise<string> = (path) => readFile(path, "utf8"), size: (path: string) => Promise<number> = async (path) => (await stat(path)).size): Promise<RecentSession[]> {
@@ -44,9 +51,7 @@ export async function recentSessions(sessions: readonly SessionInfo[], current:
     .sort((a, b) => b.modified.getTime() - a.modified.getTime()).slice(0, limit);
   return Promise.all(picked.map(async (session) => {
     const title = session.name ? cleanText(session.name, 60) : cleanText(session.firstMessage || sessionDisplayName(undefined, session.id), 60);
-    let workflow: { goal?: string; plan?: string } = {};
-    try { if (await size(session.path) <= MAX_SCAN_BYTES) workflow = sessionWorkflow(await read(session.path)); }
-    catch { /* unreadable session: show it without details */ }
+    const workflow = await sessionDetails(session.path, read, size);
     return { path: session.path, title, modified: session.modified, messages: session.messageCount, ...workflow };
   }));
 }

package/src/session-ui.ts

@@ -1,8 +1,13 @@
 import type { ExtensionContext, SessionInfo } from "@earendil-works/pi-coding-agent";
-import { Key, matchesKey, truncateToWidth, type TuiMouseEvent } from "@earendil-works/pi-tui";
+import { Key, matchesKey, truncateToWidth, wrapTextWithAnsi, type TuiMouseEvent } from "@earendil-works/pi-tui";
 import { sessionDisplayName } from "./composer.ts";
+import { withIcon } from "./icons.ts";
+import { contentRows, sidebarWidth, splitFrame } from "./split-view.ts";
 import { cleanText } from "./status.ts";
 
+/** Extra per-session facts that need reading the session file; loaded lazily for the selected row only. */
+export interface SessionDetails { goal?: string; plan?: string }
+
 /** Search session titles and first prompts, without exposing raw JSONL contents in the picker. */
 export function filterSessions(sessions: readonly SessionInfo[], query: string): SessionInfo[] {
   const terms = query.trim().toLowerCase().split(/\s+/).filter(Boolean);
@@ -12,65 +17,134 @@ export function filterSessions(sessions: readonly SessionInfo[], query: string):
   });
 }
 
-export async function pickSession(ctx: ExtensionContext, sessions: readonly SessionInfo[], initial = ""): Promise<string | undefined> {
+const two = (value: number) => String(value).padStart(2, "0");
+function age(date: Date, now = Date.now()): string {
+  if (Number.isNaN(date.getTime())) return "";
+  const minutes = Math.max(0, Math.floor((now - date.getTime()) / 60_000));
+  if (minutes < 60) return `${minutes}m`;
+  if (minutes < 1440) return `${Math.floor(minutes / 60)}h`;
+  if (minutes < 43_200) return `${Math.floor(minutes / 1440)}d`;
+  return minutes < 525_600 ? `${Math.floor(minutes / 43_200)}mo` : `${Math.floor(minutes / 525_600)}y`;
+}
+
+// Chrome rows: top border, divider, search row, hint row, bottom border.
+const CHROME = 5;
+
+/** Overlay: searchable sessions on the left, the selected session's details on the right; resolves to the chosen path. */
+export async function pickSession(ctx: ExtensionContext, sessions: readonly SessionInfo[], initial = "",
+  details?: (session: SessionInfo) => Promise<SessionDetails>): Promise<string | undefined> {
   if (!ctx.hasUI || ctx.mode !== "tui") return undefined;
+  const indexed = sessions.map((session) => ({
+    session,
+    haystack: `${session.name ?? ""} ${sessionDisplayName(session.name, session.id)} ${session.firstMessage}`.toLowerCase()
+  }));
+  const search = (query: string): SessionInfo[] => {
+    const terms = query.trim().toLowerCase().split(/\s+/).filter(Boolean);
+    if (!terms.length) return sessions.slice();
+    const rows: SessionInfo[] = [];
+    for (const item of indexed) if (terms.every((term) => item.haystack.includes(term))) rows.push(item.session);
+    return rows;
+  };
   return ctx.ui.custom<string | undefined>((tui, theme, _keys, done) => {
     let query = initial.slice(0, 100);
     let selected = 0;
     let first = 0;
     let width = 80;
-    const pageSize = () => Math.max(2, Math.min(10, Math.floor(((process.stdout.rows ?? 24) - 7) / 2)));
-    const matches = () => filterSessions(sessions, query);
-    const refresh = () => { selected = 0; first = 0; tui.requestRender(); };
+    let listRows = contentRows(CHROME, 4);
+    let layout = { top: 1, rows: 0, leftWidth: 0, bodyX: 2, footerTop: 0 };
+    let rows = search(query);
+    let closed = false;
+    // undefined = never requested; null = in flight. Keyed by path so re-filtering keeps loaded details.
+    const cache = new Map<string, SessionDetails | null>();
+    const fg = (color: string, text: string) => theme.fg(color as never, text);
+    const finish = (path: string | undefined) => { closed = true; done(path); };
+    const reveal = () => { first = Math.max(0, Math.min(selected, first), selected - listRows + 1); };
+    const move = (to: number) => { selected = Math.max(0, Math.min(rows.length - 1, to)); reveal(); tui.requestRender(); };
+    const refresh = () => { rows = search(query); selected = 0; first = 0; tui.requestRender(); };
+    const load = (session: SessionInfo) => {
+      if (!details || cache.has(session.path)) return;
+      cache.set(session.path, null);
+      // Never awaited: input stays live while the file is read, and late results after close are dropped.
+      const settle = (value: SessionDetails) => { if (closed) return; cache.set(session.path, value); tui.requestRender(); };
+      Promise.resolve().then(() => details(session)).then((value) => settle(value ?? {}), () => settle({}));
+    };
+    const describe = (session: SessionInfo, bodyWidth: number, height: number): string[] => {
+      const date = session.modified;
+      const when = Number.isNaN(date.getTime()) ? "unknown"
+        : `${date.getFullYear()}-${two(date.getMonth() + 1)}-${two(date.getDate())} ${two(date.getHours())}:${two(date.getMinutes())}` + (age(date) ? ` · ${age(date)} ago` : "");
+      const lines = [
+        fg("accent", truncateToWidth(cleanText(sessionDisplayName(session.name, session.id), 200), bodyWidth)),
+        fg("muted", withIcon("session", cleanText(session.id, 36).slice(0, 8))),
+        fg("muted", withIcon("time", when)),
+        fg("muted", `${session.messageCount} message${session.messageCount === 1 ? "" : "s"}`)
+      ];
+      if (session.cwd) lines.push(fg("muted", withIcon("folder", cleanText(session.cwd, 400))));
+      if (details) {
+        const loaded = cache.get(session.path);
+        if (!loaded) lines.push(fg("dim", "Loading details…"));
+        else {
+          for (const [key, text] of [["goal", loaded.goal], ["plan", loaded.plan]] as const) {
+            if (text?.trim()) lines.push(...wrapTextWithAnsi(withIcon(key, cleanText(text, 600)), Math.max(1, bodyWidth)).slice(0, 3).map((line) => fg("text", line)));
+          }
+        }
+      }
+      lines.push("", fg("dim", "First prompt"));
+      const prompt = cleanText(session.firstMessage, 4096);
+      lines.push(...(prompt ? wrapTextWithAnsi(prompt, Math.max(1, bodyWidth)).map((line) => fg("muted", line)) : [fg("dim", "No first prompt")]));
+      return lines.slice(0, height).map((line) => truncateToWidth(line, Math.max(0, bodyWidth)));
+    };
     return {
       invalidate() {},
       handleInput(data: string) {
-        const rows = matches();
-        if (matchesKey(data, Key.escape)) return done(undefined);
-        if (matchesKey(data, Key.enter)) return done(rows[selected]?.path);
-        if (matchesKey(data, Key.up)) selected = Math.max(0, selected - 1);
-        else if (matchesKey(data, Key.down)) selected = Math.min(rows.length - 1, selected + 1);
-        else if (matchesKey(data, Key.pageUp)) selected = Math.max(0, selected - pageSize());
-        else if (matchesKey(data, Key.pageDown)) selected = Math.min(rows.length - 1, selected + pageSize());
-        else if (matchesKey(data, Key.backspace) || data === "\x7f") { query = query.slice(0, -1); return refresh(); }
-        else if (/^[\x20-\x7e]$/.test(data) && query.length < 100) { query += data; return refresh(); }
-        first = Math.max(0, Math.min(selected, first), selected - pageSize() + 1);
-        tui.requestRender();
+        if (matchesKey(data, Key.escape)) return finish(undefined);
+        if (matchesKey(data, Key.enter)) return finish(rows[selected]?.path);
+        if (matchesKey(data, Key.up)) move(selected - 1);
+        else if (matchesKey(data, Key.down)) move(selected + 1);
+        else if (matchesKey(data, Key.pageUp)) move(selected - listRows);
+        else if (matchesKey(data, Key.pageDown)) move(selected + listRows);
+        else if (matchesKey(data, Key.backspace) || data === "\x7f") { query = query.slice(0, -1); refresh(); }
+        else if (/^[\x20-\x7e]$/.test(data) && query.length < 100) { query += data; refresh(); }
       },
       handleMouse(event: TuiMouseEvent) {
-        if (event.type === "wheel" && event.wheelDelta) {
-          selected = Math.max(0, Math.min(matches().length - 1, selected + Math.sign(event.wheelDelta)));
-          first = Math.max(0, Math.min(selected, first), selected - pageSize() + 1);
-          tui.requestRender(); return { handled: true };
-        }
-        if (event.type !== "click" || event.button !== "left" || event.x >= width) return;
-        const index = first + Math.floor((event.y - 2) / 2);
-        const row = matches()[index];
-        if (event.y >= 2 && event.y < 2 + 2 * pageSize() && row) {
-          selected = index; done(row.path); return { handled: true };
-        }
+        if (event.type === "wheel" && event.wheelDelta) { move(selected + Math.sign(event.wheelDelta)); return { handled: true }; }
+        if (event.type !== "click" || event.button !== "left") return;
+        if (event.y === 0 && event.x >= width - 3) { finish(undefined); return { handled: true }; }
+        const row = event.y - layout.top;
+        // Collapsed layouts draw the list in the only pane, so any column inside the frame hits a row.
+        const inList = layout.leftWidth ? event.x < layout.leftWidth + 3 : event.x < width;
+        const index = first + row;
+        if (row < 0 || row >= layout.rows || !inList || !rows[index]) return;
+        // First click selects (details follow); clicking the selected row again resumes it.
+        if (index === selected) finish(rows[index]!.path);
+        else move(index);
+        return { handled: true };
       },
       render(available: number): string[] {
-        width = Math.max(0, available);
-        const fit = (line: string) => truncateToWidth(line, width);
-        const rows = matches();
+        width = Math.max(12, available);
+        listRows = contentRows(CHROME, 4);
         selected = Math.max(0, Math.min(selected, rows.length - 1));
-        const lines = [
-          fit(theme.fg("accent", `╭─ SESSIONS · ${rows.length}/${sessions.length} ─`)),
-          fit(theme.fg("muted", `│ Search: ${cleanText(query, 100)}${query ? "" : "(type to filter)"}`))
+        reveal();
+        const leftWidth = sidebarWidth(width, 22, 40);
+        const bodyWidth = leftWidth ? width - leftWidth - 6 : width - 4;
+        const listWidth = leftWidth || bodyWidth;
+        const list = rows.slice(first, first + listRows).map((session, offset) => {
+          const active = first + offset === selected;
+          const when = age(session.modified);
+          const title = truncateToWidth(cleanText(sessionDisplayName(session.name, session.id), 200), Math.max(1, listWidth - 2 - (when ? when.length + 1 : 0)));
+          return fg(active ? "accent" : "muted", (active ? "▌" : " ") + " " + title) + (when ? fg("dim", " " + when) : "");
+        });
+        if (!rows.length) list.push(fg("dim", "No matching sessions"));
+        const session = rows[selected];
+        if (session && leftWidth) load(session);
+        const right = leftWidth ? (session ? describe(session, bodyWidth, listRows) : []) : list;
+        const footer = [
+          fg("muted", `Search: ${cleanText(query, 100)}${query ? "" : fg("dim", "(type to filter)")}`),
+          fg("dim", "Type to search · ↑↓/PgUp/PgDn select · Enter/click again resume · Esc cancel")
         ];
-        for (let i = first; i < Math.min(rows.length, first + pageSize()); i++) {
-          const session = rows[i]!;
-          const title = cleanText(sessionDisplayName(session.name, session.id), 55);
-          const prompt = cleanText(session.firstMessage, 90);
-          const when = Number.isNaN(session.modified.getTime()) ? "" : session.modified.toISOString().slice(0, 10);
-          lines.push(fit(theme.fg(i === selected ? "accent" : "muted", `│ ${i === selected ? "❯" : " "} ${title} · ${when}`)));
-          lines.push(fit(theme.fg("dim", `│     ${prompt || "No first prompt"}`)));
-        }
-        if (!rows.length) lines.push(fit(theme.fg("dim", "│ No matching sessions")));
-        lines.push(fit(theme.fg("dim", "╰─ Type to search · ↑↓/PgUp/PgDn select · Enter resume · Esc cancel")));
-        return lines;
+        const split = splitFrame(theme, width, `${withIcon("session", "SESSIONS")} · ${rows.length}/${sessions.length}`, leftWidth ? list : [], right, footer, listRows, leftWidth);
+        layout = split.layout;
+        return available < width ? split.lines.map((line) => truncateToWidth(line, Math.max(0, available))) : split.lines;
       }
     };
-  });
+  }, { overlay: true, overlayOptions: { width: "100%", maxHeight: "100%" } });
 }

package/src/settings-ui.ts

@@ -1,6 +1,7 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { Key, matchesKey, truncateToWidth, visibleWidth, type TuiMouseEvent } from "@earendil-works/pi-tui";
 import { FOOTER_FIELDS, type FooterField } from "./footer-settings.ts";
+import { ICON_SETS } from "./icons.ts";
 import { GOAL_ROUND_CHOICES, type JarAccent, type JarVisualSettings } from "./settings.ts";
 
 const LABELS: Record<FooterField, string> = {
@@ -34,7 +35,7 @@ export async function openJarSettings(
     let width = 64;
     const accents: JarAccent[] = ["follow", ...availableAccents.filter((name): name is JarAccent =>
       name === "default" || ["gray", "pink", "teal", "azure", "violet", "amber"].includes(name))];
-    const fields = () => page === "footer" ? FOOTER_FIELDS.length : page === "pi" ? 5 : 6;
+    const fields = () => page === "footer" ? FOOTER_FIELDS.length : page === "pi" ? 5 : 7;
     const piError = (error: unknown) => ctx.ui.notify("Could not change Pi setting: " + (error as Error).message, "error");
     const pageSize = () => Math.min(fields(), Math.max(4, (process.stdout.rows ?? 24) - 9));
     const firstVisible = () => Math.min(Math.max(0, selected - pageSize() + 1), Math.max(0, fields() - pageSize()));
@@ -61,6 +62,7 @@ export async function openJarSettings(
       else if (index === 3) update({ ...state, mascot: !state.mascot });
       else if (index === 4) update({ ...state, suggestions: !state.suggestions });
       else if (index === 5) update({ ...state, ui: !state.ui });
+      else if (index === 6) update({ ...state, icons: ICON_SETS[(ICON_SETS.indexOf(state.icons) + 1) % ICON_SETS.length]! });
       tui.requestRender();
     };
     const row = (index: number, label: string, value: string, enabled: boolean) => {
@@ -137,7 +139,8 @@ export async function openJarSettings(
             row(2, "Rounded composer", state.composer ? "ON" : "OFF", state.composer),
             row(3, "Ember mascot", state.mascot ? "ON" : "OFF", state.mascot),
             row(4, "Next-prompt suggestions", state.suggestions ? "ON" : "OFF", state.suggestions),
-            row(5, "Pi-jar UI", state.ui ? "ON" : "OFF", state.ui)
+            row(5, "Pi-jar UI", state.ui ? "ON" : "OFF", state.ui),
+            row(6, "Icons (nerd needs a Nerd Font)", state.icons.toUpperCase(), state.icons !== "ascii")
           ];
         const start = firstVisible();
         const rows = allRows.slice(start, start + pageSize());

package/src/settings.ts

@@ -2,6 +2,7 @@ import { existsSync, readFileSync, mkdirSync, renameSync, unlinkSync, writeFileS
 import { join } from "node:path";
 import { ACCENT_NAMES } from "./accent.ts";
 import { DEFAULT_FOOTER_SETTINGS, FOOTER_FIELDS, loadFooterSettings, type FooterSettings } from "./footer-settings.ts";
+import { ICON_SETS, type IconSet } from "./icons.ts";
 
 export type JarAccent = "follow" | "default" | (typeof ACCENT_NAMES)[number];
 export interface JarVisualSettings {
@@ -20,6 +21,8 @@ export interface JarVisualSettings {
   advisor: boolean;
   /** Consult the advisor automatically when the agent repeats a tool call or keeps failing. */
   advisorGates: boolean;
+  /** Glyph set for footer, composer and views: unicode, Nerd Font icons, or plain ascii. */
+  icons: IconSet;
   footer: FooterSettings;
 }
 
@@ -27,7 +30,7 @@ export const GOAL_ROUND_CHOICES = [4, 8, 12, 20] as const;
 
 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, advisor: true, advisorGates: true, footer: { ...footer } };
+  return { version: 1, accent: "follow", animations: true, ui: true, composer: true, mascot: true, suggestions: true, goalRounds: 8, advisor: true, advisorGates: true, icons: "unicode", footer: { ...footer } };
 }
 
 /** Legacy footer choices are imported only while the new file is absent. Never modify the old file. */
@@ -59,6 +62,7 @@ export function loadVisualSettings(directory: string): JarVisualSettings {
       ? value.goalRounds : fallback.goalRounds,
     advisor: typeof value.advisor === "boolean" ? value.advisor : fallback.advisor,
     advisorGates: typeof value.advisorGates === "boolean" ? value.advisorGates : fallback.advisorGates,
+    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
   };