@lebronj/pi-suite 0.1.12 → 0.1.14

package/README.md

@@ -7,12 +7,15 @@ JHP's Pi extension suite for team coding workflows.
 ```bash
 npm install -g --ignore-scripts @earendil-works/pi-coding-agent
 pi install npm:@lebronj/pi-suite
+pi install npm:pi-mcp-adapter
+pi install npm:pi-subagents
+pi install npm:pi-web-access
 ```
 
 Or use the bootstrap script to install Pi, configure the team OpenAI-compatible endpoint, install this suite, and set up Bun + qmd for memory search:
 
 ```bash
-curl -fsSL https://registry.npmjs.org/@lebronj/pi-suite/-/pi-suite-0.1.12.tgz | tar -xzO package/scripts/bootstrap.sh | bash
+curl -fsSL https://registry.npmjs.org/@lebronj/pi-suite/-/pi-suite-0.1.14.tgz | tar -xzO package/scripts/bootstrap.sh | bash
 ```
 
 ## What Is Included
@@ -22,7 +25,11 @@ curl -fsSL https://registry.npmjs.org/@lebronj/pi-suite/-/pi-suite-0.1.12.tgz |
 - Skills: provider checklist, Pi capability reference, image-to-editable-PPT workflow.
 - Vendored package: `@jhp/pi-memory`, including qmd search, external curator service, and memory/skill-draft versioning.
 
-`pi-mcp-adapter`, `pi-subagents`, and `pi-web-access` are loaded by this suite. Do not install them separately unless you filter suite resources, because duplicate extension tools/flags can conflict.
+Install the companion packages above with the suite so MCP, subagent, and web tools register from their own package manifests. The bootstrap script installs the same companion packages automatically.
+
+Do not add those companion packages inside the `@lebronj/pi-suite` manifest at the same time; loading them both from the suite manifest and as standalone Pi packages creates duplicate tool/flag registration conflicts.
+
+Existing users can run `pi update --extensions`; if Pi reports missing suite companion packages on startup, run `/pi-suite-repair` and it will install or refresh the currently required companion package set, then reload resources.
 
 Figma is not installed or loaded by default. Enable it only when needed:
 
@@ -98,6 +105,8 @@ qmd embed
 
 Memory versioning is enabled by default. It snapshots `~/.pi/agent/memory` and `~/.pi/agent/skill-drafts` into `~/.pi/agent/evolution`, commits local changes automatically, and leaves push manual by default. `memory_curate` also scans yesterday's daily log into `REVIEW.md` when learning is enabled and the daily file changed since the last scan.
 
+The external memory curator service uses a systemd user timer when available, with cron fallback. When the service points at a vendored TypeScript CLI under `node_modules`, the launcher uses Bun or tsx instead of plain Node so Node 22 can run it reliably.
+
 Useful commands:
 
 ```bash

package/extensions/pi-suite-repair.ts

@@ -0,0 +1,143 @@
+import { existsSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+import { getAgentDir, type ExtensionAPI, type ExtensionContext } from "@earendil-works/pi-coding-agent";
+
+interface PackageEntryObject {
+	source?: unknown;
+}
+
+interface SettingsFile {
+	packages?: unknown;
+}
+
+interface RepairRequirement {
+	source: string;
+	description: string;
+}
+
+const REQUIRED_PACKAGES: RepairRequirement[] = [
+	{ source: "npm:pi-mcp-adapter", description: "MCP tools" },
+	{ source: "npm:pi-subagents", description: "subagent delegation" },
+	{ source: "npm:pi-web-access", description: "web search/content tools" },
+];
+
+function readSettings(path: string): SettingsFile | undefined {
+	if (!existsSync(path)) return undefined;
+	try {
+		const parsed = JSON.parse(readFileSync(path, "utf8")) as unknown;
+		return parsed && typeof parsed === "object" ? (parsed as SettingsFile) : undefined;
+	} catch {
+		return undefined;
+	}
+}
+
+function packageSource(entry: unknown): string | undefined {
+	if (typeof entry === "string") return entry;
+	if (!entry || typeof entry !== "object") return undefined;
+	const source = (entry as PackageEntryObject).source;
+	return typeof source === "string" ? source : undefined;
+}
+
+function packageSourcesFromSettings(settings: SettingsFile | undefined): string[] {
+	if (!settings || !Array.isArray(settings.packages)) return [];
+	return settings.packages.flatMap((entry) => {
+		const source = packageSource(entry);
+		return source ? [source] : [];
+	});
+}
+
+function npmPackageName(source: string): string | undefined {
+	if (!source.startsWith("npm:")) return undefined;
+	const spec = source.slice("npm:".length);
+	if (spec.startsWith("@")) {
+		const slash = spec.indexOf("/");
+		if (slash === -1) return undefined;
+		const versionStart = spec.indexOf("@", slash + 1);
+		return versionStart === -1 ? spec : spec.slice(0, versionStart);
+	}
+	const versionStart = spec.indexOf("@");
+	return versionStart === -1 ? spec : spec.slice(0, versionStart);
+}
+
+function sourceIdentity(source: string): string {
+	return npmPackageName(source) ?? source;
+}
+
+function isVersionPinnedNpmSource(source: string): boolean {
+	if (!source.startsWith("npm:")) return false;
+	const name = npmPackageName(source);
+	return Boolean(name && source !== `npm:${name}`);
+}
+
+function requirementSatisfied(requirement: RepairRequirement, installedSources: string[]): boolean {
+	if (isVersionPinnedNpmSource(requirement.source)) {
+		return installedSources.includes(requirement.source);
+	}
+	const requiredIdentity = sourceIdentity(requirement.source);
+	return installedSources.some((source) => sourceIdentity(source) === requiredIdentity);
+}
+
+function readInstalledPackageSources(ctx: ExtensionContext): string[] {
+	const globalSettings = readSettings(join(getAgentDir(), "settings.json"));
+	const projectSettings = readSettings(join(ctx.cwd, ".pi", "settings.json"));
+	return [...packageSourcesFromSettings(globalSettings), ...packageSourcesFromSettings(projectSettings)];
+}
+
+function pendingRequirements(ctx: ExtensionContext): RepairRequirement[] {
+	const installedSources = readInstalledPackageSources(ctx);
+	return REQUIRED_PACKAGES.filter((requirement) => !requirementSatisfied(requirement, installedSources));
+}
+
+function formatRequirement(requirement: RepairRequirement): string {
+	return `${requirement.source} (${requirement.description})`;
+}
+
+export default function piSuiteRepairExtension(pi: ExtensionAPI): void {
+	let reminderShown = false;
+
+	pi.on("session_start", (_event, ctx) => {
+		if (!ctx.hasUI || reminderShown) return;
+		const pending = pendingRequirements(ctx);
+		if (pending.length === 0) return;
+		reminderShown = true;
+		ctx.ui.notify(
+			`pi-suite needs companion package repair: ${pending.map((item) => item.source).join(", ")}. Run /pi-suite-repair, then reload if prompted.`,
+			"warning",
+		);
+	});
+
+	pi.registerCommand("pi-suite-repair", {
+		description: "Install missing required companion Pi packages, then reload resources.",
+		handler: async (_args, ctx) => {
+			if (!ctx.hasUI) return;
+
+			const pending = pendingRequirements(ctx);
+			if (pending.length === 0) {
+				ctx.ui.notify("pi-suite companion packages are already registered. No repair needed.", "info");
+				return;
+			}
+
+			ctx.ui.notify(
+				`Repairing missing pi-suite companion packages: ${pending.map((item) => item.source).join(", ")}`,
+				"info",
+			);
+
+			const failures: string[] = [];
+			for (const requirement of pending) {
+				const result = await pi.exec("pi", ["install", requirement.source], { signal: ctx.signal, timeout: 120_000 });
+				if (result.code !== 0) {
+					const details = (result.stderr || result.stdout || "unknown error").trim();
+					failures.push(`${formatRequirement(requirement)}: ${details}`);
+				}
+			}
+
+			if (failures.length > 0) {
+				ctx.ui.notify(`pi-suite repair failed: ${failures.join("; ")}`, "error");
+				return;
+			}
+
+			ctx.ui.notify("pi-suite companion packages are installed. Reloading Pi resources...", "info");
+			await ctx.reload();
+		},
+	});
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lebronj/pi-suite",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "JHP's Pi extension suite for team coding workflows",
   "type": "module",
   "keywords": [
@@ -22,11 +22,6 @@
     "README.md",
     "LICENSE"
   ],
-  "dependencies": {
-    "pi-mcp-adapter": "2.9.0",
-    "pi-subagents": "0.28.0",
-    "pi-web-access": "0.10.7"
-  },
   "peerDependencies": {
     "@earendil-works/pi-agent-core": "*",
     "@earendil-works/pi-ai": "*",
@@ -54,19 +49,13 @@
   "pi": {
     "extensions": [
       "./extensions",
-      "./vendor/pi-memory/index.ts",
-      "node_modules/pi-mcp-adapter/index.ts",
-      "node_modules/pi-subagents/src/extension/index.ts",
-      "node_modules/pi-web-access/index.ts"
+      "./vendor/pi-memory/index.ts"
     ],
     "prompts": [
-      "./prompts",
-      "node_modules/pi-subagents/prompts"
+      "./prompts"
     ],
     "skills": [
-      "./skills",
-      "node_modules/pi-subagents/skills",
-      "node_modules/pi-web-access/skills"
+      "./skills"
     ]
   },
   "publishConfig": {

package/scripts/bootstrap.sh

@@ -83,6 +83,17 @@ NODE
 echo "Installing Pi extension suite: $PI_SUITE"
 pi install "$PI_SUITE"
 
+COMPANION_PACKAGES=(
+  "npm:pi-mcp-adapter"
+  "npm:pi-subagents"
+  "npm:pi-web-access"
+)
+
+echo "Installing Pi companion packages..."
+for companion_package in "${COMPANION_PACKAGES[@]}"; do
+  pi install "$companion_package"
+done
+
 link_if_safe() {
   local source_path="$1"
   local link_path="$2"

package/skills/pi-skill/SKILL.md

@@ -95,6 +95,7 @@ External curator service:
 
 - This is the main self-evolution maintenance loop: it can run daily outside the pi process, even when pi is closed.
 - It uses a systemd user timer when available, with cron fallback.
+- For vendored TypeScript CLI paths under `node_modules`, the service launcher uses Bun or tsx instead of plain Node so Node 22 does not fail on TypeScript type stripping.
 - On `session_start` and after `/reload`, pi-memory checks service status. If the service is disabled and UI is available, it shows a startup hint with enable/status/disable commands.
 - Enable with `/memory-curator-enable 03:00` or ask the agent to call `memory_curator_enable`.
 - Inspect with `/memory-curator-status` or `memory_curator_status`.
@@ -208,6 +209,7 @@ The pet extension provides a small terminal companion and durable profile.
 - `prompt-url-widget.ts`: detects PR/issue prompt templates, fetches GitHub metadata with `gh`, shows a widget, and names the session when possible.
 - `snake.ts`: `/snake` opens a TUI snake game; `Esc` pauses/saves, `q` quits, arrows/WASD move.
 - `tps.ts`: after each assistant run, shows tokens-per-second and token usage details.
+- `pi-suite-repair.ts`: registers `/pi-suite-repair` and startup reminders for missing companion Pi packages declared by the suite.
 - `memory-curator.ts`: deprecated compatibility notice only; external curation is managed by pi-memory service tools.
 
 ## Skills
@@ -243,7 +245,7 @@ Global user package configuration is in `~/.pi/agent/settings.json`; project pac
 
 Current suite package:
 
-- `@lebronj/pi-suite`: bundles local extensions, prompts, suite skills, vendored `@jhp/pi-memory`, and optional package hooks for `pi-mcp-adapter`, `pi-subagents`, and `pi-web-access`. It does not install or load `pi-mono-figma` by default.
+- `@lebronj/pi-suite`: bundles local extensions, prompts, suite skills, and vendored `@jhp/pi-memory`. The bootstrap script installs `pi-mcp-adapter`, `pi-subagents`, and `pi-web-access` as standalone companion Pi packages. It does not install or load `pi-mono-figma` by default.
 
 Common project packages:
 
@@ -259,7 +261,7 @@ Bootstrap behavior:
 - Installs global `@earendil-works/pi-coding-agent`.
 - Writes the team OpenAI-compatible provider to `~/.pi/agent/models.json`.
 - Sets default provider/model in `~/.pi/agent/settings.json`.
-- Runs `pi install npm:@lebronj/pi-suite` by default; this does not install or load `pi-mono-figma`.
+- Runs `pi install npm:@lebronj/pi-suite` by default, then installs companion packages with `pi install npm:pi-mcp-adapter`, `pi install npm:pi-subagents`, and `pi install npm:pi-web-access`; this does not install or load `pi-mono-figma`.
 - Prints follow-up instructions for enabling Figma later with `pi install npm:pi-mono-figma` and disabling it with `pi remove npm:pi-mono-figma`.
 - Creates `~/.pi/agent/memory` and links it into the workspace `.pi/memory` when safe.
 - Optionally initializes the local `~/.pi/agent/evolution` repo for memory/skill-draft snapshots; it never writes tokens or enables auto-push.

package/vendor/pi-memory/src/service-controller.ts

@@ -1,5 +1,5 @@
 import { execFileSync, spawnSync } from "node:child_process";
-import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
+import { accessSync, constants, existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 
@@ -79,8 +79,30 @@ function writeState(state: CuratorServiceState): void {
 	writeFileSync(statePath(state.memoryDir), `${JSON.stringify(state, null, 2)}\n`, "utf-8");
 }
 
+function commandPath(command: string): string | undefined {
+	if (command.includes("/")) {
+		try {
+			accessSync(command, constants.X_OK);
+			return command;
+		} catch {
+			return undefined;
+		}
+	}
+	for (const dir of (process.env.PATH || "").split(":")) {
+		if (!dir) continue;
+		const candidate = join(dir, command);
+		try {
+			accessSync(candidate, constants.X_OK);
+			return candidate;
+		} catch {
+			// keep searching PATH
+		}
+	}
+	return undefined;
+}
+
 function hasCommand(command: string): boolean {
-	return spawnSync(command, ["--version"], { stdio: "ignore" }).status === 0;
+	return commandPath(command) !== undefined || spawnSync(command, ["--version"], { stdio: "ignore" }).status === 0;
 }
 
 function canUseSystemdUser(): boolean {
@@ -93,6 +115,29 @@ function shellQuote(value: string): string {
 	return `'${value.replace(/'/g, `'"'"'`)}'`;
 }
 
+function systemdQuote(value: string): string {
+	if (/^[A-Za-z0-9_@%+=:,./-]+$/.test(value)) return value;
+	return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\$/g, "\\$")}"`;
+}
+
+type CliInvocation = {
+	command: string;
+	args: string[];
+};
+
+function resolveCliInvocation(cliPath: string): CliInvocation {
+	const normalized = cliPath.replace(/\\/g, "/");
+	const isNodeModulesTypeScript = normalized.endsWith(".ts") && normalized.includes("/node_modules/");
+	if (!isNodeModulesTypeScript) return { command: process.execPath, args: [cliPath] };
+
+	const bunPath = commandPath("bun");
+	if (bunPath) return { command: bunPath, args: [cliPath] };
+	const tsxPath = commandPath("tsx");
+	if (tsxPath) return { command: tsxPath, args: [cliPath] };
+
+	throw new Error(`Cannot install memory curator service: Node cannot run TypeScript files under node_modules (${cliPath}). Install Bun or tsx, or publish a compiled JavaScript curator CLI.`);
+}
+
 function parseSchedule(schedule: string): { hour: string; minute: string } {
 	const match = /^(\d{1,2}):(\d{2})$/.exec(schedule);
 	if (!match) throw new Error(`Invalid schedule '${schedule}'. Expected HH:MM.`);
@@ -109,7 +154,8 @@ function systemdCalendar(schedule: string): string {
 
 function writeSystemdUnits(memoryDir: string, cliPath: string, schedule: string): void {
 	mkdirSync(systemdUserDir(), { recursive: true });
-	const execStart = `${process.execPath} ${cliPath} run-once --memory-dir ${memoryDir} --reason systemd-timer`;
+	const invocation = resolveCliInvocation(cliPath);
+	const execStart = [invocation.command, ...invocation.args, "run-once", "--memory-dir", memoryDir, "--reason", "systemd-timer"].map(systemdQuote).join(" ");
 	writeFileSync(
 		servicePath(),
 		[
@@ -187,9 +233,10 @@ function enableCron(memoryDir: string, cliPath: string, schedule: string): void
 	if (!hasCommand("crontab")) throw new Error("Neither systemd user timers nor crontab are available.");
 	const { hour, minute } = parseSchedule(schedule);
 	removeCronLine();
-	const command = `${shellQuote(process.execPath)} ${shellQuote(cliPath)} run-once --memory-dir ${shellQuote(memoryDir)} --reason cron ${CRON_MARKER}`;
+	const invocation = resolveCliInvocation(cliPath);
+	const command = [invocation.command, ...invocation.args, "run-once", "--memory-dir", memoryDir, "--reason", "cron"].map(shellQuote).join(" ");
 	const existing = currentCrontab().trim();
-	const next = `${existing ? `${existing}\n` : ""}${minute} ${hour} * * * ${command}\n`;
+	const next = `${existing ? `${existing}\n` : ""}${minute} ${hour} * * * ${command} ${CRON_MARKER}\n`;
 	installCrontab(next);
 }
 
@@ -202,7 +249,7 @@ export function enableCuratorService(options: { memoryDir?: string; cliPath: str
 			enableSystemd(memoryDir, options.cliPath, schedule);
 			const state: CuratorServiceState = { ...baseState, enabled: true, backend: "systemd-user", installedAt: new Date().toISOString() };
 			writeState(state);
-			return { ok: true, backend: "systemd-user", message: "Enabled systemd user timer for daily 03:00 memory curation.", state };
+			return { ok: true, backend: "systemd-user", message: `Enabled systemd user timer for daily ${schedule} memory curation.`, state };
 		}
 		enableCron(memoryDir, options.cliPath, schedule);
 		const state: CuratorServiceState = { ...baseState, enabled: true, backend: "cron", installedAt: new Date().toISOString() };
@@ -241,8 +288,10 @@ export function getCuratorServiceStatus(options: { memoryDir?: string; cliPath:
 	];
 	if (state.lastError) parts.push(`Last error: ${state.lastError}`);
 	if (state.backend === "systemd-user" && hasCommand("systemctl")) {
-		const active = spawnSync("systemctl", ["--user", "is-active", `${SERVICE_NAME}.timer`], { encoding: "utf-8" });
-		parts.push(`systemd timer active: ${active.stdout.trim() || "unknown"}`);
+		const timerActive = spawnSync("systemctl", ["--user", "is-active", `${SERVICE_NAME}.timer`], { encoding: "utf-8" });
+		const serviceActive = spawnSync("systemctl", ["--user", "is-active", `${SERVICE_NAME}.service`], { encoding: "utf-8" });
+		parts.push(`systemd timer active: ${timerActive.stdout.trim() || "unknown"}`);
+		parts.push(`systemd service active: ${serviceActive.stdout.trim() || "unknown"}`);
 	}
 	return { ok: true, backend: state.backend, message: parts.join("\n"), state };
 }