@ai-sdk/harness-acp 1.0.29 → 1.0.31

package/dist/index.js

@@ -33,7 +33,10 @@ import { WebSocket } from "ws";
 
 // src/acp-auth.ts
 import { createHash } from "crypto";
-import { getAiGatewayAuthFromEnv } from "@ai-sdk/harness/utils";
+import {
+  getAiGatewayAuthFromEnv,
+  isHarnessAuthenticationEnvironment
+} from "@ai-sdk/harness/utils";
 var DEFAULT_AI_GATEWAY_BASE_URL = "https://ai-gateway.vercel.sh";
 function createACPAuthenticationProfileIdentity({
   authentication,
@@ -67,6 +70,10 @@ function resolveACPProviderAuthentication({
     AI_SDK_ACP_CLIENT_APP_NAME: auth.clientApp.name,
     AI_SDK_ACP_CLIENT_APP_VERSION: auth.clientApp.version
   };
+  const resolvedEnv = resolveACPAuthenticationEnvironment({
+    auth: auth.mode,
+    env
+  });
   const providerAuthentication = auth.providerAuthentication;
   if (providerAuthentication == null) {
     return { providerAuthentication: void 0, env: clientAppEnv };
@@ -77,7 +84,7 @@ function resolveACPProviderAuthentication({
       env: clientAppEnv
     };
   }
-  const mode = auth.mode ?? "auto";
+  const mode = resolveACPProviderAuthenticationMode(auth.mode);
   if (mode === "direct") {
     return {
       providerAuthentication: { type: "direct" },
@@ -86,11 +93,11 @@ function resolveACPProviderAuthentication({
   }
   const gateway = compatibility?.type === "ai-gateway" ? {
     apiKey: resolveGatewayCredential({
-      env,
+      env: resolvedEnv,
       credentialSource: compatibility.credentialSource
     }),
     baseUrl: compatibility.baseUrl
-  } : getAiGatewayAuthFromEnv({ env });
+  } : getAiGatewayAuthFromEnv({ env: resolvedEnv });
   const apiKey = gateway.apiKey;
   if (compatibility == null && mode === "auto" && apiKey == null) {
     return {
@@ -120,14 +127,16 @@ function resolveACPProviderAuthenticationCompatibility({
   providerAuthentication,
   env
 }) {
+  const resolvedEnv = resolveACPAuthenticationEnvironment({
+    auth,
+    env
+  });
   if (providerAuthentication == null) return void 0;
-  const mode = auth;
+  const mode = resolveACPProviderAuthenticationMode(auth);
   if (mode === "direct") {
     return { type: "direct", mode };
   }
-  const credentialSource = resolveGatewayCredentialSource({
-    env
-  });
+  const credentialSource = resolveGatewayCredentialSource({ env: resolvedEnv });
   if (mode === "auto" && credentialSource == null) {
     return { type: "direct", mode };
   }
@@ -136,9 +145,18 @@ function resolveACPProviderAuthenticationCompatibility({
     mode,
     env: providerAuthentication.gateway.env,
     credentialSource,
-    baseUrl: env.AI_GATEWAY_BASE_URL ?? DEFAULT_AI_GATEWAY_BASE_URL
+    baseUrl: resolvedEnv.AI_GATEWAY_BASE_URL ?? DEFAULT_AI_GATEWAY_BASE_URL
   };
 }
+function resolveACPProviderAuthenticationMode(auth) {
+  return typeof auth === "string" || auth == null ? auth ?? "auto" : "auto";
+}
+function resolveACPAuthenticationEnvironment({
+  auth,
+  env
+}) {
+  return isHarnessAuthenticationEnvironment(auth) ? auth : env;
+}
 function resolveGatewayCredentialSource({
   env
 }) {
@@ -366,18 +384,22 @@ ${implementation.source.command}
 }
 function resolveImplementationEnvironment({
   implementation,
-  env
+  env,
+  credentialEnv = env
 }) {
   const forwardedEnvironment = {};
-  for (const name of [
-    ...implementation.forwardEnv ?? [],
-    ...implementation.credentialEnv ?? []
-  ]) {
+  for (const name of implementation.forwardEnv ?? []) {
     const value = env[name];
     if (value != null && value.length > 0) {
       forwardedEnvironment[name] = value;
     }
   }
+  for (const name of implementation.credentialEnv ?? []) {
+    const value = credentialEnv[name];
+    if (value != null && value.length > 0) {
+      forwardedEnvironment[name] = value;
+    }
+  }
   return {
     ...forwardedEnvironment,
     ...implementation.env
@@ -637,7 +659,7 @@ function convertHarnessPromptToACPTextBlocks({
   }
   return content;
 }
-function prependACPInitialGuidance({
+function prependACPInstructionGuidance({
   prompt,
   instructions
 }) {
@@ -803,20 +825,26 @@ var bridgeConfigurationSchema = z3.object({
   authentication: authenticationSchema.optional(),
   providerAuthentication: providerAuthenticationSchema.optional(),
   providerEnvironment: z3.record(z3.string(), z3.string()).optional(),
-  sessionMeta: serializableRecordSchema.optional()
+  sessionMeta: serializableRecordSchema.optional(),
+  implementationArgs: z3.array(z3.string()).optional(),
+  implementationEnv: z3.record(z3.string(), z3.string()).optional()
 });
 function createACPBridgeEnvironment({
   authentication,
   providerAuthentication,
   providerEnvironment,
-  sessionMeta
+  sessionMeta,
+  implementationArgs,
+  implementationEnv
 }) {
   return {
     [ACP_BRIDGE_CONFIGURATION_ENV]: JSON.stringify({
       ...authentication == null ? {} : { authentication },
       ...providerAuthentication == null ? {} : { providerAuthentication },
       ...providerEnvironment == null ? {} : { providerEnvironment },
-      ...sessionMeta == null ? {} : { sessionMeta }
+      ...sessionMeta == null ? {} : { sessionMeta },
+      ...implementationArgs == null ? {} : { implementationArgs },
+      ...implementationEnv == null ? {} : { implementationEnv }
     })
   };
 }
@@ -999,19 +1027,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,
@@ -1053,24 +1068,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,
@@ -1093,24 +1090,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,
@@ -1198,12 +1192,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]+)*$/;
@@ -1234,11 +1222,11 @@ function createACPV1({
       `ACP harnessId must be a stable kebab-case identifier; received ${JSON.stringify(settings.harnessId)}.`
     );
   }
-  const implementation = createACPV1Implementation({ settings });
-  validateACPV1Implementation(implementation);
+  const baseImplementation = createACPV1Implementation({ settings });
+  validateACPV1Implementation(baseImplementation);
   const bootstrap = createACPBootstrap({
     harnessId: settings.harnessId,
-    implementation
+    implementation: baseImplementation
   });
   const permissionModeMapping = isCompletePermissionModeMapping({
     value: settings.permissionModeMapping
@@ -1258,8 +1246,25 @@ 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({
+        auth: settings.auth,
+        env
+      });
       const providerAuthenticationCompatibility = resolveACPProviderAuthenticationCompatibility({
         auth: settings.auth,
         providerAuthentication: settings.providerAuthentication,
@@ -1322,7 +1327,8 @@ function createACPV1({
       }
       const implementationEnvironment = resolveImplementationEnvironment({
         implementation,
-        env
+        env,
+        credentialEnv: authenticationEnvironment
       });
       let sandboxImplementationEnvironment = implementationEnvironment;
       let sandboxProviderAuthenticationEnvironment = resolvedProviderAuthentication.env;
@@ -1413,24 +1419,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, {
@@ -1480,7 +1468,7 @@ function createACPV1({
               harnessId: settings.harnessId,
               channel: attachChannel,
               proc: void 0,
-              modelId: settings.modelId,
+              modelId,
               sessionMeta: settings.session?.meta,
               instructionMapping: settings.instructionMapping,
               outputSchemaMapping: settings.outputSchemaMapping,
@@ -1496,7 +1484,9 @@ function createACPV1({
                 isResume: true,
                 lifecycleState: lifecycleData
               }),
-              skillsFingerprint,
+              instructionsFingerprint: lifecycleData.instructionsFingerprint,
+              sandbox: toolSafeSandboxSession,
+              sessionWorkDir: workDir,
               skillsDirectory,
               acpSessionId: lifecycleData.acpSessionId,
               bridgePort: coords.port,
@@ -1568,7 +1558,7 @@ function createACPV1({
           }
           const turnStartConfig = validateACPColdSessionConfiguration({
             coldSession,
-            modelId: settings.modelId,
+            modelId,
             permissionMode,
             authenticationProfile,
             sessionMeta: settings.session?.meta,
@@ -1615,7 +1605,9 @@ function createACPV1({
             authentication: settings.authentication,
             providerAuthentication: resolvedProviderAuthentication.providerAuthentication,
             providerEnvironment: sandboxProviderEnvironment == null ? void 0 : {},
-            sessionMeta: settings.session?.meta
+            sessionMeta: settings.session?.meta,
+            implementationArgs: modelConfiguration?.args,
+            implementationEnv: modelConfiguration?.env
           }),
           ...sandboxProviderAuthenticationEnvironment,
           BRIDGE_CHANNEL_TOKEN: token,
@@ -1718,7 +1710,7 @@ function createACPV1({
         harnessId: settings.harnessId,
         channel,
         proc,
-        modelId: settings.modelId,
+        modelId,
         sessionMeta: settings.session?.meta,
         instructionMapping: settings.instructionMapping,
         outputSchemaMapping: settings.outputSchemaMapping,
@@ -1734,7 +1726,9 @@ function createACPV1({
           isResume,
           lifecycleState: lifecycleData
         }),
-        skillsFingerprint,
+        instructionsFingerprint: lifecycleData?.instructionsFingerprint,
+        sandbox: toolSafeSandboxSession,
+        sessionWorkDir: workDir,
         skillsDirectory,
         acpSessionId: lifecycleData?.acpSessionId,
         bridgePort: boundPort,
@@ -1973,7 +1967,9 @@ function createSession({
   mcpServers,
   isMcpToolCall,
   initialGuidanceApplied: initialGuidanceAppliedAtStart,
-  skillsFingerprint,
+  instructionsFingerprint: instructionsFingerprintAtStart,
+  sandbox,
+  sessionWorkDir,
   skillsDirectory,
   acpSessionId: acpSessionIdAtStart,
   bridgePort,
@@ -1992,6 +1988,7 @@ function createSession({
   let stopped = false;
   let turnInFlight = turnInFlightAtStart;
   let initialGuidanceApplied = initialGuidanceAppliedAtStart;
+  let instructionsFingerprint = instructionsFingerprintAtStart;
   let latestACPSessionId = acpSessionIdAtStart;
   let latestTurnStartConfig = turnStartConfigAtStart;
   const markTurnFinished = () => {
@@ -2234,15 +2231,30 @@ function createSession({
     ...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({
@@ -2283,6 +2295,9 @@ function createSession({
         responseFormat: options.responseFormat,
         outputSchemaMapping
       });
+      const nextInstructionsFingerprint = fingerprintValue({
+        value: options.instructions ?? null
+      });
       const control = wireTurn({
         emit: options.emit,
         abortSignal: options.abortSignal,
@@ -2295,10 +2310,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 }
@@ -2315,11 +2330,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({
@@ -2601,7 +2621,7 @@ function deserializeBridgeError({
 }
 
 // src/version.ts
-var VERSION = true ? "1.0.29" : "0.0.0-test";
+var VERSION = true ? "1.0.31" : "0.0.0-test";
 
 // src/acp-harness.ts
 var ACP_CLIENT_APP = {
@@ -2640,8 +2660,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) {