@ai-sdk/harness-acp 1.0.30 → 1.0.32

package/dist/index.js

@@ -311,6 +311,8 @@ function createImplementationIdentity({
   acpVersion,
   implementation,
   clientApp,
+  clientCapabilities,
+  modelMapping,
   providerAuthentication,
   permissionModeMapping
 }) {
@@ -344,6 +346,8 @@ function createImplementationIdentity({
     executable: implementation.executable,
     args: implementation.args ?? [],
     clientApp,
+    clientCapabilities: clientCapabilities ?? null,
+    modelMapping,
     environment: {
       forwarded: forwardedEnvironment,
       credential: credentialEnvironment,
@@ -659,7 +663,7 @@ function convertHarnessPromptToACPTextBlocks({
   }
   return content;
 }
-function prependACPInitialGuidance({
+function prependACPInstructionGuidance({
   prompt,
   instructions
 }) {
@@ -729,6 +733,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 +754,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 +794,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()
 });
@@ -825,20 +848,23 @@ var bridgeConfigurationSchema = z3.object({
   authentication: authenticationSchema.optional(),
   providerAuthentication: providerAuthenticationSchema.optional(),
   providerEnvironment: z3.record(z3.string(), z3.string()).optional(),
-  sessionMeta: serializableRecordSchema.optional()
+  sessionMeta: serializableRecordSchema.optional(),
+  clientCapabilities: serializableRecordSchema.optional()
 });
 function createACPBridgeEnvironment({
   authentication,
   providerAuthentication,
   providerEnvironment,
-  sessionMeta
+  sessionMeta,
+  clientCapabilities
 }) {
   return {
     [ACP_BRIDGE_CONFIGURATION_ENV]: JSON.stringify({
       ...authentication == null ? {} : { authentication },
       ...providerAuthentication == null ? {} : { providerAuthentication },
       ...providerEnvironment == null ? {} : { providerEnvironment },
-      ...sessionMeta == null ? {} : { sessionMeta }
+      ...sessionMeta == null ? {} : { sessionMeta },
+      ...clientCapabilities == null ? {} : { clientCapabilities }
     })
   };
 }
@@ -952,7 +978,9 @@ function createACPTurnStartConfig({
   sessionMeta,
   instructionMapping,
   responseFormat,
-  outputSchemaMapping
+  outputSchemaMapping,
+  model,
+  modelMapping
 }) {
   return {
     version: 1,
@@ -962,6 +990,7 @@ function createACPTurnStartConfig({
         sessionMeta: sessionMeta ?? null,
         ...instructionMapping == null ? {} : { instructionMapping },
         ...outputSchemaMapping == null ? {} : { outputSchemaMapping },
+        modelMapping,
         builtinTools,
         permissionModeMapping: permissionModeMapping ?? null,
         mcpServers: mcpServers ?? null
@@ -971,6 +1000,7 @@ function createACPTurnStartConfig({
     tools: tools.map((tool) => acpSerializableToolSpecSchema.parse(tool)),
     builtinTools: [...builtinTools],
     permissionMode,
+    ...model == null ? {} : { model, modelMapping },
     ...responseFormat == null ? {} : { responseFormat },
     ...outputSchemaMapping == null ? {} : {
       outputSchemaMapping: {
@@ -983,8 +1013,7 @@ function createACPTurnStartConfig({
   };
 }
 function createACPColdSessionState({
-  turnStartConfig,
-  modelId
+  turnStartConfig
 }) {
   return {
     version: turnStartConfig.version,
@@ -994,8 +1023,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) {
@@ -1021,19 +1049,6 @@ function resolveACPInitialGuidanceApplied({
   if (!isResume) return false;
   return lifecycleState?.initialGuidanceApplied ?? true;
 }
-function shouldMaterializeACPSkills({
-  isResume,
-  lifecycleState,
-  skillsFingerprint,
-  skillsDirectory
-}) {
-  if (isResume && lifecycleState?.skillsFingerprint != null && lifecycleState.skillsFingerprint !== skillsFingerprint) {
-    throw new Error(
-      "ACP lifecycle state was created with a different set of skills."
-    );
-  }
-  return !isResume || lifecycleState?.skillsMaterialized !== true || lifecycleState.skillsDirectory !== skillsDirectory;
-}
 function validateACPLifecycleCompatibility({
   harnessId,
   lifecycleHarnessId,
@@ -1075,24 +1090,6 @@ import path from "path";
 import { writeSkills } from "@ai-sdk/harness/utils";
 var ACP_SKILL_NAME_PATTERN = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 var DEFAULT_ACP_SKILLS_DIRECTORY = ".agents/skills";
-function createACPSkillsFingerprint({
-  skills
-}) {
-  const canonicalSkills = skills.map((skill) => ({
-    name: skill.name,
-    description: skill.description,
-    content: skill.content,
-    files: [...skill.files ?? []].map((file) => ({
-      path: path.posix.normalize(file.path),
-      content: file.content
-    })).sort(
-      (left, right) => compareCanonicalStrings({ left: left.path, right: right.path })
-    )
-  })).sort(
-    (left, right) => compareCanonicalStrings({ left: left.name, right: right.name })
-  );
-  return createHash4("sha256").update(JSON.stringify(canonicalSkills)).digest("hex");
-}
 function resolveACPPrivateSessionDirectory({
   sandboxHomeDir,
   sessionWorkDir,
@@ -1115,24 +1112,21 @@ async function materializeACPSkills({
   rootDir,
   sessionWorkDir,
   skills,
-  shouldMaterialize,
   abortSignal
 }) {
   validateACPSkills({ skills });
   assertOutsideSessionWorkDir({ rootDir, sessionWorkDir });
-  if (shouldMaterialize) {
-    await writeSkills({
-      sandbox,
-      rootDir,
-      skills,
-      abortSignal,
-      skillNamePattern: ACP_SKILL_NAME_PATTERN,
-      invalidSkillNameMessage: ({ name }) => `Invalid ACP skill name ${JSON.stringify(name)}: expected a kebab-case slug.`,
-      invalidSkillFilePathMessage: ({ skillName, filePath }) => `Invalid ACP skill file path ${JSON.stringify(filePath)} for skill ${JSON.stringify(
-        skillName
-      )}: expected a relative POSIX path without traversal.`
-    });
-  }
+  return writeSkills({
+    sandbox,
+    rootDir,
+    skills,
+    abortSignal,
+    skillNamePattern: ACP_SKILL_NAME_PATTERN,
+    invalidSkillNameMessage: ({ name }) => `Invalid ACP skill name ${JSON.stringify(name)}: expected a kebab-case slug.`,
+    invalidSkillFilePathMessage: ({ skillName, filePath }) => `Invalid ACP skill file path ${JSON.stringify(filePath)} for skill ${JSON.stringify(
+      skillName
+    )}: expected a relative POSIX path without traversal.`
+  });
 }
 function resolveACPSkillsDirectory({
   implementationHomeDir,
@@ -1220,12 +1214,6 @@ function assertOutsideSessionWorkDir({
     );
   }
 }
-function compareCanonicalStrings({
-  left,
-  right
-}) {
-  return left < right ? -1 : left > right ? 1 : 0;
-}
 
 // src/v1/acp-v1-harness.ts
 var HARNESS_ID_REGEXP = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
@@ -1296,6 +1284,8 @@ function createACPV1({
         acpVersion: "v1",
         implementation,
         clientApp,
+        clientCapabilities: settings.clientCapabilities,
+        modelMapping: settings.modelMapping,
         providerAuthentication: providerAuthenticationCompatibility,
         permissionModeMapping: settings.permissionModeMapping
       });
@@ -1440,24 +1430,6 @@ function createACPV1({
         sessionWorkDir: workDir
       });
       const bridgeStateDir = `${privateSessionDir}/bridge`;
-      const skills = startOptions.skills ?? [];
-      const skillsFingerprint = createACPSkillsFingerprint({ skills });
-      const shouldMaterializeSkills = shouldMaterializeACPSkills({
-        isResume,
-        lifecycleState: lifecycleData,
-        skillsFingerprint,
-        skillsDirectory
-      });
-      if (skills.length > 0) {
-        await materializeACPSkills({
-          sandbox: toolSafeSandboxSession,
-          rootDir: skillsDirectory,
-          sessionWorkDir: workDir,
-          skills,
-          shouldMaterialize: shouldMaterializeSkills,
-          abortSignal: startOptions.abortSignal
-        });
-      }
       const report = startOptions.observability?.report;
       const onDiagnostic = report ? (frame) => report(
         harnessV1DiagnosticFromBridgeFrame(frame, {
@@ -1507,7 +1479,8 @@ function createACPV1({
               harnessId: settings.harnessId,
               channel: attachChannel,
               proc: void 0,
-              modelId: settings.modelId,
+              modelMapping: settings.modelMapping,
+              defaultModelId: settings.modelId,
               sessionMeta: settings.session?.meta,
               instructionMapping: settings.instructionMapping,
               outputSchemaMapping: settings.outputSchemaMapping,
@@ -1523,7 +1496,9 @@ function createACPV1({
                 isResume: true,
                 lifecycleState: lifecycleData
               }),
-              skillsFingerprint,
+              instructionsFingerprint: lifecycleData.instructionsFingerprint,
+              sandbox: toolSafeSandboxSession,
+              sessionWorkDir: workDir,
               skillsDirectory,
               acpSessionId: lifecycleData.acpSessionId,
               bridgePort: coords.port,
@@ -1570,6 +1545,7 @@ function createACPV1({
                   sessionMeta: settings.session?.meta,
                   instructionMapping: settings.instructionMapping,
                   outputSchemaMapping: settings.outputSchemaMapping,
+                  modelMapping: settings.modelMapping,
                   builtinTools: builtinToolCatalog,
                   permissionModeMapping,
                   mcpServers: settings.mcpServers
@@ -1595,12 +1571,12 @@ function createACPV1({
           }
           const turnStartConfig = validateACPColdSessionConfiguration({
             coldSession,
-            modelId: settings.modelId,
             permissionMode,
             authenticationProfile,
             sessionMeta: settings.session?.meta,
             instructionMapping: settings.instructionMapping,
             outputSchemaMapping: settings.outputSchemaMapping,
+            modelMapping: settings.modelMapping,
             builtinTools: builtinToolCatalog,
             permissionModeMapping,
             mcpServers: settings.mcpServers,
@@ -1642,7 +1618,8 @@ function createACPV1({
             authentication: settings.authentication,
             providerAuthentication: resolvedProviderAuthentication.providerAuthentication,
             providerEnvironment: sandboxProviderEnvironment == null ? void 0 : {},
-            sessionMeta: settings.session?.meta
+            sessionMeta: settings.session?.meta,
+            clientCapabilities: settings.clientCapabilities
           }),
           ...sandboxProviderAuthenticationEnvironment,
           BRIDGE_CHANNEL_TOKEN: token,
@@ -1745,7 +1722,8 @@ function createACPV1({
         harnessId: settings.harnessId,
         channel,
         proc,
-        modelId: settings.modelId,
+        modelMapping: settings.modelMapping,
+        defaultModelId: settings.modelId,
         sessionMeta: settings.session?.meta,
         instructionMapping: settings.instructionMapping,
         outputSchemaMapping: settings.outputSchemaMapping,
@@ -1761,7 +1739,9 @@ function createACPV1({
           isResume,
           lifecycleState: lifecycleData
         }),
-        skillsFingerprint,
+        instructionsFingerprint: lifecycleData?.instructionsFingerprint,
+        sandbox: toolSafeSandboxSession,
+        sessionWorkDir: workDir,
         skillsDirectory,
         acpSessionId: lifecycleData?.acpSessionId,
         bridgePort: boundPort,
@@ -1987,7 +1967,8 @@ function createSession({
   harnessId,
   channel,
   proc,
-  modelId,
+  modelMapping,
+  defaultModelId,
   sessionMeta,
   instructionMapping,
   outputSchemaMapping,
@@ -2000,7 +1981,9 @@ function createSession({
   mcpServers,
   isMcpToolCall,
   initialGuidanceApplied: initialGuidanceAppliedAtStart,
-  skillsFingerprint,
+  instructionsFingerprint: instructionsFingerprintAtStart,
+  sandbox,
+  sessionWorkDir,
   skillsDirectory,
   acpSessionId: acpSessionIdAtStart,
   bridgePort,
@@ -2019,6 +2002,7 @@ function createSession({
   let stopped = false;
   let turnInFlight = turnInFlightAtStart;
   let initialGuidanceApplied = initialGuidanceAppliedAtStart;
+  let instructionsFingerprint = instructionsFingerprintAtStart;
   let latestACPSessionId = acpSessionIdAtStart;
   let latestTurnStartConfig = turnStartConfigAtStart;
   const markTurnFinished = () => {
@@ -2253,23 +2237,36 @@ function createSession({
     ...bridge == null ? {} : { bridge },
     ...latestTurnStartConfig == null ? {} : {
       coldSession: createACPColdSessionState({
-        turnStartConfig: latestTurnStartConfig,
-        modelId
+        turnStartConfig: latestTurnStartConfig
       })
     },
     ...!includeTurnStartConfig || latestTurnStartConfig == null ? {} : { turnStartConfig: latestTurnStartConfig },
     ...recoveryStatus == null ? {} : { recovery: recoveryStatus },
     ...restoration == null ? {} : { restoration },
     initialGuidanceApplied,
-    skillsMaterialized: true,
-    skillsFingerprint,
+    ...instructionsFingerprint == null ? {} : { instructionsFingerprint },
     skillsDirectory
   });
+  const synchronizeSkills = async ({
+    skills,
+    abortSignal
+  }) => {
+    await materializeACPSkills({
+      sandbox,
+      rootDir: skillsDirectory,
+      sessionWorkDir,
+      skills,
+      abortSignal
+    });
+  };
   return {
     sessionId,
     isResume,
-    ...modelId == null ? {} : { modelId },
     doPromptTurn: async (options) => {
+      await synchronizeSkills({
+        skills: options.skills,
+        abortSignal: options.abortSignal
+      });
       if (options.responseFormat?.type === "json") {
         if (options.responseFormat.schema == null) {
           throw unsupported({
@@ -2296,6 +2293,7 @@ function createSession({
         prompt: options.prompt,
         harnessId
       });
+      const model = options.model ?? defaultModelId;
       const turnStartConfig = createACPTurnStartConfig({
         prompt,
         tools: options.tools ?? [],
@@ -2308,7 +2306,12 @@ function createSession({
         sessionMeta,
         instructionMapping,
         responseFormat: options.responseFormat,
-        outputSchemaMapping
+        outputSchemaMapping,
+        model,
+        modelMapping
+      });
+      const nextInstructionsFingerprint = fingerprintValue({
+        value: options.instructions ?? null
       });
       const control = wireTurn({
         emit: options.emit,
@@ -2322,10 +2325,10 @@ function createSession({
           turnInFlight = true;
           channel.send({
             type: "start",
-            prompt: initialGuidanceApplied ? prompt : prependACPInitialGuidance({
+            prompt: instructionsFingerprint !== nextInstructionsFingerprint && (instructionMapping == null || initialGuidanceApplied) ? prependACPInstructionGuidance({
               prompt,
-              instructions: instructionMapping == null ? options.instructions : void 0
-            }),
+              instructions: options.instructions
+            }) : prompt,
             ...instructionMapping == null ? {} : {
               instructionMapping,
               ...options.instructions == null ? {} : { instructions: options.instructions }
@@ -2334,6 +2337,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 },
@@ -2342,11 +2346,16 @@ function createSession({
           });
           latestTurnStartConfig = turnStartConfig;
           initialGuidanceApplied = true;
+          instructionsFingerprint = nextInstructionsFingerprint;
         }
       });
       return control;
     },
     doContinueTurn: async (options) => {
+      await synchronizeSkills({
+        skills: options.skills,
+        abortSignal: options.abortSignal
+      });
       if (options.responseFormat?.type === "json") {
         if (options.responseFormat.schema == null) {
           throw unsupported({
@@ -2388,6 +2397,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 ? {} : {
@@ -2532,6 +2545,7 @@ function validateACPTurnStartConfig({
   sessionMeta,
   instructionMapping,
   outputSchemaMapping,
+  modelMapping,
   builtinTools,
   permissionModeMapping,
   mcpServers
@@ -2548,7 +2562,9 @@ function validateACPTurnStartConfig({
     sessionMeta,
     instructionMapping,
     responseFormat: turnStartConfig.responseFormat,
-    outputSchemaMapping
+    outputSchemaMapping,
+    model: turnStartConfig.model,
+    modelMapping
   });
   if (current.configurationFingerprint !== turnStartConfig.configurationFingerprint) {
     throw new Error(
@@ -2558,12 +2574,12 @@ function validateACPTurnStartConfig({
 }
 function validateACPColdSessionConfiguration({
   coldSession,
-  modelId,
   permissionMode,
   authenticationProfile,
   sessionMeta,
   instructionMapping,
   outputSchemaMapping,
+  modelMapping,
   builtinTools,
   permissionModeMapping,
   mcpServers,
@@ -2581,9 +2597,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."
     );
@@ -2628,7 +2646,7 @@ function deserializeBridgeError({
 }
 
 // src/version.ts
-var VERSION = true ? "1.0.30" : "0.0.0-test";
+var VERSION = true ? "1.0.32" : "0.0.0-test";
 
 // src/acp-harness.ts
 var ACP_CLIENT_APP = {
@@ -2667,8 +2685,7 @@ var acpResumeStateSchema = z4.object({
     method: z4.enum(["resume", "load"])
   }).optional(),
   initialGuidanceApplied: z4.boolean().optional(),
-  skillsMaterialized: z4.boolean().optional(),
-  skillsFingerprint: z4.string().optional(),
+  instructionsFingerprint: z4.string().optional(),
   skillsDirectory: z4.string().optional()
 });
 function createACP(settings) {