@xynogen/pix-optimizer 1.1.6 → 1.1.8

package/README.md

@@ -1,7 +1,7 @@
 # pix-optimizer
 
-Token-optimization suite for Pi Coding Agent. Three tools wired into one
-extension via `src/index.ts`, fronted by a single `/opt` command and one
+Token-optimization suite for Pi Coding Agent. Four tools wired into one
+extension via `src/index.ts`, fronted by a single `/optimizer` command and one
 shared status-bar cell:
 
 - **Caveman** (`󰜐`) — terse-output system prompt
@@ -11,16 +11,18 @@ shared status-bar cell:
 
 ## Command
 
-One command routes to every tool:
+One command opens an interactive overlay that fronts every tool:
 
 ```text
-/opt                  → status + help
-/opt caveman <level>  → set caveman level (1/2/3/lite/full/ultra/micro/off/config)
-/opt rtk [on|off]     → toggle RTK rewriting
-/opt toon [on|off]    → toggle jq+TOON guidance
-/opt ponytail <level> → set ponytail level (1/2/3/lite/full/ultra/off/config)
+/optimizer                 → open the overlay (←→ cycle value, ↑↓ move, esc close)
 ```
 
+There is no text-arg form: the overlay is the only UI. Selecting a value calls
+the tool's `run()` handler, which persists the new value and repaints the
+shared status cell. Headless/test fallbacks print a plain status summary.
+
+State persists to `~/.pi/agent/optimizer.json` (caveman/rtk/toon/ponytail).
+
 ## Status bar
 
 A single cell always shows the enabled icons in a fixed order (`󰜐 󰓥 󰗀 󰆐`), color-
@@ -32,15 +34,15 @@ coded by state: **accent** when the tool is enabled, **dim** when disabled.
 
 Cuts ~75% of output tokens while keeping full technical accuracy.
 
-| # | Name  | Description                  |
-|---|-------|------------------------------|
-| 1 | lite  | Professional, no fluff       |
-| 2 | full  | Classic caveman              |
-| 3 | ultra | Maximum compression          |
-| – | micro | Experimental prompt-minimized |
+| Level | Description                  |
+|-------|------------------------------|
+| lite  | Professional, no fluff       |
+| full  | Classic caveman              |
+| ultra | Maximum compression          |
+| micro | Experimental prompt-minimized |
 
-`/opt caveman config` opens a settings dialog. Default level for new sessions
-and status-bar visibility are saved to `~/.pi/agent/caveman.json`.
+The `/optimizer` overlay opens a settings dialog when needed. Default level
+for new sessions is restored from `~/.pi/agent/optimizer.json`.
 
 ### RTK Tool Rewriting (`󰓥`)
 
@@ -88,14 +90,11 @@ writing code the agent stops at the first rung that holds: does this need to
 exist → stdlib → native platform → installed dep → one line → minimum that
 works. Validation, error handling, security, and accessibility are never cut.
 
-| # | Name  | Description                          |
-|---|-------|--------------------------------------|
-| 1 | lite  | Name the lazier alternative, you pick |
-| 2 | full  | The ladder enforced (default)        |
-| 3 | ultra | YAGNI extremist                      |
-
-`/opt ponytail config` opens a settings dialog. Default level for new sessions
-and status-bar visibility are saved to `~/.pi/agent/ponytail.json`.
+| Level | Description                          |
+|-------|--------------------------------------|
+| lite  | Name the lazier alternative, you pick |
+| full  | The ladder enforced (default)        |
+| ultra | YAGNI extremist                      |
 
 **No install required** — pure prompt injection, no external binary or PATH
 dependency (unlike RTK and TOON).
@@ -116,16 +115,18 @@ pi install npm:@xynogen/pix-optimizer
 
 | File              | Role                                                      |
 |-------------------|-----------------------------------------------------------|
-| `src/index.ts`    | Wires the four tools + shared status, registers `/opt`    |
-| `src/opt.ts`      | The `/opt` router: parse, complete, dispatch              |
+| `src/index.ts`    | Wires the four tools + shared status, registers `/optimizer` |
+| `src/opt.ts`      | The `/optimizer` overlay UI (keyboard nav + cycling)     |
 | `src/status.ts`   | Shared status-bar cell + `OptimizerHandle` contract       |
-| `src/caveman.ts`  | Caveman logic, levels, prompt, settings dialog            |
+| `src/caveman.ts`  | Caveman logic, levels, prompt                            |
 | `src/rtk.ts`      | RTK prompt + bash command rewriting                       |
 | `src/json.ts`     | jq+TOON guidance, heuristics, system-prompt injection     |
-| `src/ponytail.ts` | Ponytail logic, levels, prompt, settings dialog           |
+| `src/ponytail.ts` | Ponytail logic, levels, prompt                            |
+| `src/persist.ts`  | Disk-backed `~/.pi/agent/optimizer.json` persistence      |
+| `src/tool-result-filter.ts` | Strips model-guidance warnings from tool_result |
 
 Each tool registers its own lifecycle hooks and exposes an `OptimizerHandle`
-that `/opt` dispatches to. All four share one `OptimizerStatus`.
+that `/optimizer` dispatches to. All four share one `OptimizerStatus`.
 
 ## Development
 
@@ -137,22 +138,22 @@ bun test
 
 This package was built by merging two upstream Pi community packages:
 
-- **Caveman mode** — merged from [`git:github.com/jonjonrankin/pi-caveman`](https://github.com/jonjonrankin/pi-caveman)
-  (itself a fork of `npm:pi-caveman`). Reimplemented here with multiple compression levels,
-  a settings dialog, per-session persistence, and integration with the shared `/opt` command.
+- **Caveman mode** — merged from `npm:pi-caveman`. Reimplemented here with
+  multiple compression levels and integration with the shared `/optimizer`
+  command.
 
-- **RTK rewriting** — merged from `npm:pi-rtk-optimizer`. Reimplemented here with a two-layer
-  approach: prompt injection + live bash command rewriting that handles chained commands
-  (`&&`, `||`, `;`, `|`).
+- **RTK rewriting** — merged from `npm:pi-rtk-optimizer`. Reimplemented here
+  with a two-layer approach: prompt injection + live bash command rewriting
+  that handles chained commands (`&&`, `||`, `;`, `|`).
 
 - **Ponytail mode** — ruleset adapted from [`git:github.com/DietrichGebert/ponytail`](https://github.com/DietrichGebert/ponytail),
-  the "lazy senior dev" skill. Reimplemented here as a native `/opt` tool with three intensity
-  levels, a settings dialog, and per-session persistence — no external hooks or files. The
+  the "lazy senior dev" skill. Reimplemented here as a native `/optimizer`
+  tool with three intensity levels — no external hooks or files. The
   ruleset (the YAGNI ladder + safety carve-outs) is rewritten as a system-prompt fragment.
 
 All upstreams are MIT licensed. No codebase was copied directly — the logic was
-rewritten and combined into a single extension with a unified `/opt` command and shared status bar.
-This package does not sync back to any upstream.
+rewritten and combined into a single extension with a unified `/optimizer`
+command and shared status bar. This package does not sync back to any upstream.
 
 ## Full distro
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-optimizer",
-	"version": "1.1.6",
+	"version": "1.1.8",
 	"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",

package/src/caveman.ts

@@ -10,6 +10,7 @@ import type {
 	ExtensionCommandContext,
 	ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
+import { loadOptValue, saveOptValue } from "./persist.ts";
 import type { OptimizerHandle, OptimizerStatus } from "./status.ts";
 
 // ── Levels ────────────────────────────────────────────────────────────────────
@@ -155,11 +156,16 @@ export function caveman(
 	// -- 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);
 	});
 
@@ -182,6 +188,7 @@ export function caveman(
 		level = resolved;
 
 		pi.appendEntry("caveman-level", { level });
+		saveOptValue("caveman", level);
 		syncStatus(ctx);
 
 		ctx.ui.notify(

package/src/index.ts

@@ -1,13 +1,13 @@
 /**
  * pix-optimizer — token-optimization suite for Pi Coding Agent.
  *
- * Three tools, combined into one extension + one command:
+ * Four tools, combined into one extension + one command:
  *   - caveman:  terse-output system prompt
  *   - rtk:      prefixes shell commands with `rtk` + injects RTK prompt
  *   - toon:     jq + TOON guidance for dense JSON (+ bundled skill)
  *   - ponytail: lazy-senior-dev system prompt (minimal code, YAGNI)
  *
- * They share ONE status-bar cell (󰜐 󰓥 󰗀 󰆐, only enabled tools shown) and ONE
+ * They share ONE status-bar cell (󰜐 󰓥 󰗀 󰆐, all four always shown — dimmed when off, accented when on) and ONE
  * command (/optimizer — an interactive overlay). index.ts wires lifecycle hooks
  * via each module, then registers the overlay command from their handles.
  */

package/src/json.ts

@@ -22,6 +22,7 @@ import type {
 	ExtensionCommandContext,
 	ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
+import { loadOptValue, saveOptValue } from "./persist.ts";
 import type { OptimizerHandle, OptimizerStatus } from "./status.ts";
 
 // ── System prompt ───────────────────────────────────────────────────────────
@@ -225,6 +226,9 @@ export function json(
 	}
 
 	pi.on("session_start", async (_event, ctx) => {
+		// Restore the user's on/off choice from disk (survives quit/restart).
+		const saved = loadOptValue("toon");
+		if (saved === "on" || saved === "off") enabled = saved === "on";
 		syncStatus(ctx);
 	});
 	pi.on("agent_start", async (_event, ctx) => {
@@ -277,6 +281,7 @@ export function json(
 		ctx: ExtensionCommandContext,
 	): Promise<void> {
 		enabled = value === "on";
+		saveOptValue("toon", enabled ? "on" : "off");
 
 		syncStatus(ctx);
 		ctx.ui.notify(`JSON/TOON guidance ${enabled ? "on" : "off"}.`, "info");

package/src/persist.test.ts

@@ -0,0 +1,56 @@
+/**
+ * Regression test for the cross-session reset bug: optimizer tool states
+ * (caveman/ponytail/rtk/toon) were lost on a full quit/restart because they
+ * only persisted to the session log. persist.ts adds disk persistence so a
+ * value written in one session is readable in the next.
+ */
+
+import { afterAll, beforeAll, describe, expect, test } from "bun:test";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { loadOptValue, saveOptValue } from "./persist.ts";
+
+let tmpAgentDir: string;
+
+beforeAll(() => {
+	tmpAgentDir = mkdtempSync(join(tmpdir(), "optimizer-persist-test-"));
+	process.env.PI_CODING_AGENT_DIR = tmpAgentDir;
+});
+
+afterAll(() => {
+	delete process.env.PI_CODING_AGENT_DIR;
+	try {
+		rmSync(tmpAgentDir, { recursive: true });
+	} catch {
+		// temp dir may already be gone — safe to ignore
+	}
+});
+
+describe("optimizer persistence", () => {
+	test("returns undefined before anything is saved", () => {
+		expect(loadOptValue("caveman")).toBeUndefined();
+	});
+
+	test("round-trips a single tool value across save/load (new-session sim)", () => {
+		saveOptValue("caveman", "lite");
+		// A fresh load (as a new session would do) sees the persisted value.
+		expect(loadOptValue("caveman")).toBe("lite");
+	});
+
+	test("persists each tool independently in one shared file", () => {
+		saveOptValue("ponytail", "full");
+		saveOptValue("rtk", "off");
+		saveOptValue("toon", "on");
+		expect(loadOptValue("caveman")).toBe("lite");
+		expect(loadOptValue("ponytail")).toBe("full");
+		expect(loadOptValue("rtk")).toBe("off");
+		expect(loadOptValue("toon")).toBe("on");
+	});
+
+	test("overwriting one tool leaves the others intact", () => {
+		saveOptValue("caveman", "ultra");
+		expect(loadOptValue("caveman")).toBe("ultra");
+		expect(loadOptValue("ponytail")).toBe("full");
+	});
+});

package/src/persist.ts

@@ -0,0 +1,50 @@
+/**
+ * persist.ts — disk-backed persistence for the /optimizer tool states.
+ *
+ * caveman/ponytail previously saved only to the session log (lost on a fresh
+ * session); rtk/toon never persisted at all. This stores every tool's current
+ * value in one file under the agent dir so the picker survives a full quit and
+ * restart. Each tool reads its value on session_start and writes on run().
+ *
+ *   ~/.pi/agent/optimizer.json  →  { "caveman": "lite", "rtk": "on", ... }
+ */
+
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { getAgentDir } from "@earendil-works/pi-coding-agent";
+import type { OptimizerTool } from "./status.ts";
+
+type OptimizerConfig = Partial<Record<OptimizerTool, string>>;
+
+function getStatePath(): string {
+	return join(getAgentDir(), "optimizer.json");
+}
+
+function readAll(): OptimizerConfig {
+	try {
+		const sp = getStatePath();
+		if (!existsSync(sp)) return {};
+		const raw = JSON.parse(readFileSync(sp, "utf-8")) as OptimizerConfig;
+		return raw && typeof raw === "object" ? raw : {};
+	} catch {
+		// Missing, corrupt, or no getAgentDir (tests/headless) — start clean.
+		return {};
+	}
+}
+
+/** Read a single tool's persisted value, or undefined if none. */
+export function loadOptValue(tool: OptimizerTool): string | undefined {
+	return readAll()[tool];
+}
+
+/** Persist a single tool's value, merging into the shared config file. */
+export function saveOptValue(tool: OptimizerTool, value: string): void {
+	try {
+		const sp = getStatePath();
+		mkdirSync(dirname(sp), { recursive: true });
+		const next = { ...readAll(), [tool]: value };
+		writeFileSync(sp, JSON.stringify(next, null, 2), "utf-8");
+	} catch (err) {
+		console.warn(`optimizer: persist ${tool} failed:`, err);
+	}
+}

package/src/ponytail.ts

@@ -14,6 +14,7 @@ import type {
 	ExtensionCommandContext,
 	ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
+import { loadOptValue, saveOptValue } from "./persist.ts";
 import type { OptimizerHandle, OptimizerStatus } from "./status.ts";
 
 // ── Levels ────────────────────────────────────────────────────────────────────
@@ -159,11 +160,15 @@ export function ponytail(
 	// -- 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);
 	});
 
@@ -186,6 +191,7 @@ export function ponytail(
 		level = resolved;
 
 		pi.appendEntry("ponytail-level", { level });
+		saveOptValue("ponytail", level);
 		syncStatus(ctx);
 
 		ctx.ui.notify(

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(
@@ -307,6 +311,7 @@ export function rtk(
 		ctx: ExtensionCommandContext,
 	): Promise<void> {
 		enabled = value === "on";
+		saveOptValue("rtk", enabled ? "on" : "off");
 
 		await checkRtkAvailability();
 		syncStatus(ctx);

package/src/status.ts

@@ -4,12 +4,12 @@
  * 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
- * order, accent-colored. When everything is off the cell is empty.
+ * the cell renders ALL four icons in a fixed order — accent-colored when the
+ * tool is enabled, dim when disabled. The cell is never empty.
  *
- *   all on:        󰜐 󰓥 󰗀 󰆐
- *   caveman off:   󰓥 󰗀 󰆐
- *   all off:       (empty)
+ *   all on:        all four accent
+ *   caveman off:   caveman dim, rest accent
+ *   all off:       all four dim
  */
 
 import type {