@salesforce/sfdx-agent-harness-mastra 0.17.0 → 0.18.0

package/CHANGELOG.md

@@ -3,6 +3,11 @@
 All notable changes to `@salesforce/sfdx-agent-harness-mastra` are documented in this file.
 Format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
+## [0.18.0] - 2026-06-11
+
+### Fixes
+- **harness-mastra**: drive one resume per pending approval for parallel batches ([#587](https://github.com/forcedotcom/agentic-dx/pull/587))
+
 ## [0.17.0] - 2026-06-09
 
 ### Fixes

package/dist/mastra-approval-coordinator.d.ts

@@ -143,12 +143,11 @@ export declare class MastraApprovalCoordinator {
      */
     private currentRunId;
     /**
-     * The toolCallId Mastra is currently suspended on (after the natural
-     * `tool-call-approval` chunk). `null` when no suspension. The
-     * coordinator's pump loop reads this when the current `fullStream`
-     * closes to decide whether to drive a resume.
+     * ToolCallIds Mastra is currently suspended on. Mastra retains a separate
+     * workflow snapshot step per id, so the pump must drive one resume per
+     * pending id with `{ toolCallId }` to disambiguate (#586).
      */
-    private currentSuspendId;
+    private readonly pendingSuspendIds;
     /** Consumer-tool: bound parkers, keyed by `toolCallId`. `submitToolResult` resolves these. */
     private readonly pendingByToolCallId;
     /**

package/dist/mastra-approval-coordinator.js

@@ -5,6 +5,13 @@
 import { AgentSDKError, AgentSDKErrorType, } from '@salesforce/sfdx-agent-sdk';
 import { GenSink } from '@salesforce/sfdx-agent-sdk/harness';
 import { MastraEventAdapter } from './mastra-event-adapter.js';
+function pickIdWithDecision(pendingIds, decisions) {
+    for (const id of pendingIds) {
+        if (decisions.has(id))
+            return id;
+    }
+    return undefined;
+}
 /**
  * Per-`(agentId, threadId)` coordinator that subsumes the pre-#529
  * `MastraStreamBroker` + `activeRuns` pair into one object owning a single
@@ -72,12 +79,11 @@ export class MastraApprovalCoordinator {
      */
     currentRunId = '';
     /**
-     * The toolCallId Mastra is currently suspended on (after the natural
-     * `tool-call-approval` chunk). `null` when no suspension. The
-     * coordinator's pump loop reads this when the current `fullStream`
-     * closes to decide whether to drive a resume.
+     * ToolCallIds Mastra is currently suspended on. Mastra retains a separate
+     * workflow snapshot step per id, so the pump must drive one resume per
+     * pending id with `{ toolCallId }` to disambiguate (#586).
      */
-    currentSuspendId = null;
+    pendingSuspendIds = new Set();
     /** Consumer-tool: bound parkers, keyed by `toolCallId`. `submitToolResult` resolves these. */
     pendingByToolCallId = new Map();
     /**
@@ -210,7 +216,7 @@ export class MastraApprovalCoordinator {
             this.initial.push({ type: 'finish', finishReason: 'error' });
             this.initial.end();
         }
-        this.currentSuspendId = null;
+        this.pendingSuspendIds.clear();
         this.runTeardownCallbacks();
     }
     // ───────────────────────── settle methods ───────────────────────────────
@@ -233,14 +239,9 @@ export class MastraApprovalCoordinator {
         this.consumerSettled.add(toolCallId);
         this.cancelTimer(toolCallId);
         this.decisions.set(toolCallId, decision);
-        // The pump loop is the single owner of `agent.approveToolCall(...)`
-        // / `declineToolCall(...)` invocation. recordDecision buffers the
-        // decision; the pump's outer loop reads `decisions.get(suspendId)`
-        // when it sees the matching suspension and drives the resume. If
-        // the pump is currently parked on `awaitContinuation` (saw the
-        // suspension first, decision arrived second), wake it so it
-        // re-checks `decisions`.
-        if (this.continuationResolver && this.currentSuspendId === toolCallId) {
+        // Wake the pump if it's parked on `awaitContinuation` waiting for
+        // a decision on a pending id.
+        if (this.continuationResolver && this.pendingSuspendIds.has(toolCallId)) {
             const resolve = this.continuationResolver;
             this.continuationResolver = undefined;
             resolve('continued');
@@ -330,33 +331,29 @@ export class MastraApprovalCoordinator {
                 }
                 if (this.aborted || this.disposed || this.timedOut)
                     return;
-                // outcome === 'suspended': Mastra suspended after a
-                // `tool-call-approval` chunk. `currentSuspendId` carries
-                // the id Mastra is suspended on. Either the consumer
-                // already settled (decision buffered) and we drive the
-                // resume now, or we park until a settle arrives.
-                const suspendId = this.currentSuspendId;
-                if (suspendId === null) {
-                    // Defensive: stream ended without a suspension. Treat
-                    // as terminal.
+                // outcome === 'suspended': drive one resume per outer
+                // iteration. For parallel batches, all but the last resume
+                // returns a stream that closes silently while still
+                // suspended — the pump re-enters here to drive the next id.
+                if (this.pendingSuspendIds.size === 0) {
                     if (!this.initial.isEnded())
                         this.initial.end();
                     return;
                 }
-                let buffered = this.decisions.get(suspendId);
-                if (buffered === undefined) {
-                    // Park for a decision (or teardown).
+                let nextId = pickIdWithDecision(this.pendingSuspendIds, this.decisions);
+                if (nextId === undefined) {
                     const cont = await this.awaitContinuation();
                     if (cont === 'done')
                         return;
-                    // Re-read `decisions` post-wake; recordDecision sets it
-                    // before signaling, so we must see it here.
-                    buffered = this.decisions.get(suspendId);
-                    if (buffered === undefined)
+                    nextId = pickIdWithDecision(this.pendingSuspendIds, this.decisions);
+                    if (nextId === undefined)
                         return;
                 }
-                this.currentSuspendId = null;
-                const next = await this.driveResumeReturning(suspendId, buffered);
+                const decision = this.decisions.get(nextId);
+                if (decision === undefined)
+                    return;
+                this.pendingSuspendIds.delete(nextId);
+                const next = await this.driveResumeReturning(nextId, decision);
                 if (next === 'done')
                     return;
                 currentStream = next;
@@ -434,22 +431,21 @@ export class MastraApprovalCoordinator {
                     continue;
                 }
                 if (event.type === 'tool-approval-request') {
-                    // Mastra's natural `tool-call-approval` chunk → ChatEvent.
-                    // Mastra has suspended on this toolCallId. Decide whether
-                    // to surface a `tool-approval-request` to the consumer or
-                    // auto-approve silently.
+                    // Parallel batches emit one chunk per suspension before
+                    // the stream closes; accumulate every id and let the
+                    // read loop continue to the natural close.
                     const tc = event.toolCall;
                     this.toolCallArgs.set(tc.toolCallId, tc.args);
-                    this.currentSuspendId = tc.toolCallId;
+                    this.pendingSuspendIds.add(tc.toolCallId);
                     sawSuspension = true;
                     if (this.consumerToolNames.has(tc.toolName)) {
                         // Consumer tools bypass the gate per the
                         // StreamOptions.requireToolApproval JSDoc. Auto-
                         // approve silently — no ChatEvent surfaces, and the
-                        // outer pump loop drives `agent.approveToolCall`
-                        // when it picks up the buffered decision. After
-                        // Mastra resumes, the bridge `execute` parker runs
-                        // and `submitToolResult` settles it — same shape as
+                        // pump loop drives `agent.approveToolCall` when it
+                        // picks up the buffered decision. After Mastra
+                        // resumes, the bridge `execute` parker runs and
+                        // `submitToolResult` settles it — same shape as
                         // non-approval-mode consumer-tool flow.
                         this.settledByCoordinator.add(tc.toolCallId);
                         this.decisions.set(tc.toolCallId, { kind: 'approve' });
@@ -459,14 +455,7 @@ export class MastraApprovalCoordinator {
                         // pre-emit in tool-call routing).
                         this.emitApprovalRequest(tc.toolCallId, tc.toolName, tc.args);
                     }
-                    // Drain the rest of the stream so Mastra's workflow
-                    // snapshot persists before we attempt a resume.
-                    while (true) {
-                        const { done: d } = await reader.read();
-                        if (d)
-                            break;
-                    }
-                    return 'suspended';
+                    continue;
                 }
                 this.routeEnriched(event);
             }
@@ -490,17 +479,13 @@ export class MastraApprovalCoordinator {
                 /* best-effort: lock may already be released after a thrown read */
             }
         }
-        // Stream closed naturally without a `finish` chunk and without a
-        // suspension. This happens when:
-        //  (a) abort/dispose/timeout fired and Mastra closed the stream
-        //      silently (no chunk emitted).
-        //  (b) consumer-tool flow: the tool's parker resolved, Mastra
-        //      continued the same fullStream, and the next assistant turn
-        //      ran to terminal `finish` — but in that case `finish` would
-        //      have arrived in the loop above. So (b) shouldn't reach here.
-        // Treat as terminal: sink is either ended already (teardown) or
-        // we must end it now.
-        if (!sawTerminal && !sawSuspension && !this.initial.isEnded()) {
+        // Stream closed without `finish`/`error`. If any suspension is
+        // pending (just observed, or carried over from a prior non-final
+        // resume that closed silently), defer to the pump loop's drive.
+        if (sawSuspension || this.pendingSuspendIds.size > 0) {
+            return 'suspended';
+        }
+        if (!sawTerminal && !this.initial.isEnded()) {
             this.initial.end();
         }
         return 'terminal';
@@ -540,10 +525,10 @@ export class MastraApprovalCoordinator {
             return output.fullStream;
         }
         catch (err) {
+            // Route through teardown so siblings in `pendingSuspendIds`
+            // settle as auto-resolved rather than silently orphaning.
             const error = err instanceof Error ? err : new Error(String(err));
-            this.initial.push({ type: 'error', error });
-            this.initial.push({ type: 'finish', finishReason: 'error' });
-            this.initial.end();
+            this.teardown('pump-error', error, 'pump-error');
             return 'done';
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/sfdx-agent-harness-mastra",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "Mastra-backed AgentHarness implementation for @salesforce/sfdx-agent-sdk",
   "type": "module",
   "main": "dist/index.js",
@@ -38,11 +38,11 @@
     "@salesforce/llm-gateway-sdk": "0.14.0"
   },
   "peerDependencies": {
-    "@salesforce/sfdx-agent-sdk": "0.18.0"
+    "@salesforce/sfdx-agent-sdk": "0.19.0"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "@salesforce/sfdx-agent-sdk": "0.18.0",
+    "@salesforce/sfdx-agent-sdk": "0.19.0",
     "@types/node": "^22.19.20",
     "@vitest/coverage-istanbul": "^4.1.8",
     "@vitest/eslint-plugin": "^1.6.19",