pi-minimalist 0.1.2 → 0.2.2

package/src/config-file.ts

@@ -3,12 +3,9 @@
  *
  * WHY settings.json AND NOT OUR OWN FILE
  * --------------------------------------
- * The old `pi-minimalist.json` was a second config file the user had to know
- * about, and it hardcoded `~/.pi/agent`, so anyone setting
- * `PI_CODING_AGENT_DIR` silently wrote their preference somewhere it would never
- * be read back. settings.json is where a Pi user already looks, it is what
- * `pi-env` reads, and Pi tolerates unknown top-level keys (the published
- * `pi-powerline-footer` extension does exactly this with its `powerline` key).
+ * It is where a Pi user already looks, it is what `pi-env` reads, and Pi
+ * tolerates unknown top-level keys (the published `pi-powerline-footer`
+ * extension does exactly this with its `powerline` key).
  *
  * SCOPE
  *   defaults  <  global agent settings.json (PI_CODING_AGENT_DIR if set).
@@ -29,6 +26,11 @@ import {
   DEFAULTS,
   DEFAULT_TOKENS,
   GLYPH_PRESETS,
+  FRESH_PRESET,
+  LOOK_KEYS,
+  PRESETS,
+  isFresh,
+  isPreset,
   SETTINGS_KEY,
   type BasicSettings,
   type Glyphs,
@@ -52,11 +54,6 @@ export function globalSettingsPath(env = process.env): string {
   return join(agentDir(env), "settings.json");
 }
 
-/** Legacy state file written by the removed `/quiet` command. */
-export function legacyQuietPath(env = process.env): string {
-  return join(agentDir(env), "pi-minimalist.json");
-}
-
 type Json = Record<string, unknown>;
 
 function isRecord(value: unknown): value is Json {
@@ -70,59 +67,12 @@ function isRecord(value: unknown): value is Json {
 /**
  * Remove `//` and block comments that are outside string literals.
  *
- * Pi bundles `strip-json-comments` but does not re-export it to extensions, so
- * this is a small character scanner. The only real subtlety is that `//` inside a
- * JSON string (a URL, a Windows path) must NOT start a comment.
+ * Pi bundles `strip-json-comments` but does not re-export it to extensions. The
+ * regex matches a whole string first (escapes included) and keeps it, so `//`
+ * inside a URL or path never starts a comment.
  */
 export function stripJsonComments(text: string): string {
-  let out = "";
-  let inString = false;
-  let escaped = false;
-  let comment: "line" | "block" | undefined;
-
-  for (let i = 0; i < text.length; i++) {
-    const char = text[i];
-    const next = text[i + 1];
-
-    if (comment === "line") {
-      if (char === "\n") {
-        comment = undefined;
-        out += char;
-      }
-      continue;
-    }
-    if (comment === "block") {
-      if (char === "*" && next === "/") {
-        comment = undefined;
-        i++;
-      }
-      continue;
-    }
-    if (inString) {
-      out += char;
-      if (escaped) escaped = false;
-      else if (char === "\\") escaped = true;
-      else if (char === '"') inString = false;
-      continue;
-    }
-    if (char === '"') {
-      inString = true;
-      out += char;
-      continue;
-    }
-    if (char === "/" && next === "/") {
-      comment = "line";
-      i++;
-      continue;
-    }
-    if (char === "/" && next === "*") {
-      comment = "block";
-      i++;
-      continue;
-    }
-    out += char;
-  }
-  return out;
+  return text.replace(/("(?:\\.|[^"\\])*")|\/\/[^\n]*|\/\*[\s\S]*?\*\//g, (_, string) => string ?? "");
 }
 
 /** True when a file carries comments, so writing it back would destroy them. */
@@ -153,8 +103,10 @@ function readSettingsFile(path: string): Json {
  * this is hand-edited input.
  */
 function coerce(raw: unknown, into: Settings): Settings {
-  if (!isRecord(raw)) return into;
   const out = { ...into };
+  // A user with no basic key has never configured anything: they get the default preset.
+  if (isFresh(raw)) out.preset = FRESH_PRESET;
+  if (!isRecord(raw)) return out;
 
   for (const key of BASIC_KEYS) {
     if (typeof DEFAULT_BASIC[key] === "boolean" && typeof raw[key] === "boolean") {
@@ -169,6 +121,7 @@ function coerce(raw: unknown, into: Settings): Settings {
   if (Array.isArray(raw.excludeTools)) {
     out.excludeTools = raw.excludeTools.filter((name): name is string => typeof name === "string");
   }
+  if (isPreset(raw.preset)) out.preset = raw.preset;
   if (raw.glyphStyle === "unicode" || raw.glyphStyle === "ascii") {
     out.glyphStyle = raw.glyphStyle;
   }
@@ -183,9 +136,6 @@ function coerce(raw: unknown, into: Settings): Settings {
     // therefore the honest boundary of what this function can check.
     out.tokens = pickStrings(raw.tokens, Object.keys(DEFAULT_TOKENS) as (keyof Tokens)[]) as Partial<Tokens>;
   }
-  if (typeof raw.maxDetailChars === "number" && raw.maxDetailChars > 0) {
-    out.maxDetailChars = Math.floor(raw.maxDetailChars);
-  }
   return out;
 }
 
@@ -205,21 +155,14 @@ export function loadSettings(env = process.env): Settings {
 }
 
 /**
- * One-time migration of the old `/quiet` preference.
- *
- * Returns a value only when settings.json has no `groupToolRuns` yet, so an
- * explicit new setting always wins and a stale legacy file cannot resurrect a
- * preference the user has since changed.
+ * Look keys to write when the user switches to `custom` for the first time: the
+ * `lite` look, so "custom" starts from something known. Undefined when the file
+ * already holds any of the user's own look keys (they are kept untouched).
  */
-export function migratedQuiet(env = process.env): boolean | undefined {
-  const existing = readSettingsFile(globalSettingsPath(env))[SETTINGS_KEY];
-  if (isRecord(existing) && typeof existing.groupToolRuns === "boolean") return undefined;
-  try {
-    const legacy = JSON.parse(readFileSync(legacyQuietPath(env), "utf8"));
-    return isRecord(legacy) && legacy.quiet === true ? true : undefined;
-  } catch {
-    return undefined;
-  }
+export function customSeed(env = process.env): Record<string, boolean> | undefined {
+  const block = readSettingsFile(globalSettingsPath(env))[SETTINGS_KEY];
+  const own = isRecord(block) && LOOK_KEYS.some((key) => key in block);
+  return own ? undefined : PRESETS.lite;
 }
 
 // ---------------------------------------------------------------------------
@@ -232,7 +175,7 @@ export type SaveResult =
 
 /**
  * Persist only the supplied editor-managed settings into the global agent file.
- * A normal edit passes one key; Restore defaults intentionally passes all.
+ * A normal edit passes one key.
  * Hand-written `glyphs`/`tokens`/`excludeTools` values survive untouched.
  *
  * REFUSES to write a file containing comments. `JSON.stringify` would silently
@@ -263,6 +206,8 @@ export function saveBasicSettings(settings: Partial<BasicSettings>, env = proces
   }
   const existing = isRecord(root[SETTINGS_KEY]) ? root[SETTINGS_KEY] : {};
   const merged: Json = { ...existing };
+  // The first write must pin the fresh-install preset, or the file would stop looking fresh and become `custom`.
+  if (isFresh(existing)) merged.preset = FRESH_PRESET;
   for (const key of BASIC_KEYS) {
     if (settings[key] !== undefined) merged[key] = settings[key];
   }

package/src/config-ui.ts

@@ -3,7 +3,9 @@
 import { truncateToWidth, type AutocompleteItem, type Component, type SettingItem, type SettingsList, type SettingsListTheme } from "@earendil-works/pi-tui";
 import {
   BASIC_KEYS,
-  DEFAULT_BASIC,
+  LOOK_KEYS,
+  PRESET_NAMES,
+  isPreset,
   type BasicKey,
   type BasicSettings,
   type Config,
@@ -20,6 +22,11 @@ type Field = {
 
 /** Label and hover description for every basic setting, in display order. */
 export const FIELDS: Field[] = [
+  {
+    key: "preset",
+    label: "Preset",
+    description: "off = native Pi, lite = one-line rows, full = + groups and thinking rows, max = + collapsed earlier activity. custom uses your own values. A preset only sets the four look rows; your other settings are kept.",
+  },
   {
     key: "compactToolRows",
     label: "Compact tool rows",
@@ -35,12 +42,6 @@ export const FIELDS: Field[] = [
     label: "Collapse earlier activity",
     description: "Keep the latest assistant reply visible; replace earlier text, thinking, and tool calls with one summary.",
   },
-  {
-    key: "foldActivityOnFinalAnswer",
-    label: "  Collapse when final answer starts",
-    description: "Keep work visible until OpenAI starts its final answer, then collapse the earlier activity.",
-    activityOption: true,
-  },
   {
     key: "activitySummary",
     label: "  Activity summary",
@@ -83,18 +84,27 @@ type InputComponent = Component & { handleInput(data: string): void };
 type SettingsListConstructor = new (...args: ConstructorParameters<typeof SettingsList>) => SettingsList;
 type BasicValue = BasicSettings[BasicKey];
 
-/** Conditional rows plus their display values. */
-export function items(settings: Settings): SettingItem[] {
+const CHOICES: Partial<Record<BasicKey, string[]>> = {
+  preset: [...PRESET_NAMES],
+  activitySummary: ["elapsed time", "tools used"],
+  glyphStyle: ["Unicode", "ASCII"],
+};
+
+const isLook = (key: string) => (LOOK_KEYS as readonly string[]).includes(key);
+
+/** Conditional rows plus their display values. `dim` greys the look rows a preset owns. */
+export function items(settings: Settings, dim?: (text: string) => string): SettingItem[] {
   return FIELDS.filter((field) => !field.activityOption || settings.foldIntermediateActivity).map(
     ({ key, label, description }) => {
-      const value = settings[key];
-      return {
-        id: key,
-        label,
-        description,
-        currentValue: displayValue(value),
-        values: key === "activitySummary" ? ["elapsed time", "tools used"] : key === "glyphStyle" ? ["Unicode", "ASCII"] : ["on", "off"],
-      };
+      const value = displayValue(settings[key]);
+      // SettingsList has no disabled rows, so a locked row shows its dimmed value
+      // as its ONLY value: Enter "cycles" to the same text and nothing changes.
+      if (dim && isLook(key)) {
+        const shown = dim(value);
+        const hint = `Set by the '${settings.preset}' preset. Switch Preset to 'custom' to edit (your custom values are kept).`;
+        return { id: key, label, description: hint, currentValue: shown, values: [shown] };
+      }
+      return { id: key, label, description, currentValue: value, values: CHOICES[key] ?? ["on", "off"] };
     },
   );
 }
@@ -104,39 +114,35 @@ export type ConfigScreenDeps = {
   theme: SettingsListTheme;
   config: Config;
   onChange: (key: BasicKey, value: BasicValue) => void;
-  onReset: () => void;
   onClose: () => void;
 };
 
 /** Build a live screen; toggling prose folding immediately adds/removes its two child rows. */
 export function createConfigScreen(deps: ConfigScreenDeps): InputComponent {
-  const { SettingsList, theme, config, onChange, onReset, onClose } = deps;
+  const { SettingsList, theme, config, onChange, onClose } = deps;
   let list: SettingsList;
+  let locked = false;
 
   const build = () => {
-    const rows = [
-      ...items(config.all()),
-      {
-        id: "restoreDefaults",
-        label: "Restore defaults",
-        description: "Reset the settings in this editor, including Symbols. Custom glyphs, colours, and excluded tools are kept.",
-        currentValue: "Enter to restore",
-        values: ["Restore"],
-      },
-    ];
+    const preset = config.all().preset;
+    locked = preset !== "custom";
+    const rows = items(config.all(), locked ? theme.hint : undefined);
     return new SettingsList(
       rows,
       rows.length,
       theme,
       (id, displayValue) => {
-        if (id === "restoreDefaults") {
-          for (const key of BASIC_KEYS) config.set(key, DEFAULT_BASIC[key]);
-          onReset();
+        if (!isBasicKey(id)) return;
+        if (id === "preset") {
+          const value = isPreset(displayValue) ? displayValue : "custom";
+          config.set(id, value);
+          onChange(id, value);
           list = build();
           list.selectItem(id);
           return;
         }
-        if (!isBasicKey(id)) return;
+        // Locked rows only echo their own text; do nothing (their description explains).
+        if (locked && isLook(id)) return;
         if (id === "activitySummary") {
           const value = displayValue === "tools used" ? "tools" : "elapsed";
           config.set(id, value);
@@ -176,6 +182,7 @@ function isBasicKey(id: string): id is BasicKey {
 }
 
 function displayValue(value: BasicValue): string {
+  if (isPreset(value)) return value;
   if (value === "elapsed") return "elapsed time";
   if (value === "tools") return "tools used";
   if (value === "unicode") return "Unicode";
@@ -199,7 +206,8 @@ export function summary(settings: Settings): string {
   const width = Math.max(...visible.map((field) => field.label.length));
   return [
     ...visible.map(({ key, label }) => {
-      return `  ${label.padEnd(width)}  ${displayValue(settings[key])}`;
+      const dimmed = settings.preset !== "custom" && isLook(key) ? " (from preset)" : "";
+      return `  ${label.padEnd(width)}  ${displayValue(settings[key])}${dimmed}`;
     }),
     "",
     "  /minimalist          change these",

package/src/config.ts

@@ -7,11 +7,7 @@
  * are readable on their own.
  */
 
-import type { Theme, ThemeColor } from "@earendil-works/pi-coding-agent";
-
-// ThemeBg is not exported publicly, so recover it from Theme.bg's own signature
-// rather than importing a deep dist path (which is not a package export).
-type ThemeBg = Parameters<Theme["bg"]>[0];
+import type { ThemeColor } from "@earendil-works/pi-coding-agent";
 
 /** Top-level key inside Pi's settings.json. */
 export const SETTINGS_KEY = "minimalist";
@@ -41,6 +37,9 @@ export type Glyphs = {
 
 export type GlyphStyle = "unicode" | "ascii";
 
+/** Marker on the header of an opened run. Not user-configurable. */
+export const OPEN_MARKER: Record<GlyphStyle, string> = { unicode: "▾", ascii: "v" };
+
 export const GLYPH_PRESETS: Record<GlyphStyle, Glyphs> = {
   unicode: { done: "✓", failed: "✗", running: "•", queued: "›", gutter: "▌", timer: "⏱", count: "×" },
   // Every ASCII glyph is exactly one column wide, so rows stay aligned in fonts
@@ -56,9 +55,8 @@ export const GLYPH_PRESETS: Record<GlyphStyle, Glyphs> = {
  * Which Pi theme token paints each part of a row.
  *
  * Overridable, but the defaults are deliberate: the action word is a LABEL, not
- * a warning, so it uses `success` green even for mutating tools. An earlier
- * version used warning orange, which collided with orange meaning "highlighted
- * prose".
+ * a warning, so it uses `success` green even for mutating tools (orange would
+ * collide with "highlighted prose").
  */
 export type Tokens = {
   label: ThemeColor;
@@ -66,7 +64,6 @@ export type Tokens = {
   thinking: ThemeColor;
   error: ThemeColor;
   outputGutter: ThemeColor;
-  activeBg: ThemeBg;
 };
 
 export const DEFAULT_TOKENS: Tokens = {
@@ -75,7 +72,6 @@ export const DEFAULT_TOKENS: Tokens = {
   thinking: "thinkingText",
   error: "error",
   outputGutter: "borderMuted",
-  activeBg: "toolPendingBg",
 };
 
 // ---------------------------------------------------------------------------
@@ -85,15 +81,34 @@ export const DEFAULT_TOKENS: Tokens = {
 /** Settings `/minimalist` can edit: visible effect, no vocabulary needed. */
 export type ActivitySummary = "elapsed" | "tools";
 
+export const PRESET_NAMES = ["off", "lite", "full", "max", "custom"] as const;
+export type Preset = (typeof PRESET_NAMES)[number];
+
+export function isPreset(value: unknown): value is Preset {
+  return (PRESET_NAMES as readonly unknown[]).includes(value);
+}
+
+/** The only settings a preset names. Every other setting stays the user's own. */
+export const LOOK_KEYS = ["compactToolRows", "groupToolRuns", "foldIntermediateActivity", "thinkingAsToolCall"] as const;
+export type LookKey = (typeof LOOK_KEYS)[number];
+
+/** Preset of a user who has never configured anything (no basic key in the `minimalist` block). */
+export const FRESH_PRESET: Preset = "full";
+
+/** True when the `minimalist` block holds no basic key, so the user never configured anything. */
+export function isFresh(block: unknown): boolean {
+  return typeof block !== "object" || block === null || !BASIC_KEYS.some((key) => key in block);
+}
+
 export type BasicSettings = {
+  /** A named bundle of the four look settings below. `custom` uses the user's own values for all of them. */
+  preset: Preset;
   /** Master switch. Off restores Pi's native tool cards entirely. */
   compactToolRows: boolean;
   /** Fold adjacent finished rows into one summary line. */
   groupToolRuns: boolean;
   /** Replace all but the latest assistant prose block with one summary row. */
   foldIntermediateActivity: boolean;
-  /** Keep commentary visible until OpenAI starts its final-answer message. */
-  foldActivityOnFinalAnswer: boolean;
   /** What replaces the activity hidden before the latest prose block. */
   activitySummary: ActivitySummary;
   /** Draw the left gutter bar. */
@@ -116,21 +131,15 @@ export type AdvancedSettings = {
   excludeTools: string[];
   glyphs: Partial<Glyphs>;
   tokens: Partial<Tokens>;
-  /**
-   * Sanity cap on detail text length. NOT a display limit — rows truncate at the
-   * real viewport width. This only stops a multi-megabyte heredoc from being
-   * whitespace-collapsed, colored and measured on every repaint.
-   */
-  maxDetailChars: number;
 };
 
 export type Settings = BasicSettings & AdvancedSettings;
 
 export const DEFAULT_BASIC: BasicSettings = {
+  preset: "custom",
   compactToolRows: true,
   groupToolRuns: true,
   foldIntermediateActivity: false,
-  foldActivityOnFinalAnswer: false,
   activitySummary: "elapsed",
   gutter: true,
   timer: true,
@@ -140,15 +149,24 @@ export const DEFAULT_BASIC: BasicSettings = {
   glyphStyle: "unicode",
 };
 
+/**
+ * The four look settings each non-custom preset forces. A preset is a LAYER
+ * applied on read (see `Config`); it never writes the user's own keys.
+ */
+export const PRESETS: Record<Exclude<Preset, "custom">, Record<LookKey, boolean>> = {
+  off: { compactToolRows: false, groupToolRuns: false, foldIntermediateActivity: false, thinkingAsToolCall: false },
+  lite: { compactToolRows: true, groupToolRuns: false, foldIntermediateActivity: false, thinkingAsToolCall: false },
+  full: { compactToolRows: true, groupToolRuns: true, foldIntermediateActivity: false, thinkingAsToolCall: true },
+  max: { compactToolRows: true, groupToolRuns: true, foldIntermediateActivity: true, thinkingAsToolCall: true },
+};
+
 export const DEFAULT_ADVANCED: AdvancedSettings = {
   // `subagent` ships a renderer showing run id, state and a ctrl+o hint that one
-  // line cannot carry. Excluded by NAME rather than by the old "does this tool
-  // have its own renderer?" rule, which silently exempted every third-party tool
-  // and made the behavior impossible to discover from the UI.
+  // line cannot carry. Excluded by NAME rather than by a "does this tool
+  // have its own renderer?" rule, which would silently exempt every third-party tool.
   excludeTools: ["subagent"],
   glyphs: {},
   tokens: {},
-  maxDetailChars: 4000,
 };
 
 export const DEFAULTS: Settings = { ...DEFAULT_BASIC, ...DEFAULT_ADVANCED };
@@ -167,6 +185,11 @@ export type BasicKey = keyof BasicSettings;
 // Live configuration
 // ---------------------------------------------------------------------------
 
+/** defaults < the user's own keys < the preset's four look keys (none for `custom`). */
+function layer(user: Settings): Settings {
+  return user.preset === "custom" ? user : { ...user, ...PRESETS[user.preset] };
+}
+
 /**
  * The live settings object.
  *
@@ -175,7 +198,12 @@ export type BasicKey = keyof BasicSettings;
  * and no restart.
  */
 export class Config {
+  /** The user's own values (what settings.json says), before any preset. */
   private settings: Settings;
+  /** What the rest of the extension sees: `settings` with the preset layered on. */
+  private get view(): Settings {
+    return layer(this.settings);
+  }
 
   /**
    * Values changed in this session that are NOT in settings.json.
@@ -192,9 +220,10 @@ export class Config {
   }
 
   get<K extends keyof Settings>(key: K): Settings[K] {
-    return this.settings[key];
+    return this.view[key];
   }
 
+  /** Writes the user's own value; a non-custom preset keeps shadowing it until `preset` is custom. */
   set<K extends keyof Settings>(key: K, value: Settings[K]): void {
     this.settings = { ...this.settings, [key]: value };
   }
@@ -211,7 +240,7 @@ export class Config {
   }
 
   all(): Settings {
-    return this.settings;
+    return this.view;
   }
 
   /** Adopt freshly read settings, re-applying anything held only in memory. */
@@ -221,26 +250,19 @@ export class Config {
 
   /** Preset chosen by `glyphStyle`, then per-glyph overrides. */
   glyphs(): Glyphs {
-    return { ...GLYPH_PRESETS[this.settings.glyphStyle], ...this.settings.glyphs };
+    return { ...GLYPH_PRESETS[this.view.glyphStyle], ...this.view.glyphs };
   }
 
   /** Default token map plus overrides. */
   tokens(): Tokens {
-    return { ...DEFAULT_TOKENS, ...this.settings.tokens };
+    return { ...DEFAULT_TOKENS, ...this.view.tokens };
   }
 
   /**
-   * Should this tool keep Pi's own rendering?
-   *
-   * The exclusion list is the ONLY exemption, so the master switch is checked
-   * alongside it wherever claiming happens.
+   * True when this tool should be drawn as a compact row. The exclusion list is
+   * the ONLY exemption, so the master switch is checked alongside it.
    */
-  isExcluded(toolName: string): boolean {
-    return this.settings.excludeTools.includes(toolName);
-  }
-
-  /** True when this tool should be drawn as a compact row. */
   compacts(toolName: string): boolean {
-    return this.settings.compactToolRows && !this.isExcluded(toolName);
+    return this.view.compactToolRows && !this.view.excludeTools.includes(toolName);
   }
 }