@ai-sdk/harness-acp 1.0.8 → 1.0.10

package/src/v1/bridge/stream-translator.ts

@@ -78,7 +78,6 @@ export function createACPStreamTranslator({
     | undefined;
   let blockCounter = 0;
   let stepOpen = false;
-  let completedToolStepEligible = false;
   let finished = false;
   const blockIdCounts = new Map<string, number>();
   const toolStates = new Map<string, ToolState>();
@@ -154,15 +153,10 @@ export function createACPStreamTranslator({
       harnessMetadata: { acp: { inferredStep: true } },
     });
     stepOpen = false;
-    completedToolStepEligible = false;
   };
 
-  const flushCompletedToolStep = () => {
-    if (
-      !stepOpen ||
-      !completedToolStepEligible ||
-      pendingToolCallIds.size > 0
-    ) {
+  const finishCompletedToolStep = () => {
+    if (!stepOpen || pendingToolCallIds.size > 0) {
       return;
     }
     emitInferredStep({
@@ -252,7 +246,6 @@ export function createACPStreamTranslator({
       state.emittedCall = true;
       stepOpen = true;
       pendingToolCallIds.add(state.toolCallId);
-      completedToolStepEligible = false;
     }
 
     emitFileChanges({ state, emit });
@@ -270,7 +263,7 @@ export function createACPStreamTranslator({
       });
       state.emittedResult = true;
       pendingToolCallIds.delete(state.toolCallId);
-      completedToolStepEligible = pendingToolCallIds.size === 0;
+      finishCompletedToolStep();
     }
   };
 
@@ -293,7 +286,6 @@ export function createACPStreamTranslator({
     });
     stepOpen = true;
     pendingToolCallIds.add(toolCallId);
-    completedToolStepEligible = false;
   };
 
   const hostToolResult = ({
@@ -316,7 +308,7 @@ export function createACPStreamTranslator({
       ...(isError ? { isError: true } : {}),
     });
     pendingToolCallIds.delete(toolCallId);
-    completedToolStepEligible = pendingToolCallIds.size === 0;
+    finishCompletedToolStep();
   };
 
   return {
@@ -338,7 +330,6 @@ export function createACPStreamTranslator({
         update.content?.type === 'text' &&
         typeof update.content.text === 'string'
       ) {
-        flushCompletedToolStep();
         emitContent({
           type: 'text',
           text: update.content.text,
@@ -351,7 +342,6 @@ export function createACPStreamTranslator({
         update.content?.type === 'text' &&
         typeof update.content.text === 'string'
       ) {
-        flushCompletedToolStep();
         emitContent({
           type: 'reasoning',
           text: update.content.text,

package/src/v1/implementation.ts

@@ -23,6 +23,7 @@ export type ACPNpmImplementation = {
   readonly executable: string;
   readonly args?: ReadonlyArray<string>;
   readonly forwardEnv?: ReadonlyArray<string>;
+  readonly credentialEnv?: ReadonlyArray<string>;
   readonly env?: Readonly<Record<string, string>>;
 };
 
@@ -36,6 +37,7 @@ export function createACPV1Implementation({
     executable: settings.executable,
     args: settings.args,
     forwardEnv: settings.forwardEnv,
+    credentialEnv: settings.credentialEnv,
     env: settings.env,
   };
 }
@@ -68,14 +70,28 @@ export function validateACPV1Implementation(
   }
 
   validateForwardEnvironment({ forwardEnv: implementation.forwardEnv });
+  validateForwardEnvironment({ forwardEnv: implementation.credentialEnv });
   validateEnvironment({ env: implementation.env });
   const forwardedKeys = new Set(implementation.forwardEnv ?? []);
+  const credentialKeys = new Set(implementation.credentialEnv ?? []);
+  for (const key of credentialKeys) {
+    if (forwardedKeys.has(key)) {
+      throw new Error(
+        `ACP runtime environment key ${JSON.stringify(key)} cannot be configured in both forwardEnv and credentialEnv.`,
+      );
+    }
+  }
   for (const key of Object.keys(implementation.env ?? {})) {
     if (forwardedKeys.has(key)) {
       throw new Error(
         `ACP runtime environment key ${JSON.stringify(key)} cannot be configured in both forwardEnv and env.`,
       );
     }
+    if (credentialKeys.has(key)) {
+      throw new Error(
+        `ACP runtime environment key ${JSON.stringify(key)} cannot be configured in both credentialEnv and env.`,
+      );
+    }
   }
 }
 
@@ -165,6 +181,9 @@ export function createImplementationIdentity({
   const forwardedEnvironment = [
     ...new Set(implementation.forwardEnv ?? []),
   ].sort();
+  const credentialEnvironment = [
+    ...new Set(implementation.credentialEnv ?? []),
+  ].sort();
   const literalEnvironment = Object.fromEntries(
     Object.entries(implementation.env ?? {})
       .sort(([left], [right]) => left.localeCompare(right))
@@ -179,6 +198,7 @@ export function createImplementationIdentity({
     clientApp,
     environment: {
       forwarded: forwardedEnvironment,
+      credential: credentialEnvironment,
       literal: literalEnvironment,
     },
     providerAuthentication: providerAuthentication ?? null,
@@ -213,7 +233,10 @@ export function resolveImplementationEnvironment({
   env: Readonly<Record<string, string | undefined>>;
 }): Record<string, string> {
   const forwardedEnvironment: Record<string, string> = {};
-  for (const name of implementation.forwardEnv ?? []) {
+  for (const name of [
+    ...(implementation.forwardEnv ?? []),
+    ...(implementation.credentialEnv ?? []),
+  ]) {
     const value = env[name];
     if (value != null && value.length > 0) {
       forwardedEnvironment[name] = value;
@@ -284,6 +307,7 @@ function getImplementationEnvironmentKeys({
   return [
     ...new Set([
       ...(implementation.forwardEnv ?? []),
+      ...(implementation.credentialEnv ?? []),
       ...Object.keys(implementation.env ?? {}),
     ]),
   ].sort();

package/src/v1/index.ts

@@ -1,5 +1,6 @@
 export { createACPV1 } from './acp-v1-harness';
 export type {
+  ACPCredentialBrokering,
   ACPAuthentication,
   ACPInstructionMapping,
   ACPNpmLockedSource,