@aexol/spectral 0.1.1 → 0.1.2

package/dist/server/pi-bridge.js

@@ -48,8 +48,11 @@
  *  conversations within a single WS connection work normally.
  */
 import { AuthStorage, createAgentSession, DefaultResourceLoader, ModelRegistry, SessionManager, } from "@mariozechner/pi-coding-agent";
-import { createRequire } from "node:module";
+import { createJiti } from "@mariozechner/jiti";
 import { randomUUID } from "node:crypto";
+import { existsSync, readFileSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
 import aexolMcpExtension from "../extensions/aexol-mcp.js";
 import { fetchAllowedModels as defaultFetchAllowedModels, } from "../relay/models-fetch.js";
 /**
@@ -87,6 +90,41 @@ function extractTextFromContent(content) {
     }
     return out;
 }
+/**
+ * Resolve the entry point of the pi-mcp-adapter extension (index.ts)
+ * by walking up from this file's location through node_modules.
+ * Returns the absolute path, or null if the package is not installed.
+ */
+function resolveMcpAdapterEntry() {
+    const __dirname = dirname(fileURLToPath(import.meta.url));
+    const rel = "node_modules/pi-mcp-adapter/package.json";
+    const root = "/";
+    let dir = __dirname;
+    for (let i = 0; i < 20; i++) {
+        const pkgPath = resolve(dir, rel);
+        try {
+            const raw = readFileSync(pkgPath, "utf8");
+            const pkg = JSON.parse(raw);
+            const extRel = pkg.pi?.extensions?.[0];
+            if (extRel) {
+                return resolve(dirname(pkgPath), extRel);
+            }
+            // Package found but no pi.extensions — try index.ts as fallback
+            const indexTs = resolve(dirname(pkgPath), "index.ts");
+            if (existsSync(indexTs))
+                return indexTs;
+            break;
+        }
+        catch {
+            // package.json not readable at this level, keep walking up
+        }
+        const parent = dirname(dir);
+        if (parent === dir || parent === root)
+            break;
+        dir = parent;
+    }
+    return null;
+}
 export class PiBridge {
     session;
     unsubscribe;
@@ -117,23 +155,25 @@ export class PiBridge {
     async start() {
         if (this.disposed)
             throw new Error("PiBridge already disposed");
-        // Build extension factories. Always include the Aexol MCP extension;
-        // dynamically load the pi-mcp-adapter (standard MCP servers) with
-        // graceful degradation when the package is not installed.
         const extensionFactories = [aexolMcpExtension];
-        // Use createRequire to avoid TypeScript walking into pi-mcp-adapter's
-        // raw .ts sources (the package doesn't ship .d.ts). The extension factory
-        // is the default export: `export default function mcpAdapter(pi)`.
-        try {
-            const piMcpRequire = createRequire(import.meta.url);
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-            const mcpAdapterExtension = piMcpRequire("pi-mcp-adapter");
-            if (typeof mcpAdapterExtension === "function") {
-                extensionFactories.push(mcpAdapterExtension);
-                console.info("[PiBridge] Standard MCP adapter loaded (pi-mcp-adapter)");
+        // Load pi-mcp-adapter via jiti so tsc never crawls its .ts files in
+        // node_modules. The static `import` was causing tsc to type-check
+        // pi-mcp-adapter's source and fail the build on its type errors.
+        // jiti is the same loader pi uses internally for all extensions.
+        const mcpAdapterPath = resolveMcpAdapterEntry();
+        if (mcpAdapterPath) {
+            try {
+                const jiti = createJiti(import.meta.url, { moduleCache: false });
+                const mcpAdapterFactory = await jiti.import(mcpAdapterPath, { default: true });
+                if (typeof mcpAdapterFactory === "function") {
+                    extensionFactories.push(async (pi) => mcpAdapterFactory(pi));
+                }
+            }
+            catch {
+                console.info("[PiBridge] pi-mcp-adapter not found; standard MCP servers disabled.");
             }
         }
-        catch {
+        else {
             console.info("[PiBridge] pi-mcp-adapter not found; standard MCP servers disabled.");
         }
         // ResourceLoader with extensions wired in via factories.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aexol/spectral",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Always-on coding agent for Aexol — branded pi wrapper with relay-based browser access.",
   "type": "module",
   "private": false,
@@ -51,6 +51,7 @@
   },
   "dependencies": {
     "@inquirer/prompts": "^7.2.0",
+    "@mariozechner/jiti": "^2.6.5",
     "@mariozechner/pi-coding-agent": "^0.70.2",
     "better-sqlite3": "^12.9.0",
     "pi-mcp-adapter": "^2.5.4",