@ai-sdk/harness-acp 1.0.59 → 1.0.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-sdk/harness-acp",
-  "version": "1.0.59",
+  "version": "1.0.61",
   "type": "module",
   "license": "Apache-2.0",
   "sideEffects": false,
@@ -26,8 +26,8 @@
     }
   },
   "dependencies": {
-    "@ai-sdk/harness": "1.0.121",
-    "@ai-sdk/provider-utils": "5.0.45",
+    "@ai-sdk/harness": "1.0.123",
+    "@ai-sdk/provider-utils": "5.0.47",
     "ws": "^8.21.0"
   },
   "peerDependencies": {

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

@@ -12,6 +12,7 @@ import {
   type HarnessV1Skill,
   type HarnessV1StreamPart,
   type HarnessV1ToolSpec,
+  harnessStateDirectoryPath,
 } from '@ai-sdk/harness';
 import { HarnessBridgeCapabilityUnsupportedError } from '@ai-sdk/harness/bridge';
 import {
@@ -25,7 +26,6 @@ import {
   forwardBridgeProcessStream,
   getRestrictedSandboxSession,
   markBridgeStarting,
-  resolveSandboxDefaultWorkingDirectory,
   resolveSandboxHomeDir,
   SandboxChannel,
   shellQuote,
@@ -256,11 +256,6 @@ export function createACPV1<TBuiltinTools extends ToolSet = {}>({
           message: `The ${settings.harnessId} ACP harness cannot use \`mintBridgeToken\` with a sandbox session that does not expose an id.`,
         });
       }
-      const defaultWorkingDirectory =
-        await resolveSandboxDefaultWorkingDirectory({
-          sandboxSession,
-          abortSignal: startOptions.abortSignal,
-        });
       const continueFrom =
         startOptions.continueFrom ?? startOptions.resumeFrom?.continueFrom;
       const lifecycleState = continueFrom ?? startOptions.resumeFrom;
@@ -376,19 +371,21 @@ export function createACPV1<TBuiltinTools extends ToolSet = {}>({
           ),
         );
       }
+      // Harness SDK state always lives under the sandbox's own HOME, never
+      // the working directory, so it stays out of a user-owned workspace.
+      const sandboxHomeDir = await resolveSandboxHomeDir({
+        sandbox: toolSafeSandboxSession,
+        abortSignal: startOptions.abortSignal,
+      });
+      const stateDirectory = harnessStateDirectoryPath({ sandboxHomeDir });
       const resolvedBridgeDir = posix.resolve(
-        defaultWorkingDirectory,
+        stateDirectory,
         bootstrap.bootstrapDir,
       );
       const resolvedImplementationDir = `${resolvedBridgeDir}/implementation`;
       const workDir = startOptions.sessionWorkDir;
-      const sandboxHomeDir = await resolveSandboxHomeDir({
-        sandbox: toolSafeSandboxSession,
-        abortSignal: startOptions.abortSignal,
-      });
       const privateSessionDir = resolveACPPrivateSessionDirectory({
-        sandboxHomeDir,
-        harnessId: settings.harnessId,
+        stateDirectory,
         sessionId: startOptions.sessionId,
       });
       const implementationHomeDir =
@@ -2013,7 +2010,7 @@ function withNativeQuestionRequest({
     providerMetadata: {
       ...toolCall.providerMetadata,
       [harnessId]: {
-        ...(harnessMetadata ?? {}),
+        ...harnessMetadata,
         nativeRequest,
       } as NonNullable<
         Extract<HarnessV1StreamPart, { type: 'tool-call' }>['providerMetadata']
@@ -2067,7 +2064,6 @@ function takeBufferedQuestionResult({
       return buffered;
     }
   }
-  return undefined;
 }
 
 function isPermissionModeMappingValue({

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

@@ -1,27 +1,20 @@
-import { createHash } from 'node:crypto';
 import path from 'node:path';
-import type { HarnessV1Skill } from '@ai-sdk/harness';
+import {
+  harnessSessionDataDirectoryPath,
+  type HarnessV1Skill,
+} from '@ai-sdk/harness';
 
 export const ACP_SKILL_NAME_PATTERN = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 export const DEFAULT_ACP_SKILLS_DIRECTORY = '.agents/skills';
 
 export function resolveACPPrivateSessionDirectory({
-  sandboxHomeDir,
-  harnessId,
+  stateDirectory,
   sessionId,
 }: {
-  sandboxHomeDir: string;
-  harnessId: string;
+  stateDirectory: string;
   sessionId: string;
 }): string {
-  const sessionKey = createHash('sha256').update(sessionId).digest('hex');
-  return path.posix.join(
-    sandboxHomeDir,
-    '.ai-sdk',
-    'harness-acp',
-    harnessId,
-    sessionKey,
-  );
+  return harnessSessionDataDirectoryPath({ stateDirectory, sessionId });
 }
 
 export function resolveACPSkillsDirectory({

package/src/v1/bridge/acp-diagnostics.ts

@@ -66,8 +66,6 @@ function getErrorMessage({ error }: { error: unknown }): string | undefined {
   if (typeof error === 'string') {
     return error;
   }
-
-  return undefined;
 }
 
 function stripMetadata({ value }: { value: unknown }): unknown {

package/src/v1/bridge/host-tool-correlation.ts

@@ -515,7 +515,6 @@ function findTokenInvocation({
       return invocation;
     }
   }
-  return undefined;
 }
 
 function removeInvocationForToolCall({

package/src/v1/implementation.ts

@@ -79,8 +79,8 @@ 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 ?? []);
+  const forwardedKeys = new Set(implementation.forwardEnv);
+  const credentialKeys = new Set(implementation.credentialEnv);
   for (const key of credentialKeys) {
     if (forwardedKeys.has(key)) {
       throw new Error(
@@ -209,11 +209,9 @@ export function createImplementationIdentity({
             type: source.type,
             command: source.command,
           };
-  const forwardedEnvironment = [
-    ...new Set(implementation.forwardEnv ?? []),
-  ].sort();
+  const forwardedEnvironment = [...new Set(implementation.forwardEnv)].sort();
   const credentialEnvironment = [
-    ...new Set(implementation.credentialEnv ?? []),
+    ...new Set(implementation.credentialEnv),
   ].sort();
   const literalEnvironment = Object.fromEntries(
     Object.entries(implementation.env ?? {})