@ai-sdk/harness-acp 1.0.29 → 1.0.31

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @ai-sdk/harness-acp
 
+## 1.0.31
+
+### Patch Changes
+
+- 7608210: feat(harness): add `model` parameter to `HarnessAgent` instead of having each harness adapter support it on their own constructor functions
+- f7bd978: chore(harness): update underlying adapter SDKs to their latest versions
+- 14d4fc0: feat(harness): allow changing harness settings between turns via `prepareCall()` support on `HarnessAgent`
+- Updated dependencies [cc9f6ce]
+- Updated dependencies [7608210]
+- Updated dependencies [6f8a2d7]
+- Updated dependencies [14d4fc0]
+- Updated dependencies [90192f1]
+  - @ai-sdk/harness@1.0.93
+  - @ai-sdk/provider-utils@5.0.33
+
+## 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/README.md

@@ -34,6 +34,9 @@ const codexACP = createACP({
     packageVersion: '1.1.4',
   },
   executable: 'codex-acp',
+  resolveModel: ({ model }) => ({
+    env: { CODEX_CONFIG: JSON.stringify({ model }) },
+  }),
   credentialEnv: ['CODEX_API_KEY', 'OPENAI_API_KEY'],
   credentialBrokering: ({ env, sandboxEnv }) => {
     const environmentVariableName = env.CODEX_API_KEY
@@ -96,6 +99,13 @@ ACP supports only `permissionMode: 'allow-all'` because its
 restrictive modes enable Codex's internal sandbox. A bridge-backed ACP harness
 requires a sandbox with at least one exposed port.
 
+`resolveModel` is required because each ACP implementation accepts its model in
+a different place. It receives the `HarnessAgent` model when a session starts
+and can return launch `args`, `env`, or both. Returned arguments replace the
+static `args`; returned environment values overlay the static `env`. The
+resolver is not called when `HarnessAgent` has no model and the deprecated
+`modelId` fallback is also unset.
+
 Use `instructionMapping` when the ACP implementation exposes a native system
 or developer prompt. A `session-meta` mapping writes `HarnessAgent`
 instructions below the ACP session request's `_meta` field. A

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.31" : "0.0.0-test";
 function createHostToolMCPServer({
   tools: tools2,
   revision = 1,

package/dist/bridge/index.mjs

@@ -157,6 +157,7 @@ var ENV_TRUTHY = /* @__PURE__ */ new Set(["1", "true", "yes", "on"]);
 var WS_OPEN = 1;
 async function runBridge(options) {
   const { bridgeType: bridgeType2, bridgeStateDir: bridgeStateDir2, onStart, onStop, onDestroy } = options;
+  const teardownGraceMs = options.turnTeardownGraceMs ?? 1e4;
   const expectedToken = options.token ?? procEnv.BRIDGE_CHANNEL_TOKEN ?? "";
   const bridgeWsPort = options.port ?? parseInt(procEnv.BRIDGE_WS_PORT ?? "0", 10);
   const bridgeMetaPath = `${bridgeStateDir2}/bridge-meta.json`;
@@ -173,6 +174,7 @@ async function runBridge(options) {
   let isFirstTurn = true;
   let turnAbort;
   let currentUserMessages;
+  let activeTurn;
   let debugConfig;
   let consoleCaptureInstalled = false;
   const envDebugEnabled = ENV_TRUTHY.has(
@@ -363,10 +365,28 @@ async function runBridge(options) {
   const handleInbound = async (msg, ws) => {
     switch (msg.type) {
       case "start": {
+        for (; ; ) {
+          const pendingTurn = activeTurn;
+          if (pendingTurn == null) break;
+          turnAbort?.abort();
+          currentUserMessages?.close(
+            new Error("A new bridge turn replaced the active turn.")
+          );
+          let graceTimer;
+          const settled = await Promise.race([
+            pendingTurn.then(() => true),
+            new Promise((resolve) => {
+              graceTimer = setTimeout(() => resolve(false), teardownGraceMs);
+              graceTimer.unref?.();
+            })
+          ]);
+          clearTimeout(graceTimer);
+          if (!settled) break;
+        }
+        let turnFinished;
+        const thisTurn = new Promise((resolve) => turnFinished = resolve);
+        activeTurn = thisTurn;
         activeSocket = ws;
-        currentUserMessages?.close(
-          new Error("A new bridge turn replaced the active turn.")
-        );
         const firstTurn = isFirstTurn;
         isFirstTurn = false;
         eventLog = [];
@@ -423,8 +443,12 @@ async function runBridge(options) {
           if (currentUserMessages === userMessages) {
             currentUserMessages = void 0;
           }
-          currentTurnState = "waiting";
-          void writeBridgeMeta("waiting");
+          if (activeTurn === thisTurn) {
+            activeTurn = void 0;
+            currentTurnState = "waiting";
+            void writeBridgeMeta("waiting");
+          }
+          turnFinished();
         }
         return;
       }
@@ -659,7 +683,9 @@ var bridgeConfigurationSchema = z.object({
   authentication: authenticationSchema.optional(),
   providerAuthentication: providerAuthenticationSchema.optional(),
   providerEnvironment: z.record(z.string(), z.string()).optional(),
-  sessionMeta: serializableRecordSchema.optional()
+  sessionMeta: serializableRecordSchema.optional(),
+  implementationArgs: z.array(z.string()).optional(),
+  implementationEnv: z.record(z.string(), z.string()).optional()
 });
 async function readACPBridgeEnvironment({
   env
@@ -3388,15 +3414,18 @@ async function ensureSession({
     instructions: start.instructions,
     instructionMapping: start.instructionMapping,
     sessionMeta: bridgeConfiguration.sessionMeta,
-    environment: createChildEnvironment({
-      launchEnv,
-      implementationDir,
-      privateHome: implementation.privateHome
-    })
+    environment: {
+      ...createChildEnvironment({
+        launchEnv,
+        implementationDir,
+        privateHome: implementation.privateHome
+      }),
+      ...bridgeConfiguration.implementationEnv
+    }
   });
   child = spawn(
     `${implementationDir}/${implementation.executablePath}`,
-    [...implementation.args],
+    [...bridgeConfiguration.implementationArgs ?? implementation.args],
     {
       cwd: workDir,
       env: instructionConfiguration.environment,