@ai-sdk/harness-acp 1.0.0 → 1.0.2

package/dist/index.js

@@ -1,6 +1,33 @@
 // src/acp-harness.ts
 import { z as z4 } from "zod/v4";
 
+// src/v1/acp-v1-harness.ts
+import { createHash as createHash5, randomBytes } from "crypto";
+import { readFile } from "fs/promises";
+import { posix } from "path";
+import { fileURLToPath } from "url";
+import {
+  HarnessCapabilityUnsupportedError as HarnessCapabilityUnsupportedError2,
+  harnessV1DiagnosticFromBridgeFrame
+} from "@ai-sdk/harness";
+import { HarnessBridgeCapabilityUnsupportedError } from "@ai-sdk/harness/bridge";
+import {
+  createBridgeErrorHandler,
+  createBridgeStartupError,
+  classifyDiskLog,
+  drainBridgeProcessStream,
+  forwardBridgeProcessStream,
+  markBridgeStarting,
+  resolveSandboxHomeDir,
+  SandboxChannel,
+  shellQuote,
+  waitForBridgeReady
+} from "@ai-sdk/harness/utils";
+import {
+  asSchema
+} from "@ai-sdk/provider-utils";
+import { WebSocket } from "ws";
+
 // src/acp-auth.ts
 import { createHash } from "crypto";
 import { getAiGatewayAuthFromEnv } from "@ai-sdk/harness/utils";
@@ -145,53 +172,34 @@ function sortIdentityValue({ value }) {
   return value;
 }
 
-// src/v1/acp-v1-harness.ts
-import { createHash as createHash5, randomBytes } from "crypto";
-import { readFile } from "fs/promises";
-import { posix } from "path";
-import { fileURLToPath } from "url";
-import {
-  HarnessCapabilityUnsupportedError as HarnessCapabilityUnsupportedError2,
-  harnessV1DiagnosticFromBridgeFrame
-} from "@ai-sdk/harness";
-import { HarnessBridgeCapabilityUnsupportedError } from "@ai-sdk/harness/bridge";
-import {
-  createBridgeErrorHandler,
-  createBridgeStartupError,
-  classifyDiskLog,
-  drainBridgeProcessStream,
-  forwardBridgeProcessStream,
-  markBridgeStarting,
-  resolveSandboxHomeDir,
-  SandboxChannel,
-  shellQuote,
-  waitForBridgeReady
-} from "@ai-sdk/harness/utils";
-import {
-  asSchema
-} from "@ai-sdk/provider-utils";
-import { WebSocket } from "ws";
-
 // src/v1/implementation.ts
 import { createHash as createHash2 } from "crypto";
+function createACPV1Implementation({
+  settings
+}) {
+  return {
+    source: settings.source,
+    executable: settings.executable,
+    args: settings.args,
+    forwardEnv: settings.forwardEnv,
+    env: settings.env
+  };
+}
 var EXACT_SEMVER_REGEXP = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?$/;
 var PACKAGE_NAME_REGEXP = /^(?:@[a-z0-9][a-z0-9._-]*\/)?[a-z0-9][a-z0-9._-]*$/;
 var EXECUTABLE_NAME_REGEXP = /^[A-Za-z0-9][A-Za-z0-9._-]*$/;
 var ENVIRONMENT_VARIABLE_NAME_REGEXP = /^[A-Za-z_][A-Za-z0-9_]*$/;
 function validateACPV1Implementation(implementation) {
-  if (isLockedImplementation(implementation)) {
-    if (implementation.packageJson.length === 0) {
-      throw new Error(
-        "ACP locked npm implementation packageJson must not be empty."
-      );
+  const { source } = implementation;
+  if (source.type === "npm-locked") {
+    if (source.packageJson.length === 0) {
+      throw new Error("ACP source.packageJson must not be empty.");
     }
-    if (implementation.pnpmLockYaml.length === 0) {
-      throw new Error(
-        "ACP locked npm implementation pnpmLockYaml must not be empty."
-      );
+    if (source.pnpmLockYaml.length === 0) {
+      throw new Error("ACP source.pnpmLockYaml must not be empty.");
     }
   } else {
-    validateSimpleImplementation({ implementation });
+    validateNpmSimpleSource({ source });
   }
   if (!EXECUTABLE_NAME_REGEXP.test(implementation.executable)) {
     throw new Error(
@@ -212,8 +220,9 @@ function validateACPV1Implementation(implementation) {
 function createImplementationManifest({
   implementation
 }) {
-  if (isLockedImplementation(implementation)) {
-    return implementation.packageJson;
+  const { source } = implementation;
+  if (source.type === "npm-locked") {
+    return source.packageJson;
   }
   return JSON.stringify(
     {
@@ -222,7 +231,7 @@ function createImplementationManifest({
       private: true,
       type: "module",
       dependencies: {
-        [implementation.packageName]: implementation.version
+        [source.packageName]: source.packageVersion ?? "latest"
       }
     },
     null,
@@ -232,18 +241,17 @@ function createImplementationManifest({
 function getImplementationLockfile({
   implementation
 }) {
-  return isLockedImplementation(implementation) ? implementation.pnpmLockYaml : void 0;
+  const { source } = implementation;
+  return source.type === "npm-locked" ? source.pnpmLockYaml : void 0;
 }
 function createImplementationDescriptor({
-  implementation,
-  implementationIdentity
+  implementation
 }) {
   return JSON.stringify(
     {
       executable: implementation.executable,
       args: implementation.args ?? [],
-      envKeys: getImplementationEnvironmentKeys({ implementation }),
-      implementationIdentity
+      envKeys: getImplementationEnvironmentKeys({ implementation })
     },
     null,
     2
@@ -257,14 +265,15 @@ function createImplementationIdentity({
   providerAuthentication,
   permissionModeMapping
 }) {
-  const acquisition = isLockedImplementation(implementation) ? {
-    mode: "locked",
-    packageJson: implementation.packageJson,
-    pnpmLockYaml: implementation.pnpmLockYaml
+  const { source } = implementation;
+  const sourceIdentity = source.type === "npm-locked" ? {
+    type: source.type,
+    packageJson: source.packageJson,
+    pnpmLockYaml: source.pnpmLockYaml
   } : {
-    mode: "simple",
-    packageName: implementation.packageName,
-    version: implementation.version
+    type: source.type,
+    packageName: source.packageName,
+    ...source.packageVersion == null ? {} : { packageVersion: source.packageVersion }
   };
   const forwardedEnvironment = [
     ...new Set(implementation.forwardEnv ?? [])
@@ -275,7 +284,7 @@ function createImplementationIdentity({
   const payload = {
     harnessId,
     acpVersion,
-    acquisition,
+    source: sourceIdentity,
     executable: implementation.executable,
     args: implementation.args ?? [],
     clientApp,
@@ -293,7 +302,7 @@ function createImplementationInstallCommand({
   storeDir,
   implementation
 }) {
-  return `pnpm --dir ${implementationDir} install` + (isLockedImplementation(implementation) ? " --frozen-lockfile" : "") + ` --prod --store-dir ${storeDir}`;
+  return `pnpm --dir ${implementationDir} install` + (implementation.source.type === "npm-locked" ? " --frozen-lockfile" : "") + ` --prod --store-dir ${storeDir}`;
 }
 function resolveImplementationEnvironment({
   implementation,
@@ -311,17 +320,17 @@ function resolveImplementationEnvironment({
     ...implementation.env
   };
 }
-function validateSimpleImplementation({
-  implementation
+function validateNpmSimpleSource({
+  source
 }) {
-  if (!PACKAGE_NAME_REGEXP.test(implementation.packageName)) {
+  if (!PACKAGE_NAME_REGEXP.test(source.packageName)) {
     throw new Error(
-      `ACP npm package name is invalid: ${JSON.stringify(implementation.packageName)}.`
+      `ACP npm package name is invalid: ${JSON.stringify(source.packageName)}.`
     );
   }
-  if (!EXACT_SEMVER_REGEXP.test(implementation.version)) {
+  if (source.packageVersion != null && !EXACT_SEMVER_REGEXP.test(source.packageVersion)) {
     throw new Error(
-      `ACP npm implementation version must be an exact semantic version; received ${JSON.stringify(implementation.version)}.`
+      `ACP npm package version must be an exact semantic version; received ${JSON.stringify(source.packageVersion)}.`
     );
   }
 }
@@ -360,9 +369,6 @@ function getImplementationEnvironmentKeys({
     ])
   ].sort();
 }
-function isLockedImplementation(implementation) {
-  return implementation.mode === "locked";
-}
 function stableStringify2({ value }) {
   return JSON.stringify(sortValue({ value }));
 }
@@ -534,9 +540,19 @@ var coldRestoreSchema = z2.object({
   type: z2.literal("cold-restore"),
   acpSessionId: z2.string()
 });
-var outboundMessageSchema = harnessV1BridgeOutboundMessageSchema;
+var acpToolCallCandidateSchema = z2.object({
+  type: z2.literal("acp-tool-call-candidate"),
+  toolCall: z2.custom(
+    (value) => value != null && typeof value === "object" && typeof value.toolCallId === "string" && typeof value.title === "string"
+  )
+});
+var outboundMessageSchema = z2.union([
+  harnessV1BridgeOutboundMessageSchema,
+  acpToolCallCandidateSchema
+]);
 var startMessageSchema = harnessV1BridgeStartBaseSchema.extend({
   prompt: z2.array(acpTextContentBlockSchema),
+  mcpServers: z2.record(z2.string(), z2.unknown()).optional(),
   tools: z2.array(acpSerializableToolSpecSchema).optional(),
   builtinTools: z2.array(builtinToolSchema).readonly().default([]),
   permissionModeMapping: permissionModeMappingSchema.optional(),
@@ -616,6 +632,7 @@ function createACPTurnStartConfig({
   builtinTools,
   permissionMode,
   permissionModeMapping,
+  mcpServers,
   debug,
   authenticationProfile,
   sessionMeta
@@ -627,7 +644,8 @@ function createACPTurnStartConfig({
         authenticationProfile,
         sessionMeta: sessionMeta ?? null,
         builtinTools,
-        permissionModeMapping: permissionModeMapping ?? null
+        permissionModeMapping: permissionModeMapping ?? null,
+        mcpServers: mcpServers ?? null
       })
     ).digest("hex"),
     prompt: [...prompt],
@@ -889,17 +907,23 @@ function createACPV1({
   port: portOverride,
   startupTimeoutMs,
   clientApp,
-  implementationIdentity,
-  authenticationProfile,
-  providerAuthenticationCompatibility,
   lifecycleStateSchema
 }) {
+  if (settings.mcpServers != null && Object.prototype.hasOwnProperty.call(
+    settings.mcpServers,
+    "ai-sdk-harness-tools"
+  )) {
+    throw new Error(
+      'ACP MCP server name "ai-sdk-harness-tools" is reserved for HarnessAgent tools.'
+    );
+  }
   if (!HARNESS_ID_REGEXP.test(settings.harnessId)) {
     throw new Error(
       `ACP harnessId must be a stable kebab-case identifier; received ${JSON.stringify(settings.harnessId)}.`
     );
   }
-  validateACPV1Implementation(settings.implementation);
+  const implementation = createACPV1Implementation({ settings });
+  validateACPV1Implementation(implementation);
   const BOOTSTRAP_DIR = `.harness-bootstrap/${settings.harnessId}`;
   let cachedBootstrap;
   const permissionModeMapping = isCompletePermissionModeMapping({
@@ -921,7 +945,7 @@ function createACPV1({
         readBridgeAsset({ name: "host-tool-mcp.mjs" })
       ]);
       const implementationLock = getImplementationLockfile({
-        implementation: settings.implementation
+        implementation
       });
       cachedBootstrap = {
         harnessId: settings.harnessId,
@@ -943,14 +967,13 @@ function createACPV1({
           {
             path: `${BOOTSTRAP_DIR}/implementation/package.json`,
             content: createImplementationManifest({
-              implementation: settings.implementation
+              implementation
             })
           },
           {
             path: `${BOOTSTRAP_DIR}/implementation/implementation.json`,
             content: createImplementationDescriptor({
-              implementation: settings.implementation,
-              implementationIdentity
+              implementation
             })
           },
           ...implementationLock == null ? [] : [
@@ -968,7 +991,7 @@ function createACPV1({
             command: createImplementationInstallCommand({
               implementationDir: "implementation",
               storeDir: "../.pnpm-store",
-              implementation: settings.implementation
+              implementation
             })
           }
         ]
@@ -983,13 +1006,31 @@ function createACPV1({
         });
       }
       const permissionMode = startOptions.permissionMode ?? "allow-all";
+      const env = { ...process.env };
+      const providerAuthenticationCompatibility = resolveACPProviderAuthenticationCompatibility({
+        auth: settings.auth,
+        providerAuthentication: settings.providerAuthentication,
+        env
+      });
+      const implementationIdentity = createImplementationIdentity({
+        harnessId: settings.harnessId,
+        acpVersion: "v1",
+        implementation,
+        clientApp,
+        providerAuthentication: providerAuthenticationCompatibility,
+        permissionModeMapping: settings.permissionModeMapping
+      });
+      const authenticationProfile = createACPAuthenticationProfileIdentity({
+        authentication: settings.authentication,
+        providerAuthenticationCompatibility
+      });
       const resolvedProviderAuthentication = resolveACPProviderAuthentication({
         auth: {
           mode: settings.auth,
           providerAuthentication: settings.providerAuthentication,
           clientApp
         },
-        env: process.env,
+        env,
         compatibility: providerAuthenticationCompatibility
       });
       const sandboxSession = startOptions.sandboxSession;
@@ -1097,6 +1138,8 @@ function createACPV1({
               builtinTools: builtinToolCatalog,
               permissionMode,
               permissionModeMapping,
+              mcpServers: settings.mcpServers,
+              isMcpToolCall: settings.isMcpToolCall,
               initialGuidanceApplied: resolveACPInitialGuidanceApplied({
                 isResume: true,
                 lifecycleState: lifecycleData
@@ -1146,7 +1189,8 @@ function createACPV1({
                   authenticationProfile,
                   sessionMeta: settings.session?.meta,
                   builtinTools: builtinToolCatalog,
-                  permissionModeMapping
+                  permissionModeMapping,
+                  mcpServers: settings.mcpServers
                 });
                 respawnStrategy = {
                   mode: "lossy-rerun",
@@ -1175,6 +1219,7 @@ function createACPV1({
             sessionMeta: settings.session?.meta,
             builtinTools: builtinToolCatalog,
             permissionModeMapping,
+            mcpServers: settings.mcpServers,
             debug: startOptions.observability?.debug
           });
           respawnStrategy = {
@@ -1189,7 +1234,7 @@ function createACPV1({
         override: portOverride,
         harnessId: settings.harnessId
       });
-      const token = randomBytes(32).toString("hex");
+      const token = settings.mintBridgeToken == null ? randomBytes(32).toString("hex") : settings.mintBridgeToken(sandboxSession.id);
       await sandbox.run({
         command: `mkdir -p ${shellQuote(workDir)} ${shellQuote(bridgeStateDir)}`,
         abortSignal: startOptions.abortSignal
@@ -1204,8 +1249,8 @@ function createACPV1({
         command: `node ${shellQuote(`${resolvedBridgeDir}/bridge.mjs`)} --workdir ${shellQuote(workDir)} --bridge-state-dir ${shellQuote(bridgeStateDir)} --implementation-dir ${shellQuote(resolvedImplementationDir)} --bridge-type ${shellQuote(settings.harnessId)}`,
         env: {
           ...resolveImplementationEnvironment({
-            implementation: settings.implementation,
-            env: process.env
+            implementation,
+            env
           }),
           ...createACPBridgeEnvironment({
             authentication: settings.authentication,
@@ -1279,6 +1324,7 @@ function createACPV1({
               builtinTools: builtinToolCatalog,
               permissionMode,
               permissionModeMapping,
+              ...settings.mcpServers == null ? {} : { mcpServers: settings.mcpServers },
               tools: respawnStrategy.turnStartConfig.tools,
               turnStartConfig: respawnStrategy.turnStartConfig,
               recoveryMode: {
@@ -1316,6 +1362,8 @@ function createACPV1({
         builtinTools: builtinToolCatalog,
         permissionMode,
         permissionModeMapping,
+        mcpServers: settings.mcpServers,
+        isMcpToolCall: settings.isMcpToolCall,
         initialGuidanceApplied: resolveACPInitialGuidanceApplied({
           isResume,
           lifecycleState: lifecycleData
@@ -1475,6 +1523,8 @@ function createSession({
   builtinTools,
   permissionMode,
   permissionModeMapping,
+  mcpServers,
+  isMcpToolCall,
   initialGuidanceApplied: initialGuidanceAppliedAtStart,
   skillCatalog,
   skillsFingerprint,
@@ -1521,6 +1571,8 @@ function createSession({
     let abortError;
     let abortListenerAttached = false;
     let openBlock;
+    const dynamicToolCalls = /* @__PURE__ */ new Map();
+    const toolCallClassificationErrors = /* @__PURE__ */ new Map();
     const subscriptions = [];
     const forward = (event) => {
       if (event.type === "text-start" || event.type === "reasoning-start") {
@@ -1553,9 +1605,7 @@ function createSession({
       "reasoning-start",
       "reasoning-delta",
       "reasoning-end",
-      "tool-call",
       "tool-approval-request",
-      "tool-result",
       "file-change",
       "finish-step",
       "raw"
@@ -1583,6 +1633,44 @@ function createSession({
         settle({ error: abortError });
       }
     };
+    subscriptions.push(
+      channel.on("acp-tool-call-candidate", (event) => {
+        try {
+          dynamicToolCalls.set(
+            event.toolCall.toolCallId,
+            isMcpToolCall?.(event.toolCall) === true
+          );
+        } catch (error) {
+          toolCallClassificationErrors.set(event.toolCall.toolCallId, error);
+        }
+      })
+    );
+    subscriptions.push(
+      channel.on("tool-call", (event) => {
+        if (toolCallClassificationErrors.has(event.toolCallId)) {
+          const error = toolCallClassificationErrors.get(event.toolCallId);
+          closeForwardedBlock();
+          forward({ type: "error", error });
+          try {
+            channel.send({ type: "abort" });
+          } catch {
+          }
+          settle({ error });
+          return;
+        }
+        forward(
+          dynamicToolCalls.get(event.toolCallId) === true ? { ...event, dynamic: true } : event
+        );
+      })
+    );
+    subscriptions.push(
+      channel.on("tool-result", (event) => {
+        const dynamic = dynamicToolCalls.get(event.toolCallId) === true;
+        dynamicToolCalls.delete(event.toolCallId);
+        toolCallClassificationErrors.delete(event.toolCallId);
+        forward(dynamic ? { ...event, dynamic: true } : event);
+      })
+    );
     for (const type of eventTypes) {
       subscriptions.push(channel.on(type, (event) => forward(event)));
     }
@@ -1723,6 +1811,7 @@ function createSession({
         builtinTools,
         permissionMode,
         permissionModeMapping,
+        mcpServers,
         debug,
         authenticationProfile,
         sessionMeta
@@ -1748,6 +1837,7 @@ function createSession({
             builtinTools,
             permissionMode,
             permissionModeMapping,
+            ...mcpServers == null ? {} : { mcpServers },
             tools: options.tools == null ? void 0 : turnStartConfig.tools,
             turnStartConfig
           });
@@ -1785,6 +1875,7 @@ function createSession({
             builtinTools: turnStartConfig.builtinTools,
             permissionMode: turnStartConfig.permissionMode,
             permissionModeMapping: turnStartConfig.permissionModeMapping,
+            ...mcpServers == null ? {} : { mcpServers },
             tools: turnStartConfig.tools,
             turnStartConfig,
             recoveryMode: {
@@ -1917,7 +2008,8 @@ function validateACPTurnStartConfig({
   authenticationProfile,
   sessionMeta,
   builtinTools,
-  permissionModeMapping
+  permissionModeMapping,
+  mcpServers
 }) {
   const current = createACPTurnStartConfig({
     prompt: turnStartConfig.prompt,
@@ -1925,6 +2017,7 @@ function validateACPTurnStartConfig({
     builtinTools,
     permissionMode: turnStartConfig.permissionMode,
     permissionModeMapping,
+    mcpServers,
     debug: turnStartConfig.debug,
     authenticationProfile,
     sessionMeta
@@ -1943,6 +2036,7 @@ function validateACPColdSessionConfiguration({
   sessionMeta,
   builtinTools,
   permissionModeMapping,
+  mcpServers,
   debug
 }) {
   const current = createACPTurnStartConfig({
@@ -1951,6 +2045,7 @@ function validateACPColdSessionConfiguration({
     builtinTools,
     permissionMode,
     permissionModeMapping,
+    mcpServers,
     debug,
     authenticationProfile,
     sessionMeta
@@ -2000,7 +2095,7 @@ function deserializeBridgeError({
 }
 
 // src/version.ts
-var VERSION = true ? "1.0.0" : "0.0.0-test";
+var VERSION = true ? "1.0.2" : "0.0.0-test";
 
 // src/acp-harness.ts
 var ACP_CLIENT_APP = {
@@ -2042,43 +2137,25 @@ var acpResumeStateSchema = z4.object({
   skillsFingerprint: z4.string().optional()
 });
 function createACP(settings) {
+  if (settings.mcpServers != null && Object.prototype.hasOwnProperty.call(
+    settings.mcpServers,
+    "ai-sdk-harness-tools"
+  )) {
+    throw new Error(
+      'ACP MCP server name "ai-sdk-harness-tools" is reserved for HarnessAgent tools.'
+    );
+  }
   const version = settings.version ?? "v1";
   switch (version) {
     case "v1": {
       const clientApp = settings.clientApp ?? ACP_CLIENT_APP;
-      const providerAuthenticationCompatibility = resolveACPProviderAuthenticationCompatibility({
-        auth: settings.auth,
-        providerAuthentication: settings.providerAuthentication,
-        env: process.env
-      });
-      const implementationIdentity = createImplementationIdentity({
-        harnessId: settings.harnessId,
-        acpVersion: version,
-        implementation: settings.implementation,
-        clientApp,
-        providerAuthentication: providerAuthenticationCompatibility,
-        permissionModeMapping: settings.permissionModeMapping
-      });
-      const authenticationProfile = createACPAuthenticationProfileIdentity({
-        authentication: settings.authentication,
-        providerAuthenticationCompatibility
-      });
-      const lifecycleStateSchema = acpResumeStateSchema.extend({
-        implementationIdentity: z4.literal(implementationIdentity),
-        authenticationProfile: acpResumeStateSchema.shape.authenticationProfile.unwrap().extend({
-          digest: z4.literal(authenticationProfile.digest)
-        }).optional()
-      });
       return createACPV1({
         settings,
         builtinTools: settings.builtinTools ?? ACP_BUILTIN_TOOLS,
         port: settings.port,
         startupTimeoutMs: settings.startupTimeoutMs,
         clientApp,
-        implementationIdentity,
-        authenticationProfile,
-        providerAuthenticationCompatibility,
-        lifecycleStateSchema
+        lifecycleStateSchema: acpResumeStateSchema
       });
     }
     default: