pi-forge 0.0.0 → 1.1.4

package/dist/server/extensions-discovery.js

@@ -0,0 +1,147 @@
+/**
+ * Surface pi PACKAGE contributions (extension-registered tools +
+ * skills) to the pi-forge layer.
+ *
+ * Background: pi keeps two separate concepts. **Packages** are the
+ * install unit (npm or git, persisted in `settings.json#packages[]`,
+ * managed by `DefaultPackageManager`). A package can contribute any
+ * of `extensions`, `skills`, `prompts`, `themes` declared in its
+ * `package.json#pi` manifest. **Extensions** are the JS/TS modules
+ * that programmatically register tools at session start. So a single
+ * package (e.g. pi-subagents) can register tools via its extension
+ * entry AND ship a `skills/` dir AND ship `prompts/` — all flowing
+ * through the same package install.
+ *
+ * Pi's own `DefaultResourceLoader.reload()` does:
+ *
+ *   const packageManager = new DefaultPackageManager({ cwd, agentDir, settingsManager });
+ *   const resolved = await packageManager.resolve();
+ *   // resolved.extensions, resolved.skills, etc. are ResolvedResource[]
+ *   // with .path, .enabled, .metadata.source
+ *
+ * We mirror that. The PackageManager handles every install location —
+ * `~/.pi/agent/packages/<name>/` for npm-installed-via-pi, project
+ * `.pi/packages/`, plus any directory installs the user did manually.
+ * No hardcoded path scan.
+ *
+ * After the package manager hands us the enabled paths:
+ *   - Extension paths get passed as `configuredPaths` to
+ *     `discoverAndLoadExtensions(...)` so we can enumerate the tool
+ *     names each extension registers.
+ *   - Skill paths feed into `loadSkills(skillPaths: [...])` for
+ *     enumeration in Settings → Skills.
+ *
+ * The `metadata.source` field on each ResolvedResource is the
+ * user-visible package name ("pi-subagents", "git+https://…"). We
+ * surface it as `packageSource` so the Settings UI can group tools
+ * + skills by package instead of by extension entry path.
+ */
+import { discoverAndLoadExtensions, DefaultPackageManager, SettingsManager, } from "@mariozechner/pi-coding-agent";
+import { config } from "./config.js";
+/**
+ * Resolve package-contributed resources visible to a session in `cwd`.
+ *
+ * Used by:
+ *   - `session-registry.buildToolsAllowlist` to union package-extension
+ *     tool names into the allowlist passed to `createAgentSession`
+ *   - `routes/config.ts` `GET /config/tools` to list package-contributed
+ *     tools in the Settings → Tools tab (grouped by package)
+ *   - `config-manager.listSkills` to feed package skill paths into
+ *     `loadSkills` so they show up in Settings → Skills
+ *
+ * Failures inside individual packages or extensions surface as
+ * `errors[]` rather than throwing. A single broken package must not
+ * block session creation or settings rendering.
+ */
+export async function discoverExtensionResources(cwd) {
+    const errors = [];
+    let extensionPathToPackage;
+    let skillEntries;
+    try {
+        const settingsManager = SettingsManager.create(cwd, config.piConfigDir);
+        // Some SDK paths reload settings on construction; defensively
+        // call reload here so we read the on-disk packages list fresh
+        // (matches DefaultResourceLoader.reload() ordering).
+        await settingsManager.reload?.();
+        const packageManager = new DefaultPackageManager({
+            cwd,
+            agentDir: config.piConfigDir,
+            settingsManager,
+        });
+        const resolved = await packageManager.resolve();
+        // Filter to enabled paths AND keep their source attribution. A
+        // resource without a metadata.source we can't attribute is
+        // dropped — better silently absent than rendered as "unknown".
+        extensionPathToPackage = new Map();
+        for (const r of resolved.extensions) {
+            if (!r.enabled)
+                continue;
+            const src = r.metadata.source;
+            if (typeof src !== "string" || src.length === 0)
+                continue;
+            extensionPathToPackage.set(r.path, src);
+        }
+        skillEntries = [];
+        for (const r of resolved.skills) {
+            if (!r.enabled)
+                continue;
+            // Only forward PACKAGE-origin skills. The PackageManager also
+            // surfaces auto-discovered top-level skills (the bare global
+            // skill dir, project .pi/skills, etc.) with `origin:
+            // "top-level"` — those are already loaded by the
+            // `includeDefaults: true` path in `loadSkills`, so passing
+            // them through too would double-count every default skill.
+            if (r.metadata.origin !== "package")
+                continue;
+            const src = r.metadata.source;
+            if (typeof src !== "string" || src.length === 0)
+                continue;
+            skillEntries.push({ packageSource: src, skillPath: r.path });
+        }
+    }
+    catch (err) {
+        errors.push({
+            path: "<package-manager>",
+            error: err instanceof Error ? err.message : String(err),
+        });
+        return { tools: [], skillPaths: [], errors };
+    }
+    // Now load each extension to enumerate its registered tools.
+    // discoverAndLoadExtensions accepts our resolved extension paths
+    // via the third (configuredPaths) arg — it'll still also scan the
+    // legacy `cwd/.pi/extensions/` and `agentDir/extensions/` dirs,
+    // which is fine for backward compat with hand-dropped extensions.
+    const tools = [];
+    if (extensionPathToPackage.size === 0) {
+        return { tools, skillPaths: skillEntries, errors };
+    }
+    let loaded;
+    try {
+        loaded = await discoverAndLoadExtensions(Array.from(extensionPathToPackage.keys()), cwd, config.piConfigDir);
+    }
+    catch (err) {
+        errors.push({
+            path: "<discoverAndLoadExtensions>",
+            error: err instanceof Error ? err.message : String(err),
+        });
+        return { tools, skillPaths: skillEntries, errors };
+    }
+    for (const e of loaded.errors) {
+        errors.push({ path: e.path, error: e.error });
+    }
+    for (const ext of loaded.extensions) {
+        const pkgSource = extensionPathToPackage.get(ext.path) ?? extensionPathToPackage.get(ext.resolvedPath);
+        if (pkgSource === undefined)
+            continue; // Not from a package we resolved (legacy dir scan); skip.
+        for (const [, registered] of ext.tools) {
+            const def = registered.definition;
+            const info = { name: def.name, packageSource: pkgSource };
+            if (typeof def.description === "string" && def.description.length > 0) {
+                info.description = def.description;
+            }
+            tools.push(info);
+        }
+    }
+    return { tools, skillPaths: skillEntries, errors };
+}
+//# sourceMappingURL=extensions-discovery.js.map

package/dist/server/extensions-discovery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"extensions-discovery.js","sourceRoot":"","sources":["../src/extensions-discovery.ts"],"names":[],"mappings":"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"}