@jaggerxtrm/pi-extensions 0.8.1 → 0.9.0

package/extensions/service-skills/index.ts

@@ -3,37 +3,63 @@ import { SubprocessRunner } from "../../src/core";
 import * as path from "node:path";
 import * as fs from "node:fs";
 
-const SERVICE_REGISTRY_FILES = [
-	"service-registry.json",
-	path.join(".claude", "skills", "service-registry.json"),
-];
+// service-skills v2: the canonical machinery skill is `service-skills`; per-service
+// skills + the registry live under the per-repo umbrella in .xtrm packs.
+const MACHINERY_SKILL = "service-skills";
 
 const GLOBAL_SKILL_ROOTS = [
 	path.join(process.env.HOME || "", ".agents", "skills"),
 	path.join(process.env.HOME || "", ".claude", "skills"),
 ];
 
+function listPackDirs(cwd: string): string[] {
+	const packsRoot = path.join(cwd, ".xtrm", "skills", "user", "packs");
+	try {
+		return fs
+			.readdirSync(packsRoot, { withFileTypes: true })
+			.filter((e) => e.isDirectory())
+			.map((e) => path.join(packsRoot, e.name))
+			.sort();
+	} catch {
+		return [];
+	}
+}
+
 export default function (pi: ExtensionAPI) {
 	const getCwd = (ctx: any) => ctx.cwd || process.cwd();
 
+	// Precedence mirrors bootstrap.get_registry_path: canonical .xtrm umbrella wins,
+	// then flat pack-root, then legacy repo-root / .claude (never let stale shadow).
 	const resolveRegistryPath = (cwd: string): string | null => {
-		for (const rel of SERVICE_REGISTRY_FILES) {
+		const packDirs = listPackDirs(cwd);
+		for (const pack of packDirs) {
+			const umbrella = path.join(pack, "service-skills", "service-registry.json");
+			if (fs.existsSync(umbrella)) return umbrella;
+		}
+		for (const pack of packDirs) {
+			const flat = path.join(pack, "service-registry.json");
+			if (fs.existsSync(flat)) return flat;
+		}
+		for (const rel of ["service-registry.json", path.join(".claude", "skills", "service-registry.json")]) {
 			const candidate = path.join(cwd, rel);
 			if (fs.existsSync(candidate)) return candidate;
 		}
 		return null;
 	};
 
-	const resolveSkillScript = (cwd: string, skillName: string, scriptName: string): string | null => {
-		const localPath = path.join(cwd, ".claude", "skills", skillName, "scripts", scriptName);
-		if (fs.existsSync(localPath)) return localPath;
-
+	const resolveSkillScript = (cwd: string, scriptName: string): string | null => {
+		const candidates = [
+			path.join(cwd, ".claude", "skills", MACHINERY_SKILL, "scripts", scriptName),
+			path.join(cwd, ".xtrm", "skills", "default", MACHINERY_SKILL, "scripts", scriptName),
+		];
+		for (const candidate of candidates) {
+			if (fs.existsSync(candidate)) return candidate;
+		}
 		for (const root of GLOBAL_SKILL_ROOTS) {
 			if (!root) continue;
-			const candidate = path.join(root, skillName, "scripts", scriptName);
+			const candidate = path.join(root, MACHINERY_SKILL, "scripts", scriptName);
 			if (fs.existsSync(candidate)) return candidate;
 		}
-
 		return null;
 	};
 
@@ -43,7 +69,7 @@ export default function (pi: ExtensionAPI) {
 		const registryPath = resolveRegistryPath(cwd);
 		if (!registryPath) return undefined;
 
-		const catalogerPath = resolveSkillScript(cwd, "using-service-skills", "cataloger.py");
+		const catalogerPath = resolveSkillScript(cwd, "cataloger.py");
 		if (!catalogerPath) return undefined;
 
 		const result = await SubprocessRunner.run("python3", [catalogerPath], {
@@ -77,7 +103,7 @@ export default function (pi: ExtensionAPI) {
 		const registryPath = resolveRegistryPath(cwd);
 		if (!registryPath) return undefined;
 
-		const driftDetectorPath = resolveSkillScript(cwd, "updating-service-skills", "drift_detector.py");
+		const driftDetectorPath = resolveSkillScript(cwd, "drift_detector.py");
 		if (!driftDetectorPath) return undefined;
 
 		const hookInput = JSON.stringify({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jaggerxtrm/pi-extensions",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "description": "Unified Pi extension entrypoint for xtrm-managed extensions",
   "type": "module",
   "publishConfig": {