@ai-sdk/harness-acp 1.0.29 → 1.0.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-sdk/harness-acp",
-  "version": "1.0.29",
+  "version": "1.0.30",
   "type": "module",
   "license": "Apache-2.0",
   "sideEffects": false,
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "@ai-sdk/harness": "1.0.91",
+    "@ai-sdk/harness": "1.0.92",
     "@ai-sdk/provider-utils": "5.0.32",
     "ws": "^8.21.0"
   },

package/src/acp-auth.ts

@@ -1,15 +1,18 @@
 import { createHash } from 'node:crypto';
-import { getAiGatewayAuthFromEnv } from '@ai-sdk/harness/utils';
+import {
+  getAiGatewayAuthFromEnv,
+  isHarnessAuthenticationEnvironment,
+} from '@ai-sdk/harness/utils';
 import type {
   ACPAuthentication,
+  ACPAuthenticationMode as ACPV1AuthenticationMode,
   ACPProviderAuthentication,
-  ACPProviderAuthenticationMode,
 } from './v1';
 import type { ACPResolvedProviderAuthentication } from './v1/bridge/acp-v1-bridge-environment';
 
 const DEFAULT_AI_GATEWAY_BASE_URL = 'https://ai-gateway.vercel.sh';
 
-export type ACPAuthOptions = ACPProviderAuthenticationMode;
+export type ACPAuthenticationMode = ACPV1AuthenticationMode;
 
 export type ACPClientApp = {
   readonly name: string;
@@ -17,7 +20,7 @@ export type ACPClientApp = {
 };
 
 type ACPAuthResolutionOptions = {
-  readonly mode?: ACPAuthOptions;
+  readonly mode?: ACPAuthenticationMode;
   readonly providerAuthentication: ACPProviderAuthentication | undefined;
   readonly clientApp: ACPClientApp;
 };
@@ -102,6 +105,10 @@ export 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: undefined, env: clientAppEnv };
@@ -114,7 +121,7 @@ export function resolveACPProviderAuthentication({
     };
   }
 
-  const mode = auth.mode ?? 'auto';
+  const mode = resolveACPProviderAuthenticationMode(auth.mode);
   if (mode === 'direct') {
     return {
       providerAuthentication: { type: 'direct' },
@@ -126,12 +133,12 @@ export function resolveACPProviderAuthentication({
     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 {
@@ -166,20 +173,22 @@ export function resolveACPProviderAuthenticationCompatibility({
   providerAuthentication,
   env,
 }: {
-  auth?: ACPProviderAuthenticationMode;
+  auth?: ACPAuthenticationMode;
   providerAuthentication: ACPProviderAuthentication | undefined;
   env: Record<string, string | undefined>;
 }): ACPProviderAuthenticationCompatibility | undefined {
+  const resolvedEnv = resolveACPAuthenticationEnvironment({
+    auth,
+    env,
+  });
   if (providerAuthentication == null) return undefined;
 
-  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 };
   }
@@ -189,10 +198,26 @@ export 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: ACPAuthenticationMode | undefined,
+): Extract<ACPAuthenticationMode, string> {
+  return typeof auth === 'string' || auth == null ? (auth ?? 'auto') : 'auto';
+}
+
+export function resolveACPAuthenticationEnvironment({
+  auth,
+  env,
+}: {
+  auth: ACPAuthenticationMode | undefined;
+  env: Record<string, string | undefined>;
+}): Record<string, string | undefined> {
+  return isHarnessAuthenticationEnvironment(auth) ? auth : env;
+}
+
 export function resolveACPEnv({
   auth,
   env,

package/src/index.ts

@@ -1,5 +1,5 @@
 export { createACP } from './acp-harness';
-export type { ACPAuthOptions, ACPClientApp } from './acp-auth';
+export type { ACPAuthenticationMode, ACPClientApp } from './acp-auth';
 export type { ACPHarnessSettings } from './acp-harness';
 export type {
   ACPAnnotations,
@@ -31,7 +31,6 @@ export type {
   ACPPermissionModeTarget,
   ACPProfileValue,
   ACPProviderAuthentication,
-  ACPProviderAuthenticationMode,
   ACPSerializablePrimitive,
   ACPSerializableValue,
   ACPSource,

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

@@ -39,6 +39,7 @@ import {
 import { WebSocket } from 'ws';
 import {
   createACPAuthenticationProfileIdentity,
+  resolveACPAuthenticationEnvironment,
   resolveACPProviderAuthentication,
   resolveACPProviderAuthenticationCompatibility,
   type ACPAuthenticationProfileIdentity,
@@ -188,6 +189,10 @@ export function createACPV1<TBuiltinTools extends ToolSet = {}>({
       }
       const permissionMode = startOptions.permissionMode ?? 'allow-all';
       const env = { ...process.env };
+      const authenticationEnvironment = resolveACPAuthenticationEnvironment({
+        auth: settings.auth,
+        env,
+      });
       const providerAuthenticationCompatibility =
         resolveACPProviderAuthenticationCompatibility({
           auth: settings.auth,
@@ -259,6 +264,7 @@ export function createACPV1<TBuiltinTools extends ToolSet = {}>({
       const implementationEnvironment = resolveImplementationEnvironment({
         implementation,
         env,
+        credentialEnv: authenticationEnvironment,
       });
       let sandboxImplementationEnvironment = implementationEnvironment;
       let sandboxProviderAuthenticationEnvironment =

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

@@ -1,4 +1,5 @@
 import type {
+  HarnessV1Authentication,
   HarnessV1CredentialForwarding,
   HarnessV1PermissionMode,
   HarnessV1RequestTransformation,
@@ -66,7 +67,7 @@ export type ACPAuthentication = {
   readonly clientCapabilities?: Readonly<Record<string, ACPSerializableValue>>;
 };
 
-export type ACPProviderAuthenticationMode = 'auto' | 'direct' | 'ai-gateway';
+export type ACPAuthenticationMode = HarnessV1Authentication;
 
 export type ACPProviderAuthentication = {
   readonly gateway: {
@@ -123,7 +124,7 @@ export type ACPV1Settings = {
   readonly harnessId: string;
   readonly mcpServers?: Record<string, unknown>;
   readonly isMcpToolCall?: (toolCall: ACPToolCall) => boolean;
-  readonly auth?: ACPProviderAuthenticationMode;
+  readonly auth?: ACPAuthenticationMode;
   readonly source: ACPSource;
   readonly executable: string;
   readonly args?: ReadonlyArray<string>;

package/src/v1/implementation.ts

@@ -277,20 +277,25 @@ ${implementation.source.command}
 export function resolveImplementationEnvironment({
   implementation,
   env,
+  credentialEnv = env,
 }: {
   implementation: ACPImplementation;
   env: Readonly<Record<string, string | undefined>>;
+  credentialEnv?: Readonly<Record<string, string | undefined>>;
 }): Record<string, string> {
   const forwardedEnvironment: Record<string, string> = {};
-  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,

package/src/v1/index.ts

@@ -2,6 +2,7 @@ export { createACPV1 } from './acp-v1-harness';
 export type {
   ACPCredentialBrokering,
   ACPAuthentication,
+  ACPAuthenticationMode,
   ACPInstallCommandSource,
   ACPInstructionMapping,
   ACPNpmLockedSource,
@@ -11,7 +12,6 @@ export type {
   ACPPermissionModeTarget,
   ACPProfileValue,
   ACPProviderAuthentication,
-  ACPProviderAuthenticationMode,
   ACPSerializablePrimitive,
   ACPSerializableValue,
   ACPSource,