@xynogen/pix-optimizer 1.1.4 → 1.1.7

package/src/ponytail.ts

@@ -9,21 +9,12 @@
  * skill. We inject it as a system-prompt fragment — no external hooks/files.
  */
 
-import { mkdir, readFile, writeFile } from "node:fs/promises";
-import { homedir } from "node:os";
-import { join } from "node:path";
 import type {
 	ExtensionAPI,
 	ExtensionCommandContext,
 	ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
-import { getSettingsListTheme } from "@earendil-works/pi-coding-agent";
-import {
-	Container,
-	type SettingItem,
-	SettingsList,
-	Text,
-} from "@earendil-works/pi-tui";
+import { loadOptValue, saveOptValue } from "./persist.ts";
 import type { OptimizerHandle, OptimizerStatus } from "./status.ts";
 
 // ── Levels ────────────────────────────────────────────────────────────────────
@@ -41,19 +32,6 @@ export const LEVEL_NUMBERS: Record<string, Level> = {
 	"3": "ultra",
 };
 
-const PONYTAIL_COMMAND_OPTIONS = [
-	{ value: "1", label: "1 (lite)", description: "Name the lazier alternative" },
-	{ value: "2", label: "2 (full)", description: "The ladder enforced" },
-	{ value: "3", label: "3 (ultra)", description: "YAGNI extremist" },
-	{ value: "lite", label: "lite", description: "Name the lazier alternative" },
-	{ value: "full", label: "full", description: "The ladder enforced" },
-	{ value: "ultra", label: "ultra", description: "YAGNI extremist" },
-	{ value: "off", label: "off", description: "Disable ponytail mode" },
-	{ value: "stop", label: "stop", description: "Disable ponytail mode" },
-	{ value: "quit", label: "quit", description: "Disable ponytail mode" },
-	{ value: "config", label: "config", description: "Open settings dialog" },
-] as const;
-
 // ── Status labels ─────────────────────────────────────────────────────────────
 
 export const STATUS_LABELS: Record<Exclude<Level, "off">, string> = {
@@ -140,7 +118,7 @@ export function buildHelp(current: Level): string {
 	return [
 		`Ponytail mode: ${statusLine}`,
 		"",
-		"Usage: /opt ponytail <level>",
+		"Usage: /optimizer ponytail <level>",
 		"  1  lite   - name the lazier alternative, you pick",
 		"  2  full   - the ladder enforced (default)",
 		"  3  ultra  - YAGNI extremist",
@@ -157,55 +135,6 @@ export function toggleLevel(current: Level): Level {
 	return current === "off" ? "full" : "off";
 }
 
-// ── Config ────────────────────────────────────────────────────────────────────
-
-export interface PonytailConfig {
-	/** Level to apply on new sessions. "off" means don't auto-enable. */
-	defaultLevel: Level;
-	/** Whether to show the status bar indicator. */
-	showStatus: boolean;
-}
-
-export const DEFAULT_CONFIG: PonytailConfig = {
-	defaultLevel: "full",
-	showStatus: true,
-};
-
-const CONFIG_PATH = join(homedir(), ".pi", "agent", "ponytail.json");
-
-export function parseConfig(raw: unknown): PonytailConfig {
-	const parsed = raw as Record<string, unknown>;
-	return {
-		defaultLevel: LEVELS.includes(parsed?.defaultLevel as Level)
-			? (parsed.defaultLevel as Level)
-			: DEFAULT_CONFIG.defaultLevel,
-		showStatus:
-			typeof parsed?.showStatus === "boolean"
-				? parsed.showStatus
-				: DEFAULT_CONFIG.showStatus,
-	};
-}
-
-let _saveQueue: Promise<void> = Promise.resolve();
-
-async function loadConfig(): Promise<PonytailConfig> {
-	try {
-		const raw = await readFile(CONFIG_PATH, "utf8");
-		return parseConfig(JSON.parse(raw));
-	} catch {
-		return { ...DEFAULT_CONFIG };
-	}
-}
-
-async function saveConfig(config: PonytailConfig): Promise<void> {
-	const snapshot = `${JSON.stringify(config, null, 2)}\n`;
-	_saveQueue = _saveQueue.then(async () => {
-		await mkdir(join(homedir(), ".pi", "agent"), { recursive: true });
-		await writeFile(CONFIG_PATH, snapshot, "utf8");
-	});
-	return _saveQueue;
-}
-
 // ── Pi extension ────────────────────────────────────────────────────────────
 
 export function ponytail(
@@ -213,26 +142,11 @@ export function ponytail(
 	status: OptimizerStatus,
 ): OptimizerHandle {
 	let level: Level = "off";
-	let config: PonytailConfig = { ...DEFAULT_CONFIG };
-	let configLoadPromise: Promise<void> | null = null;
-
-	const ensureConfigLoaded = async () => {
-		if (!configLoadPromise) {
-			configLoadPromise = (async () => {
-				config = await loadConfig();
-				if (level === "off" && config.defaultLevel !== "off") {
-					level = config.defaultLevel;
-				}
-			})();
-		}
-		await configLoadPromise;
-	};
 
 	// -- Status: report into the shared optimizer indicator. --
 
 	function syncStatus(ctx: Pick<ExtensionContext, "ui">) {
-		const on = level !== "off" && config.showStatus;
-		status.set("ponytail", on, ctx);
+		status.set("ponytail", level !== "off", ctx);
 	}
 
 	// Inject ponytail prompt via before_agent_start
@@ -243,25 +157,18 @@ export function ponytail(
 		return { systemPrompt: `${prompt}\n\n${existing}` };
 	});
 
-	// -- Restore state on session load --
+	// -- Restore live level from the session log on load --
 
 	pi.on("session_start", async (_event, ctx) => {
-		await ensureConfigLoaded();
-
-		let sessionLevel: Level | null = null;
+		// Session log first (in-session branch nav), then disk (survives a full
+		// quit/restart). Disk wins when present.
 		for (const entry of ctx.sessionManager.getEntries()) {
 			if (entry.type === "custom" && entry.customType === "ponytail-level") {
-				sessionLevel = (entry.data as { level: Level })?.level ?? null;
+				level = (entry.data as { level: Level })?.level ?? level;
 			}
 		}
-
-		if (sessionLevel !== null) {
-			level = sessionLevel;
-		} else if (config.defaultLevel !== "off") {
-			level = config.defaultLevel;
-			pi.appendEntry("ponytail-level", { level });
-		}
-
+		const saved = loadOptValue("ponytail");
+		if (saved && LEVELS.includes(saved as Level)) level = saved as Level;
 		syncStatus(ctx);
 	});
 
@@ -273,36 +180,18 @@ export function ponytail(
 	});
 	pi.on("session_shutdown", async () => {});
 
-	// -- Subcommand handler (dispatched by the merged /opt router) --
+	// -- Overlay value handler (called by the /optimizer overlay) --
 
 	async function run(
-		args: string,
+		value: string,
 		ctx: ExtensionCommandContext,
 	): Promise<void> {
-		const arg = args.trim().toLowerCase();
-
-		// No argument → show help
-		if (!arg) {
-			ctx.ui.notify(buildHelp(level), "info");
-			return;
-		}
-
-		if (arg === "config") {
-			await openConfig(ctx);
-			return;
-		}
-
-		const resolved = resolveLevel(arg);
-		if (resolved === null) {
-			ctx.ui.notify(
-				`Unknown: "${arg}". Use 1/2/3, ${LEVELS.join(", ")}, stop, quit, or config`,
-				"error",
-			);
-			return;
-		}
+		const resolved = resolveLevel(value);
+		if (resolved === null) return;
 		level = resolved;
 
 		pi.appendEntry("ponytail-level", { level });
+		saveOptValue("ponytail", level);
 		syncStatus(ctx);
 
 		ctx.ui.notify(
@@ -313,127 +202,11 @@ export function ponytail(
 		);
 	}
 
-	function complete(prefix: string) {
-		const normalized = prefix.trim().toLowerCase();
-		const items = PONYTAIL_COMMAND_OPTIONS.filter((item) =>
-			item.value.startsWith(normalized),
-		);
-		return items.length > 0 ? items.map((i) => ({ ...i })) : null;
-	}
-
-	// -- config: interactive SettingsList --
-
-	async function openConfig(ctx: ExtensionContext) {
-		await ensureConfigLoaded();
-
-		await ctx.ui.custom((_tui, theme, _kb, done) => {
-			const items: SettingItem[] = [
-				{
-					id: "defaultLevel",
-					label: "Default level for new sessions",
-					currentValue: config.defaultLevel,
-					values: [...LEVELS],
-				},
-				{
-					id: "showStatus",
-					label: "Show status bar",
-					currentValue: config.showStatus ? "on" : "off",
-					values: ["on", "off"],
-				},
-			];
-
-			const container = new Container();
-			container.addChild(
-				new Text(theme.fg("accent", theme.bold(" Ponytail Config")), 0, 0),
-			);
-			container.addChild(
-				new Text(theme.fg("dim", " Saved to ~/.pi/agent/ponytail.json"), 0, 0),
-			);
-			container.addChild(
-				new Text(
-					theme.fg("dim", " Default level applies to future sessions."),
-					0,
-					0,
-				),
-			);
-			container.addChild(new Text("", 0, 0));
-
-			const applySettingChange = (id: string, newValue: string) => {
-				if (id === "defaultLevel" && LEVELS.includes(newValue as Level)) {
-					config.defaultLevel = newValue as Level;
-				} else if (id === "showStatus") {
-					config.showStatus = newValue === "on";
-				}
-				saveConfig(config);
-				syncStatus(ctx);
-			};
-
-			const settingsList = new SettingsList(
-				items,
-				Math.min(items.length + 2, 10),
-				getSettingsListTheme(),
-				applySettingChange,
-				() => done(undefined),
-			);
-
-			container.addChild(settingsList);
-			container.addChild(
-				new Text(
-					theme.fg("dim", " ←→/hl/tab change • ↑↓/jk move • esc close"),
-					0,
-					0,
-				),
-			);
-
-			const cycleSelectedValue = (direction: -1 | 1) => {
-				const selectedIndex = (
-					settingsList as unknown as { selectedIndex: number }
-				).selectedIndex;
-				const item = items[selectedIndex];
-				if (!item?.values?.length) return;
-				const currentIndex = item.values.indexOf(item.currentValue);
-				const nextIndex =
-					(currentIndex + direction + item.values.length) % item.values.length;
-				const newValue = item.values[nextIndex]!;
-				item.currentValue = newValue;
-				settingsList.updateValue(item.id, newValue);
-				applySettingChange(item.id, newValue);
-			};
-
-			return {
-				render: (w: number) => container.render(w),
-				invalidate: () => container.invalidate(),
-				handleInput: (data: string) => {
-					if (data === "j") data = "\u001b[B";
-					else if (data === "k") data = "\u001b[A";
-					else if (data === "h") {
-						cycleSelectedValue(-1);
-						_tui.requestRender();
-						return;
-					} else if (data === "l" || data === "\u001b[C" || data === "\t") {
-						cycleSelectedValue(1);
-						_tui.requestRender();
-						return;
-					} else if (data === "\u001b[D") {
-						cycleSelectedValue(-1);
-						_tui.requestRender();
-						return;
-					} else if (data === "\u001b" || data === "q") {
-						done(undefined);
-						return;
-					}
-
-					settingsList.handleInput(data);
-					_tui.requestRender();
-				},
-			};
-		});
-	}
-
 	return {
 		name: "ponytail",
-		help: "ponytail <1|2|3|lite|full|ultra|off|config> — lazy senior dev (minimal code)",
+		help: "ponytail — lazy senior dev (minimal code)",
+		values: LEVELS,
+		current: () => level,
 		run,
-		complete,
 	};
 }

package/src/rtk.ts

@@ -11,6 +11,7 @@ import type {
 	ExtensionCommandContext,
 	ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
+import { loadOptValue, saveOptValue } from "./persist.ts";
 import type { OptimizerHandle, OptimizerStatus } from "./status.ts";
 
 /**
@@ -283,6 +284,9 @@ export function rtk(
 	// Keep the status indicator in sync across the agent lifecycle. Probe
 	// availability on session start so the icon reflects reality immediately.
 	pi.on("session_start", async (_event, ctx) => {
+		// Restore the user's on/off choice from disk (survives quit/restart).
+		const saved = loadOptValue("rtk");
+		if (saved === "on" || saved === "off") enabled = saved === "on";
 		const probe = await checkRtkAvailability();
 		if (!probe.available && !warnedMissing) {
 			ctx.ui.notify(
@@ -300,32 +304,20 @@ export function rtk(
 		syncStatus(ctx);
 	});
 
-	// -- Subcommand handler (dispatched by the merged /opt router) --
+	// -- Overlay value handler (called by the /optimizer overlay) --
 
 	async function run(
-		args: string,
+		value: string,
 		ctx: ExtensionCommandContext,
 	): Promise<void> {
-		const arg = args.trim().toLowerCase();
-		if (arg === "on") enabled = true;
-		else if (arg === "off") enabled = false;
-		else enabled = !enabled; // bare toggles
+		enabled = value === "on";
+		saveOptValue("rtk", enabled ? "on" : "off");
 
 		await checkRtkAvailability();
 		syncStatus(ctx);
 		ctx.ui.notify(`RTK rewriting ${enabled ? "on" : "off"}.`, "info");
 	}
 
-	function complete(prefix: string) {
-		const items = [
-			{ value: "on", label: "on", description: "Force RTK rewriting on" },
-			{ value: "off", label: "off", description: "Force RTK rewriting off" },
-		];
-		const n = prefix.trim().toLowerCase();
-		const filtered = items.filter((i) => i.value.startsWith(n));
-		return filtered.length > 0 ? filtered : null;
-	}
-
 	// Rewrite bash commands to add rtk prefix.
 	//
 	// The SDK fires a single `tool_call` event for every tool. The bash variant
@@ -373,8 +365,9 @@ export function rtk(
 
 	return {
 		name: "rtk",
-		help: "rtk [on|off] — prefix shell commands with rtk (token-optimized)",
+		help: "rtk — prefix shell commands with rtk (token-optimized)",
+		values: ["off", "on"],
+		current: () => (enabled ? "on" : "off"),
 		run,
-		complete,
 	};
 }

package/src/status.ts

@@ -1,7 +1,7 @@
 /**
  * status.ts — shared status-bar indicator for the optimizer suite.
  *
- * caveman / rtk / json each toggle independently, but they're all the same
+ * caveman / rtk / toon / ponytail each toggle independently, but they're all the same
  * class of thing (token-optimization tools), so they share ONE status cell
  * instead of three. Each tool reports its on/off state into a single registry;
  * the cell renders only the icons whose tool is currently enabled, in a fixed
@@ -18,26 +18,22 @@ import type {
 	ThemeColor,
 } from "@earendil-works/pi-coding-agent";
 
-/** Argument-completion item shape used by the merged /opt command. */
-export interface CompletionItem {
-	value: string;
-	label: string;
-	description: string;
-}
-
 /**
- * Each optimizer tool (caveman/rtk/json) exposes a handle so the single `/opt`
- * router can dispatch subcommands to it without knowing its internals.
+ * Each optimizer tool (caveman/rtk/toon/ponytail) exposes a handle so the
+ * single `/optimizer` overlay can render one row per tool and apply value
+ * changes without knowing the tool's internals.
  */
 export interface OptimizerHandle {
-	/** Subcommand name, e.g. "caveman" / "rtk" / "toon". */
+	/** Tool name, e.g. "caveman" / "rtk" / "toon". */
 	name: OptimizerTool;
-	/** One-line help shown by `/opt` with no args. */
+	/** One-line summary shown in the overlay row. */
 	help: string;
-	/** Handle `/opt <name> <args>`. `args` is everything after the name. */
-	run(args: string, ctx: ExtensionCommandContext): Promise<void> | void;
-	/** Completions for the second token (`/opt <name> <prefix>`). */
-	complete(prefix: string): CompletionItem[] | null;
+	/** Cyclable values for this tool's overlay row, in display order. */
+	values: readonly string[];
+	/** Current value string (must be one of `values`). */
+	current(): string;
+	/** Apply a chosen value (persists + repaints status). `value` is one of `values`. */
+	run(value: string, ctx: ExtensionCommandContext): Promise<void> | void;
 }
 
 /** Stable status-bar key shared by every optimizer tool. */
@@ -94,6 +90,11 @@ export function renderStatus(
 export class OptimizerStatus {
 	private states: Partial<Record<OptimizerTool, boolean>> = {};
 
+	/** Current enabled state for one tool (undefined until first set). */
+	get(tool: OptimizerTool): boolean | undefined {
+		return this.states[tool];
+	}
+
 	/** Update one tool's enabled state and repaint the shared cell. */
 	set(
 		tool: OptimizerTool,