@ai-sdk/harness-acp 1.0.31 → 1.0.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-sdk/harness-acp",
-  "version": "1.0.31",
+  "version": "1.0.33",
   "type": "module",
   "license": "Apache-2.0",
   "sideEffects": false,
@@ -26,8 +26,8 @@
     }
   },
   "dependencies": {
-    "@ai-sdk/harness": "1.0.93",
-    "@ai-sdk/provider-utils": "5.0.33",
+    "@ai-sdk/harness": "1.0.95",
+    "@ai-sdk/provider-utils": "5.0.34",
     "ws": "^8.21.0"
   },
   "peerDependencies": {

package/src/acp-harness.ts

@@ -48,11 +48,12 @@ export 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.
    */
@@ -114,6 +115,8 @@ const acpResumeStateSchema = z.object({
   skillsDirectory: z.string().optional(),
 });
 
+type ACPBridgeCoords = z.infer<typeof acpBridgeCoordsSchema>;
+
 export function createACP<TBuiltinTools extends ToolSet = {}>(
   settings: ACPHarnessSettings<TBuiltinTools>,
 ): HarnessV1<TBuiltinTools> {
@@ -148,7 +151,9 @@ export function createACP<TBuiltinTools extends ToolSet = {}>(
         portEndpoint: settings.portEndpoint,
         startupTimeoutMs: settings.startupTimeoutMs,
         clientApp,
-        lifecycleStateSchema: acpResumeStateSchema,
+        lifecycleStateSchema: acpResumeStateSchema satisfies z.ZodType<{
+          bridge?: ACPBridgeCoords;
+        }>,
       });
     }
     default:

package/src/index.ts

@@ -24,8 +24,7 @@ export type {
   ACPAuthentication,
   ACPInstallCommandSource,
   ACPInstructionMapping,
-  ACPModelResolution,
-  ACPModelResolver,
+  ACPModelMapping,
   ACPNpmLockedSource,
   ACPNpmSimpleSource,
   ACPOutputSchemaMapping,

package/src/v1/{acp-bootstrap.ts → acp-v1-bootstrap.ts}

@@ -120,31 +120,23 @@ export function createACPBootstrap({
 }
 
 async function readBridgeAsset({ name }: { name: string }): Promise<string> {
-  const candidates = resolveBridgeAssetCandidates({
-    name,
-    moduleUrl: import.meta.url,
-  });
-  let lastError: unknown;
-  for (const url of candidates) {
-    try {
-      return await readFile(fileURLToPath(url), 'utf8');
-    } catch (error) {
-      if ((error as NodeJS.ErrnoException).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',
+  );
 }
 
-export function resolveBridgeAssetCandidates({
+export function resolveBridgeAssetUrl({
   name,
   moduleUrl,
 }: {
   name: string;
   moduleUrl: string | URL;
-}): URL[] {
-  return [
-    new URL(`./bridge/${name}`, moduleUrl),
-    new URL(`../bridge/${name}`, moduleUrl),
-  ];
+}): URL {
+  return new URL(`./bridge/${name}`, moduleUrl);
 }

package/src/v1/acp-v1-bridge-protocol.ts

@@ -14,6 +14,7 @@ import { z } from 'zod/v4';
 import type { ACPToolCall } from '../acp-tool-call';
 import type {
   ACPInstructionMapping,
+  ACPModelMapping,
   ACPPermissionModeMapping,
 } from './acp-v1-settings';
 import { acpTextContentBlockSchema } from './acp-v1-prompt';
@@ -125,6 +126,20 @@ const outputSchemaMappingSchema: z.ZodType<ACPSerializableOutputSchemaMapping> =
     path: z.array(z.string().min(1)).min(1),
   });
 
+const modelMappingSchema: z.ZodType<ACPModelMapping> = z.discriminatedUnion(
+  'type',
+  [
+    z.object({
+      type: z.literal('session-config-option'),
+      path: z.string().min(1),
+    }),
+    z.object({
+      type: z.literal('session-model'),
+      path: z.string().min(1),
+    }),
+  ],
+);
+
 export type ACPTurnStartConfig = {
   readonly version: 1;
   readonly configurationFingerprint: string;
@@ -133,6 +148,8 @@ export type ACPTurnStartConfig = {
   readonly builtinTools: Array<ACPBuiltinToolMapping>;
   readonly permissionMode: HarnessV1PermissionMode;
   readonly permissionModeMapping?: ACPPermissionModeMapping;
+  readonly model?: string;
+  readonly modelMapping?: ACPModelMapping;
   readonly debug?: HarnessV1DebugConfig;
   readonly responseFormat?: z.infer<
     typeof harnessV1BridgeStartBaseSchema
@@ -148,6 +165,8 @@ export const acpTurnStartConfigSchema = z.object({
   builtinTools: z.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(),
@@ -156,14 +175,15 @@ export const acpTurnStartConfigSchema = z.object({
 
 export type ACPColdSessionState = Omit<
   ACPTurnStartConfig,
-  'prompt' | 'debug'
-> & {
-  readonly modelId?: string;
-};
+  'prompt' | 'debug' | 'model' | 'modelMapping'
+>;
 
 export const acpColdSessionStateSchema: z.ZodType<ACPColdSessionState> =
-  acpTurnStartConfigSchema.omit({ prompt: true, debug: true }).extend({
-    modelId: z.string().optional(),
+  acpTurnStartConfigSchema.omit({
+    prompt: true,
+    debug: true,
+    model: true,
+    modelMapping: true,
   });
 
 const lossyRecoverySchema = z.object({
@@ -203,6 +223,7 @@ export const startMessageSchema = harnessV1BridgeStartBaseSchema.extend({
   tools: z.array(acpSerializableToolSpecSchema).optional(),
   builtinTools: z.array(builtinToolSchema).readonly().default([]),
   permissionModeMapping: permissionModeMappingSchema.optional(),
+  modelMapping: modelMappingSchema.optional(),
   turnStartConfig: acpTurnStartConfigSchema,
   recoveryMode: z
     .discriminatedUnion('type', [lossyRecoverySchema, coldRestoreSchema])

package/src/v1/acp-v1-harness.ts

@@ -1,4 +1,4 @@
-import { createHash, randomBytes } from 'node:crypto';
+import { createHash } from 'node:crypto';
 import { posix } from 'node:path';
 import {
   HarnessCapabilityUnsupportedError,
@@ -16,6 +16,7 @@ import {
 import { HarnessBridgeCapabilityUnsupportedError } from '@ai-sdk/harness/bridge';
 import {
   applyCredentialForwarding,
+  createBridgeToken,
   createBridgeErrorHandler,
   createBridgeStartupError,
   createSandboxCredentialEnvironment,
@@ -30,6 +31,7 @@ import {
   shellQuote,
   warnCredentialBrokeringUnavailable,
   waitForBridgeReady,
+  withBridgeToken,
 } from '@ai-sdk/harness/utils';
 import {
   asSchema,
@@ -53,7 +55,7 @@ import {
   resolveImplementationEnvironment,
   validateACPV1Implementation,
 } from './implementation';
-import { createACPBootstrap } from './acp-bootstrap';
+import { createACPBootstrap } from './acp-v1-bootstrap';
 import {
   outboundMessageSchema,
   type ACPBuiltinToolMapping,
@@ -80,6 +82,7 @@ import {
 } from './acp-v1-prompt';
 import type {
   ACPInstructionMapping,
+  ACPModelMapping,
   ACPOutputSchemaMapping,
   ACPPermissionModeMapping,
   ACPPermissionModeTarget,
@@ -158,11 +161,11 @@ export function createACPV1<TBuiltinTools extends ToolSet = {}>({
       `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,
@@ -186,24 +189,6 @@ export function createACPV1<TBuiltinTools extends ToolSet = {}>({
             'ACP built-in tool filtering is not available in this initial ACP v1 implementation.',
         });
       }
-      const modelId = startOptions.model ?? settings.modelId;
-      const modelConfiguration =
-        modelId == null ? undefined : 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({
@@ -221,6 +206,8 @@ export function createACPV1<TBuiltinTools extends ToolSet = {}>({
         acpVersion: 'v1',
         implementation,
         clientApp,
+        clientCapabilities: settings.clientCapabilities,
+        modelMapping: settings.modelMapping,
         providerAuthentication: providerAuthenticationCompatibility,
         permissionModeMapping: settings.permissionModeMapping,
       });
@@ -452,7 +439,8 @@ export function createACPV1<TBuiltinTools extends ToolSet = {}>({
               harnessId: settings.harnessId,
               channel: attachChannel,
               proc: undefined,
-              modelId,
+              modelMapping: settings.modelMapping,
+              defaultModelId: settings.modelId,
               sessionMeta: settings.session?.meta,
               instructionMapping: settings.instructionMapping,
               outputSchemaMapping: settings.outputSchemaMapping,
@@ -518,6 +506,7 @@ export function createACPV1<TBuiltinTools extends ToolSet = {}>({
                   sessionMeta: settings.session?.meta,
                   instructionMapping: settings.instructionMapping,
                   outputSchemaMapping: settings.outputSchemaMapping,
+                  modelMapping: settings.modelMapping,
                   builtinTools: builtinToolCatalog,
                   permissionModeMapping,
                   mcpServers: settings.mcpServers,
@@ -544,12 +533,12 @@ export function createACPV1<TBuiltinTools extends ToolSet = {}>({
           }
           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,
@@ -579,7 +568,7 @@ export function createACPV1<TBuiltinTools extends ToolSet = {}>({
       });
       const token =
         settings.mintBridgeToken == null
-          ? randomBytes(32).toString('hex')
+          ? createBridgeToken()
           : settings.mintBridgeToken(sandboxId!);
       await toolSafeSandboxSession.run({
         command: `mkdir -p ${shellQuote(workDir)} ${shellQuote(bridgeStateDir)}`,
@@ -608,8 +597,7 @@ export function createACPV1<TBuiltinTools extends ToolSet = {}>({
             providerEnvironment:
               sandboxProviderEnvironment == null ? undefined : {},
             sessionMeta: settings.session?.meta,
-            implementationArgs: modelConfiguration?.args,
-            implementationEnv: modelConfiguration?.env,
+            clientCapabilities: settings.clientCapabilities,
           }),
           ...sandboxProviderAuthenticationEnvironment,
           BRIDGE_CHANNEL_TOKEN: token,
@@ -722,7 +710,8 @@ export function createACPV1<TBuiltinTools extends ToolSet = {}>({
         harnessId: settings.harnessId,
         channel,
         proc,
-        modelId,
+        modelMapping: settings.modelMapping,
+        defaultModelId: settings.modelId,
         sessionMeta: settings.session?.meta,
         instructionMapping: settings.instructionMapping,
         outputSchemaMapping: settings.outputSchemaMapping,
@@ -945,18 +934,6 @@ function openWebSocket({
   });
 }
 
-function withBridgeToken({
-  endpoint,
-  token,
-}: {
-  endpoint: HarnessV1PortEndpoint;
-  token: string;
-}): HarnessV1PortEndpoint {
-  const bridgeUrl = new URL(endpoint.url);
-  bridgeUrl.searchParams.set('agent_bridge_token', token);
-  return { ...endpoint, url: bridgeUrl.toString() };
-}
-
 function restoreColdACPSession({
   channel,
   harnessId,
@@ -1046,7 +1023,8 @@ function createSession({
   harnessId,
   channel,
   proc,
-  modelId,
+  modelMapping,
+  defaultModelId,
   sessionMeta,
   instructionMapping,
   outputSchemaMapping,
@@ -1081,7 +1059,8 @@ function createSession({
   harnessId: string;
   channel: ACPChannel;
   proc: Experimental_SandboxProcess | undefined;
-  modelId: string | undefined;
+  modelMapping: ACPModelMapping;
+  defaultModelId: string | undefined;
   sessionMeta: Readonly<Record<string, ACPSerializableValue>> | undefined;
   instructionMapping: ACPInstructionMapping | undefined;
   outputSchemaMapping: ACPOutputSchemaMapping | undefined;
@@ -1375,7 +1354,6 @@ function createSession({
       : {
           coldSession: createACPColdSessionState({
             turnStartConfig: latestTurnStartConfig,
-            modelId,
           }),
         }),
     ...(!includeTurnStartConfig || latestTurnStartConfig == null
@@ -1407,7 +1385,6 @@ function createSession({
   return {
     sessionId,
     isResume,
-    ...(modelId == null ? {} : { modelId }),
     doPromptTurn: async options => {
       await synchronizeSkills({
         skills: options.skills,
@@ -1442,6 +1419,7 @@ function createSession({
         prompt: options.prompt,
         harnessId,
       });
+      const model = options.model ?? defaultModelId;
       const turnStartConfig = createACPTurnStartConfig({
         prompt,
         tools: options.tools ?? [],
@@ -1455,6 +1433,8 @@ function createSession({
         instructionMapping,
         responseFormat: options.responseFormat,
         outputSchemaMapping,
+        model,
+        modelMapping,
       });
       const nextInstructionsFingerprint = fingerprintValue({
         value: options.instructions ?? null,
@@ -1491,6 +1471,7 @@ function createSession({
             builtinTools,
             permissionMode,
             permissionModeMapping,
+            ...(model == null ? {} : { model, modelMapping }),
             ...(options.responseFormat == null
               ? {}
               : { responseFormat: options.responseFormat }),
@@ -1554,6 +1535,12 @@ 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 }),
@@ -1751,6 +1738,7 @@ function validateACPTurnStartConfig({
   sessionMeta,
   instructionMapping,
   outputSchemaMapping,
+  modelMapping,
   builtinTools,
   permissionModeMapping,
   mcpServers,
@@ -1760,6 +1748,7 @@ function validateACPTurnStartConfig({
   sessionMeta: Readonly<Record<string, ACPSerializableValue>> | undefined;
   instructionMapping: ACPInstructionMapping | undefined;
   outputSchemaMapping: ACPOutputSchemaMapping | undefined;
+  modelMapping: ACPModelMapping;
   builtinTools: ReadonlyArray<ACPBuiltinToolMapping>;
   permissionModeMapping: ACPPermissionModeMapping | undefined;
   mcpServers: Record<string, unknown> | undefined;
@@ -1777,6 +1766,8 @@ function validateACPTurnStartConfig({
     instructionMapping,
     responseFormat: turnStartConfig.responseFormat,
     outputSchemaMapping,
+    model: turnStartConfig.model,
+    modelMapping,
   });
   if (
     current.configurationFingerprint !==
@@ -1790,24 +1781,24 @@ function validateACPTurnStartConfig({
 
 function validateACPColdSessionConfiguration({
   coldSession,
-  modelId,
   permissionMode,
   authenticationProfile,
   sessionMeta,
   instructionMapping,
   outputSchemaMapping,
+  modelMapping,
   builtinTools,
   permissionModeMapping,
   mcpServers,
   debug,
 }: {
   coldSession: ACPColdSessionState;
-  modelId: string | undefined;
   permissionMode: NonNullable<StartMessage['permissionMode']>;
   authenticationProfile: ACPAuthenticationProfileIdentity;
   sessionMeta: Readonly<Record<string, ACPSerializableValue>> | undefined;
   instructionMapping: ACPInstructionMapping | undefined;
   outputSchemaMapping: ACPOutputSchemaMapping | undefined;
+  modelMapping: ACPModelMapping;
   builtinTools: ReadonlyArray<ACPBuiltinToolMapping>;
   permissionModeMapping: ACPPermissionModeMapping | undefined;
   mcpServers: Record<string, unknown> | undefined;
@@ -1826,11 +1817,12 @@ function validateACPColdSessionConfiguration({
     instructionMapping,
     responseFormat: coldSession.responseFormat,
     outputSchemaMapping,
+    model: undefined,
+    modelMapping,
   });
   if (
     current.configurationFingerprint !== coldSession.configurationFingerprint ||
-    coldSession.permissionMode !== permissionMode ||
-    coldSession.modelId !== modelId
+    coldSession.permissionMode !== permissionMode
   ) {
     throw new Error(
       'ACP cold-session state is incompatible with the current non-secret session configuration.',

package/src/v1/acp-v1-settings.ts

@@ -75,20 +75,15 @@ export type ACPProviderAuthentication = {
   };
 };
 
-export 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>>;
-};
-
-export type ACPModelResolver = (options: {
-  readonly model: string;
-}) => ACPModelResolution;
+export type ACPModelMapping =
+  | {
+      readonly type: 'session-config-option';
+      readonly path: string;
+    }
+  | {
+      readonly type: 'session-model';
+      readonly path: string;
+    };
 
 export type ACPCredentialBrokering = ({
   env,
@@ -158,11 +153,12 @@ export 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.
    */

package/src/v1/acp-v1-turn-start-config.ts

@@ -11,6 +11,7 @@ import {
 import type { ACPTextContentBlock } from './acp-v1-prompt';
 import type {
   ACPInstructionMapping,
+  ACPModelMapping,
   ACPOutputSchemaMapping,
   ACPPermissionModeMapping,
   ACPSerializableValue,
@@ -29,6 +30,8 @@ export function createACPTurnStartConfig({
   instructionMapping,
   responseFormat,
   outputSchemaMapping,
+  model,
+  modelMapping,
 }: {
   prompt: ReadonlyArray<ACPTextContentBlock>;
   tools: ReadonlyArray<HarnessV1ToolSpec>;
@@ -42,6 +45,8 @@ export function createACPTurnStartConfig({
   instructionMapping: ACPInstructionMapping | undefined;
   responseFormat: StartMessage['responseFormat'];
   outputSchemaMapping: ACPOutputSchemaMapping | undefined;
+  model: string | undefined;
+  modelMapping: ACPModelMapping;
 }): ACPTurnStartConfig {
   return {
     version: 1,
@@ -52,6 +57,7 @@ export function createACPTurnStartConfig({
           sessionMeta: sessionMeta ?? null,
           ...(instructionMapping == null ? {} : { instructionMapping }),
           ...(outputSchemaMapping == null ? {} : { outputSchemaMapping }),
+          modelMapping,
           builtinTools,
           permissionModeMapping: permissionModeMapping ?? null,
           mcpServers: mcpServers ?? null,
@@ -62,6 +68,7 @@ export function createACPTurnStartConfig({
     tools: tools.map(tool => acpSerializableToolSpecSchema.parse(tool)),
     builtinTools: [...builtinTools],
     permissionMode,
+    ...(model == null ? {} : { model, modelMapping }),
     ...(responseFormat == null ? {} : { responseFormat }),
     ...(outputSchemaMapping == null
       ? {}
@@ -78,10 +85,8 @@ export function createACPTurnStartConfig({
 
 export function createACPColdSessionState({
   turnStartConfig,
-  modelId,
 }: {
   turnStartConfig: ACPTurnStartConfig;
-  modelId: string | undefined;
 }): ACPColdSessionState {
   return {
     version: turnStartConfig.version,
@@ -98,7 +103,6 @@ export function createACPColdSessionState({
     ...(turnStartConfig.permissionModeMapping == null
       ? {}
       : { permissionModeMapping: turnStartConfig.permissionModeMapping }),
-    ...(modelId == null ? {} : { modelId }),
   };
 }
 

package/src/v1/bridge/acp-v1-bridge-environment.ts

@@ -59,8 +59,7 @@ export type ACPBridgeConfiguration = {
   readonly providerAuthentication?: ACPResolvedProviderAuthentication;
   readonly providerEnvironment?: Readonly<Record<string, string>>;
   readonly sessionMeta?: Readonly<Record<string, ACPSerializableValue>>;
-  readonly implementationArgs?: ReadonlyArray<string>;
-  readonly implementationEnv?: Readonly<Record<string, string>>;
+  readonly clientCapabilities?: Readonly<Record<string, ACPSerializableValue>>;
 };
 
 const bridgeConfigurationSchema: z.ZodType<ACPBridgeConfiguration> = z.object({
@@ -68,8 +67,7 @@ const bridgeConfigurationSchema: z.ZodType<ACPBridgeConfiguration> = z.object({
   providerAuthentication: providerAuthenticationSchema.optional(),
   providerEnvironment: z.record(z.string(), z.string()).optional(),
   sessionMeta: serializableRecordSchema.optional(),
-  implementationArgs: z.array(z.string()).optional(),
-  implementationEnv: z.record(z.string(), z.string()).optional(),
+  clientCapabilities: serializableRecordSchema.optional(),
 });
 
 export function createACPBridgeEnvironment({
@@ -77,8 +75,7 @@ export function createACPBridgeEnvironment({
   providerAuthentication,
   providerEnvironment,
   sessionMeta,
-  implementationArgs,
-  implementationEnv,
+  clientCapabilities,
 }: ACPBridgeConfiguration): Record<string, string> {
   return {
     [ACP_BRIDGE_CONFIGURATION_ENV]: JSON.stringify({
@@ -86,8 +83,7 @@ export function createACPBridgeEnvironment({
       ...(providerAuthentication == null ? {} : { providerAuthentication }),
       ...(providerEnvironment == null ? {} : { providerEnvironment }),
       ...(sessionMeta == null ? {} : { sessionMeta }),
-      ...(implementationArgs == null ? {} : { implementationArgs }),
-      ...(implementationEnv == null ? {} : { implementationEnv }),
+      ...(clientCapabilities == null ? {} : { clientCapabilities }),
     }),
   };
 }

package/src/v1/bridge/index.ts

@@ -44,6 +44,7 @@ import {
 } from './refresh-host-tool-catalog';
 import { createACPPermissionController } from './permission-controller';
 import { configureACPPermissionMode } from './permission-mode';
+import { configureACPModel } from './model-mapping';
 import {
   assertACPResumeCapability,
   createACPRecoveredSession,
@@ -214,6 +215,13 @@ async function runTurn(start: StartMessage, turn: BridgeTurn): Promise<void> {
     return;
   }
 
+  await configureACPModel({
+    agent: connection!.agent,
+    sessionId: activeSession.sessionId,
+    model: start.model,
+    mapping: start.modelMapping,
+  });
+
   let rejectCancellationFailure!: (error: unknown) => void;
   const cancellationFailure = new Promise<never>((_, reject) => {
     rejectCancellationFailure = reject;
@@ -419,12 +427,11 @@ async function ensureSession({
         implementationDir,
         privateHome: implementation.privateHome,
       }),
-      ...bridgeConfiguration.implementationEnv,
     },
   });
   child = spawn(
     `${implementationDir}/${implementation.executablePath}`,
-    [...(bridgeConfiguration.implementationArgs ?? implementation.args)],
+    [...implementation.args],
     {
       cwd: workDir,
       env: instructionConfiguration.environment,
@@ -475,6 +482,7 @@ async function ensureSession({
     protocolVersion: acp.PROTOCOL_VERSION,
     clientApp,
     authentication,
+    clientCapabilities: bridgeConfiguration.clientCapabilities,
     supportsBooleanSessionConfigOptions: Object.values(
       start.permissionModeMapping ?? {},
     ).some(