@xynogen/pix-models 0.1.17 → 0.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-models",
-	"version": "0.1.17",
+	"version": "0.1.18",
 	"description": "Pi extension — enhanced /models picker with BenchLM ranks",
 	"type": "module",
 	"main": "src/index.ts",

package/src/patch-builtin.test.ts

@@ -2,19 +2,7 @@ import { describe, expect, it } from "bun:test";
 import { mkdtempSync, readFileSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-
-// Pure replacement tested in isolation (the exported fn resolves the host
-// package, which isn't present in the test sandbox).
-const MODEL_COMMAND_LINE = '{ name: "model", description: "Select model (opens selector UI)" },';
-
-function escapeRegExp(text: string): string {
-	return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-
-function patchSource(source: string): string {
-	if (!source.includes(MODEL_COMMAND_LINE)) return source;
-	return source.replace(new RegExp(`[ \\t]*${escapeRegExp(MODEL_COMMAND_LINE)}\\n?`), "");
-}
+import { stripBuiltinModelCommand } from "./patch-builtin.ts";
 
 const UNPATCHED = `export const BUILTIN_SLASH_COMMANDS = [
     { name: "settings", description: "Open settings menu" },
@@ -23,40 +11,80 @@ const UNPATCHED = `export const BUILTIN_SLASH_COMMANDS = [
 ];
 `;
 
+const CURRENT_PI = `export const BUILTIN_SLASH_COMMANDS = [
+    { name: "settings", description: "Open settings menu" },
+    { name: "model", description: "Select model (opens selector UI)", argumentHint: "<provider/model>" },
+    { name: "scoped-models", description: "Enable/disable models for Ctrl+P cycling" },
+];
+`;
+
 describe("patch-builtin /model removal", () => {
 	it("removes the built-in /model line and keeps neighbors", () => {
-		const out = patchSource(UNPATCHED);
+		const out = stripBuiltinModelCommand(UNPATCHED);
 		expect(out).not.toContain('name: "model"');
 		expect(out).toContain('name: "settings"');
 		expect(out).toContain('name: "login"');
 	});
 
 	it("is idempotent — second pass is a no-op", () => {
-		const once = patchSource(UNPATCHED);
-		const twice = patchSource(once);
+		const once = stripBuiltinModelCommand(UNPATCHED);
+		const twice = stripBuiltinModelCommand(once);
 		expect(twice).toBe(once);
 	});
 
 	it("leaves an already-clean file untouched", () => {
 		const clean = `export const X = [\n    { name: "login" },\n];\n`;
-		expect(patchSource(clean)).toBe(clean);
+		expect(stripBuiltinModelCommand(clean)).toBe(clean);
 	});
 
 	it("does not strip the plural /models entry", () => {
-		const withPlural = `[
+		const withPlural = `export const BUILTIN_SLASH_COMMANDS = [
     { name: "models", description: "Enhanced picker" },
     { name: "model", description: "Select model (opens selector UI)" },
-]`;
-		const out = patchSource(withPlural);
+];`;
+		const out = stripBuiltinModelCommand(withPlural);
 		expect(out).toContain('name: "models"');
 		expect(out).not.toContain('{ name: "model", description');
 	});
 
+	it("removes Pi's current /model form with an argument hint", () => {
+		const out = stripBuiltinModelCommand(CURRENT_PI);
+		expect(out).not.toContain('name: "model"');
+		expect(out).toContain('name: "settings"');
+		expect(out).toContain('name: "scoped-models"');
+	});
+
+	it("does not alter /model text outside the built-in command array", () => {
+		const source = `const source = '{ name: "model" }';
+export const BUILTIN_SLASH_COMMANDS = [
+    { name: "settings", description: "Open settings menu" },
+];
+`;
+		expect(stripBuiltinModelCommand(source)).toBe(source);
+	});
+
+	it("removes a multi-line /model command without touching adjacent entries", () => {
+		const multiline = `export const BUILTIN_SLASH_COMMANDS = [
+    { name: "settings", description: "Open settings menu" },
+    {
+        name: "model",
+        description: "Select model (opens selector UI)",
+        argumentHint: "<provider/model>",
+    },
+    { name: "login", description: "Configure provider authentication" },
+];
+`;
+		const out = stripBuiltinModelCommand(multiline);
+		expect(out).not.toContain('name: "model"');
+		expect(out).toContain('name: "settings"');
+		expect(out).toContain('name: "login"');
+	});
+
 	it("round-trips through disk", () => {
 		const dir = mkdtempSync(join(tmpdir(), "pix-patch-"));
 		const file = join(dir, "slash-commands.js");
-		writeFileSync(file, UNPATCHED, "utf8");
-		writeFileSync(file, patchSource(readFileSync(file, "utf8")), "utf8");
+		writeFileSync(file, CURRENT_PI, "utf8");
+		writeFileSync(file, stripBuiltinModelCommand(readFileSync(file, "utf8")), "utf8");
 		expect(readFileSync(file, "utf8")).not.toContain('name: "model"');
 	});
 });

package/src/patch-builtin.ts

@@ -19,7 +19,12 @@ import { createRequire } from "node:module";
 import { homedir } from "node:os";
 import { dirname, join, resolve } from "node:path";
 
-const MODEL_COMMAND_LINE = '{ name: "model", description: "Select model (opens selector UI)" },';
+// Pi has added fields to this object over time (for example, `argumentHint` in
+// v0.80). Match the command entry by its stable `name`, rather than an exact
+// serialized line, while limiting the match to a single non-nested object.
+const BUILTIN_COMMANDS_ARRAY = /export\s+const\s+BUILTIN_SLASH_COMMANDS[^=]*=\s*\[/;
+const BUILTIN_MODEL_COMMAND =
+	/^[ \t]*\{(?=[^{}]*\bname\s*:\s*["']model["'])[^{}]*\},?[ \t]*(?:\r?\n|$)/gm;
 
 /** Candidate slash-commands.js paths, most-specific first. */
 function candidatePaths(): string[] {
@@ -89,10 +94,8 @@ export function patchOutBuiltinModelCommand(): void {
 		return;
 	}
 
-	if (!source.includes(MODEL_COMMAND_LINE)) return; // already patched
-
-	const patched = source.replace(new RegExp(`[ \\t]*${escapeRegExp(MODEL_COMMAND_LINE)}\\n?`), "");
-	if (patched === source) return;
+	const patched = stripBuiltinModelCommand(source);
+	if (patched === source) return; // already patched, or host format is unknown
 
 	try {
 		writeFileSync(file, patched, "utf8");
@@ -101,8 +104,25 @@ export function patchOutBuiltinModelCommand(): void {
 	}
 }
 
-function escapeRegExp(text: string): string {
-	return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+/**
+ * Remove Pi's built-in `/model` entry from compiled slash-command source.
+ *
+ * The command objects are static, flat literals. Matching the entry's `name`
+ * tolerates added properties and line wrapping without touching `/models`.
+ */
+export function stripBuiltinModelCommand(source: string): string {
+	const array = BUILTIN_COMMANDS_ARRAY.exec(source);
+	if (!array || array.index === undefined) return source;
+
+	const open = array.index + array[0].lastIndexOf("[");
+	const close = source.indexOf("];", open);
+	if (close < 0) return source;
+
+	const entries = source.slice(open + 1, close);
+	const patchedEntries = entries.replace(BUILTIN_MODEL_COMMAND, "");
+	if (patchedEntries === entries) return source;
+
+	return `${source.slice(0, open + 1)}${patchedEntries}${source.slice(close)}`;
 }
 
 // Export for tests