@xynogen/pix-core 0.1.6 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-core",
-	"version": "0.1.6",
+	"version": "0.2.0",
 	"description": "Pi extension — core UI/UX bundle (welcome banner, footer, model picker, self-update)",
 	"type": "module",
 	"main": "src/index.ts",

package/src/commands/diff/diff.ts

@@ -1,170 +1,32 @@
 /**
- * Diff Extension
+ * /diff — explain unstaged git diff with per-file +/- counts.
  *
- * Tracks files changed during the last agent run (git delta + tool-touched
- * paths from edit/write), and exposes /diff to list/open them.
- *
- * Subcommands:
- *   /diff         → interactive selector, opens choice in editor
- *   /diff list    → notify with the list of changed files
- *   /diff clear   → reset tracked set and re-baseline against git
- *
- * Editor: $PI_DIFF_EDITOR > $VISUAL > $EDITOR > zed > code > vim
+ * The agent runs `git status` + `git diff`, then replies with:
+ *   1. 1–2 sentence explanation of what changed
+ *   2. Per-file +/- line counts
+ *   3. Total +/- line count
  */
 
-import path from "node:path";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
-const COMMAND = "diff";
+const DIFF_PROMPT = `Run git status and inspect the unstaged git diff, then respond with only:
 
-function getStringPath(input: unknown): string | undefined {
-	if (!input || typeof input !== "object" || !("path" in input))
-		return undefined;
-	const p = (input as { path?: unknown }).path;
-	return typeof p === "string" ? p : undefined;
-}
+1. A short 1-2 sentence explanation of what changed and why it matters.
+2. A list of changed unstaged files with their +/- line counts.
+3. A total +/- line count at the bottom.
 
-function toAbs(cwd: string, p: string): string {
-	return path.isAbsolute(p) ? path.normalize(p) : path.resolve(cwd, p);
-}
-
-function toRel(cwd: string, p: string): string {
-	const r = path.relative(cwd, p);
-	return r && !r.startsWith("..") && !path.isAbsolute(r) ? r : p;
-}
-
-function parseGitStatus(output: string, cwd: string): Set<string> {
-	const files = new Set<string>();
-	for (const line of output.split("\n")) {
-		if (line.length < 4) continue;
-		const raw = line.slice(3).trim();
-		if (!raw) continue;
-		const target = raw.includes(" -> ") ? raw.split(" -> ").at(-1) : raw;
-		if (!target) continue;
-		files.add(toAbs(cwd, target.replace(/^"|"$/g, "")));
-	}
-	return files;
-}
-
-async function getGitChanged(
-	pi: ExtensionAPI,
-	cwd: string,
-): Promise<Set<string>> {
-	const r = await pi.exec(
-		"git",
-		["status", "--porcelain", "--untracked-files=all"],
-		{ cwd, timeout: 5000 },
-	);
-	if (r.code !== 0) return new Set();
-	return parseGitStatus(r.stdout, cwd);
-}
-
-function diff(current: Set<string>, baseline: Set<string>): Set<string> {
-	return new Set([...current].filter((f) => !baseline.has(f)));
-}
-
-function pickEditor(): { cmd: string; args: (file: string) => string[] } {
-	const env =
-		process.env.PI_DIFF_EDITOR || process.env.VISUAL || process.env.EDITOR;
-	if (env) {
-		const parts = env.split(/\s+/);
-		const cmd = parts[0];
-		const rest = parts.slice(1);
-		return { cmd, args: (f) => [...rest, f] };
-	}
-	return { cmd: "zed", args: (f) => ["-e", f] };
-}
+Keep it concise. Use git commands to calculate the line counts. Base the summary on the actual diff, not only filenames. Do not include staged changes unless they also have unstaged modifications.`;
 
 export default function (pi: ExtensionAPI) {
-	let baseline = new Set<string>();
-	let changed = new Set<string>();
-	let touched = new Set<string>();
-
-	pi.on("agent_start", async (_event, ctx) => {
-		touched = new Set();
-		changed = new Set();
-		baseline = await getGitChanged(pi, ctx.cwd);
-	});
-
-	pi.on("tool_result", (event, ctx) => {
-		if (event.toolName !== "edit" && event.toolName !== "write") return;
-		const p = getStringPath(event.input);
-		if (!p) return;
-		touched.add(toAbs(ctx.cwd, p));
-	});
-
-	pi.on("agent_end", async (_event, ctx) => {
-		const now = await getGitChanged(pi, ctx.cwd);
-		changed = new Set([...diff(now, baseline), ...touched]);
-		if (changed.size > 0) {
-			ctx.ui.notify(
-				`📝 ${changed.size} changed file(s). Run /${COMMAND} to view/open.`,
-				"info",
-			);
-		}
-	});
-
-	pi.registerCommand(COMMAND, {
-		description:
-			"Show files changed by the last agent run and open one in your editor",
-		handler: async (args, ctx) => {
-			await ctx.waitForIdle();
-			const arg = (args ?? "").trim();
-
-			if (arg === "clear") {
-				changed = new Set();
-				touched = new Set();
-				baseline = await getGitChanged(pi, ctx.cwd);
-				ctx.ui.notify("Cleared changed file list", "info");
+	pi.registerCommand("diff", {
+		description: "Explain unstaged git diff with per-file +/- counts",
+		handler: async (_args, ctx) => {
+			if (!ctx.isIdle()) {
+				pi.sendUserMessage(DIFF_PROMPT, { deliverAs: "followUp" });
+				ctx.ui.notify("Queued /diff after the current turn finishes.", "info");
 				return;
 			}
-
-			const files = [...changed].sort((a, b) =>
-				toRel(ctx.cwd, a).localeCompare(toRel(ctx.cwd, b)),
-			);
-			if (files.length === 0) {
-				ctx.ui.notify(
-					"No changed files tracked from the last agent run",
-					"info",
-				);
-				return;
-			}
-
-			if (arg === "list") {
-				ctx.ui.notify(
-					`Changed files:\n${files.map((f) => `- ${toRel(ctx.cwd, f)}`).join("\n")}`,
-					"info",
-				);
-				return;
-			}
-
-			if (arg) {
-				ctx.ui.notify(
-					`Unknown /${COMMAND} argument: ${arg}. Try /${COMMAND}, /${COMMAND} list, /${COMMAND} clear.`,
-					"warning",
-				);
-				return;
-			}
-
-			const labels = files.map((f) => toRel(ctx.cwd, f));
-			const selected = await ctx.ui.select("Open changed file", labels);
-			if (!selected) return;
-
-			const file = files[labels.indexOf(selected)];
-			if (!file) return;
-
-			const ed = pickEditor();
-			const r = await pi.exec(ed.cmd, ed.args(file), {
-				cwd: ctx.cwd,
-				timeout: 5000,
-			});
-			if (r.code === 0)
-				ctx.ui.notify(`Opened ${selected} in ${ed.cmd}`, "info");
-			else
-				ctx.ui.notify(
-					r.stderr.trim() || `Failed to open ${selected} in ${ed.cmd}`,
-					"error",
-				);
+			pi.sendUserMessage(DIFF_PROMPT);
 		},
 	});
 }

package/src/commands/models/models.ts

@@ -24,6 +24,7 @@ import {
 	visibleWidth,
 } from "@earendil-works/pi-tui";
 import { lookupBenchmark, lookupModelsDev } from "../../lib/data";
+import { patchOutBuiltinModelCommand } from "./patch-builtin";
 
 // ─── Pure logic (exported for tests) ─────────────────────────────────────────
 
@@ -352,6 +353,10 @@ export async function showEnhancedPicker(
 }
 
 export default function modelPickerExtension(pi: ExtensionAPI) {
+	// Remove Pi's built-in /model so only the enhanced /models picker remains.
+	// Self-healing: re-applies on every load, so a Pi upgrade can't restore it.
+	patchOutBuiltinModelCommand();
+
 	const handler = async (_args: unknown, ctx: ExtensionContext) => {
 		await showEnhancedPicker(pi, ctx);
 	};

package/src/commands/models/patch-builtin.test.ts

@@ -0,0 +1,66 @@
+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?`),
+		"",
+	);
+}
+
+const UNPATCHED = `export const BUILTIN_SLASH_COMMANDS = [
+    { name: "settings", description: "Open settings menu" },
+    { name: "model", description: "Select model (opens selector UI)" },
+    { name: "login", description: "Configure provider authentication" },
+];
+`;
+
+describe("patch-builtin /model removal", () => {
+	it("removes the built-in /model line and keeps neighbors", () => {
+		const out = patchSource(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);
+		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);
+	});
+
+	it("does not strip the plural /models entry", () => {
+		const withPlural = `[
+    { name: "models", description: "Enhanced picker" },
+    { name: "model", description: "Select model (opens selector UI)" },
+]`;
+		const out = patchSource(withPlural);
+		expect(out).toContain('name: "models"');
+		expect(out).not.toContain('{ name: "model", description');
+	});
+
+	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");
+		expect(readFileSync(file, "utf8")).not.toContain('name: "model"');
+	});
+});

package/src/commands/models/patch-builtin.ts

@@ -0,0 +1,60 @@
+/**
+ * patch-builtin.ts — strip Pi's built-in /model slash command at load time.
+ *
+ * Built-in commands can't be removed via the extension API, so we edit Pi's
+ * compiled slash-commands.js directly. Done on every load: idempotent and
+ * self-healing across Pi upgrades, so no manual repatch is ever needed.
+ */
+
+import { readFileSync, writeFileSync } from "node:fs";
+import { createRequire } from "node:module";
+import { dirname, resolve } from "node:path";
+
+const HOST_PACKAGE = "@earendil-works/pi-coding-agent";
+const MODEL_COMMAND_LINE =
+	'{ name: "model", description: "Select model (opens selector UI)" },';
+
+/** Locate the host's compiled slash-commands.js, or null if it can't be found. */
+function findSlashCommandsFile(): string | null {
+	try {
+		const require = createRequire(import.meta.url);
+		const entry = require.resolve(HOST_PACKAGE);
+		return resolve(dirname(entry), "core", "slash-commands.js");
+	} catch {
+		return null;
+	}
+}
+
+/**
+ * Remove the built-in /model command line from Pi's slash-commands.js.
+ * Idempotent: returns silently if the file is missing or already patched.
+ */
+export function patchOutBuiltinModelCommand(): void {
+	const file = findSlashCommandsFile();
+	if (!file) return;
+
+	let source: string;
+	try {
+		source = readFileSync(file, "utf8");
+	} catch {
+		return; // file not present (different Pi layout) — nothing to do
+	}
+
+	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;
+
+	try {
+		writeFileSync(file, patched, "utf8");
+	} catch {
+		// Read-only install — leave /model in place rather than crash.
+	}
+}
+
+function escapeRegExp(text: string): string {
+	return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}

package/src/commands/tools.test.ts

@@ -6,7 +6,7 @@
 import { describe, expect, it } from "bun:test";
 
 describe("merged pix-tools commands", () => {
-	for (const name of ["lg", "yeet", "copy-all", "diff"]) {
+	for (const name of ["diff"]) {
 		it(`${name} exports a register function`, async () => {
 			const mod = await import(`./${name}/${name}.ts`);
 			expect(mod.default).toBeFunction();

package/src/index.ts

@@ -4,7 +4,7 @@
  * Layout (grouped by concern):
  *   - ui/       — welcome (π banner + health checks), footer (status bar)
  *   - commands/ — models (/models picker), update (/update self-update),
- *                 lg (/lg), yeet (/yeet), copy-all (/copy-all), diff (/diff)
+ *                 diff (/diff)
  *   - tool/     — todo (durable execution checklist),
  *                 toolbox (/toolbox command — user toggles tools on/off),
  *                 lazy (lazy tool exposure — gates schemas out of the prompt)
@@ -19,12 +19,9 @@ import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import registerSkillLoader from "@xynogen/pix-skills";
 import registerAgentSop from "./commands/agent-sop/agent-sop.ts";
 import registerClear from "./commands/clear/clear.ts";
-import registerCopyAll from "./commands/copy-all/copy-all.ts";
 import registerDiff from "./commands/diff/diff.ts";
-import registerLg from "./commands/lg/lg.ts";
 import registerModels from "./commands/models/models.ts";
 import registerUpdate from "./commands/update/update.ts";
-import registerYeet from "./commands/yeet/yeet.ts";
 import registerNudges from "./nudge/index.ts";
 import registerAsk from "./tool/ask/index.ts";
 import registerTodo from "./tool/todo/todo.ts";
@@ -41,9 +38,6 @@ export default function (pi: ExtensionAPI): void {
 	registerDiagnostics(pi);
 	registerModels(pi);
 	registerUpdate(pi);
-	registerLg(pi);
-	registerYeet(pi);
-	registerCopyAll(pi);
 	registerDiff(pi);
 	registerClear(pi);
 	registerTodo(pi);

package/src/commands/copy-all/copy-all.ts

@@ -1,104 +0,0 @@
-/**
- * Copy-All Extension
- *
- * /copy-all → copies the entire user+assistant conversation in the current
- * branch to the system clipboard. Uses pbcopy on macOS, xclip/xsel/wl-copy
- * on Linux, clip.exe on WSL/Windows.
- */
-
-import { spawn } from "node:child_process";
-import { platform } from "node:os";
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-
-function textFromContent(content: unknown): string {
-	if (typeof content === "string") return content;
-	if (!Array.isArray(content)) return "";
-	return content
-		.map((block) => {
-			if (!block || typeof block !== "object" || !("type" in block)) return "";
-			if (
-				block.type === "text" &&
-				"text" in block &&
-				typeof block.text === "string"
-			)
-				return block.text;
-			if (block.type === "image") return "[image]";
-			return "";
-		})
-		.filter(Boolean)
-		.join("\n");
-}
-
-function pickClipboardCmd(): { cmd: string; args: string[] } | undefined {
-	const p = platform();
-	if (p === "darwin") return { cmd: "pbcopy", args: [] };
-	if (p === "win32") return { cmd: "clip.exe", args: [] };
-	// linux / wsl
-	if (process.env.WSL_DISTRO_NAME) return { cmd: "clip.exe", args: [] };
-	if (process.env.WAYLAND_DISPLAY) return { cmd: "wl-copy", args: [] };
-	return { cmd: "xclip", args: ["-selection", "clipboard"] };
-}
-
-function copyToClipboard(text: string): Promise<void> {
-	return new Promise((resolve, reject) => {
-		const c = pickClipboardCmd();
-		if (!c) {
-			reject(new Error("No clipboard utility detected"));
-			return;
-		}
-		const child = spawn(c.cmd, c.args);
-		let stderr = "";
-		child.stderr.on("data", (chunk) => {
-			stderr += String(chunk);
-		});
-		child.on("error", reject);
-		child.on("close", (code) => {
-			if (code === 0) resolve();
-			else
-				reject(new Error(stderr.trim() || `${c.cmd} exited with code ${code}`));
-		});
-		child.stdin.end(text);
-	});
-}
-
-export default function (pi: ExtensionAPI) {
-	pi.registerCommand("copy-all", {
-		description:
-			"Copy all user/assistant messages in this thread to the clipboard",
-		handler: async (_args, ctx) => {
-			await ctx.waitForIdle();
-
-			const messages = ctx.sessionManager
-				.getBranch()
-				.filter((entry) => entry.type === "message")
-				.map((entry) => entry.message)
-				.filter((m) => m.role === "user" || m.role === "assistant");
-
-			const text = messages
-				.map((m) => {
-					const c = textFromContent(m.content).trim();
-					return `${m.role.toUpperCase()}:\n${c}`;
-				})
-				.filter((s) => !s.endsWith(":\n"))
-				.join("\n\n---\n\n");
-
-			if (!text) {
-				ctx.ui.notify("No user or assistant messages to copy", "info");
-				return;
-			}
-
-			try {
-				await copyToClipboard(text);
-				ctx.ui.notify(
-					`📋 Copied ${messages.length} messages to clipboard`,
-					"info",
-				);
-			} catch (err) {
-				ctx.ui.notify(
-					`Clipboard copy failed: ${err instanceof Error ? err.message : String(err)}`,
-					"error",
-				);
-			}
-		},
-	});
-}

package/src/commands/lg/lg.ts

@@ -1,32 +0,0 @@
-/**
- * /lg — summarize unstaged git changes with per-file +/- counts.
- *
- * The agent runs `git status` + line counts and replies with:
- *   1. 1–2 sentence summary of unstaged changes
- *   2. Per-file +/- line counts
- *   3. Total +/- line count
- */
-
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-
-const LG_PROMPT = `Run git status, inspect what has changed, then respond with only:
-
-1. A short 1-2 sentence summary of the unstaged changes.
-2. A list of changed unstaged files with their +/- line counts.
-3. A total +/- line count at the bottom.
-
-Keep it concise. Use git commands to calculate the line counts; do not include staged changes unless they also have unstaged modifications.`;
-
-export default function (pi: ExtensionAPI) {
-	pi.registerCommand("lg", {
-		description: "Summarize unstaged git changes with per-file +/- counts",
-		handler: async (_args, ctx) => {
-			if (!ctx.isIdle()) {
-				pi.sendUserMessage(LG_PROMPT, { deliverAs: "followUp" });
-				ctx.ui.notify("Queued /lg after the current turn finishes.", "info");
-				return;
-			}
-			pi.sendUserMessage(LG_PROMPT);
-		},
-	});
-}

package/src/commands/yeet/yeet.ts

@@ -1,29 +0,0 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-
-const YEET_PROMPT = `Commit the current repository changes.
-
-Steps:
-1. Add all unstaged changes with \`git add -A\`.
-2. Inspect the staged changes and write a concise commit message that accurately summarizes them.
-3. Commit the changes with that message.
-   - If there are no staged changes, output "Nothing to commit" and stop.
-
-Keep the commit message concise. Do not push.`;
-
-export default function (pi: ExtensionAPI) {
-	pi.registerCommand("yeet", {
-		description: "Add and commit current repo changes (no push)",
-		handler: async (args, ctx) => {
-			const prompt = args?.trim()
-				? `${YEET_PROMPT}\n\nAdditional instructions from the user:\n${args.trim()}`
-				: YEET_PROMPT;
-
-			if (ctx.isIdle()) {
-				pi.sendUserMessage(prompt);
-			} else {
-				pi.sendUserMessage(prompt, { deliverAs: "followUp" });
-				ctx.ui.notify("Queued /yeet as a follow-up", "info");
-			}
-		},
-	});
-}