@xynogen/pix-optimizer 1.1.19 → 1.1.22

package/README.md

@@ -1,14 +1,16 @@
 # pix-optimizer
 
-Token-optimization suite for Pi Coding Agent. Four tools wired into one
+Token-optimization suite for Pi Coding Agent. Three tools wired into one
 extension via `src/index.ts`, fronted by a single `/optimizer` command and one
 shared status-bar cell:
 
 - **Caveman** (`Cv`) — terse-output system prompt
 - **RTK** (`Rk`) — prefixes shell commands with `rtk` + injects RTK prompt
-- **TOON** (`Tn`) — jq + TOON guidance for dense JSON (skill lives in pix-skills)
 - **Ponytail** (`Pt`) — lazy-senior-dev system prompt (minimal code, YAGNI)
 
+TOON guidance lives exclusively in the on-demand `toon-json` skill bundled by
+`@xynogen/pix-skills`; it is no longer optimizer state or prompt injection.
+
 ## Command
 
 One command opens an interactive overlay that fronts every tool:
@@ -21,11 +23,11 @@ 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). **Initial values** for a new session can be set in the `optimizer` section of `~/.pi/agent/pix.json` — the runtime toggle via `/optimizer` still persists changes to `optimizer.json` as before.
+State persists to `~/.pi/agent/optimizer.json` (caveman/rtk/ponytail). **Initial values** for a new session can be set in the `optimizer` section of `~/.pi/agent/pix.json` — the runtime toggle via `/optimizer` still persists changes to `optimizer.json` as before.
 
 ## Status bar
 
-A single cell always shows all four tool icons in a fixed order, color-coded by
+A single cell always shows all three tool icons in a fixed order, color-coded by
 state: **accent** when the tool is enabled, **dim** when disabled.
 
 ### Icon style (Nerd Font, Unicode, or ASCII)
@@ -37,15 +39,11 @@ font (e.g. MesloLGS NF). Terminals without one render them as missing-glyph
 | Mode | Glyphs | Needs Nerd Font? |
 |---|---|---|
 | `nerd` (default) | Nerd Font PUA glyphs | yes |
-| `unicode` | `♤ ♡ ♢ ♧` (outline card suits) | no |
-| `ascii` | `Cv Rk Tn Pt` | no |
-
-Switch the style live from the **`/optimizer` overlay** — a fifth `icons` row
-at the bottom cycles `nerd → unicode → ascii` with `←→`; the choice persists to
-`~/.pi/agent/optimizer.json`.
+| `unicode` | `♤ ♡ ♧` (outline card suits) | no |
+| `ascii` | `Cv Rk Pt` | no |
 
-Icons follow the **global** `pix-pretty` mode — set via `/pix` or `PRETTY_ICONS`
-env var. The optimizer no longer has its own toggle.
+Icons follow the **global** `pix-pretty` mode. Set it via `/pix` or the
+`PRETTY_ICONS` environment variable; the optimizer has no separate icon toggle.
 
 ## Features
 
@@ -84,23 +82,6 @@ Two layers, both active automatically:
 cargo install rtk-ai
 ```
 
-### TOON / JSON Compression (`Tn`)
-
-Guidance for handling information-dense JSON via `jq` (query/reshape) and
-`toon` (compress). The system-prompt nudge is injected **only when the user
-prompt mentions JSON** (`json`/`jsonl`/`jq`/`toon`/`openapi`/…). TOON shines
-on uniform/tabular arrays; deeply nested or array-of-arrays data and API
-contracts stay as JSON.
-
-The `toon-json` skill (full workflow + when-NOT-to-use guidance) is bundled in
-`pix-skills` and auto-discovered from there.
-
-**Requirement:** `jq` and `toon` on `PATH`.
-
-```bash
-npm i -g @toon-format/cli
-```
-
 ### Ponytail Mode (`Pt`)
 
 "Lazy senior dev" mode. Governs **what** the agent builds (minimal code,
@@ -115,8 +96,8 @@ works. Validation, error handling, security, and accessibility are never cut.
 | full  | The ladder enforced (default)        |
 | ultra | YAGNI extremist                      |
 
-**No install required** — pure prompt injection, no external binary or PATH
-dependency (unlike RTK and TOON).
+**No install required** — pure prompt injection, with no external binary or
+PATH dependency.
 
 ## Configuration via `pix.json`
 
@@ -127,7 +108,6 @@ Set the initial optimizer state for new sessions in `~/.pi/agent/pix.json`. Thes
   "optimizer": {
     "caveman": "lite",   // off | lite | full | ultra | micro
     "rtk":     true,
-    "toon":    false,
     "ponytail": "off"   // off | lite | full | ultra
   }
 }
@@ -149,18 +129,17 @@ pi install npm:@xynogen/pix-optimizer
 
 | File              | Role                                                      |
 |-------------------|-----------------------------------------------------------|
-| `src/index.ts`    | Wires the four tools + shared status, registers `/optimizer` |
+| `src/index.ts`    | Wires the three tools + shared status, registers `/optimizer` |
 | `src/opt.ts`      | The `/optimizer` overlay UI (keyboard nav + cycling)     |
 | `src/status.ts`   | Shared status-bar cell (`toolIcon()` → shared `pix-pretty` catalog) |
 | `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                            |
 | `src/persist.ts`  | Disk-backed `~/.pi/agent/optimizer.json` persistence; seeds initial state from `pix.json` |
 | `src/tool-result-filter.ts` | Strips model-guidance warnings from tool_result |
 
 Each tool registers its own lifecycle hooks and exposes an `OptimizerHandle`
-that `/optimizer` dispatches to. All four share one `OptimizerStatus`.
+that `/optimizer` dispatches to. All three share one `OptimizerStatus`.
 
 ## Development
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@xynogen/pix-optimizer",
-	"version": "1.1.19",
-	"description": "Performance optimization suite for Pi Coding Agent - caveman mode + RTK tool rewriting + jq/TOON JSON compression + ponytail lazy-dev mode",
+	"version": "1.1.22",
+	"description": "Performance optimization suite for Pi Coding Agent - caveman mode + RTK tool rewriting + ponytail lazy-dev mode",
 	"type": "module",
 	"main": "src/index.ts",
 	"scripts": {
@@ -16,9 +16,6 @@
 	"pi": {
 		"extensions": [
 			"./src/index.ts"
-		],
-		"skills": [
-			"./src/skills"
 		]
 	},
 	"keywords": [
@@ -28,9 +25,6 @@
 		"optimizer",
 		"caveman",
 		"rtk",
-		"toon",
-		"jq",
-		"json",
 		"ponytail",
 		"performance"
 	],

package/src/index.ts

@@ -1,13 +1,12 @@
 /**
  * pix-optimizer — token-optimization suite for Pi Coding Agent.
  *
- * Four tools, combined into one extension + one command:
+ * Three 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 (all four icons always shown — dimmed when
+ * They share ONE status-bar cell (all three icons always shown — dimmed when
  * off, accented when on; icon style is nerd/unicode/ascii, set via /optimizer)
  * and ONE command (/optimizer — an interactive overlay). index.ts wires
  * lifecycle hooks via each module, then registers the overlay command.
@@ -15,7 +14,6 @@
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { caveman } from "./caveman.ts";
-import { json } from "./json.ts";
 import { registerOptCommand } from "./opt.ts";
 import { ponytail } from "./ponytail.ts";
 import { rtk } from "./rtk.ts";
@@ -31,7 +29,6 @@ export default function optimizer(pi: ExtensionAPI) {
 	const handles: Record<OptimizerTool, OptimizerHandle> = {
 		caveman: caveman(pi, status),
 		rtk: rtk(pi, status),
-		toon: json(pi, status),
 		ponytail: ponytail(pi, status),
 	};
 

package/src/opt.ts

@@ -2,8 +2,8 @@
  * opt.ts — the single `/optimizer` command: an interactive overlay that fronts
  * every optimizer tool.
  *
- * caveman / rtk / toon / ponytail each register their own lifecycle hooks but
- * expose an OptimizerHandle (name · values · current() · run()). This overlay
+ * caveman / rtk / ponytail each register their own lifecycle hooks but expose
+ * an OptimizerHandle (name · values · current() · run()). This overlay
  * renders one SettingsList row per tool:
  *
  *   ↑↓  move between tools
@@ -15,8 +15,13 @@
  */
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { matchesKey } from "@earendil-works/pi-tui";
-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";
 
@@ -25,7 +30,7 @@ const MIN_CONTENT = 28;
 const MAX_CONTENT = 60;
 
 /** Fixed render order — matches the status-bar cell. */
-const TOOL_ORDER: readonly OptimizerTool[] = ["caveman", "rtk", "toon", "ponytail"];
+const TOOL_ORDER: readonly OptimizerTool[] = ["caveman", "rtk", "ponytail"];
 
 /** Strip the leading "name [args] — " prefix from a handle's help string. */
 function helpSummary(help: string): string {
@@ -69,7 +74,7 @@ export function registerOptCommand(
 	_status: OptimizerStatus,
 ): void {
 	pi.registerCommand("optimizer", {
-		description: "pix-optimizer: caveman / rtk / toon / ponytail tools",
+		description: "pix-optimizer: caveman / rtk / ponytail tools",
 		handler: async (_args, ctx) => {
 			const ui = ctx.ui as unknown as {
 				theme: {
@@ -114,12 +119,16 @@ 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,
 				) => {
+					const guide = (key: string, action: string) =>
+						theme.fg("text", key) + theme.fg("dim", ` ${action}`);
+					const guideSep = theme.fg("dim", " · ");
 					let selected = 0;
+					const pager = new ModalPager();
 
 					const cycle = (direction: -1 | 1) => {
 						const tool = TOOL_ORDER[selected] as OptimizerTool;
@@ -131,6 +140,7 @@ export function registerOptCommand(
 
 					const move = (direction: -1 | 1) => {
 						selected = (selected + direction + TOOL_ORDER.length) % TOOL_ORDER.length;
+						pager.followSelection();
 					};
 
 					return {
@@ -149,24 +159,38 @@ 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)),
+									"",
+									guide("←→", "change") +
+										guideSep +
+										guide("↑↓", "move") +
+										guideSep +
+										guide("PgUp/PgDn", "inspect") +
+										guideSep +
+										guide("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 (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.

package/src/persist.ts

@@ -2,7 +2,7 @@
  * 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
+ * session); rtk 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().
  *
@@ -16,6 +16,8 @@ import type { OptimizerTool } from "./status.ts";
 
 type OptimizerFileConfig = Partial<Record<OptimizerTool, string>>;
 
+const OPTIMIZER_TOOLS: readonly OptimizerTool[] = ["caveman", "rtk", "ponytail"];
+
 function getStatePath(): string {
 	return join(getAgentDir(), "optimizer.json");
 }
@@ -24,8 +26,15 @@ function readFile(): OptimizerFileConfig {
 	try {
 		const sp = getStatePath();
 		if (!existsSync(sp)) return {};
-		const raw = JSON.parse(readFileSync(sp, "utf-8")) as OptimizerFileConfig;
-		return raw && typeof raw === "object" ? raw : {};
+		const raw = JSON.parse(readFileSync(sp, "utf-8")) as unknown;
+		if (!raw || typeof raw !== "object" || Array.isArray(raw)) return {};
+
+		const config: OptimizerFileConfig = {};
+		for (const tool of OPTIMIZER_TOOLS) {
+			const value = (raw as Record<string, unknown>)[tool];
+			if (typeof value === "string") config[tool] = value;
+		}
+		return config;
 	} catch {
 		return {};
 	}

package/src/status.ts

@@ -1,15 +1,11 @@
 /**
  * status.ts — shared status-bar indicator for the optimizer suite.
  *
- * 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 ALL four icons in a fixed order — accent-colored when the
- * tool is enabled, dim when disabled. The cell is never empty.
- *
- *   all on:        all four accent
- *   caveman off:   caveman dim, rest accent
- *   all off:       all four dim
+ * caveman / rtk / ponytail each toggle independently, but they're all the same
+ * class of thing (token-optimization tools), so they share ONE status cell.
+ * Each tool reports its on/off state into a single registry; the cell renders
+ * all three icons in a fixed order — accent-colored when enabled, dim when
+ * disabled. The cell is never empty.
  */
 
 import type {
@@ -20,12 +16,12 @@ import type {
 import { type IconKey, icon, onIconModeChange } from "@xynogen/pix-pretty/icon-catalog";
 
 /**
- * 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.
+ * Each optimizer tool (caveman/rtk/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 {
-	/** Tool name, e.g. "caveman" / "rtk" / "toon". */
+	/** Tool name, e.g. "caveman" / "rtk" / "ponytail". */
 	name: OptimizerTool;
 	/** One-line summary shown in the overlay row. */
 	help: string;
@@ -41,7 +37,7 @@ export interface OptimizerHandle {
 export const STATUS_KEY = "pix-optimizer";
 
 /** Tools that participate in the shared indicator, in render order. */
-export type OptimizerTool = "caveman" | "rtk" | "toon" | "ponytail";
+export type OptimizerTool = "caveman" | "rtk" | "ponytail";
 
 /**
  * Icons come from the shared pix-pretty catalog and follow the ONE global icon
@@ -52,7 +48,6 @@ export type OptimizerTool = "caveman" | "rtk" | "toon" | "ponytail";
 const TOOL_ICON_KEY: Record<OptimizerTool, IconKey> = {
 	caveman: "opt.caveman",
 	rtk: "opt.rtk",
-	toon: "opt.toon",
 	ponytail: "opt.ponytail",
 };
 
@@ -62,7 +57,7 @@ export function toolIcon(tool: OptimizerTool): string {
 }
 
 /** Fixed left-to-right order of icons in the cell. */
-const TOOL_ORDER: readonly OptimizerTool[] = ["caveman", "rtk", "toon", "ponytail"];
+const TOOL_ORDER: readonly OptimizerTool[] = ["caveman", "rtk", "ponytail"];
 
 /** Theme color for enabled icons. */
 const ENABLED_COLOR: ThemeColor = "accent";
@@ -74,7 +69,7 @@ export type Colorize = (color: ThemeColor, text: string) => string;
 
 /**
  * Build the colored status string for a set of tool states. ALL tool icons are
- * always shown, in TOOL_ORDER; each is accent-colored when its tool is enabled
+ * always shown in TOOL_ORDER; each is accent-colored when its tool is enabled
  * and dim when disabled. Glyphs resolve against the active global icon mode
  * (see /pix). `color` applies the theme color (e.g. theme.fg).
  *
@@ -93,7 +88,7 @@ export function renderStatus(
 /**
  * Shared registry: each tool calls `set(tool, enabled)` whenever its state
  * changes, then the combined cell is re-rendered. A single registry instance
- * is created per extension load and passed to caveman/rtk/json.
+ * is created per extension load and passed to caveman/rtk/ponytail.
  */
 export class OptimizerStatus {
 	private states: Partial<Record<OptimizerTool, boolean>> = {};

package/src/json.ts

@@ -1,284 +0,0 @@
-/**
- * json.ts — JSON token-optimization via jq + TOON.
- *
- * A small system-prompt nudge teaching the model to run JSON through
- * `jq` (query/reshape) and `toon` (compress for context), and to convert
- * back to JSON only when a strict contract requires it.
- *
- * The bundled `toon-json` skill lives in pix-skills and is auto-discovered
- * from there — no resources_discover hook needed here.
- *
- * TOON = Token-Oriented Object Notation (https://github.com/toon-format/spec).
- * It shines on uniform/tabular arrays of objects (declare keys once, stream
- * rows) and loses to compact JSON on deeply nested / non-uniform / array-of-
- * arrays data. The prompt encodes that boundary so the model picks correctly.
- *
- * Pure helpers are exported for tests; json(pi) is the extension entry, called
- * by index.ts alongside caveman(pi) and rtk(pi).
- */
-
-import type {
-	ExtensionAPI,
-	ExtensionCommandContext,
-	ExtensionContext,
-} from "@earendil-works/pi-coding-agent";
-import { canExecute } from "./capability.ts";
-import { loadOptValue, saveOptValue } from "./persist.ts";
-import type { OptimizerHandle, OptimizerStatus } from "./status.ts";
-
-// ── System prompt ───────────────────────────────────────────────────────────
-
-export const JSON_SYSTEM_PROMPT = `# JSON Handling — jq + TOON
-
-When working with information-dense JSON (LLM/OpenAPI schemas, API responses,
-config dumps, datasets), prefer this pipeline over dumping raw JSON into context:
-
-\`\`\`bash
-curl -s <url> | jq '<query>' | toon          # fetch → reshape → compress
-cat data.json   | jq '.items'  | toon --stats # local file, show token savings
-echo "$TOON"    | toon -d                      # convert TOON back to JSON
-\`\`\`
-
-## Why
-- **jq** queries/reshapes so you only carry the slice you need.
-- **toon** re-encodes JSON as TOON: uniform arrays of objects declare their
-  keys once (\`key[N]{a,b,c}:\`) then stream bare rows — large token savings on
-  tabular/dense data. \`toon\` auto-detects direction; \`-d\` decodes back.
-
-## When TOON helps (use it)
-- Uniform/tabular arrays of objects (TOON's sweet spot — savings scale with rows × fields)
-- Flat objects and primitive arrays
-- Shallow nesting
-
-## When to SKIP TOON (keep JSON)
-- API-level contracts / payloads you must send or store verbatim
-- Deeply nested or non-uniform structures (compact JSON can win)
-- Arrays of arrays (TOON is less efficient here)
-- Anything a downstream parser requires as strict JSON
-
-Rule of thumb: TOON for **reading** dense data into context; JSON for **contracts**.
-See the \`toon-json\` skill for the full workflow.`;
-
-// ── Prompt relevance gate ─────────────────────────────────────────────────────
-
-/**
- * Tokens that signal the user prompt is about JSON / the jq+TOON workflow.
- * Matched as whole words (case-insensitive) so "adjust" / "jsx" don't trip "js".
- */
-const JSON_TRIGGERS = [
-	"json",
-	"jsonl",
-	"ndjson",
-	"js",
-	"jq",
-	"toon",
-	"openapi",
-	"swagger",
-] as const;
-
-const JSON_TRIGGER_RE = new RegExp(`\\b(${JSON_TRIGGERS.join("|")})\\b`, "i");
-
-/**
- * True when the user prompt mentions JSON (or a related token), so the
- * jq+TOON guidance is only injected when actually relevant. Case-insensitive
- * and word-bounded ("JSON", "Json", "json" all match; "adjust" does not).
- */
-export function mentionsJson(prompt: string | undefined | null): boolean {
-	if (!prompt) return false;
-	return JSON_TRIGGER_RE.test(prompt);
-}
-
-// ── Pure decision helper ──────────────────────────────────────────────────────
-
-export interface ToonAdvice {
-	/** Whether TOON is likely to reduce tokens for this shape. */
-	useToon: boolean;
-	/** Short human-readable reason. */
-	reason: string;
-}
-
-/**
- * Heuristic guidance on whether a parsed JSON value is a good TOON candidate.
- *
- * This is intentionally a *recommendation* surfaced to the model / user, not an
- * enforcement. It encodes the efficiency boundary from the TOON spec:
- *   - uniform arrays of objects → strongly yes (tabular sweet spot)
- *   - flat objects / primitive arrays → yes
- *   - arrays of arrays → no (TOON's one losing case)
- *   - deeply nested / non-uniform → no (compact JSON can win)
- *
- * @param value parsed JSON (object/array/primitive)
- * @param maxDepth nesting depth at which we stop recommending TOON (default 4)
- */
-export function adviseToon(value: unknown, maxDepth = 4): ToonAdvice {
-	if (Array.isArray(value)) {
-		if (value.length === 0) {
-			return { useToon: false, reason: "empty array — nothing to compress" };
-		}
-		// Array of arrays: TOON's only structurally-worse case.
-		if (value.every((v) => Array.isArray(v))) {
-			return {
-				useToon: false,
-				reason: "array of arrays — JSON is more compact",
-			};
-		}
-		// Uniform array of flat objects → tabular sweet spot.
-		if (isUniformObjectArray(value)) {
-			return {
-				useToon: true,
-				reason: `uniform array of ${value.length} objects — TOON tabular sweet spot`,
-			};
-		}
-		// Array of primitives.
-		if (value.every((v) => !isObjectLike(v))) {
-			return {
-				useToon: true,
-				reason: "primitive array — TOON omits quotes/braces",
-			};
-		}
-		return {
-			useToon: false,
-			reason: "non-uniform array — savings uncertain, keep JSON",
-		};
-	}
-
-	if (isObjectLike(value)) {
-		const depth = objectDepth(value);
-		if (depth > maxDepth) {
-			return {
-				useToon: false,
-				reason: `nesting depth ${depth} > ${maxDepth} — compact JSON may win`,
-			};
-		}
-		return {
-			useToon: true,
-			reason: "shallow object — TOON drops quotes/braces",
-		};
-	}
-
-	return { useToon: false, reason: "primitive value — nothing to compress" };
-}
-
-/** True for plain objects/arrays (things with nested structure). */
-function isObjectLike(v: unknown): v is Record<string, unknown> | unknown[] {
-	return typeof v === "object" && v !== null;
-}
-
-/**
- * A uniform array of objects: every element is a plain (non-array) object and
- * they all share the same set of keys, each holding a primitive value. This is
- * exactly the shape TOON encodes as a single header + bare rows.
- */
-export function isUniformObjectArray(arr: unknown[]): boolean {
-	if (arr.length === 0) return false;
-	const first = arr[0];
-	if (!isPlainObject(first)) return false;
-	const keys = Object.keys(first).sort();
-	if (keys.length === 0) return false;
-
-	return arr.every((el) => {
-		if (!isPlainObject(el)) return false;
-		const elKeys = Object.keys(el).sort();
-		if (elKeys.length !== keys.length) return false;
-		for (let i = 0; i < keys.length; i++) {
-			if (elKeys[i] !== keys[i]) return false;
-			// values must be primitive for a clean tabular row
-			if (isObjectLike((el as Record<string, unknown>)[keys[i] as string])) return false;
-		}
-		return true;
-	});
-}
-
-function isPlainObject(v: unknown): v is Record<string, unknown> {
-	return typeof v === "object" && v !== null && !Array.isArray(v);
-}
-
-/** Max nesting depth of a JSON value (primitives = 0). */
-export function objectDepth(value: unknown): number {
-	if (!isObjectLike(value)) return 0;
-	const children = Array.isArray(value) ? value : Object.values(value);
-	let max = 0;
-	for (const child of children) {
-		const d = objectDepth(child);
-		if (d > max) max = d;
-	}
-	return max + 1;
-}
-
-// ── Bundled skill path ────────────────────────────────────────────────────────
-
-// ── Pi extension ──────────────────────────────────────────────────────────────
-
-export function json(pi: ExtensionAPI, status: OptimizerStatus): OptimizerHandle {
-	let enabled = true;
-	let jqAvailable: boolean | null = null;
-	let toonAvailable: boolean | null = null;
-
-	// Report into the shared optimizer indicator.
-	function syncStatus(ctx: Pick<ExtensionContext, "ui">) {
-		status.set("toon", enabled && jqAvailable !== false && toonAvailable !== false, ctx);
-	}
-
-	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) => {
-		syncStatus(ctx);
-	});
-	pi.on("agent_end", async (_event, ctx) => {
-		syncStatus(ctx);
-	});
-
-	// Inject the JSON-handling nudge into the system prompt, but ONLY when the
-	// user prompt actually mentions JSON / a related token — otherwise it's dead
-	// weight in every turn. Probe jq/toon lazily here (not at session_start) so
-	// we don't add startup overhead for a workflow the user may never trigger.
-	pi.on("before_agent_start", async (event, ctx) => {
-		if (!enabled) return undefined;
-		if (!mentionsJson(event.prompt)) return undefined;
-
-		// Probe once on first JSON-relevant prompt.
-		if (jqAvailable === null || toonAvailable === null) {
-			[jqAvailable, toonAvailable] = await Promise.all([
-				canExecute(pi, "jq", ["--version"]),
-				canExecute(pi, "toon", ["--version"]),
-			]);
-			if (!jqAvailable)
-				ctx.ui.notify(
-					"jq not found — JSON/TOON guidance disabled. Install: sudo apt install jq  or  brew install jq",
-					"warning",
-				);
-			if (!toonAvailable)
-				ctx.ui.notify(
-					"toon not found — JSON/TOON guidance disabled. Install: bun add -g @toon-format/cli  or  npm i -g @toon-format/cli",
-					"warning",
-				);
-			syncStatus(ctx);
-		}
-
-		if (jqAvailable === false || toonAvailable === false) return undefined;
-		const existing = event.systemPrompt ?? "";
-		return { systemPrompt: `${JSON_SYSTEM_PROMPT}\n\n${existing}` };
-	});
-
-	// -- Overlay value handler (called by the /optimizer overlay) --
-
-	async function run(value: string, ctx: ExtensionCommandContext): Promise<void> {
-		enabled = value === "on";
-		saveOptValue("toon", enabled ? "on" : "off");
-
-		syncStatus(ctx);
-		ctx.ui.notify(`JSON/TOON guidance ${enabled ? "on" : "off"}.`, "info");
-	}
-
-	return {
-		name: "toon",
-		help: "toon — jq+TOON guidance for dense JSON",
-		values: ["off", "on"],
-		current: () => (enabled ? "on" : "off"),
-		run,
-	};
-}