@xynogen/pix-core 0.2.1 → 0.2.3

package/package.json

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

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

@@ -4,25 +4,82 @@
  * 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.
+ *
+ * Resolution strategy (in order):
+ *   1. Locate the `pi` binary via PATH → infer package root from its realpath.
+ *      The binary is always at <pkg>/dist/cli.js so ../../ is the package root.
+ *   2. Probe well-known global install locations (bun, npm).
+ *   3. Fall back to createRequire against the extension's own node_modules
+ *      (works when pi and the extension share the same install tree).
  */
 
-import { readFileSync, writeFileSync } from "node:fs";
+import { execSync } from "node:child_process";
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { createRequire } from "node:module";
-import { dirname, resolve } from "node:path";
+import { homedir } from "node:os";
+import { dirname, join, 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 {
+/** Candidate slash-commands.js paths, most-specific first. */
+function candidatePaths(): string[] {
+	const paths: string[] = [];
+
+	// 1. Resolve via the running `pi` binary → its realpath gives the dist dir.
+	try {
+		const piReal = execSync("realpath $(which pi)", {
+			encoding: "utf8",
+			stdio: ["pipe", "pipe", "pipe"],
+		}).trim();
+		if (piReal) {
+			// piReal = /.../pi-coding-agent/dist/cli.js → dist/ → ../dist/core/
+			const distCore = resolve(dirname(piReal), "core");
+			paths.push(join(distCore, "slash-commands.js"));
+		}
+	} catch {
+		// `pi` not on PATH or `which`/`realpath` unavailable — skip
+	}
+
+	// 2. Well-known global install locations.
+	const home = homedir();
+	const globalRoots = [
+		join(home, ".bun", "install", "global", "node_modules"),
+		join(home, ".npm-global", "lib", "node_modules"),
+		"/usr/local/lib/node_modules",
+		"/usr/lib/node_modules",
+	];
+	for (const root of globalRoots) {
+		paths.push(
+			join(
+				root,
+				"@earendil-works",
+				"pi-coding-agent",
+				"dist",
+				"core",
+				"slash-commands.js",
+			),
+		);
+	}
+
+	// 3. Fallback: createRequire from this file (works when extension is co-installed).
 	try {
 		const require = createRequire(import.meta.url);
-		const entry = require.resolve(HOST_PACKAGE);
-		return resolve(dirname(entry), "core", "slash-commands.js");
+		const entry = require.resolve("@earendil-works/pi-coding-agent");
+		paths.push(resolve(dirname(entry), "core", "slash-commands.js"));
 	} catch {
-		return null;
+		// local resolution failed — skip
 	}
+
+	return paths;
+}
+
+/** Locate the host's compiled slash-commands.js, or null if not found. */
+function findSlashCommandsFile(): string | null {
+	for (const p of candidatePaths()) {
+		if (existsSync(p)) return p;
+	}
+	return null;
 }
 
 /**
@@ -37,7 +94,7 @@ export function patchOutBuiltinModelCommand(): void {
 	try {
 		source = readFileSync(file, "utf8");
 	} catch {
-		return; // file not present (different Pi layout) — nothing to do
+		return;
 	}
 
 	if (!source.includes(MODEL_COMMAND_LINE)) return; // already patched
@@ -58,3 +115,6 @@ export function patchOutBuiltinModelCommand(): void {
 function escapeRegExp(text: string): string {
 	return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
+
+// Export for tests
+export { candidatePaths, findSlashCommandsFile };

package/src/index.ts

@@ -16,7 +16,6 @@
  */
 
 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 registerDiff from "./commands/diff/diff.ts";
@@ -32,7 +31,6 @@ import registerWelcome from "./ui/welcome.ts";
 
 export default function (pi: ExtensionAPI): void {
 	registerAgentSop(pi);
-	registerSkillLoader(pi);
 	registerWelcome(pi);
 	registerFooter(pi);
 	registerDiagnostics(pi);

package/src/nudge/capability.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from "bun:test";
 import { mkdirSync, rmSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
-import {
+import registerCapabilityNudge, {
 	buildOrientation,
 	CAPABILITY_REMINDER,
 	countInvocableSkills,
@@ -52,11 +52,9 @@ describe("CAPABILITY_REMINDER", () => {
 		expect(CAPABILITY_REMINDER).toContain("read_skills()");
 	});
 
-	test("points at /toolbox slash command for discovery (not a function call)", () => {
-		expect(CAPABILITY_REMINDER).toContain("/toolbox");
-		// must NOT imply toolbox is a callable function
+	test("does not mention user-only toolbox command", () => {
+		expect(CAPABILITY_REMINDER).not.toContain("/toolbox");
 		expect(CAPABILITY_REMINDER).not.toContain("toolbox(");
-		expect(CAPABILITY_REMINDER).toContain("function definitions");
 	});
 });
 
@@ -132,13 +130,11 @@ describe("buildOrientation", () => {
 		expect(out).toContain("2 skills");
 	});
 
-	test("explains how to use read_skills() and /toolbox for discovery", () => {
+	test("explains how to use read_skills() without user-only toolbox", () => {
 		const out = buildOrientation([tool("read", "builtin")], []);
 		expect(out).toContain("read_skills()");
-		expect(out).toContain("/toolbox");
-		// toolbox must NOT appear as a function call
+		expect(out).not.toContain("/toolbox");
 		expect(out).not.toContain("toolbox(");
-		expect(out.toLowerCase()).toMatch(/discover|enable/);
 	});
 
 	test("calls out gated tools and points at toolbox to enable them", () => {
@@ -153,7 +149,7 @@ describe("buildOrientation", () => {
 			["read", "grep"], // active set: 2 gated out
 		);
 		expect(out).toContain("2 are gated");
-		expect(out).toContain("enable via toolbox");
+		expect(out).toContain("function definitions");
 	});
 
 	test("singular phrasing when exactly one tool is gated", () => {
@@ -163,7 +159,7 @@ describe("buildOrientation", () => {
 			["read"],
 		);
 		expect(out).toContain("1 is gated");
-		expect(out).toContain("enable via toolbox");
+		expect(out).toContain("function definitions");
 	});
 
 	test("no gate line when nothing is gated", () => {
@@ -213,6 +209,33 @@ describe("buildOrientation", () => {
 	});
 });
 
+describe("registerCapabilityNudge", () => {
+	test("injects orientation into system prompt, not a custom message", async () => {
+		let handler: ((event: { systemPrompt?: string }) => unknown) | undefined;
+		const pi = {
+			on(event: string, fn: typeof handler) {
+				if (event === "before_agent_start") handler = fn;
+			},
+			getAllTools() {
+				return [tool("read", "builtin")];
+			},
+			getActiveTools() {
+				return ["read"];
+			},
+		} as never;
+
+		registerCapabilityNudge(pi);
+		const result = (await handler?.({ systemPrompt: "BASE" })) as {
+			systemPrompt?: string;
+			message?: unknown;
+		};
+
+		expect(result.message).toBeUndefined();
+		expect(result.systemPrompt).toStartWith("BASE\n\nToolbelt:");
+		expect(result.systemPrompt).toContain("Orientation only");
+	});
+});
+
 describe("graphifyHint", () => {
 	const tmpDir = join(import.meta.dir, ".graphify-hint-test-tmp");
 

package/src/nudge/capability.ts

@@ -4,7 +4,7 @@
  * Models drift toward improvising mid-session, forgetting they can ask the
  * user, search the web, pull library docs (context7), use LSP, or invoke an
  * Agent Skill instead of guessing. Fires on EVERY user prompt via
- * `before_agent_start`, emitted as ONE hidden message (`display: false`).
+ * `before_agent_start`, injected into the system prompt for the turn.
  *
  * Two modes:
  *   1. FIRST prompt of the session — an orientation block: a high-level
@@ -31,12 +31,13 @@ import type {
 type LoadedSkill = NonNullable<BuildSystemPromptOptions["skills"]>[number];
 
 /** The standing per-turn reminder. Kept terse — it ships on every turn. */
+/** How often (in turns after the first) to re-send the capability reminder. */
+const REMINDER_INTERVAL = 10;
+
 export const CAPABILITY_REMINDER =
 	"Reminder — check knowledge resources " +
 	"(skills/tools/MCP/web/user) before improvising. " +
-	"Matching skill? Call read_skills() first. " +
-	"Use /toolbox to discover/enable gated tools. " +
-	"All tools callable via function definitions.";
+	"Matching skill? Call read_skills() first.";
 
 /**
  * Build the optional graphify hint line.
@@ -93,7 +94,7 @@ export function partitionTools(
  * Build the one-time orientation block shown on the FIRST prompt. Describes the
  * shape of the toolbelt (counts) and how to explore it via `toolbox`, plus the
  * sorted skill names so the model knows what exists by name without a dump of
- * descriptions (those live in the system prompt / are searchable via toolbox).
+ * descriptions (those live in the system prompt / are searchable via tools).
  */
 export function buildOrientation(
 	tools: ToolInfo[] | undefined,
@@ -119,7 +120,7 @@ export function buildOrientation(
 	// Lead with the gate — tools not described in the prompt are still callable
 	// via function definitions, but the model doesn't know about them.
 	const gateLine = gated
-		? `${gated} ${gated === 1 ? "is" : "are"} gated (kept out of the prompt to save context) — enable via toolbox to discover. All tools are always callable via function definitions.`
+		? `${gated} ${gated === 1 ? "is" : "are"} gated (kept out of the prompt to save context). All tools are always callable via function definitions.`
 		: undefined;
 
 	const lines = [
@@ -128,8 +129,7 @@ export function buildOrientation(
 	if (gateLine) lines.push(gateLine);
 	lines.push(
 		"Don't improvise what a capability covers — ask the user, search the web, or pull docs first.",
-		"`read_skills()` lists/loads bundled skills — call it when a skill matches your task. " +
-			"/toolbox (slash command) discovers and enables gated tools.",
+		"`read_skills()` lists/loads bundled skills — call it when a skill matches your task.",
 	);
 	if (skillNames.length) {
 		lines.push(`Skills: ${skillNames.join(", ")}.`);
@@ -147,14 +147,14 @@ export function buildOrientation(
 }
 
 export default function registerCapabilityNudge(pi: ExtensionAPI): void {
-	let orientationSent = false;
+	let turnCount = 0;
 
 	pi.on("before_agent_start", async (event) => {
 		const skills = event.systemPromptOptions?.skills;
+		turnCount++;
 
 		let content: string;
-		if (!orientationSent) {
-			orientationSent = true;
+		if (turnCount === 1) {
 			let tools: ToolInfo[] | undefined;
 			try {
 				tools = pi.getAllTools();
@@ -170,21 +170,20 @@ export default function registerCapabilityNudge(pi: ExtensionAPI): void {
 				activeToolNames = undefined;
 			}
 			content = buildOrientation(tools, skills, activeToolNames);
-		} else {
-			// Per-turn reminder — append graphify hint when graph exists
+		} else if (turnCount % REMINDER_INTERVAL === 1) {
+			// Fire reminder every REMINDER_INTERVAL turns (turn 11, 21, ...)
 			const cwd = process.cwd();
 			const gHint = graphifyHint(cwd);
 			content = gHint
 				? `${CAPABILITY_REMINDER}\n${gHint}`
 				: CAPABILITY_REMINDER;
+		} else {
+			return; // no nudge this turn
 		}
 
-		return {
-			message: {
-				customType: "pix-capability-nudge",
-				content,
-				display: false,
-			},
-		};
+		const existing = event.systemPrompt ?? "";
+		const systemPrompt = existing ? `${existing}\n\n${content}` : content;
+
+		return { systemPrompt };
 	});
 }

package/src/ui/welcome.ts

@@ -296,7 +296,7 @@ export default function (pi: ExtensionAPI) {
 	pi.on("session_start", (_event, ctx) => {
 		dismissed = false;
 
-		// Snapshot static values now (model may change mid-session)
+		// cwd is static; model can change via /model so keep it mutable
 		const modelId = ctx.model?.id ?? "—";
 		const cwd = shortCwd(ctx.cwd);
 
@@ -320,15 +320,12 @@ export default function (pi: ExtensionAPI) {
 			"welcome",
 			(tui: { requestRender(): void }, theme: Theme) => {
 				requestRender = () => tui.requestRender();
-				const logoLines = buildLogoLines(
-					theme as unknown as Theme,
-					modelId,
-					cwd,
-				);
 
 				return {
 					render: () => {
 						const t = theme as unknown as Theme;
+						// Re-read modelId each render so /model changes show live
+						const logoLines = buildLogoLines(t, modelId, cwd);
 						return [...logoLines, ...buildCheckLines(t, CHECKS), ""];
 					},
 					dispose() {