@ai-sdk/harness-acp 1.0.31 → 1.0.33

package/dist/index.d.ts

@@ -145,19 +145,13 @@ type ACPProviderAuthentication = {
         readonly env: Readonly<Record<string, ACPProfileValue>>;
     };
 };
-type ACPModelResolution = {
-    /**
-     * Replaces the implementation's static launch arguments.
-     */
-    readonly args?: ReadonlyArray<string>;
-    /**
-     * Overlays the implementation's static launch environment.
-     */
-    readonly env?: Readonly<Record<string, string>>;
+type ACPModelMapping = {
+    readonly type: 'session-config-option';
+    readonly path: string;
+} | {
+    readonly type: 'session-model';
+    readonly path: string;
 };
-type ACPModelResolver = (options: {
-    readonly model: string;
-}) => ACPModelResolution;
 type ACPCredentialBrokering = ({ env, sandboxEnv, }: {
     env: Readonly<Record<string, string>>;
     sandboxEnv?: Readonly<Record<string, string>>;
@@ -212,11 +206,12 @@ type ACPV1Settings = {
      */
     readonly env?: Readonly<Record<string, string>>;
     readonly authentication?: ACPAuthentication;
+    readonly clientCapabilities?: Readonly<Record<string, ACPSerializableValue>>;
     readonly providerAuthentication?: ACPProviderAuthentication;
     /**
-     * Maps a HarnessAgent model identifier to implementation launch settings.
+     * Maps the HarnessAgent model identifier to an ACP session operation.
      */
-    readonly resolveModel: ACPModelResolver;
+    readonly modelMapping: ACPModelMapping;
     /**
      * @deprecated Use `model` on `HarnessAgent` instead.
      */
@@ -287,11 +282,12 @@ type ACPHarnessSettings<TBuiltinTools extends ToolSet = {}> = {
     readonly credentialForwarding?: ACPV1Settings['credentialForwarding'];
     readonly env?: ACPV1Settings['env'];
     readonly authentication?: ACPV1Settings['authentication'];
+    readonly clientCapabilities?: ACPV1Settings['clientCapabilities'];
     readonly providerAuthentication?: ACPV1Settings['providerAuthentication'];
     /**
-     * Maps a HarnessAgent model identifier to implementation launch settings.
+     * Maps the HarnessAgent model identifier to an ACP session operation.
      */
-    readonly resolveModel: ACPV1Settings['resolveModel'];
+    readonly modelMapping: ACPV1Settings['modelMapping'];
     /**
      * @deprecated Use `model` on `HarnessAgent` instead.
      */
@@ -307,4 +303,4 @@ declare function createACP<TBuiltinTools extends ToolSet = {}>(settings: ACPHarn
 
 declare const VERSION: string;
 
-export { type ACPAnnotations, type ACPAudioContent, type ACPAuthentication, type ACPAuthenticationMode, type ACPBlobResourceContents, type ACPClientApp, type ACPContentBlock, type ACPCredentialBrokering, type ACPEmbeddedResource, type ACPHarnessSettings, type ACPImageContent, type ACPInstallCommandSource, type ACPInstructionMapping, type ACPMetadata, type ACPModelResolution, type ACPModelResolver, type ACPNpmLockedSource, type ACPNpmSimpleSource, type ACPOutputSchemaMapping, type ACPPermissionModeMapping, type ACPPermissionModeTarget, type ACPProfileValue, type ACPProviderAuthentication, type ACPResourceLink, type ACPRole, type ACPSerializablePrimitive, type ACPSerializableValue, type ACPSource, type ACPTextContent, type ACPTextResourceContents, type ACPToolCall, type ACPToolCallContent, type ACPToolCallLocation, type ACPToolCallStatus, type ACPToolKind, type ACPV1Settings, type ACPValueSource, VERSION, createACP };
+export { type ACPAnnotations, type ACPAudioContent, type ACPAuthentication, type ACPAuthenticationMode, type ACPBlobResourceContents, type ACPClientApp, type ACPContentBlock, type ACPCredentialBrokering, type ACPEmbeddedResource, type ACPHarnessSettings, type ACPImageContent, type ACPInstallCommandSource, type ACPInstructionMapping, type ACPMetadata, type ACPModelMapping, type ACPNpmLockedSource, type ACPNpmSimpleSource, type ACPOutputSchemaMapping, type ACPPermissionModeMapping, type ACPPermissionModeTarget, type ACPProfileValue, type ACPProviderAuthentication, type ACPResourceLink, type ACPRole, type ACPSerializablePrimitive, type ACPSerializableValue, type ACPSource, type ACPTextContent, type ACPTextResourceContents, type ACPToolCall, type ACPToolCallContent, type ACPToolCallLocation, type ACPToolCallStatus, type ACPToolKind, type ACPV1Settings, type ACPValueSource, VERSION, createACP };

package/dist/index.js

@@ -2,7 +2,7 @@
 import { z as z4 } from "zod/v4";
 
 // src/v1/acp-v1-harness.ts
-import { createHash as createHash5, randomBytes } from "crypto";
+import { createHash as createHash5 } from "crypto";
 import { posix } from "path";
 import {
   HarnessCapabilityUnsupportedError as HarnessCapabilityUnsupportedError2,
@@ -11,6 +11,7 @@ import {
 import { HarnessBridgeCapabilityUnsupportedError } from "@ai-sdk/harness/bridge";
 import {
   applyCredentialForwarding,
+  createBridgeToken,
   createBridgeErrorHandler,
   createBridgeStartupError,
   createSandboxCredentialEnvironment,
@@ -24,7 +25,8 @@ import {
   SandboxChannel,
   shellQuote,
   warnCredentialBrokeringUnavailable,
-  waitForBridgeReady
+  waitForBridgeReady,
+  withBridgeToken
 } from "@ai-sdk/harness/utils";
 import {
   asSchema
@@ -311,6 +313,8 @@ function createImplementationIdentity({
   acpVersion,
   implementation,
   clientApp,
+  clientCapabilities,
+  modelMapping,
   providerAuthentication,
   permissionModeMapping
 }) {
@@ -344,6 +348,8 @@ function createImplementationIdentity({
     executable: implementation.executable,
     args: implementation.args ?? [],
     clientApp,
+    clientCapabilities: clientCapabilities ?? null,
+    modelMapping,
     environment: {
       forwarded: forwardedEnvironment,
       credential: credentialEnvironment,
@@ -470,7 +476,7 @@ function sortValue({ value }) {
   return value;
 }
 
-// src/v1/acp-bootstrap.ts
+// src/v1/acp-v1-bootstrap.ts
 import { readFile } from "fs/promises";
 import { fileURLToPath } from "url";
 function createACPBootstrap({
@@ -565,29 +571,21 @@ function createACPBootstrap({
   };
 }
 async function readBridgeAsset({ name }) {
-  const candidates = resolveBridgeAssetCandidates({
-    name,
-    moduleUrl: import.meta.url
-  });
-  let lastError;
-  for (const url of candidates) {
-    try {
-      return await readFile(fileURLToPath(url), "utf8");
-    } catch (error) {
-      if (error.code !== "ENOENT") throw error;
-      lastError = error;
-    }
-  }
-  throw lastError ?? new Error(`ACP bridge asset not found: ${name}`);
+  return readFile(
+    fileURLToPath(
+      resolveBridgeAssetUrl({
+        name,
+        moduleUrl: import.meta.url
+      })
+    ),
+    "utf8"
+  );
 }
-function resolveBridgeAssetCandidates({
+function resolveBridgeAssetUrl({
   name,
   moduleUrl
 }) {
-  return [
-    new URL(`./bridge/${name}`, moduleUrl),
-    new URL(`../bridge/${name}`, moduleUrl)
-  ];
+  return new URL(`./bridge/${name}`, moduleUrl);
 }
 
 // src/v1/acp-v1-bridge-protocol.ts
@@ -729,6 +727,19 @@ var outputSchemaMappingSchema = z2.object({
   type: z2.literal("session-prompt-meta"),
   path: z2.array(z2.string().min(1)).min(1)
 });
+var modelMappingSchema = z2.discriminatedUnion(
+  "type",
+  [
+    z2.object({
+      type: z2.literal("session-config-option"),
+      path: z2.string().min(1)
+    }),
+    z2.object({
+      type: z2.literal("session-model"),
+      path: z2.string().min(1)
+    })
+  ]
+);
 var acpTurnStartConfigSchema = z2.object({
   version: z2.literal(1),
   configurationFingerprint: z2.string(),
@@ -737,12 +748,17 @@ var acpTurnStartConfigSchema = z2.object({
   builtinTools: z2.array(builtinToolSchema).default([]),
   permissionMode: harnessV1BridgeStartBaseSchema.shape.permissionMode.unwrap(),
   permissionModeMapping: permissionModeMappingSchema.optional(),
+  model: harnessV1BridgeStartBaseSchema.shape.model.optional(),
+  modelMapping: modelMappingSchema.optional(),
   debug: harnessV1BridgeStartBaseSchema.shape.debug.optional(),
   responseFormat: harnessV1BridgeStartBaseSchema.shape.responseFormat.optional(),
   outputSchemaMapping: outputSchemaMappingSchema.optional()
 });
-var acpColdSessionStateSchema = acpTurnStartConfigSchema.omit({ prompt: true, debug: true }).extend({
-  modelId: z2.string().optional()
+var acpColdSessionStateSchema = acpTurnStartConfigSchema.omit({
+  prompt: true,
+  debug: true,
+  model: true,
+  modelMapping: true
 });
 var lossyRecoverySchema = z2.object({
   type: z2.literal("lossy-rerun"),
@@ -772,6 +788,7 @@ var startMessageSchema = harnessV1BridgeStartBaseSchema.extend({
   tools: z2.array(acpSerializableToolSpecSchema).optional(),
   builtinTools: z2.array(builtinToolSchema).readonly().default([]),
   permissionModeMapping: permissionModeMappingSchema.optional(),
+  modelMapping: modelMappingSchema.optional(),
   turnStartConfig: acpTurnStartConfigSchema,
   recoveryMode: z2.discriminatedUnion("type", [lossyRecoverySchema, coldRestoreSchema]).optional()
 });
@@ -826,16 +843,14 @@ var bridgeConfigurationSchema = z3.object({
   providerAuthentication: providerAuthenticationSchema.optional(),
   providerEnvironment: z3.record(z3.string(), z3.string()).optional(),
   sessionMeta: serializableRecordSchema.optional(),
-  implementationArgs: z3.array(z3.string()).optional(),
-  implementationEnv: z3.record(z3.string(), z3.string()).optional()
+  clientCapabilities: serializableRecordSchema.optional()
 });
 function createACPBridgeEnvironment({
   authentication,
   providerAuthentication,
   providerEnvironment,
   sessionMeta,
-  implementationArgs,
-  implementationEnv
+  clientCapabilities
 }) {
   return {
     [ACP_BRIDGE_CONFIGURATION_ENV]: JSON.stringify({
@@ -843,8 +858,7 @@ function createACPBridgeEnvironment({
       ...providerAuthentication == null ? {} : { providerAuthentication },
       ...providerEnvironment == null ? {} : { providerEnvironment },
       ...sessionMeta == null ? {} : { sessionMeta },
-      ...implementationArgs == null ? {} : { implementationArgs },
-      ...implementationEnv == null ? {} : { implementationEnv }
+      ...clientCapabilities == null ? {} : { clientCapabilities }
     })
   };
 }
@@ -958,7 +972,9 @@ function createACPTurnStartConfig({
   sessionMeta,
   instructionMapping,
   responseFormat,
-  outputSchemaMapping
+  outputSchemaMapping,
+  model,
+  modelMapping
 }) {
   return {
     version: 1,
@@ -968,6 +984,7 @@ function createACPTurnStartConfig({
         sessionMeta: sessionMeta ?? null,
         ...instructionMapping == null ? {} : { instructionMapping },
         ...outputSchemaMapping == null ? {} : { outputSchemaMapping },
+        modelMapping,
         builtinTools,
         permissionModeMapping: permissionModeMapping ?? null,
         mcpServers: mcpServers ?? null
@@ -977,6 +994,7 @@ function createACPTurnStartConfig({
     tools: tools.map((tool) => acpSerializableToolSpecSchema.parse(tool)),
     builtinTools: [...builtinTools],
     permissionMode,
+    ...model == null ? {} : { model, modelMapping },
     ...responseFormat == null ? {} : { responseFormat },
     ...outputSchemaMapping == null ? {} : {
       outputSchemaMapping: {
@@ -989,8 +1007,7 @@ function createACPTurnStartConfig({
   };
 }
 function createACPColdSessionState({
-  turnStartConfig,
-  modelId
+  turnStartConfig
 }) {
   return {
     version: turnStartConfig.version,
@@ -1000,8 +1017,7 @@ function createACPColdSessionState({
     permissionMode: turnStartConfig.permissionMode,
     ...turnStartConfig.responseFormat == null ? {} : { responseFormat: turnStartConfig.responseFormat },
     ...turnStartConfig.outputSchemaMapping == null ? {} : { outputSchemaMapping: turnStartConfig.outputSchemaMapping },
-    ...turnStartConfig.permissionModeMapping == null ? {} : { permissionModeMapping: turnStartConfig.permissionModeMapping },
-    ...modelId == null ? {} : { modelId }
+    ...turnStartConfig.permissionModeMapping == null ? {} : { permissionModeMapping: turnStartConfig.permissionModeMapping }
   };
 }
 function stableStringify3(value) {
@@ -1222,11 +1238,11 @@ function createACPV1({
       `ACP harnessId must be a stable kebab-case identifier; received ${JSON.stringify(settings.harnessId)}.`
     );
   }
-  const baseImplementation = createACPV1Implementation({ settings });
-  validateACPV1Implementation(baseImplementation);
+  const implementation = createACPV1Implementation({ settings });
+  validateACPV1Implementation(implementation);
   const bootstrap = createACPBootstrap({
     harnessId: settings.harnessId,
-    implementation: baseImplementation
+    implementation
   });
   const permissionModeMapping = isCompletePermissionModeMapping({
     value: settings.permissionModeMapping
@@ -1246,19 +1262,6 @@ function createACPV1({
           message: "ACP built-in tool filtering is not available in this initial ACP v1 implementation."
         });
       }
-      const modelId = startOptions.model ?? settings.modelId;
-      const modelConfiguration = modelId == null ? void 0 : settings.resolveModel({ model: modelId });
-      const implementation = {
-        ...baseImplementation,
-        ...modelConfiguration?.args == null ? {} : { args: modelConfiguration.args },
-        ...modelConfiguration?.env == null ? {} : {
-          env: {
-            ...baseImplementation.env,
-            ...modelConfiguration.env
-          }
-        }
-      };
-      validateACPV1Implementation(implementation);
       const permissionMode = startOptions.permissionMode ?? "allow-all";
       const env = { ...process.env };
       const authenticationEnvironment = resolveACPAuthenticationEnvironment({
@@ -1275,6 +1278,8 @@ function createACPV1({
         acpVersion: "v1",
         implementation,
         clientApp,
+        clientCapabilities: settings.clientCapabilities,
+        modelMapping: settings.modelMapping,
         providerAuthentication: providerAuthenticationCompatibility,
         permissionModeMapping: settings.permissionModeMapping
       });
@@ -1468,7 +1473,8 @@ function createACPV1({
               harnessId: settings.harnessId,
               channel: attachChannel,
               proc: void 0,
-              modelId,
+              modelMapping: settings.modelMapping,
+              defaultModelId: settings.modelId,
               sessionMeta: settings.session?.meta,
               instructionMapping: settings.instructionMapping,
               outputSchemaMapping: settings.outputSchemaMapping,
@@ -1533,6 +1539,7 @@ function createACPV1({
                   sessionMeta: settings.session?.meta,
                   instructionMapping: settings.instructionMapping,
                   outputSchemaMapping: settings.outputSchemaMapping,
+                  modelMapping: settings.modelMapping,
                   builtinTools: builtinToolCatalog,
                   permissionModeMapping,
                   mcpServers: settings.mcpServers
@@ -1558,12 +1565,12 @@ function createACPV1({
           }
           const turnStartConfig = validateACPColdSessionConfiguration({
             coldSession,
-            modelId,
             permissionMode,
             authenticationProfile,
             sessionMeta: settings.session?.meta,
             instructionMapping: settings.instructionMapping,
             outputSchemaMapping: settings.outputSchemaMapping,
+            modelMapping: settings.modelMapping,
             builtinTools: builtinToolCatalog,
             permissionModeMapping,
             mcpServers: settings.mcpServers,
@@ -1586,7 +1593,7 @@ function createACPV1({
         override: portOverride,
         harnessId: settings.harnessId
       });
-      const token = settings.mintBridgeToken == null ? randomBytes(32).toString("hex") : settings.mintBridgeToken(sandboxId);
+      const token = settings.mintBridgeToken == null ? createBridgeToken() : settings.mintBridgeToken(sandboxId);
       await toolSafeSandboxSession.run({
         command: `mkdir -p ${shellQuote(workDir)} ${shellQuote(bridgeStateDir)}`,
         abortSignal: startOptions.abortSignal
@@ -1606,8 +1613,7 @@ function createACPV1({
             providerAuthentication: resolvedProviderAuthentication.providerAuthentication,
             providerEnvironment: sandboxProviderEnvironment == null ? void 0 : {},
             sessionMeta: settings.session?.meta,
-            implementationArgs: modelConfiguration?.args,
-            implementationEnv: modelConfiguration?.env
+            clientCapabilities: settings.clientCapabilities
           }),
           ...sandboxProviderAuthenticationEnvironment,
           BRIDGE_CHANNEL_TOKEN: token,
@@ -1710,7 +1716,8 @@ function createACPV1({
         harnessId: settings.harnessId,
         channel,
         proc,
-        modelId,
+        modelMapping: settings.modelMapping,
+        defaultModelId: settings.modelId,
         sessionMeta: settings.session?.meta,
         instructionMapping: settings.instructionMapping,
         outputSchemaMapping: settings.outputSchemaMapping,
@@ -1872,14 +1879,6 @@ function openWebSocket({
     ws.once("error", onError);
   });
 }
-function withBridgeToken({
-  endpoint,
-  token
-}) {
-  const bridgeUrl = new URL(endpoint.url);
-  bridgeUrl.searchParams.set("agent_bridge_token", token);
-  return { ...endpoint, url: bridgeUrl.toString() };
-}
 function restoreColdACPSession({
   channel,
   harnessId,
@@ -1954,7 +1953,8 @@ function createSession({
   harnessId,
   channel,
   proc,
-  modelId,
+  modelMapping,
+  defaultModelId,
   sessionMeta,
   instructionMapping,
   outputSchemaMapping,
@@ -2223,8 +2223,7 @@ function createSession({
     ...bridge == null ? {} : { bridge },
     ...latestTurnStartConfig == null ? {} : {
       coldSession: createACPColdSessionState({
-        turnStartConfig: latestTurnStartConfig,
-        modelId
+        turnStartConfig: latestTurnStartConfig
       })
     },
     ...!includeTurnStartConfig || latestTurnStartConfig == null ? {} : { turnStartConfig: latestTurnStartConfig },
@@ -2249,7 +2248,6 @@ function createSession({
   return {
     sessionId,
     isResume,
-    ...modelId == null ? {} : { modelId },
     doPromptTurn: async (options) => {
       await synchronizeSkills({
         skills: options.skills,
@@ -2281,6 +2279,7 @@ function createSession({
         prompt: options.prompt,
         harnessId
       });
+      const model = options.model ?? defaultModelId;
       const turnStartConfig = createACPTurnStartConfig({
         prompt,
         tools: options.tools ?? [],
@@ -2293,7 +2292,9 @@ function createSession({
         sessionMeta,
         instructionMapping,
         responseFormat: options.responseFormat,
-        outputSchemaMapping
+        outputSchemaMapping,
+        model,
+        modelMapping
       });
       const nextInstructionsFingerprint = fingerprintValue({
         value: options.instructions ?? null
@@ -2322,6 +2323,7 @@ function createSession({
             builtinTools,
             permissionMode,
             permissionModeMapping,
+            ...model == null ? {} : { model, modelMapping },
             ...options.responseFormat == null ? {} : { responseFormat: options.responseFormat },
             ...turnStartConfig.outputSchemaMapping == null ? {} : { outputSchemaMapping: turnStartConfig.outputSchemaMapping },
             ...mcpServers == null ? {} : { mcpServers },
@@ -2381,6 +2383,10 @@ function createSession({
             builtinTools: turnStartConfig.builtinTools,
             permissionMode: turnStartConfig.permissionMode,
             permissionModeMapping: turnStartConfig.permissionModeMapping,
+            ...turnStartConfig.model == null ? {} : {
+              model: turnStartConfig.model,
+              modelMapping: turnStartConfig.modelMapping
+            },
             ...turnStartConfig.responseFormat == null ? {} : { responseFormat: turnStartConfig.responseFormat },
             ...turnStartConfig.outputSchemaMapping == null ? {} : { outputSchemaMapping: turnStartConfig.outputSchemaMapping },
             ...instructionMapping == null ? {} : {
@@ -2525,6 +2531,7 @@ function validateACPTurnStartConfig({
   sessionMeta,
   instructionMapping,
   outputSchemaMapping,
+  modelMapping,
   builtinTools,
   permissionModeMapping,
   mcpServers
@@ -2541,7 +2548,9 @@ function validateACPTurnStartConfig({
     sessionMeta,
     instructionMapping,
     responseFormat: turnStartConfig.responseFormat,
-    outputSchemaMapping
+    outputSchemaMapping,
+    model: turnStartConfig.model,
+    modelMapping
   });
   if (current.configurationFingerprint !== turnStartConfig.configurationFingerprint) {
     throw new Error(
@@ -2551,12 +2560,12 @@ function validateACPTurnStartConfig({
 }
 function validateACPColdSessionConfiguration({
   coldSession,
-  modelId,
   permissionMode,
   authenticationProfile,
   sessionMeta,
   instructionMapping,
   outputSchemaMapping,
+  modelMapping,
   builtinTools,
   permissionModeMapping,
   mcpServers,
@@ -2574,9 +2583,11 @@ function validateACPColdSessionConfiguration({
     sessionMeta,
     instructionMapping,
     responseFormat: coldSession.responseFormat,
-    outputSchemaMapping
+    outputSchemaMapping,
+    model: void 0,
+    modelMapping
   });
-  if (current.configurationFingerprint !== coldSession.configurationFingerprint || coldSession.permissionMode !== permissionMode || coldSession.modelId !== modelId) {
+  if (current.configurationFingerprint !== coldSession.configurationFingerprint || coldSession.permissionMode !== permissionMode) {
     throw new Error(
       "ACP cold-session state is incompatible with the current non-secret session configuration."
     );
@@ -2621,7 +2632,7 @@ function deserializeBridgeError({
 }
 
 // src/version.ts
-var VERSION = true ? "1.0.31" : "0.0.0-test";
+var VERSION = true ? "1.0.33" : "0.0.0-test";
 
 // src/acp-harness.ts
 var ACP_CLIENT_APP = {