@lebronj/pi-suite 0.1.13 → 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.13.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.13.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:
 

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.13",
+  "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

@@ -209,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
@@ -244,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:
 
@@ -260,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.