@ai-sdk/harness-pi 1.0.64 → 1.0.66

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @ai-sdk/harness-pi
 
+## 1.0.66
+
+### Patch Changes
+
+- b6642fa: fix(harness-pi): resolve compound provider/id model ids under their scoped provider
+
+## 1.0.65
+
+### Patch Changes
+
+- c20a315: feat(harness-pi): support caller-supplied inline Pi extension factories
+- a03ff6c: feat(harness): add support for per-harness MCP servers
+- Updated dependencies [401a4ba]
+- Updated dependencies [a03ff6c]
+  - @ai-sdk/provider-utils@5.0.26
+  - @ai-sdk/harness@1.0.65
+
 ## 1.0.64
 
 ### Patch Changes

package/README.md

@@ -50,3 +50,23 @@ try {
 ```
 
 The adapter requires a `HarnessV1SandboxProvider`. Pi has no in-sandbox bridge, so the sandbox doesn't need to expose any ports — `@ai-sdk/sandbox-vercel` or `@ai-sdk/sandbox-just-bash` both work.
+
+## Inline extensions
+
+Use `extensionFactories` to load trusted inline Pi extensions for each harness session:
+
+```ts
+import { createPi } from '@ai-sdk/harness-pi';
+
+const harness = createPi({
+  extensionFactories: [
+    pi => {
+      pi.on('agent_start', () => {
+        console.log('Pi agent started');
+      });
+    },
+  ],
+});
+```
+
+Routine resource refreshes between turns do not reinitialize extension factories. If the underlying Pi session is rebuilt, factories initialize for the new Pi runtime. Extension factories execute in the host Node.js process, so only pass factories you trust. This option does not enable filesystem extension discovery: user, project, personal, and settings-based Pi extensions remain disabled. Themes and prompt templates also remain disabled.

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import * as _ai_sdk_harness from '@ai-sdk/harness';
 import { HarnessV1, HarnessV1BuiltinTool } from '@ai-sdk/harness';
+import { ExtensionFactory } from '@earendil-works/pi-coding-agent';
 
 /**
  * Pi auth options. Exactly one of `gateway` or `customEnv` is honoured
@@ -52,6 +53,17 @@ type PiHarnessSettings = {
      * model settings.
      */
     readonly agentDir?: string;
+    /**
+     * MCP server definitions keyed by server name. Each definition uses the
+     * underlying runtime's native MCP server configuration format.
+     */
+    readonly mcpServers?: Record<string, unknown>;
+    /**
+     * Trusted inline Pi extensions loaded for each harness session.
+     *
+     * Filesystem-discovered user and project extensions remain disabled.
+     */
+    readonly extensionFactories?: ReadonlyArray<ExtensionFactory>;
 };
 declare const PI_BUILTIN_TOOLS: {
     readonly read: HarnessV1BuiltinTool<{

package/dist/index.js

@@ -108,7 +108,7 @@ import { resolveSandboxHomeDir } from "@ai-sdk/harness/utils";
 import { getAiGatewayAuthFromEnv } from "@ai-sdk/harness/utils";
 
 // src/version.ts
-var VERSION = true ? "1.0.64" : "0.0.0-test";
+var VERSION = true ? "1.0.66" : "0.0.0-test";
 
 // src/pi-auth.ts
 var DEFAULT_GATEWAY_BASE_URL = "https://ai-gateway.vercel.sh";
@@ -368,6 +368,15 @@ function extractAssistantText(message) {
 // src/pi-model-resolver.ts
 import { getAiGatewayAuthFromEnv as getAiGatewayAuthFromEnv2 } from "@ai-sdk/harness/utils";
 var DEFAULT_PI_GATEWAY_MODEL_ID = "anthropic/claude-sonnet-4.6";
+var findScopedMatch = (effectiveId, models) => {
+  const slashIndex = effectiveId.indexOf("/");
+  if (slashIndex === -1) return void 0;
+  const prefix = effectiveId.slice(0, slashIndex);
+  const bareId = effectiveId.slice(slashIndex + 1);
+  return models.find(
+    (m) => m.provider === prefix && (m.id === bareId || m.name === bareId)
+  );
+};
 function createPiModelResolver({
   modelRegistry,
   env = process.env
@@ -390,7 +399,18 @@ function createPiModelResolver({
     if (!effectiveId) return void 0;
     const models = loadModels();
     const matches = (m) => m.id === effectiveId || m.name === effectiveId;
-    return useGateway && models.find((m) => m.provider === "vercel-ai-gateway" && matches(m)) || models.find(matches);
+    const gatewayMatch = useGateway ? models.find((m) => m.provider === "vercel-ai-gateway" && matches(m)) : void 0;
+    if (gatewayMatch) return gatewayMatch;
+    const scopedMatch = findScopedMatch(effectiveId, models);
+    if (scopedMatch && !modelRegistry.hasConfiguredAuth(scopedMatch)) {
+      const authenticatedFlatMatches = models.filter(
+        (m) => m.id === effectiveId && modelRegistry.hasConfiguredAuth(m)
+      );
+      if (authenticatedFlatMatches.length === 1) {
+        return authenticatedFlatMatches[0];
+      }
+    }
+    return scopedMatch ?? models.find(matches);
   };
 }
 
@@ -740,6 +760,7 @@ async function writePiSkills(args) {
 
 // src/pi-translate.ts
 import { randomBytes } from "crypto";
+import { secureJsonParse } from "@ai-sdk/provider-utils";
 
 // src/pi-utils.ts
 import {
@@ -804,7 +825,9 @@ function createPiTranslatorState(options = {}) {
     pendingStepToolCallIds: /* @__PURE__ */ new Set(),
     stepOpen: false,
     hostToolResults: /* @__PURE__ */ new Map(),
+    dynamicToolCallIds: /* @__PURE__ */ new Set(),
     builtinToolNames: new Set(options.builtinToolNames ?? []),
+    hostToolNames: new Set(options.hostToolNames ?? []),
     nativeToCommonNameMap: map
   };
 }
@@ -830,6 +853,14 @@ function unwrapPiToolResult(event) {
   if (typeof event.content === "string") return event.content;
   return event.result ?? event.content ?? null;
 }
+function parseMcpToolResult(content) {
+  if (typeof content !== "string") return content;
+  try {
+    return secureJsonParse(content);
+  } catch {
+    return content;
+  }
+}
 function resolveToolName(state, nativeName) {
   const common = state.nativeToCommonNameMap.get(nativeName);
   return { wire: common ?? nativeName, native: nativeName };
@@ -969,7 +1000,9 @@ function translatePiEvent(event, state) {
       if (!event.toolCallId || !event.toolName) return [];
       const { wire, native } = resolveToolName(state, event.toolName);
       state.observedToolNames.set(event.toolCallId, wire);
-      const providerExecuted = state.builtinToolNames.has(native);
+      const isMcpTool = !state.hostToolNames.has(native) && (native === "mcp" || native.startsWith("mcp__"));
+      const providerExecuted = state.builtinToolNames.has(native) || isMcpTool;
+      if (isMcpTool) state.dynamicToolCallIds.add(event.toolCallId);
       const input = serializeToolOutput(event.args ?? event.input ?? {});
       return [
         {
@@ -978,7 +1011,8 @@ function translatePiEvent(event, state) {
           toolName: wire,
           input,
           ...wire !== native ? { nativeName: native } : {},
-          ...providerExecuted ? { providerExecuted: true } : {}
+          ...providerExecuted ? { providerExecuted: true } : {},
+          ...isMcpTool ? { dynamic: true } : {}
         }
       ];
     }
@@ -989,7 +1023,8 @@ function translatePiEvent(event, state) {
       const nativeName = event.toolName;
       const wire = recordedName ?? (nativeName ? resolveToolName(state, nativeName).wire : void 0);
       if (!wire) return [];
-      const result = state.hostToolResults.has(event.toolCallId) ? state.hostToolResults.get(event.toolCallId) ?? null : unwrapPiToolResult(event);
+      const dynamic = state.dynamicToolCallIds.delete(event.toolCallId);
+      const result = state.hostToolResults.has(event.toolCallId) ? state.hostToolResults.get(event.toolCallId) ?? null : dynamic ? parseMcpToolResult(unwrapPiToolResult(event)) : unwrapPiToolResult(event);
       state.hostToolResults.delete(event.toolCallId);
       state.pendingStepToolCallIds.delete(event.toolCallId);
       return [
@@ -998,7 +1033,8 @@ function translatePiEvent(event, state) {
           toolCallId: event.toolCallId,
           toolName: wire,
           result,
-          ...event.isError ? { isError: true } : {}
+          ...event.isError ? { isError: true } : {},
+          ...dynamic ? { dynamic: true } : {}
         },
         ...finishStep(state)
       ];
@@ -1505,6 +1541,7 @@ async function syncHostWorkspaceFromSandbox(args) {
 
 // src/pi-session.ts
 var HARNESS_ID2 = "pi";
+var PI_MCP_ADAPTER_PACKAGE = "pi-mcp-adapter";
 var parkedPiSessions = /* @__PURE__ */ new Map();
 function isWithinDirectory(parent, child) {
   const rel = path7.relative(parent, child);
@@ -1670,18 +1707,56 @@ async function createPiSession(input) {
     env: resolverEnv
   });
   const resolvedModel = resolveModel(input.settings.model);
+  const mcpServers = resolvePiMcpServers({
+    mcpServers: input.settings.mcpServers
+  });
+  const hasMcpServers = Object.keys(mcpServers).length > 0;
+  const extensionFactories = [
+    ...input.settings.extensionFactories ?? []
+  ];
+  if (hasMcpServers) {
+    const { createMcpAdapter } = await import(PI_MCP_ADAPTER_PACKAGE);
+    extensionFactories.push(
+      createMcpAdapter({
+        config: {
+          mcpServers,
+          settings: {
+            directTools: true,
+            toolPrefix: "mcp",
+            disableProxyTool: true
+          }
+        }
+      })
+    );
+  }
+  const hasExtensionFactories = extensionFactories.length > 0;
+  let preserveExtensionsResult = false;
+  let currentExtensionsResult;
   const resourceLoader = new DefaultResourceLoader({
     cwd: sessionWorkDir,
     agentDir: hostAgentDir,
     settingsManager,
     appendSystemPromptOverride: () => [],
-    extensionFactories: [],
+    extensionFactories,
+    ...hasExtensionFactories ? {
+      // DefaultResourceLoader invokes inline factories on every reload.
+      // Resource-only reloads retain the active extension runtime, while a
+      // genuine Pi session rebuild is allowed to replace that runtime.
+      extensionsOverride: (extensions) => {
+        if (preserveExtensionsResult && currentExtensionsResult != null) {
+          return currentExtensionsResult;
+        }
+        currentExtensionsResult = extensions;
+        return extensions;
+      }
+    } : {},
     // Pi runs in the host process, so its default resource discovery reaches
     // the host developer's personal config (`~/.pi/agent/*`, `~/.agents/*`).
-    // The harness does not expose extensions, themes, or prompt templates, so
-    // disable those entirely — this also avoids loading and executing a host
-    // developer's personal Pi extensions inside the server process. Skills are
-    // kept but filtered to workspace project skills plus harness-provided
+    // The harness exposes only explicitly supplied inline extension factories;
+    // disable filesystem extension discovery entirely to avoid loading and
+    // executing a host developer's personal or project Pi extensions inside
+    // the server process. Themes and prompt templates stay disabled. Skills
+    // are kept but filtered to workspace project skills plus harness-provided
     // skills whose files live in sandbox HOME.
     noExtensions: true,
     noThemes: true,
@@ -1697,6 +1772,20 @@ async function createPiSession(input) {
     })
   });
   await resourceLoader.reload();
+  async function reloadResourcesOnly() {
+    if (!hasExtensionFactories) {
+      await resourceLoader.reload();
+      return;
+    }
+    const factories = extensionFactories.splice(0);
+    preserveExtensionsResult = true;
+    try {
+      await resourceLoader.reload();
+    } finally {
+      preserveExtensionsResult = false;
+      extensionFactories.push(...factories);
+    }
+  }
   let piSession;
   let unsubscribe;
   let lastToolsSignature;
@@ -1824,13 +1913,27 @@ async function createPiSession(input) {
       builtinNames: [...builtinNames]
     };
   }
+  async function disposePiSession() {
+    unsubscribe?.();
+    unsubscribe = void 0;
+    const session = piSession;
+    piSession = void 0;
+    if (!session) return;
+    if (hasMcpServers) {
+      await session.reload().catch(() => {
+      });
+    }
+    session.dispose();
+  }
   async function rebuildPiSession(userTools, isFirstBuild) {
+    let resourcesReloaded = false;
     if (piSession) {
-      unsubscribe?.();
-      unsubscribe = void 0;
-      piSession.dispose();
-      piSession = void 0;
+      await disposePiSession();
       await new Promise((resolve) => setTimeout(resolve, 25));
+      if (hasExtensionFactories) {
+        await resourceLoader.reload();
+        resourcesReloaded = true;
+      }
     }
     const { customTools, builtinNames } = buildToolDefinitions(userTools);
     const toolNames = customTools.map((t) => t.name);
@@ -1847,17 +1950,21 @@ async function createPiSession(input) {
       settingsManager,
       resourceLoader,
       customTools,
-      tools: toolNames,
+      ...hasMcpServers ? { noTools: "builtin" } : { tools: toolNames },
       ...input.settings.thinkingLevel ? { thinkingLevel: input.settings.thinkingLevel } : {},
       ...resolvedModel ? { model: resolvedModel } : {}
     });
     piSession = session;
+    if (hasMcpServers) {
+      await piSession.bindExtensions({ mode: "print" });
+    }
     const candidatePath = sessionManager.getSessionFile();
     if (candidatePath) {
       sessionFileName = safePiSessionFileName(path7.basename(candidatePath));
     }
     translatorState = createPiTranslatorState({
       builtinToolNames: builtinNames,
+      hostToolNames: userTools.map((tool2) => tool2.name),
       nativeToCommon: NATIVE_TO_COMMON
     });
     unsubscribe = piSession.subscribe((rawEvent) => {
@@ -1872,6 +1979,7 @@ async function createPiSession(input) {
         }
       }
     });
+    return resourcesReloaded;
   }
   async function runTurn(turnOpts) {
     if (stopped) {
@@ -1880,11 +1988,14 @@ async function createPiSession(input) {
     const userTools = turnOpts.tools;
     const signature = JSON.stringify(userTools.map((t) => t.name).sort());
     const needsRebuild = piSession == null || signature !== lastToolsSignature;
+    let resourcesReloaded = false;
     if (needsRebuild) {
-      await rebuildPiSession(userTools, piSession == null);
+      resourcesReloaded = await rebuildPiSession(userTools, piSession == null);
       lastToolsSignature = signature;
     }
-    await resourceLoader.reload();
+    if (!resourcesReloaded) {
+      await reloadResourcesOnly();
+    }
     await syncHostWorkspaceFromSandbox({
       sandbox,
       sandboxWorkDir: input.sessionWorkDir,
@@ -1893,6 +2004,7 @@ async function createPiSession(input) {
     currentEmit = turnOpts.emit;
     translatorState = createPiTranslatorState({
       builtinToolNames: [...PI_NATIVE_BUILTIN_NAMES],
+      hostToolNames: userTools.map((tool2) => tool2.name),
       nativeToCommon: NATIVE_TO_COMMON
     });
     turnOpts.emit({ type: "stream-start" });
@@ -1974,10 +2086,7 @@ async function createPiSession(input) {
       } catch {
       }
     }
-    unsubscribe?.();
-    unsubscribe = void 0;
-    piSession?.dispose();
-    piSession = void 0;
+    await disposePiSession();
     workspaceVfs.unmount();
     await rm2(hostRoot, { recursive: true, force: true });
     return {
@@ -2036,10 +2145,7 @@ async function createPiSession(input) {
       parkedPiSessions.delete(input.sessionId);
       settlePendingToolResults("Pi session stopped");
       settlePendingToolApprovals("Pi session stopped");
-      unsubscribe?.();
-      unsubscribe = void 0;
-      piSession?.dispose();
-      piSession = void 0;
+      await disposePiSession();
       workspaceVfs.unmount();
       await rm2(hostRoot, { recursive: true, force: true });
     },
@@ -2094,10 +2200,7 @@ async function createPiSession(input) {
       parkedPiSessions.delete(input.sessionId);
       settlePendingToolResults("Pi session suspended");
       settlePendingToolApprovals("Pi session suspended");
-      unsubscribe?.();
-      unsubscribe = void 0;
-      piSession?.dispose();
-      piSession = void 0;
+      await disposePiSession();
       workspaceVfs.unmount();
       await rm2(hostRoot, { recursive: true, force: true });
       return {
@@ -2110,6 +2213,19 @@ async function createPiSession(input) {
   };
   return sessionImpl;
 }
+function resolvePiMcpServers({
+  mcpServers
+}) {
+  if (mcpServers == null) return {};
+  for (const [name, value] of Object.entries(mcpServers)) {
+    if (value == null || typeof value !== "object" || Array.isArray(value)) {
+      throw new Error(
+        `Pi MCP server ${JSON.stringify(name)} must be configured with an object value.`
+      );
+    }
+  }
+  return mcpServers;
+}
 function isAbortError(value) {
   if (value == null) return false;
   if (typeof value === "object" && value.name === "AbortError") {
@@ -2428,7 +2544,9 @@ function createPi(settings = {}) {
         settings: {
           ...settings.auth ? { auth: settings.auth } : {},
           ...settings.model ? { model: settings.model } : {},
-          ...settings.thinkingLevel ? { thinkingLevel: settings.thinkingLevel } : {}
+          ...settings.thinkingLevel ? { thinkingLevel: settings.thinkingLevel } : {},
+          ...settings.mcpServers ? { mcpServers: settings.mcpServers } : {},
+          ...settings.extensionFactories ? { extensionFactories: settings.extensionFactories } : {}
         },
         clientApp: PI_CLIENT_APP,
         isResume: lifecycleState != null,