@ai-sdk/harness-acp 1.0.29 → 1.0.30

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @ai-sdk/harness-acp
 
+## 1.0.30
+
+### Patch Changes
+
+- e0d7cfb: feat(harness): allow harness sessions to optionally authenticate from an isolated environment supplied through the `auth` option, and remove support for the formerly deprecated legacy auth options types
+- Updated dependencies [e0d7cfb]
+  - @ai-sdk/harness@1.0.92
+
 ## 1.0.29
 
 ### Patch Changes

package/dist/bridge/host-tool-mcp.mjs

@@ -12,7 +12,7 @@ import {
   ListToolsRequestSchema,
   McpError
 } from "@modelcontextprotocol/sdk/types.js";
-var VERSION = true ? "1.0.29" : "0.0.0-test";
+var VERSION = true ? "1.0.30" : "0.0.0-test";
 function createHostToolMCPServer({
   tools: tools2,
   revision = 1,

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { HarnessV1RequestTransformation, HarnessV1CredentialForwarding, HarnessV1PermissionMode, HarnessV1PortEndpoint, HarnessV1 } from '@ai-sdk/harness';
+import { HarnessV1Authentication, HarnessV1RequestTransformation, HarnessV1CredentialForwarding, HarnessV1PermissionMode, HarnessV1PortEndpoint, HarnessV1 } from '@ai-sdk/harness';
 import { ToolSet } from '@ai-sdk/provider-utils';
 
 type ACPMetadata = Record<string, unknown>;
@@ -139,7 +139,7 @@ type ACPAuthentication = {
     readonly meta?: Readonly<Record<string, ACPSerializableValue>>;
     readonly clientCapabilities?: Readonly<Record<string, ACPSerializableValue>>;
 };
-type ACPProviderAuthenticationMode = 'auto' | 'direct' | 'ai-gateway';
+type ACPAuthenticationMode$1 = HarnessV1Authentication;
 type ACPProviderAuthentication = {
     readonly gateway: {
         readonly env: Readonly<Record<string, ACPProfileValue>>;
@@ -180,7 +180,7 @@ type ACPV1Settings = {
     readonly harnessId: string;
     readonly mcpServers?: Record<string, unknown>;
     readonly isMcpToolCall?: (toolCall: ACPToolCall) => boolean;
-    readonly auth?: ACPProviderAuthenticationMode;
+    readonly auth?: ACPAuthenticationMode$1;
     readonly source: ACPSource;
     readonly executable: string;
     readonly args?: ReadonlyArray<string>;
@@ -227,7 +227,7 @@ type ACPV1Settings = {
     readonly mintBridgeToken?: (sandboxId: string) => string;
 };
 
-type ACPAuthOptions = ACPProviderAuthenticationMode;
+type ACPAuthenticationMode = ACPAuthenticationMode$1;
 type ACPClientApp = {
     readonly name: string;
     readonly version: string;
@@ -279,4 +279,4 @@ declare function createACP<TBuiltinTools extends ToolSet = {}>(settings: ACPHarn
 
 declare const VERSION: string;
 
-export { type ACPAnnotations, type ACPAudioContent, type ACPAuthOptions, type ACPAuthentication, type ACPBlobResourceContents, type ACPClientApp, type ACPContentBlock, type ACPCredentialBrokering, type ACPEmbeddedResource, type ACPHarnessSettings, type ACPImageContent, type ACPInstallCommandSource, type ACPInstructionMapping, type ACPMetadata, type ACPNpmLockedSource, type ACPNpmSimpleSource, type ACPOutputSchemaMapping, type ACPPermissionModeMapping, type ACPPermissionModeTarget, type ACPProfileValue, type ACPProviderAuthentication, type ACPProviderAuthenticationMode, 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 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

@@ -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
@@ -1260,6 +1282,10 @@ function createACPV1({
       }
       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 +1348,8 @@ function createACPV1({
       }
       const implementationEnvironment = resolveImplementationEnvironment({
         implementation,
-        env
+        env,
+        credentialEnv: authenticationEnvironment
       });
       let sandboxImplementationEnvironment = implementationEnvironment;
       let sandboxProviderAuthenticationEnvironment = resolvedProviderAuthentication.env;
@@ -2601,7 +2628,7 @@ function deserializeBridgeError({
 }
 
 // src/version.ts
-var VERSION = true ? "1.0.29" : "0.0.0-test";
+var VERSION = true ? "1.0.30" : "0.0.0-test";
 
 // src/acp-harness.ts
 var ACP_CLIENT_APP = {