@ai-sdk/harness-acp 1.0.39 → 1.0.40

package/dist/index.d.ts

@@ -152,9 +152,10 @@ type ACPModelMapping = {
     readonly type: 'session-model';
     readonly path: string;
 };
-type ACPCredentialBrokering = ({ env, sandboxEnv, }: {
+type ACPCredentialBrokering = ({ env, sandboxEnv, headers, }: {
     env: Readonly<Record<string, string>>;
     sandboxEnv?: Readonly<Record<string, string>>;
+    headers?: Readonly<Record<string, string>>;
 }) => ReadonlyArray<HarnessV1RequestTransformation>;
 type ACPPermissionModeTarget = {
     readonly type: 'session-mode';
@@ -177,11 +178,19 @@ type ACPInstructionMapping = {
     readonly type: 'launch-env-json';
     readonly variable: string;
     readonly path: ReadonlyArray<string>;
+} | {
+    readonly type: 'filesystem';
+    readonly path: string;
 };
 type ACPOutputSchemaMapping = {
     readonly type: 'session-prompt-meta';
     readonly path: ReadonlyArray<string>;
 };
+/**
+ * Transport used for the harness-owned MCP server that exposes host tools to
+ * an ACP implementation.
+ */
+type ACPHostToolMCPTransport = 'stdio' | 'http';
 type ACPAskUserQuestionsSettings = {
     readonly requestMethod: string;
     readonly isNativeToolCall?: (options: {
@@ -252,6 +261,14 @@ type ACPV1Settings = {
      * below the ACP session prompt's `_meta` field.
      */
     readonly outputSchemaMapping?: ACPOutputSchemaMapping;
+    /**
+     * Transport used for the harness-owned MCP server that exposes host tools to
+     * the ACP implementation. Defaults to `stdio`. Set this to `http` for
+     * implementations that only accept HTTP or SSE MCP servers from the client,
+     * which requires the implementation to advertise
+     * `agentCapabilities.mcpCapabilities.http`.
+     */
+    readonly hostToolMcpTransport?: ACPHostToolMCPTransport;
     readonly askUserQuestions?: ACPAskUserQuestionsSettings;
     readonly permissionModeMapping?: ACPPermissionModeMapping;
     readonly session?: {
@@ -316,6 +333,14 @@ type ACPHarnessSettings<TBuiltinTools extends ToolSet = {}, TAskUserQuestions ex
     readonly skillsDirectory?: ACPV1Settings['skillsDirectory'];
     readonly instructionMapping?: ACPV1Settings['instructionMapping'];
     readonly outputSchemaMapping?: ACPV1Settings['outputSchemaMapping'];
+    /**
+     * Transport used for the harness-owned MCP server that exposes host tools to
+     * the ACP implementation. Defaults to `stdio`. Set this to `http` for
+     * implementations that only accept HTTP or SSE MCP servers from the client,
+     * which requires the implementation to advertise
+     * `agentCapabilities.mcpCapabilities.http`.
+     */
+    readonly hostToolMcpTransport?: ACPV1Settings['hostToolMcpTransport'];
     readonly askUserQuestions?: TAskUserQuestions;
     readonly permissionModeMapping?: ACPV1Settings['permissionModeMapping'];
     readonly session?: ACPV1Settings['session'];
@@ -328,4 +353,4 @@ declare function createACP<TBuiltinTools extends ToolSet = {}, TAskUserQuestions
 
 declare const VERSION: string;
 
-export { type ACPAnnotations, type ACPAskUserQuestionsSettings, 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 ACPModelMapping, 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 };
+export { type ACPAnnotations, type ACPAskUserQuestionsSettings, type ACPAudioContent, type ACPAuthentication, type ACPAuthenticationMode, type ACPBlobResourceContents, type ACPClientApp, type ACPContentBlock, type ACPCredentialBrokering, type ACPEmbeddedResource, type ACPHarnessSettings, type ACPHostToolMCPTransport, type ACPImageContent, type ACPInstallCommandSource, type ACPInstructionMapping, type ACPMetadata, type ACPModelMapping, 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

@@ -29,7 +29,9 @@ import {
   shellQuote,
   warnCredentialBrokeringUnavailable,
   waitForBridgeReady,
-  withBridgeToken
+  withBridgeToken,
+  writeInstructions,
+  writeSkills
 } from "@ai-sdk/harness/utils";
 import {
   asSchema
@@ -709,6 +711,10 @@ var instructionMappingSchema = z2.discriminatedUnion("type", [
     type: z2.literal("launch-env-json"),
     variable: z2.string().min(1),
     path: instructionMappingPathSchema
+  }),
+  z2.object({
+    type: z2.literal("filesystem"),
+    path: z2.string().min(1)
   })
 ]);
 var outputSchemaMappingSchema = z2.object({
@@ -825,6 +831,10 @@ var profileValueSchema = z3.lazy(
     z3.record(z3.string(), profileValueSchema)
   ])
 );
+var hostToolMcpTransportSchema = z3.enum([
+  "stdio",
+  "http"
+]);
 var serializableRecordSchema = z3.record(z3.string(), serializableValueSchema);
 var profileRecordSchema = z3.record(z3.string(), profileValueSchema);
 var authenticationSchema = z3.object({
@@ -845,7 +855,8 @@ var bridgeConfigurationSchema = z3.object({
   providerEnvironment: z3.record(z3.string(), z3.string()).optional(),
   sessionMeta: serializableRecordSchema.optional(),
   clientCapabilities: serializableRecordSchema.optional(),
-  askUserQuestionsRequestMethod: z3.string().optional()
+  askUserQuestionsRequestMethod: z3.string().optional(),
+  hostToolMcpTransport: hostToolMcpTransportSchema.optional()
 });
 function createACPBridgeEnvironment({
   authentication,
@@ -853,7 +864,8 @@ function createACPBridgeEnvironment({
   providerEnvironment,
   sessionMeta,
   clientCapabilities,
-  askUserQuestionsRequestMethod
+  askUserQuestionsRequestMethod,
+  hostToolMcpTransport
 }) {
   return {
     [ACP_BRIDGE_CONFIGURATION_ENV]: JSON.stringify({
@@ -862,7 +874,8 @@ function createACPBridgeEnvironment({
       ...providerEnvironment == null ? {} : { providerEnvironment },
       ...sessionMeta == null ? {} : { sessionMeta },
       ...clientCapabilities == null ? {} : { clientCapabilities },
-      ...askUserQuestionsRequestMethod == null ? {} : { askUserQuestionsRequestMethod }
+      ...askUserQuestionsRequestMethod == null ? {} : { askUserQuestionsRequestMethod },
+      ...hostToolMcpTransport == null ? {} : { hostToolMcpTransport }
     })
   };
 }
@@ -1085,51 +1098,25 @@ function validateACPLifecycleCompatibility({
 // src/v1/acp-v1-skills.ts
 import { createHash as createHash4 } from "crypto";
 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 resolveACPPrivateSessionDirectory({
   sandboxHomeDir,
-  sessionWorkDir,
   harnessId,
   sessionId
 }) {
   const sessionKey = createHash4("sha256").update(sessionId).digest("hex");
-  const rootDir = path.posix.join(
+  return path.posix.join(
     sandboxHomeDir,
     ".ai-sdk",
     "harness-acp",
     harnessId,
     sessionKey
   );
-  assertOutsideSessionWorkDir({ rootDir, sessionWorkDir });
-  return rootDir;
-}
-async function materializeACPSkills({
-  sandbox,
-  rootDir,
-  sessionWorkDir,
-  skills,
-  abortSignal
-}) {
-  validateACPSkills({ skills });
-  assertOutsideSessionWorkDir({ rootDir, sessionWorkDir });
-  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,
-  skillsDirectory = DEFAULT_ACP_SKILLS_DIRECTORY,
-  sessionWorkDir
+  skillsDirectory = DEFAULT_ACP_SKILLS_DIRECTORY
 }) {
   const containsTraversal = skillsDirectory.split(/[\\/]/).some((segment) => segment === "..");
   const normalizedDirectory = path.posix.normalize(skillsDirectory);
@@ -1138,9 +1125,7 @@ function resolveACPSkillsDirectory({
       `ACP skillsDirectory ${JSON.stringify(skillsDirectory)} must be a relative POSIX path without traversal.`
     );
   }
-  const rootDir = path.posix.join(implementationHomeDir, normalizedDirectory);
-  assertOutsideSessionWorkDir({ rootDir, sessionWorkDir });
-  return rootDir;
+  return path.posix.join(implementationHomeDir, normalizedDirectory);
 }
 function validateACPSkills({
   skills
@@ -1198,20 +1183,6 @@ function validateACPAttachedFilePath({
   }
   return normalizedPath;
 }
-function assertOutsideSessionWorkDir({
-  rootDir,
-  sessionWorkDir
-}) {
-  const relative = path.posix.relative(sessionWorkDir, rootDir);
-  const isInside = relative === "" || !relative.startsWith("../") && !path.posix.isAbsolute(relative);
-  if (isInside) {
-    throw new Error(
-      `ACP skill directory ${JSON.stringify(rootDir)} must be outside sessionWorkDir ${JSON.stringify(
-        sessionWorkDir
-      )}.`
-    );
-  }
-}
 
 // src/v1/acp-v1-harness.ts
 var HARNESS_ID_REGEXP = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
@@ -1378,7 +1349,8 @@ function createACPV1({
         };
         const requestTransformations = settings.credentialBrokering({
           env: brokeringEnvironment,
-          sandboxEnv: sandboxImplementationEnvironment
+          sandboxEnv: sandboxImplementationEnvironment,
+          ...startOptions.headers == null ? {} : { headers: startOptions.headers }
         });
         if (requestTransformations.length > 0) {
           await sandboxSession.addRequestTransformations(
@@ -1416,14 +1388,14 @@ function createACPV1({
       });
       const privateSessionDir = resolveACPPrivateSessionDirectory({
         sandboxHomeDir,
-        sessionWorkDir: workDir,
         harnessId: settings.harnessId,
         sessionId: startOptions.sessionId
       });
+      const implementationHomeDir = implementation.source.type === "install-command" ? `${resolvedImplementationDir}/home` : sandboxHomeDir;
+      const skillsDir = settings.skillsDirectory ?? DEFAULT_ACP_SKILLS_DIRECTORY;
       const skillsDirectory = resolveACPSkillsDirectory({
-        implementationHomeDir: implementation.source.type === "install-command" ? `${resolvedImplementationDir}/home` : sandboxHomeDir,
-        skillsDirectory: settings.skillsDirectory,
-        sessionWorkDir: workDir
+        implementationHomeDir,
+        skillsDirectory: settings.skillsDirectory
       });
       const bridgeStateDir = `${privateSessionDir}/bridge`;
       const report = startOptions.observability?.report;
@@ -1495,7 +1467,8 @@ function createACPV1({
               }),
               instructionsFingerprint: lifecycleData.instructionsFingerprint,
               sandbox: toolSafeSandboxSession,
-              sessionWorkDir: workDir,
+              homePath: implementationHomeDir,
+              skillsDir,
               skillsDirectory,
               acpSessionId: lifecycleData.acpSessionId,
               bridgePort: coords.port,
@@ -1633,7 +1606,8 @@ function createACPV1({
             providerEnvironment: sandboxProviderEnvironment == null ? void 0 : {},
             sessionMeta: settings.session?.meta,
             clientCapabilities: settings.clientCapabilities,
-            askUserQuestionsRequestMethod: settings.askUserQuestions?.requestMethod
+            askUserQuestionsRequestMethod: settings.askUserQuestions?.requestMethod,
+            hostToolMcpTransport: settings.hostToolMcpTransport
           }),
           ...sandboxProviderAuthenticationEnvironment,
           BRIDGE_CHANNEL_TOKEN: token,
@@ -1756,7 +1730,8 @@ function createACPV1({
         }),
         instructionsFingerprint: lifecycleData?.instructionsFingerprint,
         sandbox: toolSafeSandboxSession,
-        sessionWorkDir: workDir,
+        homePath: implementationHomeDir,
+        skillsDir,
         skillsDirectory,
         acpSessionId: lifecycleData?.acpSessionId,
         bridgePort: boundPort,
@@ -1991,7 +1966,8 @@ function createSession({
   initialGuidanceApplied: initialGuidanceAppliedAtStart,
   instructionsFingerprint: instructionsFingerprintAtStart,
   sandbox,
-  sessionWorkDir,
+  homePath,
+  skillsDir,
   skillsDirectory,
   acpSessionId: acpSessionIdAtStart,
   bridgePort,
@@ -2407,14 +2383,34 @@ function createSession({
     skills,
     abortSignal
   }) => {
-    await materializeACPSkills({
+    validateACPSkills({ skills });
+    await writeSkills({
       sandbox,
-      rootDir: skillsDirectory,
-      sessionWorkDir,
+      homePath,
+      skillsDir,
       skills,
-      abortSignal
+      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.`
     });
   };
+  const synchronizeInstructions = async ({
+    instructions,
+    abortSignal
+  }) => {
+    if (instructionMapping?.type === "filesystem") {
+      await writeInstructions({
+        sandbox,
+        homePath,
+        instructionsFile: instructionMapping.path,
+        instructions,
+        abortSignal
+      });
+    }
+  };
   return {
     sessionId,
     isResume,
@@ -2423,6 +2419,10 @@ function createSession({
         skills: options.skills,
         abortSignal: options.abortSignal
       });
+      await synchronizeInstructions({
+        instructions: options.instructions,
+        abortSignal: options.abortSignal
+      });
       if (options.responseFormat?.type === "json") {
         if (options.responseFormat.schema == null) {
           throw unsupported({
@@ -2481,7 +2481,7 @@ function createSession({
           turnInFlight = true;
           channel.send({
             type: "start",
-            prompt: instructionsFingerprint !== nextInstructionsFingerprint && (instructionMapping == null || initialGuidanceApplied) ? prependACPInstructionGuidance({
+            prompt: instructionMapping?.type !== "filesystem" && instructionsFingerprint !== nextInstructionsFingerprint && (instructionMapping == null || initialGuidanceApplied) ? prependACPInstructionGuidance({
               prompt,
               instructions: options.instructions
             }) : prompt,
@@ -2512,6 +2512,10 @@ function createSession({
         skills: options.skills,
         abortSignal: options.abortSignal
       });
+      await synchronizeInstructions({
+        instructions: options.instructions,
+        abortSignal: options.abortSignal
+      });
       if (options.responseFormat?.type === "json") {
         if (options.responseFormat.schema == null) {
           throw unsupported({
@@ -2587,11 +2591,6 @@ function createSession({
           `${harnessId} ACP session ${sessionId} is stopped; cannot suspend.`
         );
       }
-      if (!turnInFlight) {
-        throw new Error(
-          `${harnessId} ACP session ${sessionId} has no in-flight turn to suspend.`
-        );
-      }
       stopped = true;
       const lastSeenEventId = await channel.suspend();
       return {
@@ -2841,7 +2840,7 @@ function deserializeBridgeError({
 }
 
 // src/version.ts
-var VERSION = true ? "1.0.39" : "0.0.0-test";
+var VERSION = true ? "1.0.40" : "0.0.0-test";
 
 // src/acp-harness.ts
 var ACP_CLIENT_APP = {