@cursor/bdk 0.2.1 → 0.2.3

package/dist/internal/deploy-client.js

@@ -215,6 +215,22 @@ const agentkitSessionRunsSchema = z
     startLog: z.string().nullable(),
 })
     .passthrough();
+const agentkitSessionEventPollSchema = z
+    .object({
+    events: z.array(z
+        .object({
+        index: z.number().optional(),
+        type: z.string().optional(),
+    })
+        .passthrough()),
+    execution: z
+        .object({
+        executionId: z.string(),
+        turnStatus: z.string(),
+    })
+        .nullable(),
+})
+    .passthrough();
 const deploymentSchema = z.object({
     id: z.number(),
     slug: z.string(),
@@ -559,19 +575,26 @@ export class AgentServeDeployClient {
             return agentkitEventRepositoriesSchema.parse(raw).repositories;
         });
     }
-    /**
-     * Pin a v2 install onto a release
-     * (`PUT /internal/agentsdk/deployments/:slug/release`), newest ready one
-     * when neither selector is given. A multi-tenant deploy leaves tenants
-     * on the release they were installed on.
-     */
     upgradeAgentkitInstall(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.pinAgentkitInstall("upgrade", args);
+        });
+    }
+    rollbackAgentkitInstall(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.pinAgentkitInstall("rollback", args);
+        });
+    }
+    pinAgentkitInstall(direction, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const raw = yield this.request({
-                method: "PUT",
-                path: `/internal/agentsdk/deployments/${encodeURIComponent(args.slug)}/release?teamId=${args.teamId}`,
+                method: direction === "upgrade" ? "PUT" : "POST",
+                path: `/internal/agentsdk/deployments/${encodeURIComponent(args.slug)}/${direction === "upgrade" ? "release" : "rollback"}?teamId=${args.teamId}`,
                 body: Object.assign(Object.assign({}, (args.releaseId === undefined ? {} : { releaseId: args.releaseId })), (args.version === undefined ? {} : { version: args.version })),
-                context: { verb: "upgrade", slug: args.slug },
+                context: {
+                    verb: direction === "upgrade" ? "upgrade" : "roll back",
+                    slug: args.slug,
+                },
             });
             return agentkitInstallReleaseSchema.parse(raw).releaseId;
         });
@@ -624,6 +647,19 @@ export class AgentServeDeployClient {
             return agentkitSessionRunsSchema.parse(raw);
         });
     }
+    /** Events written so far. Pass `afterEventIndex: -1` to read from the start. */
+    getAgentkitSessionEvents(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const raw = yield this.request({
+                method: "GET",
+                path: `/internal/agentsdk/deployments/${encodeURIComponent(args.slug)}` +
+                    `/sessions/${encodeURIComponent(args.sessionId)}/events` +
+                    `?teamId=${args.teamId}&afterEventIndex=${args.afterEventIndex}`,
+                context: { verb: "get session events", slug: args.slug },
+            });
+            return agentkitSessionEventPollSchema.parse(raw);
+        });
+    }
     listDeployments(args) {
         return __awaiter(this, void 0, void 0, function* () {
             const raw = yield this.request({

package/dist/internal/discovery/connections.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connections.d.ts","sourceRoot":"","sources":["../../../src/internal/discovery/connections.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EAExB,KAAK,oBAAoB,EAQ1B,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,KAAK,gBAAgB,EAAsC,MAAM,cAAc,CAAC;AAIzF,4DAA4D;AAC5D,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,mBAAmB,GAAG,MAAM,CAa/E;AA4FD,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,gBAAgB,EACrB,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,SAAS,oBAAoB,EAAE,GAChD,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAoBjC;AAED,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAM3C;AA2BD,wBAAsB,eAAe,CACnC,GAAG,EAAE,gBAAgB,EACrB,cAAc,EAAE,MAAM,EACtB,IAAI,GAAE,OAAO,GAAG,MAAgB,GAC/B,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAmBjC;AAED,iEAAiE;AACjE,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,gBAAgB,EACrB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,oBAAoB,EAChC,IAAI,EAAE,OAAO,GAAG,MAAM,GACrB,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAoN3C"}
+{"version":3,"file":"connections.d.ts","sourceRoot":"","sources":["../../../src/internal/discovery/connections.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EAExB,KAAK,oBAAoB,EAQ1B,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,KAAK,gBAAgB,EAAsC,MAAM,cAAc,CAAC;AAIzF,4DAA4D;AAC5D,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,mBAAmB,GAAG,MAAM,CAa/E;AA4FD,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,gBAAgB,EACrB,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,SAAS,oBAAoB,EAAE,GAChD,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAoBjC;AAED,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAM3C;AA2BD,wBAAsB,eAAe,CACnC,GAAG,EAAE,gBAAgB,EACrB,cAAc,EAAE,MAAM,EACtB,IAAI,GAAE,OAAO,GAAG,MAAgB,GAC/B,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAmBjC;AAED,iEAAiE;AACjE,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,gBAAgB,EACrB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,oBAAoB,EAChC,IAAI,EAAE,OAAO,GAAG,MAAM,GACrB,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CA8N3C"}

package/dist/internal/discovery/connections.js

@@ -12,6 +12,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { join } from "node:path";
 import { cursorAccountServersHasMixedWildcard, isInlineStdioConnection, isToolEffect, normalizeConnectionEffects, normalizeConnectionTools, normalizeCursorAccountServers, } from "../../types.js";
+import { unresolvedConnectionEnvNames } from "../connection-env.js";
 import { packageInlineStdioConnection } from "../package-inline-stdio.js";
 import { displayPath, errorMessage, isBlank } from "./context.js";
 import { importDefault, moduleEntries } from "./modules.js";
@@ -352,6 +353,16 @@ export function compileConnection(ctx, entryPath, name, connection, role) {
             });
             return undefined;
         }
+        // A warning, never an error: templates resolve when the connection opens,
+        // and a hosted deployment binds its secrets after discovery has run.
+        const unresolved = unresolvedConnectionEnvNames(transport);
+        if (unresolved.length > 0) {
+            ctx.diagnostics.push({
+                severity: "warning",
+                path: displayPath(ctx, entryPath),
+                message: `MCP connection "${name}" templates ${unresolved.map(variable => `\${${variable}}`).join(", ")}, which the environment does not set. The value resolves when the connection opens, so hosted deployments are fine; locally, set it before the turn or the credential is empty.`,
+            });
+        }
         return {
             name,
             transport,

package/dist/internal/event-mapper.d.ts

@@ -41,6 +41,9 @@ type NestedTaskUpdate = {
     type: "step-completed";
     stepId: number;
     stepDurationMs: number;
+} | {
+    type: "tool-requests-listed";
+    callCount: number;
 };
 type ToolCallDeltaUpdate = {
     type: "tool-call-delta";
@@ -48,8 +51,12 @@ type ToolCallDeltaUpdate = {
     modelCallId: string;
     taskUpdate: NestedTaskUpdate;
 };
-/** SDK updates plus nested task deltas once the SDK exposes them. */
-type InteractionUpdate = SdkInteractionUpdate | ToolCallDeltaUpdate;
+type ToolRequestsListedUpdate = {
+    type: "tool-requests-listed";
+    callCount: number;
+};
+/** SDK updates plus list-closed / nested task deltas ahead of `@cursor/sdk`. */
+type InteractionUpdate = SdkInteractionUpdate | ToolCallDeltaUpdate | ToolRequestsListedUpdate;
 export interface ToolCallDescription {
     toolName: string;
     args?: unknown;
@@ -72,6 +79,17 @@ export declare class TurnEventMapper {
     private summaryTitle;
     /** Per-parent-call accumulators for nested subagent streams. */
     private readonly nested;
+    /** One wave per model step (or per call when the step id is missing). */
+    private readonly waves;
+    /**
+     * Keys of waves that already emitted `actions.completed`, plus each
+     * finished call's singleton key. A late duplicate cannot reopen the
+     * batch or emit a second pair for the same callId. A new late callId
+     * still gets its own singleton.
+     */
+    private readonly sealedWaveKeys;
+    /** Listed-call count from `tool-requests-listed`, keyed by parentCallId. */
+    private readonly listedCounts;
     /**
      * @param isStubbed Reports whether a finished tool call was answered by the
      * host rather than executed. The harness reports an answered call exactly
@@ -106,8 +124,32 @@ export declare class TurnEventMapper {
     /** Close out the turn: finalize any open assistant text block. */
     finish(): void;
     private handleNestedTaskUpdate;
-    private emitToolStarted;
-    private emitToolCompleted;
+    private noteToolStarted;
+    private noteToolCompleted;
+    private callBelongsToWave;
+    private singletonWave;
+    /**
+     * Starts join the open model-step wave until `actions.requested` seals.
+     * A later start for that same step is its own singleton pair so completed
+     * cannot list tools the matching requested envelope never had.
+     */
+    private waveForStart;
+    /**
+     * Completes join a model-step wave only when that call already started
+     * there. A start-less complete on an open sibling batch would flush with
+     * `actions.requested` and then block `actions.completed` forever.
+     */
+    private waveForComplete;
+    private adoptSingletonResults;
+    private ensureWave;
+    private noteRequestsListed;
+    private maybeSealListedWave;
+    private sealOpenRequests;
+    private sealWaveRequests;
+    private maybeEmitActionsCompleted;
+    private emitActionsCompleted;
+    private forgetWave;
+    private flushOpenResults;
     private ensureNested;
     private flushAssistantText;
     private flushNestedAssistantText;

package/dist/internal/event-mapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event-mapper.d.ts","sourceRoot":"","sources":["../../src/internal/event-mapper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"event-mapper.d.ts","sourceRoot":"","sources":["../../src/internal/event-mapper.ts"],"names":[],"mappings":"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"}

package/dist/internal/event-mapper.js

@@ -12,6 +12,11 @@ function asToolCallDelta(update) {
     }
     return update;
 }
+function modelCallIdOf(update) {
+    return typeof update.modelCallId === "string" && update.modelCallId !== ""
+        ? update.modelCallId
+        : undefined;
+}
 export class TurnEventMapper {
     /**
      * @param isStubbed Reports whether a finished tool call was answered by the
@@ -25,6 +30,17 @@ export class TurnEventMapper {
         this.reasoningAccumulator = "";
         /** Per-parent-call accumulators for nested subagent streams. */
         this.nested = new Map();
+        /** One wave per model step (or per call when the step id is missing). */
+        this.waves = new Map();
+        /**
+         * Keys of waves that already emitted `actions.completed`, plus each
+         * finished call's singleton key. A late duplicate cannot reopen the
+         * batch or emit a second pair for the same callId. A new late callId
+         * still gets its own singleton.
+         */
+        this.sealedWaveKeys = new Set();
+        /** Listed-call count from `tool-requests-listed`, keyed by parentCallId. */
+        this.listedCounts = new Map();
     }
     /** Per-turn token usage summed across model steps. */
     get usage() {
@@ -100,17 +116,25 @@ export class TurnEventMapper {
             }
             case "tool-call-started": {
                 this.flushAssistantText("tool_call");
-                this.emitToolStarted(update.callId, update.toolCall);
+                this.noteToolStarted(update.callId, update.toolCall, {
+                    modelCallId: modelCallIdOf(update),
+                });
                 return;
             }
             case "tool-call-completed": {
-                this.emitToolCompleted(update.callId, update.toolCall);
+                this.noteToolCompleted(update.callId, update.toolCall, {
+                    modelCallId: modelCallIdOf(update),
+                });
                 return;
             }
             case "step-started": {
                 this.emit({ type: "step.started", data: { stepId: update.stepId } });
                 return;
             }
+            case "tool-requests-listed": {
+                this.noteRequestsListed(undefined, update.callCount);
+                return;
+            }
             case "step-completed": {
                 this.emit({
                     type: "step.completed",
@@ -149,6 +173,8 @@ export class TurnEventMapper {
     }
     /** Close out the turn: finalize any open assistant text block. */
     finish() {
+        this.sealOpenRequests();
+        this.flushOpenResults();
         this.flushAssistantText("stop");
         for (const parentCallId of this.nested.keys()) {
             this.flushNestedAssistantText(parentCallId, "stop");
@@ -198,15 +224,26 @@ export class TurnEventMapper {
             }
             case "tool-call-started": {
                 this.flushNestedAssistantText(parentCallId, "tool_call");
-                this.emitToolStarted(update.callId, update.toolCall, parentCallId);
+                this.noteToolStarted(update.callId, update.toolCall, {
+                    parentCallId,
+                    modelCallId: modelCallIdOf(update),
+                });
                 return;
             }
             case "tool-call-completed": {
-                this.emitToolCompleted(update.callId, update.toolCall, parentCallId);
+                this.noteToolCompleted(update.callId, update.toolCall, {
+                    parentCallId,
+                    modelCallId: modelCallIdOf(update),
+                });
                 return;
             }
             case "partial-tool-call":
+                return;
             case "step-started":
+                return;
+            case "tool-requests-listed":
+                this.noteRequestsListed(parentCallId, update.callCount);
+                return;
             case "step-completed":
                 return;
             default: {
@@ -214,22 +251,32 @@ export class TurnEventMapper {
             }
         }
     }
-    emitToolStarted(callId, toolCall, parentCallId) {
+    noteToolStarted(callId, toolCall, ids) {
+        const parentCallId = ids === null || ids === void 0 ? void 0 : ids.parentCallId;
+        const modelCallId = ids === null || ids === void 0 ? void 0 : ids.modelCallId;
         const description = describeToolCall(toolCall);
-        this.emit({
-            type: "actions.requested",
-            data: {
-                calls: [
-                    {
-                        callId,
-                        toolName: description.toolName,
-                        args: description.args,
-                        parentCallId,
-                    },
-                ],
+        const call = {
+            callId,
+            toolName: description.toolName,
+            args: description.args,
+            parentCallId,
+            modelCallId,
+        };
+        if (modelCallId !== undefined) {
+            this.sealOpenRequests({
                 parentCallId,
-            },
-        });
+                exceptModelCallId: modelCallId,
+            });
+        }
+        const wave = this.waveForStart({ parentCallId, modelCallId, callId });
+        if (wave === undefined) {
+            return;
+        }
+        if (wave.calls.every(existing => existing.callId !== callId)) {
+            wave.calls.push(call);
+        }
+        this.adoptSingletonResults(wave, parentCallId, callId);
+        this.maybeSealListedWave(wave);
         // Subagent bookends only fire for the top-level task tool, not nested
         // tools inside a subagent (nested subagents aren't supported).
         if (description.subagent !== undefined && parentCallId === undefined) {
@@ -242,14 +289,39 @@ export class TurnEventMapper {
                 },
             });
         }
+        if (wave.modelCallId === undefined) {
+            this.sealWaveRequests(wave);
+        }
     }
-    emitToolCompleted(callId, toolCall, parentCallId) {
+    noteToolCompleted(callId, toolCall, ids) {
+        const parentCallId = ids === null || ids === void 0 ? void 0 : ids.parentCallId;
+        const modelCallId = ids === null || ids === void 0 ? void 0 : ids.modelCallId;
         const description = describeToolCall(toolCall);
         const result = describeToolResult(toolCall);
-        this.emit({
-            type: "action.result",
-            data: Object.assign(Object.assign({ callId, toolName: description.toolName, output: result.output, isError: result.isError }, (this.isStubbed(callId) ? { stubbed: true } : {})), { parentCallId }),
-        });
+        const actionResult = {
+            callId,
+            toolName: description.toolName,
+            output: result.output,
+            isError: result.isError,
+            stubbed: this.isStubbed(callId) ? true : undefined,
+            parentCallId,
+            modelCallId,
+        };
+        const wave = this.waveForComplete({ parentCallId, modelCallId, callId });
+        if (wave === undefined) {
+            return;
+        }
+        const isNew = wave.results.every(existing => existing.callId !== callId);
+        if (isNew) {
+            wave.results.push(actionResult);
+        }
+        if (wave.requestedEmitted && isNew) {
+            this.emit({
+                type: "action.result",
+                data: actionResult,
+            });
+            this.maybeEmitActionsCompleted(wave);
+        }
         if (description.subagent !== undefined && parentCallId === undefined) {
             this.flushNestedAssistantText(callId, "stop");
             this.nested.delete(callId);
@@ -259,6 +331,215 @@ export class TurnEventMapper {
             });
         }
     }
+    callBelongsToWave(wave, callId) {
+        return (wave.calls.some(existing => existing.callId === callId) ||
+            wave.results.some(existing => existing.callId === callId));
+    }
+    singletonWave(parentCallId, callId) {
+        const key = waveKey({ parentCallId, callId });
+        if (this.sealedWaveKeys.has(key) && !this.waves.has(key)) {
+            return undefined;
+        }
+        return this.ensureWave(key, { parentCallId });
+    }
+    /**
+     * Starts join the open model-step wave until `actions.requested` seals.
+     * A later start for that same step is its own singleton pair so completed
+     * cannot list tools the matching requested envelope never had.
+     */
+    waveForStart(ids) {
+        const groupedKey = waveKey(ids);
+        const grouped = this.waves.get(groupedKey);
+        if (grouped !== undefined && !grouped.requestedEmitted) {
+            return grouped;
+        }
+        if (grouped !== undefined && this.callBelongsToWave(grouped, ids.callId)) {
+            return grouped;
+        }
+        if (grouped !== undefined && grouped.requestedEmitted) {
+            return this.singletonWave(ids.parentCallId, ids.callId);
+        }
+        if (this.sealedWaveKeys.has(groupedKey)) {
+            return this.singletonWave(ids.parentCallId, ids.callId);
+        }
+        return this.ensureWave(groupedKey, {
+            modelCallId: ids.modelCallId,
+            parentCallId: ids.parentCallId,
+        });
+    }
+    /**
+     * Completes join a model-step wave only when that call already started
+     * there. A start-less complete on an open sibling batch would flush with
+     * `actions.requested` and then block `actions.completed` forever.
+     */
+    waveForComplete(ids) {
+        const groupedKey = waveKey(ids);
+        const grouped = this.waves.get(groupedKey);
+        if (grouped !== undefined && this.callBelongsToWave(grouped, ids.callId)) {
+            return grouped;
+        }
+        if (grouped !== undefined) {
+            return this.singletonWave(ids.parentCallId, ids.callId);
+        }
+        if (this.sealedWaveKeys.has(groupedKey)) {
+            return this.waves.get(waveKey({ parentCallId: ids.parentCallId, callId: ids.callId }));
+        }
+        return this.ensureWave(groupedKey, {
+            modelCallId: ids.modelCallId,
+            parentCallId: ids.parentCallId,
+        });
+    }
+    adoptSingletonResults(wave, parentCallId, callId) {
+        const singletonKey = waveKey({ parentCallId, callId });
+        if (singletonKey === wave.key) {
+            return;
+        }
+        const singleton = this.waves.get(singletonKey);
+        if (singleton === undefined) {
+            return;
+        }
+        for (const result of singleton.results) {
+            if (wave.results.every(existing => existing.callId !== result.callId)) {
+                wave.results.push(result);
+            }
+        }
+        this.waves.delete(singletonKey);
+    }
+    ensureWave(key, ids) {
+        var _a;
+        let wave = this.waves.get(key);
+        if (wave === undefined) {
+            const expectedCalls = this.listedCounts.get((_a = ids.parentCallId) !== null && _a !== void 0 ? _a : "");
+            wave = {
+                key,
+                modelCallId: ids.modelCallId,
+                parentCallId: ids.parentCallId,
+                expectedCalls,
+                calls: [],
+                results: [],
+                requestedEmitted: false,
+                completedEmitted: false,
+            };
+            this.waves.set(key, wave);
+        }
+        return wave;
+    }
+    noteRequestsListed(parentCallId, callCount) {
+        const listed = Math.max(0, callCount);
+        if (listed === 0) {
+            this.sealOpenRequests({ parentCallId });
+            this.listedCounts.delete(parentCallId !== null && parentCallId !== void 0 ? parentCallId : "");
+            return;
+        }
+        this.listedCounts.set(parentCallId !== null && parentCallId !== void 0 ? parentCallId : "", listed);
+        for (const wave of this.waves.values()) {
+            if (wave.parentCallId !== parentCallId || wave.requestedEmitted) {
+                continue;
+            }
+            wave.expectedCalls = listed;
+            this.maybeSealListedWave(wave);
+        }
+    }
+    maybeSealListedWave(wave) {
+        var _a, _b;
+        const expected = (_a = wave.expectedCalls) !== null && _a !== void 0 ? _a : this.listedCounts.get((_b = wave.parentCallId) !== null && _b !== void 0 ? _b : "");
+        if (expected !== undefined && wave.calls.length >= expected) {
+            this.sealWaveRequests(wave);
+        }
+    }
+    sealOpenRequests(ids) {
+        const parentCallId = ids === null || ids === void 0 ? void 0 : ids.parentCallId;
+        const exceptModelCallId = ids === null || ids === void 0 ? void 0 : ids.exceptModelCallId;
+        for (const wave of this.waves.values()) {
+            if (wave.parentCallId !== parentCallId) {
+                continue;
+            }
+            if (exceptModelCallId !== undefined && wave.modelCallId === exceptModelCallId) {
+                continue;
+            }
+            this.sealWaveRequests(wave);
+        }
+    }
+    sealWaveRequests(wave) {
+        var _a;
+        if (wave.requestedEmitted || wave.calls.length === 0) {
+            return;
+        }
+        wave.requestedEmitted = true;
+        this.listedCounts.delete((_a = wave.parentCallId) !== null && _a !== void 0 ? _a : "");
+        this.emit({
+            type: "actions.requested",
+            data: {
+                calls: wave.calls,
+                parentCallId: wave.parentCallId,
+                modelCallId: wave.modelCallId,
+            },
+        });
+        for (const result of wave.results) {
+            this.emit({
+                type: "action.result",
+                data: result,
+            });
+        }
+        this.maybeEmitActionsCompleted(wave);
+    }
+    maybeEmitActionsCompleted(wave) {
+        if (wave.completedEmitted ||
+            !wave.requestedEmitted ||
+            wave.calls.length === 0 ||
+            wave.results.length < wave.calls.length) {
+            return;
+        }
+        const callIds = new Set(wave.calls.map(call => call.callId));
+        if (!wave.results.every(result => callIds.has(result.callId))) {
+            return;
+        }
+        if (!wave.calls.every(call => wave.results.some(result => result.callId === call.callId))) {
+            return;
+        }
+        this.emitActionsCompleted(wave);
+    }
+    emitActionsCompleted(wave) {
+        wave.completedEmitted = true;
+        this.emit({
+            type: "actions.completed",
+            data: {
+                results: wave.results,
+                parentCallId: wave.parentCallId,
+                modelCallId: wave.modelCallId,
+            },
+        });
+        this.forgetWave(wave);
+    }
+    forgetWave(wave) {
+        this.waves.delete(wave.key);
+        this.sealedWaveKeys.add(wave.key);
+        for (const callId of new Set([
+            ...wave.calls.map(call => call.callId),
+            ...wave.results.map(result => result.callId),
+        ])) {
+            this.sealedWaveKeys.add(waveKey({ parentCallId: wave.parentCallId, callId }));
+        }
+        wave.calls = [];
+        wave.results = [];
+    }
+    flushOpenResults() {
+        for (const wave of [...this.waves.values()]) {
+            if (wave.calls.length === 0 && wave.results.length > 0) {
+                wave.calls = wave.results.map(result => ({
+                    callId: result.callId,
+                    toolName: result.toolName,
+                    parentCallId: result.parentCallId,
+                    modelCallId: result.modelCallId,
+                }));
+            }
+            this.sealWaveRequests(wave);
+            this.maybeEmitActionsCompleted(wave);
+            if (!wave.completedEmitted) {
+                this.forgetWave(wave);
+            }
+        }
+    }
     ensureNested(parentCallId) {
         let acc = this.nested.get(parentCallId);
         if (acc === undefined) {
@@ -323,8 +604,14 @@ export function describeToolCall(toolCall) {
             const subagentName = (_a = subagentType === null || subagentType === void 0 ? void 0 : subagentType.name) !== null && _a !== void 0 ? _a : subagentType === null || subagentType === void 0 ? void 0 : subagentType.kind;
             return {
                 toolName: "task",
-                args: Object.assign({ description: toolCall.args.description }, (subagentName === undefined ? {} : { subagentType: subagentName })),
-                subagent: Object.assign(Object.assign({}, (subagentName === undefined ? {} : { name: subagentName })), { description: toolCall.args.description }),
+                args: {
+                    description: toolCall.args.description,
+                    subagentType: subagentName,
+                },
+                subagent: {
+                    name: subagentName,
+                    description: toolCall.args.description,
+                },
             };
         }
         default: {
@@ -357,6 +644,10 @@ export function describeToolResult(toolCall) {
     }
     return { output: result.value, isError: false };
 }
+function waveKey(ids) {
+    var _a, _b;
+    return `${(_a = ids.parentCallId) !== null && _a !== void 0 ? _a : ""}:${(_b = ids.modelCallId) !== null && _b !== void 0 ? _b : `call:${ids.callId}`}`;
+}
 function addUsage(total, usage) {
     var _a, _b;
     if (total === undefined) {