@xynogen/pix-optimizer 1.1.16 → 1.1.17

package/README.md

@@ -44,7 +44,7 @@ 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`.
 
-Icons follow the **global** `pix-pretty` mode — set via `/pretty` or `PRETTY_ICONS`
+Icons follow the **global** `pix-pretty` mode — set via `/pix` or `PRETTY_ICONS`
 env var. The optimizer no longer has its own toggle.
 
 ## Features

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-optimizer",
-	"version": "1.1.16",
+	"version": "1.1.17",
 	"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/capability.test.ts

@@ -0,0 +1,42 @@
+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);
+	});
+});

package/src/capability.ts

@@ -0,0 +1,16 @@
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+
+/** Test whether a command can perform a harmless operation through Pi's executor. */
+export async function canExecute(
+	pi: Pick<ExtensionAPI, "exec">,
+	command: string,
+	args: string[],
+	timeout = 3000,
+): Promise<boolean> {
+	try {
+		const result = await pi.exec(command, args, { timeout });
+		return result.code === 0;
+	} catch {
+		return false;
+	}
+}

package/src/index.ts

@@ -23,7 +23,7 @@ import { type OptimizerHandle, OptimizerStatus, type OptimizerTool } from "./sta
 import { filterModelWarnings } from "./tool-result-filter.ts";
 
 export default function optimizer(pi: ExtensionAPI) {
-	// Icons follow the global pix-pretty mode (set via /pretty); no local state.
+	// Icons follow the global pix-pretty mode (set via /pix); no local state.
 	const status = new OptimizerStatus();
 
 	// Each module registers its own lifecycle hooks and returns a handle the

package/src/json.ts

@@ -22,6 +22,7 @@ import type {
 	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";
 
@@ -241,12 +242,10 @@ export function json(pi: ExtensionAPI, status: OptimizerStatus): OptimizerHandle
 
 		// Probe once on first JSON-relevant prompt.
 		if (jqAvailable === null || toonAvailable === null) {
-			const [jqRes, toonRes] = await Promise.all([
-				pi.exec("which", ["jq"], { timeout: 1000 }).catch(() => ({ code: 1 })),
-				pi.exec("which", ["toon"], { timeout: 1000 }).catch(() => ({ code: 1 })),
+			[jqAvailable, toonAvailable] = await Promise.all([
+				canExecute(pi, "jq", ["--version"]),
+				canExecute(pi, "toon", ["--version"]),
 			]);
-			jqAvailable = jqRes.code === 0;
-			toonAvailable = toonRes.code === 0;
 			if (!jqAvailable)
 				ctx.ui.notify(
 					"jq not found — JSON/TOON guidance disabled. Install: sudo apt install jq  or  brew install jq",

package/src/rtk.test.ts

@@ -1,9 +1,11 @@
-import { describe, expect, it } from "bun:test";
+import { describe, expect, it, mock } from "bun:test";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import {
 	applyRtkRewrite,
 	type BashCallEvent,
 	buildSudoBlockReason,
 	detectSudoSegments,
+	probeRtkAvailability,
 	rewriteChain,
 	splitChain,
 } from "./rtk.ts";
@@ -13,6 +15,34 @@ function bashEvent(command: string): BashCallEvent {
 	return { toolName: "bash", input: { command } };
 }
 
+describe("probeRtkAvailability", () => {
+	it("probes rtk directly and accepts a successful version check", async () => {
+		const exec = mock(async () => ({
+			stdout: "rtk 0.1.0",
+			stderr: "",
+			code: 0,
+			killed: false,
+		}));
+
+		expect(await probeRtkAvailability({ exec } as Pick<ExtensionAPI, "exec">)).toBe(true);
+		expect(exec).toHaveBeenCalledWith("rtk", ["--version"], { timeout: 3000 });
+	});
+
+	it("rejects an unsuccessful version check", async () => {
+		const exec = mock(async () => ({ stdout: "", stderr: "missing", code: 1, killed: false }));
+
+		expect(await probeRtkAvailability({ exec } as Pick<ExtensionAPI, "exec">)).toBe(false);
+	});
+
+	it("treats a spawn failure as unavailable", async () => {
+		const exec = mock(async () => {
+			throw new Error("ENOENT");
+		});
+
+		expect(await probeRtkAvailability({ exec } as Pick<ExtensionAPI, "exec">)).toBe(false);
+	});
+});
+
 describe("splitChain", () => {
 	it("returns single segment for plain command", () => {
 		expect(splitChain("git status")).toEqual(["git status"]);

package/src/rtk.ts

@@ -11,6 +11,7 @@ import type {
 	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";
 
@@ -136,7 +137,11 @@ const RTK_COMMANDS = new Set([
 interface RtkStatus {
 	available: boolean;
 	checkedAt: number;
-	path?: string;
+}
+
+/** Probe the command we actually use instead of relying on a platform-specific locator. */
+export function probeRtkAvailability(pi: Pick<ExtensionAPI, "exec">): Promise<boolean> {
+	return canExecute(pi, "rtk", ["--version"]);
 }
 
 /**
@@ -242,25 +247,12 @@ export function rtk(pi: ExtensionAPI, status: OptimizerStatus): OptimizerHandle
 			return rtkStatus;
 		}
 
-		try {
-			const result = await pi.exec("which", ["rtk"], { timeout: 1000 });
-			if (result.code === 0 && result.stdout?.trim()) {
-				rtkStatus = {
-					available: true,
-					checkedAt: Date.now(),
-					path: result.stdout.trim(),
-				};
-				warnedMissing = false;
-				return rtkStatus;
-			}
-		} catch (_error) {
-			// which command failed
-		}
-
+		const available = await probeRtkAvailability(pi);
 		rtkStatus = {
-			available: false,
+			available,
 			checkedAt: Date.now(),
 		};
+		if (available) warnedMissing = false;
 		return rtkStatus;
 	};
 

package/src/status.ts

@@ -45,7 +45,7 @@ export type OptimizerTool = "caveman" | "rtk" | "toon" | "ponytail";
 
 /**
  * Icons come from the shared pix-pretty catalog and follow the ONE global icon
- * mode (set via /pretty). The optimizer no longer owns a mode: each tool maps
+ * mode (set via /pix). The optimizer no longer owns a mode: each tool maps
  * to a semantic catalog key, and the cell renders whatever the active mode
  * resolves — nerd / unicode / ascii — with no per-package knob.
  */
@@ -76,7 +76,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
  * and dim when disabled. Glyphs resolve against the active global icon mode
- * (see /pretty). `color` applies the theme color (e.g. theme.fg).
+ * (see /pix). `color` applies the theme color (e.g. theme.fg).
  *
  * Pure + exported for tests (pass a tagging colorizer to assert per-icon color).
  * A trailing space separates the cell from the next status segment.
@@ -102,7 +102,7 @@ export class OptimizerStatus {
 
 	constructor() {
 		// The cell is a pushed status (setStatus), so it does NOT auto-refresh
-		// when /pretty flips the global icon mode. Repaint it on mode change
+		// when /pix flips the global icon mode. Repaint it on mode change
 		// using the last-seen ctx (no-op until the cell has painted once).
 		onIconModeChange(() => {
 			if (this.lastCtx) this.paint(this.lastCtx);