@xynogen/pix-optimizer 1.1.18 → 1.1.20

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-optimizer",
-	"version": "1.1.18",
+	"version": "1.1.20",
 	"description": "Performance optimization suite for Pi Coding Agent - caveman mode + RTK tool rewriting + jq/TOON JSON compression + ponytail lazy-dev mode",
 	"type": "module",
 	"main": "src/index.ts",
@@ -9,6 +9,7 @@
 	},
 	"files": [
 		"src",
+		"!src/**/*.test.ts",
 		"README.md",
 		"LICENSE"
 	],

package/src/caveman.ts

@@ -5,12 +5,12 @@
  * called by index.ts alongside rtk(pi).
  */
 
-import type {
-	ExtensionAPI,
-	ExtensionCommandContext,
-	ExtensionContext,
-} from "@earendil-works/pi-coding-agent";
-import { loadOptValue, saveOptValue } from "./persist.ts";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import {
+	createMode,
+	resolveLevel as resolveLevelGeneric,
+	toggleLevel as toggleLevelGeneric,
+} from "./mode.ts";
 import type { OptimizerHandle, OptimizerStatus } from "./status.ts";
 
 // ── Levels ────────────────────────────────────────────────────────────────────
@@ -97,11 +97,7 @@ export function buildPrompt(level: Level): string {
  * Handles stop aliases (stop/quit → "off") and valid level names.
  */
 export function resolveLevel(arg: string): Level | null {
-	const a = arg.trim().toLowerCase();
-	if (STOP_ALIASES.has(a)) return "off";
-	if (LEVEL_NUMBERS[a]) return LEVEL_NUMBERS[a];
-	if (LEVELS.includes(a as Level)) return a as Level;
-	return null;
+	return resolveLevelGeneric(arg, LEVELS, LEVEL_NUMBERS, STOP_ALIASES);
 }
 
 /**
@@ -127,74 +123,18 @@ export function buildHelp(current: Level): string {
  * Toggle: off → full, anything else → off.
  */
 export function toggleLevel(current: Level): Level {
-	return current === "off" ? "full" : "off";
+	return toggleLevelGeneric(current);
 }
 
 // ── Pi extension ────────────────────────────────────────────────────────────
 
 export function caveman(pi: ExtensionAPI, status: OptimizerStatus): OptimizerHandle {
-	let level: Level = "off";
-
-	// -- Status: report into the shared optimizer indicator. --
-
-	function syncStatus(ctx: Pick<ExtensionContext, "ui">) {
-		status.set("caveman", level !== "off", ctx);
-	}
-
-	// Inject caveman prompt via before_agent_start
-	pi.on("before_agent_start", async (event, _ctx) => {
-		const prompt = buildPrompt(level);
-		if (!prompt) return undefined;
-		const existing = event.systemPrompt ?? "";
-		return { systemPrompt: `${prompt}\n\n${existing}` };
-	});
-
-	// -- Restore live level from the session log on load --
-
-	pi.on("session_start", async (_event, ctx) => {
-		// Session log first (survives in-session branch nav), then disk (survives
-		// a full quit/restart). Disk wins when present so a new session restores
-		// the last chosen level instead of defaulting to off.
-		for (const entry of ctx.sessionManager.getEntries()) {
-			if (entry.type === "custom" && entry.customType === "caveman-level") {
-				level = (entry.data as { level: Level })?.level ?? level;
-			}
-		}
-		const saved = loadOptValue("caveman");
-		if (saved && LEVELS.includes(saved as Level)) level = saved as Level;
-		syncStatus(ctx);
-	});
-
-	pi.on("agent_start", async (_event, ctx) => {
-		syncStatus(ctx);
-	});
-	pi.on("agent_end", async (_event, ctx) => {
-		syncStatus(ctx);
-	});
-	pi.on("session_shutdown", async () => {});
-
-	// -- Overlay value handler (called by the /optimizer overlay) --
-
-	async function run(value: string, ctx: ExtensionCommandContext): Promise<void> {
-		const resolved = resolveLevel(value);
-		if (resolved === null) return;
-		level = resolved;
-
-		pi.appendEntry("caveman-level", { level });
-		saveOptValue("caveman", level);
-		syncStatus(ctx);
-
-		ctx.ui.notify(
-			level === "off" ? "Caveman mode off." : `Caveman: ${STATUS_LABELS[level]}`,
-			"info",
-		);
-	}
-
-	return {
+	return createMode(pi, status, {
 		name: "caveman",
 		help: "caveman — terse output",
-		values: LEVELS,
-		current: () => level,
-		run,
-	};
+		levels: LEVELS,
+		buildPrompt,
+		resolve: resolveLevel,
+		notify: (level) => (level === "off" ? "Caveman mode off." : `Caveman: ${STATUS_LABELS[level]}`),
+	});
 }

package/src/mode.ts

@@ -0,0 +1,116 @@
+/**
+ * mode.ts — shared plumbing for prompt-injection optimizer modes.
+ *
+ * caveman.ts and ponytail.ts are the same *kind* of tool: a level enum, a
+ * system-prompt fragment injected via before_agent_start, and identical
+ * persistence/status wiring. Only the prompt/help/label *content* differs —
+ * that stays in each module. This file owns the generic level resolution and
+ * the extension factory both call.
+ */
+
+import type {
+	ExtensionAPI,
+	ExtensionCommandContext,
+	ExtensionContext,
+} from "@earendil-works/pi-coding-agent";
+import { loadOptValue, saveOptValue } from "./persist.ts";
+import type { OptimizerHandle, OptimizerStatus, OptimizerTool } from "./status.ts";
+
+/**
+ * Resolve a raw command arg to a level, or null if unrecognised.
+ * Handles stop aliases (stop/quit → "off"), numeric shortcuts, and level names.
+ */
+export function resolveLevel<L extends string>(
+	arg: string,
+	levels: readonly L[],
+	levelNumbers: Record<string, L>,
+	stopAliases: ReadonlySet<string>,
+): L | null {
+	const a = arg.trim().toLowerCase();
+	if (stopAliases.has(a)) return "off" as L;
+	if (levelNumbers[a]) return levelNumbers[a];
+	if (levels.includes(a as L)) return a as L;
+	return null;
+}
+
+/** Toggle: off → full, anything else → off. */
+export function toggleLevel<L extends string>(current: L): L {
+	return (current === "off" ? "full" : "off") as L;
+}
+
+export interface ModeConfig<L extends string> {
+	/** Status-registry key + persistence key + `${name}-level` custom entry. */
+	name: OptimizerTool;
+	/** One-line overlay summary. */
+	help: string;
+	/** Cyclable values in display order. */
+	levels: readonly L[];
+	/** Build the system-prompt fragment for a level ("" when off). */
+	buildPrompt(level: L): string;
+	/** Resolve an overlay/command value to a level (each module supplies its enum). */
+	resolve(value: string): L | null;
+	/** Notification shown after a successful change. */
+	notify(level: L): string;
+}
+
+/**
+ * Build the shared extension: prompt injection + session restore + status +
+ * overlay handle. Identical across every prompt-mode tool.
+ */
+export function createMode<L extends string>(
+	pi: ExtensionAPI,
+	status: OptimizerStatus,
+	config: ModeConfig<L>,
+): OptimizerHandle {
+	const { name, levels, buildPrompt } = config;
+	const customType = `${name}-level`;
+	let level = "off" as L;
+
+	function syncStatus(ctx: Pick<ExtensionContext, "ui">) {
+		status.set(name, level !== "off", ctx);
+	}
+
+	pi.on("before_agent_start", async (event, _ctx) => {
+		const prompt = buildPrompt(level);
+		if (!prompt) return undefined;
+		const existing = event.systemPrompt ?? "";
+		return { systemPrompt: `${prompt}\n\n${existing}` };
+	});
+
+	pi.on("session_start", async (_event, ctx) => {
+		// Session log first (survives 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 === customType) {
+				level = ((entry.data as { level: L })?.level ?? level) as L;
+			}
+		}
+		const saved = loadOptValue(name);
+		if (saved && levels.includes(saved as L)) level = saved as L;
+		syncStatus(ctx);
+	});
+
+	pi.on("agent_start", async (_event, ctx) => syncStatus(ctx));
+	pi.on("agent_end", async (_event, ctx) => syncStatus(ctx));
+	pi.on("session_shutdown", async () => {});
+
+	async function run(value: string, ctx: ExtensionCommandContext): Promise<void> {
+		const resolved = config.resolve(value);
+		if (resolved === null) return;
+		level = resolved;
+
+		pi.appendEntry(customType, { level });
+		saveOptValue(name, level);
+		syncStatus(ctx);
+
+		ctx.ui.notify(config.notify(level), "info");
+	}
+
+	return {
+		name,
+		help: config.help,
+		values: levels,
+		current: () => level,
+		run,
+	};
+}

package/src/opt.ts

@@ -15,7 +15,13 @@
  */
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { frameLines } from "@xynogen/pix-pretty/modal-frame";
+import { type KeybindingsManager, matchesKey } from "@earendil-works/pi-tui";
+import {
+	frameModal,
+	MIN_MODAL_HEIGHT,
+	ModalPager,
+	terminalModalHeight,
+} from "@xynogen/pix-pretty/modal-frame";
 import type { OptimizerHandle, OptimizerStatus, OptimizerTool } from "./status.ts";
 import { toolIcon } from "./status.ts";
 
@@ -113,12 +119,13 @@ export function registerOptCommand(
 
 			await ui.custom<null>(
 				(
-					tui: { requestRender(): void },
+					tui: { requestRender(): void; terminal?: { rows?: number } },
 					theme: typeof ui.theme,
-					_kb: unknown,
+					kb: KeybindingsManager,
 					done: (v: null) => void,
 				) => {
 					let selected = 0;
+					const pager = new ModalPager();
 
 					const cycle = (direction: -1 | 1) => {
 						const tool = TOOL_ORDER[selected] as OptimizerTool;
@@ -130,6 +137,7 @@ export function registerOptCommand(
 
 					const move = (direction: -1 | 1) => {
 						selected = (selected + direction + TOOL_ORDER.length) % TOOL_ORDER.length;
+						pager.followSelection();
 					};
 
 					return {
@@ -148,30 +156,46 @@ export function registerOptCommand(
 								const bar = theme.fg(on ? "accent" : "dim", levelBar(cur, handles[tool].values));
 								return `${cursor} ${glyph}  ${name}  ${value}  ${bar}`;
 							});
-							const lines = [
-								theme.fg("accent", theme.bold("󱎫  Optimizer")),
-								"",
-								...rows,
-								"",
-								theme.fg("dim", helpSummary(handles[TOOL_ORDER[selected] as OptimizerTool].help)),
-								"",
-								theme.fg("dim", "←→ change · ↑↓ move · esc close"),
-							];
-							return frameLines({
+							const result = frameModal({
 								width: boxW,
-								lines,
+								maxHeight: terminalModalHeight(tui.terminal?.rows),
+								minHeight: MIN_MODAL_HEIGHT,
+								header: [theme.fg("accent", theme.bold("󱎫  Optimizer")), ""],
+								body: rows,
+								footer: [
+									"",
+									theme.fg("dim", helpSummary(handles[TOOL_ORDER[selected] as OptimizerTool].help)),
+									"",
+									theme.fg("dim", "←→ change · ↑↓ move · PgUp/PgDn inspect · esc close"),
+								],
+								bodyOffset: pager.bodyOffset,
+								selectedBodyLine: pager.selectedLine(selected),
 								color: (s) => theme.fg("accent", s),
 								bg: (s) => theme.bg("customMessageBg", s),
 							});
+							pager.sync(result);
+							return result.lines;
 						},
 						invalidate: () => {},
 						handleInput: (data: string) => {
-							if (data === "k" || data === "\u001b[A") move(-1);
-							else if (data === "j" || data === "\u001b[B") move(1);
-							else if (data === "h" || data === "\u001b[D") cycle(-1);
-							else if (data === "l" || data === "\u001b[C" || data === " " || data === "\r")
+							if (pager.handleInput(data, kb)) {
+								tui.requestRender();
+								return;
+							}
+							// matchesKey handles both legacy bytes and Kitty CSI-u encodings
+							// for letters and special keys alike — raw string compares like
+							// `data === "k"` silently fail under the Kitty keyboard protocol.
+							if (matchesKey(data, "k") || matchesKey(data, "up")) move(-1);
+							else if (matchesKey(data, "j") || matchesKey(data, "down")) move(1);
+							else if (matchesKey(data, "h") || matchesKey(data, "left")) cycle(-1);
+							else if (
+								matchesKey(data, "l") ||
+								matchesKey(data, "right") ||
+								matchesKey(data, "space") ||
+								matchesKey(data, "enter")
+							)
 								cycle(1);
-							else if (data === "\u001b" || data === "q") {
+							else if (matchesKey(data, "escape") || matchesKey(data, "q")) {
 								done(null);
 								return;
 							} else return;

package/src/ponytail.ts

@@ -9,12 +9,12 @@
  * skill. We inject it as a system-prompt fragment — no external hooks/files.
  */
 
-import type {
-	ExtensionAPI,
-	ExtensionCommandContext,
-	ExtensionContext,
-} from "@earendil-works/pi-coding-agent";
-import { loadOptValue, saveOptValue } from "./persist.ts";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import {
+	createMode,
+	resolveLevel as resolveLevelGeneric,
+	toggleLevel as toggleLevelGeneric,
+} from "./mode.ts";
 import type { OptimizerHandle, OptimizerStatus } from "./status.ts";
 
 // ── Levels ────────────────────────────────────────────────────────────────────
@@ -102,11 +102,7 @@ export function buildPrompt(level: Level): string {
  * Handles stop aliases (stop/quit → "off") and valid level names.
  */
 export function resolveLevel(arg: string): Level | null {
-	const a = arg.trim().toLowerCase();
-	if (STOP_ALIASES.has(a)) return "off";
-	if (LEVEL_NUMBERS[a]) return LEVEL_NUMBERS[a];
-	if (LEVELS.includes(a as Level)) return a as Level;
-	return null;
+	return resolveLevelGeneric(arg, LEVELS, LEVEL_NUMBERS, STOP_ALIASES);
 }
 
 /**
@@ -131,73 +127,19 @@ export function buildHelp(current: Level): string {
  * Toggle: off → full, anything else → off.
  */
 export function toggleLevel(current: Level): Level {
-	return current === "off" ? "full" : "off";
+	return toggleLevelGeneric(current);
 }
 
 // ── Pi extension ────────────────────────────────────────────────────────────
 
 export function ponytail(pi: ExtensionAPI, status: OptimizerStatus): OptimizerHandle {
-	let level: Level = "off";
-
-	// -- Status: report into the shared optimizer indicator. --
-
-	function syncStatus(ctx: Pick<ExtensionContext, "ui">) {
-		status.set("ponytail", level !== "off", ctx);
-	}
-
-	// Inject ponytail prompt via before_agent_start
-	pi.on("before_agent_start", async (event, _ctx) => {
-		const prompt = buildPrompt(level);
-		if (!prompt) return undefined;
-		const existing = event.systemPrompt ?? "";
-		return { systemPrompt: `${prompt}\n\n${existing}` };
-	});
-
-	// -- Restore live level from the session log on load --
-
-	pi.on("session_start", async (_event, ctx) => {
-		// 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") {
-				level = (entry.data as { level: Level })?.level ?? level;
-			}
-		}
-		const saved = loadOptValue("ponytail");
-		if (saved && LEVELS.includes(saved as Level)) level = saved as Level;
-		syncStatus(ctx);
-	});
-
-	pi.on("agent_start", async (_event, ctx) => {
-		syncStatus(ctx);
-	});
-	pi.on("agent_end", async (_event, ctx) => {
-		syncStatus(ctx);
-	});
-	pi.on("session_shutdown", async () => {});
-
-	// -- Overlay value handler (called by the /optimizer overlay) --
-
-	async function run(value: string, ctx: ExtensionCommandContext): Promise<void> {
-		const resolved = resolveLevel(value);
-		if (resolved === null) return;
-		level = resolved;
-
-		pi.appendEntry("ponytail-level", { level });
-		saveOptValue("ponytail", level);
-		syncStatus(ctx);
-
-		ctx.ui.notify(
-			level === "off" ? "Ponytail mode off." : `Ponytail: ${STATUS_LABELS[level]}`,
-			"info",
-		);
-	}
-
-	return {
+	return createMode(pi, status, {
 		name: "ponytail",
 		help: "ponytail — lazy senior dev (minimal code)",
-		values: LEVELS,
-		current: () => level,
-		run,
-	};
+		levels: LEVELS,
+		buildPrompt,
+		resolve: resolveLevel,
+		notify: (level) =>
+			level === "off" ? "Ponytail mode off." : `Ponytail: ${STATUS_LABELS[level]}`,
+	});
 }

package/src/capability.test.ts

@@ -1,42 +0,0 @@
-import { describe, expect, it, mock } from "bun:test";
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { canExecute } from "./capability.ts";
-
-function executor(impl: ExtensionAPI["exec"]): Pick<ExtensionAPI, "exec"> {
-	return { exec: impl };
-}
-
-describe("canExecute", () => {
-	it("runs the requested capability probe without a shell", async () => {
-		const exec = mock(async () => ({
-			stdout: "jq-1.7",
-			stderr: "",
-			code: 0,
-			killed: false,
-		}));
-
-		expect(await canExecute(executor(exec), "jq", ["--version"])).toBe(true);
-		expect(exec).toHaveBeenCalledWith("jq", ["--version"], { timeout: 3000 });
-	});
-
-	it("supports a custom timeout", async () => {
-		const exec = mock(async () => ({ stdout: "2.3.0", stderr: "", code: 0, killed: false }));
-
-		expect(await canExecute(executor(exec), "toon", ["--version"], 1000)).toBe(true);
-		expect(exec).toHaveBeenCalledWith("toon", ["--version"], { timeout: 1000 });
-	});
-
-	it("returns false for a non-zero exit", async () => {
-		const exec = mock(async () => ({ stdout: "", stderr: "failed", code: 1, killed: false }));
-
-		expect(await canExecute(executor(exec), "jq", ["--version"])).toBe(false);
-	});
-
-	it("returns false when the executable cannot be spawned", async () => {
-		const exec = mock(async () => {
-			throw new Error("ENOENT");
-		});
-
-		expect(await canExecute(executor(exec), "toon", ["--version"])).toBe(false);
-	});
-});