@cursor/bdk 0.2.25 → 0.2.27

package/dist/internal/session-engine.js

@@ -15,7 +15,7 @@ import { SlackAskDedupeStore, SlackNudgeStore } from "../channels/slack/nudge-st
 import { resolveDedicatedSlackHostBinding } from "../channels/slack/slack-channel.js";
 import { AGENT_SERVE_USER_STORE_FILES_SOURCE_ID, agentStoreKeys, DEPLOYMENT_STORE_MOUNT_PATH, USER_STORE_MOUNT_PATH, } from "../files.js";
 import { cursorHostedFiles, isCursorHostedFilesAvailable, isCursorUserStoreFilesAvailable, } from "../files-backends/cursor-hosted.js";
-import { isFileSystemToolAlias, isMutatingFileSystemTool, localFileSystem, resolveFileSystemTools, resolveHostHarnessToolOptions, tempFs, unionFs, writeWorkspaceFilesToRoot, } from "../filesystem.js";
+import { isFileNotFoundError, isFileSystemToolAlias, isMutatingFileSystemTool, localFileSystem, readOnlyFs, resolveFileSystemTools, resolveHostHarnessToolOptions, sessionFileSystem, writeWorkspaceFilesToRoot, } from "../filesystem.js";
 import { storageKeysForArchitecture } from "../storage.js";
 import { DEFAULT_MODEL, DIRECT_TOOL_CALL_CHANNEL_ID, isCursorAccountTransport, isHostOauthConnectionTransport, isSymbolicConnectionTransport, } from "../types.js";
 import { resolveAdvertisedTools } from "./advertise-tools.js";
@@ -44,9 +44,9 @@ import { createHostOtelApi } from "./host-otel.js";
 import { createHostPlatforms, createHostSlackClient, } from "./host-platforms.js";
 import { HostedAdmissionLocalSendError, isDuringHostedAdmission, } from "./hosted-admission-context.js";
 import { hostedSessionResumeKey } from "./hosted-catch-protocol.js";
-import { formatContinuationToken, newContinuationKey, newSessionId, newToolCallId, parseContinuationToken, } from "./ids.js";
+import { formatContinuationToken, newContinuationKey, newSessionId, newToolCallId, parseContinuationToken, resolveDeliveryId, } from "./ids.js";
 import { validateToolInput } from "./json-schema.js";
-import { isMcpNeedsAuthError, McpHost } from "./mcp-host.js";
+import { isMcpNeedsAuthError, McpHost, McpReconnectError } from "./mcp-host.js";
 import { McpOauthOnDemandHub } from "./mcp-oauth-on-demand.js";
 import { shouldStartProcessMemoryTelemetry, startProcessMemoryTelemetry, } from "./process-memory-telemetry.js";
 import { buildSessionContextBlock, SCHEDULE_CHANNEL_PREFIX } from "./prompt-context.js";
@@ -56,6 +56,7 @@ import { SessionStore } from "./session-store.js";
 import { syncSkillsToStore } from "./skills-sync.js";
 import { steeringEnabled } from "./steering.js";
 import { resolveApiKeySync } from "./cursor/credentials.js";
+import { CLI_COMMAND_NAME } from "./distribution.js";
 import { createSessionLivePublisher } from "./session-live-publisher.js";
 import { StorageCoordinator, isTurnBoundaryEvent } from "./storage-coordinator.js";
 import { decideToolCall, directCallEffect } from "./tool-policy.js";
@@ -66,11 +67,15 @@ import { TurnGovernor } from "./turn-governor.js";
 import { TurnLeaseStore } from "./turn-lease-store.js";
 import { TurnOutbox } from "./turn-outbox.js";
 import { isCursorManagedV2Hosting, resolveAgentV2Hosting } from "./v2-hosting.js";
-import { buildAgentsMdContent, buildCloudMemorySection, buildCloudSessionWorkspaceSection, buildCloudWorkspaceSection, ensureOwnGitRoot, isNestedInGitRepo, materializeWorkspace, SERVER_TOOLS_MCP_SERVER_NAME, withIdentityPreamble, } from "./workspace.js";
+import { buildAgentsMdContent, buildCloudMemorySection, buildCloudSessionWorkspaceSection, buildCloudWorkspaceSection, ensureOwnGitRoot, isNestedInGitRepo, materializeWorkspace, SERVER_TOOLS_MCP_SERVER_NAME, SKILLS_MOUNT_PATH, skillsFileSystem, withIdentityPreamble, } from "./workspace.js";
 import { syncSessionWorkspaceFiles, syncWorkspaceToStore, WorkspaceFileRefusal, wipeSessionWorkspace, } from "./workspace-sync.js";
 export const HTTP_CHANNEL_ID = "http";
 export { mergeChannelStateSkipNull } from "./channel-state.js";
 export { SCHEDULE_CHANNEL_PREFIX } from "./prompt-context.js";
+/**
+ * @deprecated Channel handlers may still catch this. It stays on the package
+ * root for those handlers.
+ */
 export class SessionBusyError extends Error {
     constructor(sessionId) {
         super(`Session ${sessionId} already has a running turn; wait for session.waiting before sending a follow-up`);
@@ -165,6 +170,8 @@ export class AuthInterruptedError extends Error {
         this.name = "AuthInterruptedError";
     }
 }
+/** How long an interactive turn waits for a person to authorize a connection. */
+export const MCP_AUTH_PARK_TIMEOUT_MS = 10 * 60_000;
 const mcpAuthAls = new AsyncLocalStorage();
 const RELEASED_CONTINUATIONS_CAP = 256;
 /** Marker that we `git init`'d this shared harness so scaffold is ours to write. */
@@ -230,6 +237,8 @@ export class SessionEngine {
         this.deliveredNudges = new Map();
         /** Aborts the in-flight turn per session so a follow-up can preempt it. */
         this.turnAborts = new Map();
+        /** Turn mode of the in-flight turn per session, owned with `turnAborts`. */
+        this.turnModes = new Map();
         /** Serializes turn admission per session (latest follow-up wins). */
         this.admissionChains = new Map();
         /** Live turn snapshot so a coalesced Slack wake can repaint on this process. */
@@ -257,23 +266,24 @@ export class SessionEngine {
         this.cloudUsageBackfillDone = new Set();
         /** Deduped in-flight cloud usage backfills, keyed by session id. */
         this.cloudUsageBackfill = new Map();
-        /** Per-session FileSystem handle cache (not a tree snapshot). */
+        /** Per-session authored `fs` and skills handles (not tree snapshots). */
         this.sessionRoots = new Map();
         /** In-flight factory resolves, so the first turn and a racing callTool share one handle. */
         this.sessionRootInflight = new Map();
-        /** Per-turn `unionFs({ "/": authored, "/tmp": tempFs() })`. Dropped at end of turn. */
+        /** Per-turn union of the authored tree, `/agent/skills`, and `/tmp`. Dropped at end of turn. */
         this.turnRoots = new Map();
         this.project = options.project;
         applyAgentContinuationDefaults(this.project);
         this.stateRoot = options.stateRoot;
         this.runner = options.runner;
         this.logger = options.logger ?? (() => { });
+        this.readFrameworkMeter = options.otelMeter ?? (() => undefined);
         this.getCloudUsage = options.getCloudUsage ?? defaultGetCloudUsage;
         this.estimateSessionCost = options.estimateSessionCost ?? estimateCostFromApi;
         this.otel = options.otel;
         this.otelHost = createHostOtelApi({
             agentName: options.project.name,
-            meter: options.otelMeter,
+            meter: this.readFrameworkMeter,
             collector: options.otel,
         });
         this.turnGovernor = new TurnGovernor(options.project.agent.concurrency);
@@ -371,7 +381,7 @@ export class SessionEngine {
                 agentName: options.project.name,
                 getEventLogStats: () => this.logs.memoryStats(),
                 logger: this.logger,
-                meter: options.otelMeter,
+                meter: this.readFrameworkMeter,
             })
             : undefined;
     }
@@ -661,6 +671,7 @@ export class SessionEngine {
         if (options.clearCloudOverride === true && options.cloud !== undefined) {
             throw new Error("send options cloud and clearCloudOverride cannot be combined");
         }
+        const deliveryId = resolveDeliveryId(options.deliveryId);
         const identity = channelId === HTTP_CHANNEL_ID
             ? httpContinuationIdentity(this.project.httpChannel)
             : channelContinuationIdentity(this.channelsById.get(channelId));
@@ -760,11 +771,13 @@ export class SessionEngine {
             }
             const since = (await this.logs.get(record.sessionId)).count;
             const coalesced = await this.startTurn(record.sessionId, message, {
+                turnMode: sendOptions.turnMode ?? "non-interactive",
                 admission: enqueueOnly ? "coalesce" : (sendOptions.admission ?? "preempt"),
                 ...(sendOptions.coalesceSourceTs === undefined
                     ? {}
                     : { sourceTs: sendOptions.coalesceSourceTs }),
                 ...(enqueueOnly ? { hostedEnqueueOnly: true } : {}),
+                deliveryIds: [deliveryId],
             });
             if (enqueueOnly && !coalesced) {
                 throw new HostedEnqueueNotActiveError(record.sessionId);
@@ -772,7 +785,7 @@ export class SessionEngine {
             if (!enqueueOnly && coalesced && sendOptions.refreshState !== undefined) {
                 await this.repaintOnCoalescedRefresh(record.sessionId, sendOptions.refreshState);
             }
-            return this.channelSession(record.sessionId, record, false, coalesced, since);
+            return this.channelSession(record.sessionId, record, deliveryId, false, coalesced, since);
         }
         if (sendOptions.hostedEnqueueOnly === true) {
             throw new HostedEnqueueNotActiveError(sendOptions.hostedSessionId);
@@ -816,12 +829,14 @@ export class SessionEngine {
         });
         const since = (await this.logs.get(record.sessionId)).count;
         await this.startTurn(record.sessionId, message, {
+            turnMode: sendOptions.turnMode ?? "non-interactive",
             admission: sendOptions.admission ?? "preempt",
             ...(sendOptions.coalesceSourceTs === undefined
                 ? {}
                 : { sourceTs: sendOptions.coalesceSourceTs }),
+            deliveryIds: [deliveryId],
         });
-        return this.channelSession(record.sessionId, record, true, false, since);
+        return this.channelSession(record.sessionId, record, deliveryId, true, false, since);
     }
     rejectMismatchedModelConfig(existing, modelConfig) {
         const next = modelConfigForDryRun(modelConfig, existing.dryRun);
@@ -861,7 +876,7 @@ export class SessionEngine {
             throw error;
         }
         try {
-            await this.startTurn(sessionId, message);
+            await this.startTurn(sessionId, message, { turnMode: "interactive" });
             return next;
         }
         catch (error) {
@@ -883,7 +898,7 @@ export class SessionEngine {
         if (record === undefined || record.channelId !== channelId) {
             return null;
         }
-        return this.channelSession(sessionId, record, false);
+        return this.channelSession(sessionId, record, undefined, false);
     }
     /** Cross-channel hand-off (schedules and channel route handlers). */
     async receive(channel, input) {
@@ -968,7 +983,7 @@ export class SessionEngine {
      * Resolves to `true` when the message was coalesced (enqueued), `false`
      * when a turn was started.
      */
-    startTurn(sessionId, message, options = {}) {
+    startTurn(sessionId, message, options) {
         const prior = this.admissionChains.get(sessionId) ?? Promise.resolve();
         const admitted = prior
             .catch(() => { })
@@ -1001,7 +1016,18 @@ export class SessionEngine {
     }
     enqueueCoalesced(sessionId, item) {
         const queue = this.coalesceQueues.get(sessionId) ?? [];
-        if (item.sourceTs !== undefined && queue.some((entry) => entry.sourceTs === item.sourceTs)) {
+        const duplicate = item.sourceTs === undefined
+            ? undefined
+            : queue.find((entry) => entry.sourceTs === item.sourceTs);
+        if (duplicate !== undefined) {
+            for (const id of item.deliveryIds) {
+                if (!duplicate.deliveryIds.includes(id)) {
+                    duplicate.deliveryIds.push(id);
+                }
+            }
+            if (item.turnMode === "interactive") {
+                duplicate.turnMode = "interactive";
+            }
             return;
         }
         queue.push(item);
@@ -1092,8 +1118,12 @@ export class SessionEngine {
         const message = this.formatCoalescedFollowups(pending);
         this.logger(`[session] coalesce drain starting follow-up (${pending.length}) ${sessionId}`);
         await this.startTurn(sessionId, message, {
+            turnMode: pending.some((item) => item.turnMode === "interactive")
+                ? "interactive"
+                : "non-interactive",
             admission: "preempt",
             retainCoalesced: true,
+            deliveryIds: pending.flatMap((item) => item.deliveryIds),
         });
     }
     async steerIntoRunningTurn(sessionId, message) {
@@ -1108,16 +1138,24 @@ export class SessionEngine {
             return "revert_to_followup";
         }
     }
-    async admitTurn(sessionId, message, options = {}) {
+    async admitTurn(sessionId, message, options) {
         const admission = options.admission ?? "preempt";
         if (admission === "coalesce" && steeringEnabled() && this.isTurnRunning(sessionId)) {
             const toolCtx = this.activeToolContexts.get(sessionId);
             const steerOutcome = await this.steerIntoRunningTurn(sessionId, message);
             if (steerOutcome === "complete_delivered") {
                 this.logger(`[session] steered into running turn ${sessionId}`);
+                // The person who steered now waits on this turn and can connect.
+                if (options.turnMode === "interactive" && this.turnModes.has(sessionId)) {
+                    this.turnModes.set(sessionId, "interactive");
+                }
                 if (toolCtx !== undefined) {
-                    toolCtx.emit({ type: "message.received", data: { text: message } });
-                    toolCtx.emit({ type: "nudge.delivered", data: {} });
+                    const deliveryIds = options.deliveryIds;
+                    toolCtx.emit({ type: "message.received", data: { text: message, deliveryIds } });
+                    // Outbox items from an older server carry no ids.
+                    for (const deliveryId of deliveryIds ?? [undefined]) {
+                        toolCtx.emit({ type: "nudge.delivered", data: { deliveryId } });
+                    }
                 }
                 return true;
             }
@@ -1129,6 +1167,8 @@ export class SessionEngine {
             this.enqueueCoalesced(sessionId, {
                 message,
                 sourceTs: options.sourceTs,
+                turnMode: options.turnMode,
+                deliveryIds: [...(options.deliveryIds ?? [])],
             });
             this.logger(`[session] coalesce enqueue ${sessionId}`);
             return true;
@@ -1186,12 +1226,13 @@ export class SessionEngine {
             await this.appendEvent(sessionId, {
                 type: "message.received",
                 turnId,
-                data: { text: message },
+                data: { text: message, deliveryIds: options.deliveryIds },
             });
             // `turn.started` is appended by executeTurn once the turn holds a
             // governor slot; saturated engines emit `turn.queued` first.
             const abort = new AbortController();
             this.turnAborts.set(sessionId, abort);
+            this.turnModes.set(sessionId, options.turnMode);
             // Lifecycle promise includes post-turn coalesce drain so waiters and
             // interrupt settle after follow-ups are admitted (not only executeTurn).
             // Assigned before the async body runs so self-identity checks typecheck.
@@ -1224,6 +1265,7 @@ export class SessionEngine {
                 }
                 if (this.turnAborts.get(sessionId) === abort) {
                     this.turnAborts.delete(sessionId);
+                    this.turnModes.delete(sessionId);
                 }
                 // Failed or cancelled owners must not start a coalesced successor;
                 // managed delivery retries the same follow-ups.
@@ -1346,10 +1388,14 @@ export class SessionEngine {
         return this.interrupt(existing.sessionId);
     }
     hasRootOverride() {
-        return this.project.agent.root !== undefined;
+        return this.project.agent.fs !== undefined || this.project.agent.root !== undefined;
+    }
+    /** The field the author set, for messages. Discovery copies a lone `root` onto `fs`. */
+    authoredFsField() {
+        return this.project.agent.root === undefined ? "fs" : "root";
     }
     /**
-     * FileSystem for this turn or `callTool`. Authored `root` (static or
+     * FileSystem for this turn or `callTool`. Authored `fs` (static or
      * factory) is cached per session when `cache` is set; unscoped
      * `callTool` passes the invocation id and does not cache, so factories
      * cannot share one tree across callers. A static handle is used as
@@ -1358,20 +1404,21 @@ export class SessionEngine {
      * the Cursor SDK natives, always through the synthesized tools.
      */
     async resolveFileSystem(options) {
-        const authored = this.project.agent.root;
-        if (authored === undefined) {
+        if (!this.hasRootOverride()) {
             return localFileSystem({ cwd: options.cwd });
         }
-        const authoredRoot = await this.resolveAuthoredFileSystem(options);
+        const authored = await this.resolveAuthoredFileSystem(options);
         if (options.cache) {
             const existing = this.turnRoots.get(options.sessionId);
             if (existing !== undefined) {
                 return existing.root;
             }
         }
-        const root = unionFs({
-            "/": authoredRoot,
-            "/tmp": tempFs(),
+        const root = sessionFileSystem({
+            authored: authored.fs,
+            skills: authored.skills === undefined
+                ? undefined
+                : { path: SKILLS_MOUNT_PATH, fs: authored.skills },
         });
         if (options.cache && this.isTurnRunning(options.sessionId)) {
             this.turnRoots.set(options.sessionId, { root, cwd: options.cwd });
@@ -1379,9 +1426,10 @@ export class SessionEngine {
         return root;
     }
     async resolveAuthoredFileSystem(options) {
-        const authored = this.project.agent.root;
+        const agent = this.project.agent;
+        const authored = agent.fs ?? agent.root;
         if (authored === undefined) {
-            throw new Error("resolveAuthoredFileSystem requires an authored root");
+            throw new Error("resolveAuthoredFileSystem requires an authored fs");
         }
         if (options.cache) {
             const cached = this.sessionRoots.get(options.sessionId);
@@ -1393,14 +1441,14 @@ export class SessionEngine {
                 return inflight;
             }
         }
-        const resolve = async () => {
+        const resolveFs = async () => {
             if (typeof authored !== "function") {
                 return authored;
             }
             const host = this.hostForSession(options.cache ? options.sessionId : undefined);
             const ctx = {
                 sessionId: options.sessionId,
-                agentName: this.project.agent.name,
+                agentName: agent.name,
                 ...(options.continuationKey === undefined
                     ? {}
                     : { continuationKey: options.continuationKey }),
@@ -1408,6 +1456,37 @@ export class SessionEngine {
             };
             return await authored(ctx);
         };
+        const resolve = async () => {
+            const fs = await resolveFs();
+            if (agent.skillsMount === false) {
+                return { fs, skills: undefined };
+            }
+            let skillsOccupied = false;
+            try {
+                skillsOccupied = (await fs.stat(SKILLS_MOUNT_PATH)).kind !== "missing";
+            }
+            catch (error) {
+                if (!isFileNotFoundError(error)) {
+                    throw error;
+                }
+                skillsOccupied = false;
+            }
+            if (skillsOccupied) {
+                throw new Error(`Agent "${agent.name}" ${this.authoredFsField()} already has ${SKILLS_MOUNT_PATH}, where BDK mounts the agent's skills. Remove ${SKILLS_MOUNT_PATH} from ${this.authoredFsField()}, or set skills: false to keep yours.`);
+            }
+            const skills = await this.baseSkillsFileSystem();
+            if (agent.skillsMount === undefined) {
+                return { fs, skills };
+            }
+            return {
+                fs,
+                skills: readOnlyFs(await agent.skillsMount({
+                    skills,
+                    sessionId: options.sessionId,
+                    continuationKey: options.continuationKey,
+                })),
+            };
+        };
         if (!options.cache) {
             return resolve();
         }
@@ -1422,6 +1501,13 @@ export class SessionEngine {
             this.sessionRootInflight.delete(options.sessionId);
         }
     }
+    baseSkillsFileSystem() {
+        this.baseSkills ??= skillsFileSystem(this.project.agent.skills).catch((error) => {
+            this.baseSkills = undefined;
+            throw error;
+        });
+        return this.baseSkills;
+    }
     dropTurnFileSystem(sessionId) {
         this.turnRoots.delete(sessionId);
     }
@@ -2079,11 +2165,11 @@ export class SessionEngine {
         //
         // Factory roots omit `allowedTools` at discovery (the live handle is
         // resolved per session). The allowlist guard below therefore never
-        // fires for `defineAgent({ root: (ctx) => … })` with omitted `tools`,
+        // fires for `defineAgent({ fs: (ctx) => … })` with omitted `tools`,
         // and a per-send `cloud` attach would skip the virtual-root allowlist
-        // and run unrestricted on a VM. Any authored root refuses non-local turns.
+        // and run unrestricted on a VM. Any authored fs refuses non-local turns.
         if (runtime !== "local" && this.hasRootOverride()) {
-            throw new Error(`Agent "${agent.name}" declares root, which cannot be served on ${runtime} turns. Refusing the session rather than running it against the host VM.`);
+            throw new Error(`Agent "${agent.name}" declares ${this.authoredFsField()}, which cannot be served on ${runtime} turns. Refusing the session rather than running it against the host VM.`);
         }
         if (runtime !== "local" && agent.allowedTools !== undefined) {
             throw new Error(`Agent "${agent.name}" declares a built-in tool allowlist (tools), which cannot be enforced on ${runtime} turns. Refusing the session rather than running it unrestricted.`);
@@ -2210,7 +2296,7 @@ export class SessionEngine {
         // synthesized file tools and embedded script bodies.
         const localInstructions = runtime === "local"
             ? authoredRoot
-                ? buildAgentsMdContent({ ...instructionsAgent, tools: [...instructionsAgent.tools, ...synthesized] }, { includeScripts: true })
+                ? buildAgentsMdContent({ ...instructionsAgent, tools: [...instructionsAgent.tools, ...synthesized] }, { includeScripts: true, skillsIndex: agent.skillsMount !== false })
                 : buildAgentsMdContent(instructionsAgent, {
                     includeScripts: this.hasBorrowedWorkspace(record),
                 })
@@ -2569,6 +2655,7 @@ export class SessionEngine {
             turnId,
             callId: newToolCallId("mcp"),
             toolName: "mcp",
+            turnMode: () => this.turnModeFor(record.sessionId),
             emit,
         }, () => resolveAdvertisedTools({
             agent: this.advertisingAgent(),
@@ -2708,6 +2795,7 @@ export class SessionEngine {
                 turnId: args.turnId,
                 callId: toolCallId,
                 toolName: args.tool.name,
+                turnMode: () => this.turnModeFor(args.record.sessionId),
                 emit: args.emit,
             }, () => this.runExecutedTool({
                 tool: args.tool,
@@ -2947,9 +3035,28 @@ export class SessionEngine {
         if (ctx === undefined) {
             throw error;
         }
+        const authored = this.authoredConnection(connection);
+        const optional = authored?.optional === true;
+        const canPark = () => ctx.turnMode() === "interactive" && !optional;
+        const giveUp = () => {
+            if (optional) {
+                // The original error lets `resolveAdvertisedTools` skip the connection.
+                this.logger(`[session] skipping optional MCP connection ${connection}: authorization required`);
+                throw error;
+            }
+            if (authored !== undefined && !canPark()) {
+                throw new McpReconnectError(authored.name, mcpAuthReconnectMessage(authored), error);
+            }
+            throw error;
+        };
+        // Only `oauth: true` can recover without a person, from a saved token.
+        const canRefresh = authored !== undefined && isHostOauthConnectionTransport(authored.transport);
+        if (!canPark() && !canRefresh) {
+            return giveUp();
+        }
         const minted = await this.mintAuthUrl(connection, ctx.sessionId);
         if (minted === undefined) {
-            throw error;
+            return giveUp();
         }
         if ("authorized" in minted) {
             await this.persistHostedMcpOauth(connection);
@@ -2964,7 +3071,13 @@ export class SessionEngine {
                 return await this.withMcpAuth(connection, run);
             }
         }
-        const decision = await this.parkForAuth({
+        if (!canPark()) {
+            if (minted.state !== "") {
+                await this.oauthHub.abortCall(ctx.sessionId, ctx.callId);
+            }
+            return giveUp();
+        }
+        const outcome = await this.parkForAuth({
             sessionId: ctx.sessionId,
             turnId: ctx.turnId,
             callId: ctx.callId,
@@ -2973,7 +3086,10 @@ export class SessionEngine {
             authUrl: minted.authUrl,
             emit: ctx.emit,
         });
-        if (decision === "deny") {
+        if (outcome === "timeout" && authored !== undefined) {
+            throw new McpReconnectError(authored.name, mcpAuthReconnectMessage(authored), error);
+        }
+        if (outcome !== "approve") {
             throw new Error(`MCP connection "${connection}" authorization was denied.`);
         }
         await this.persistHostedMcpOauth(connection);
@@ -3043,7 +3159,34 @@ export class SessionEngine {
             },
         });
         this.logger(`[session] tool ${args.toolName} awaiting MCP auth ${args.connection} (${args.callId})`);
-        const { decision, by } = await resolutionPromise;
+        const endWait = (by) => {
+            void this.oauthHub.abortCall(args.sessionId, args.callId);
+            return this.auths.resolve(args.sessionId, args.callId, "deny", by);
+        };
+        const signal = this.turnAborts.get(args.sessionId)?.signal;
+        const endForAbort = () => {
+            endWait("interrupt");
+        };
+        if (signal?.aborted) {
+            endForAbort();
+        }
+        else {
+            signal?.addEventListener("abort", endForAbort, { once: true });
+        }
+        let timedOut = false;
+        const timer = setTimeout(() => {
+            timedOut = endWait("timeout");
+        }, MCP_AUTH_PARK_TIMEOUT_MS);
+        timer.unref();
+        let decision;
+        let by;
+        try {
+            ({ decision, by } = await resolutionPromise);
+        }
+        finally {
+            clearTimeout(timer);
+            signal?.removeEventListener("abort", endForAbort);
+        }
         await this.updateRecord(args.sessionId, (current) => ({
             ...current,
             pendingAuths: (current.pendingAuths ?? []).filter((item) => item.callId !== args.callId),
@@ -3058,8 +3201,9 @@ export class SessionEngine {
                 by,
             },
         });
-        this.logger(`[session] tool ${args.toolName} MCP auth ${decision} (${args.callId})`);
-        return decision;
+        const outcome = timedOut ? "timeout" : decision;
+        this.logger(`[session] tool ${args.toolName} MCP auth ${outcome} (${args.callId})`);
+        return outcome;
     }
     async clearPendingAuths(sessionId) {
         await this.oauthHub.abortSession(sessionId);
@@ -3125,9 +3269,14 @@ export class SessionEngine {
             turnId: active.turnId,
             callId: newToolCallId(toolName),
             toolName,
+            turnMode: () => this.turnModeFor(sessionId),
             emit: active.emit,
         }, fn);
     }
+    /** A session with no turn in flight has no person waiting on it. */
+    turnModeFor(sessionId) {
+        return this.turnModes.get(sessionId) ?? "non-interactive";
+    }
     // ==========================================================================
     // Direct tool calls (deterministic invocation, no model turn)
     // ==========================================================================
@@ -3487,6 +3636,7 @@ export class SessionEngine {
                         turnId: callId,
                         callId,
                         toolName,
+                        turnMode: () => "non-interactive",
                         emit,
                     }, run)
                     : run;
@@ -3668,6 +3818,20 @@ export class SessionEngine {
         if (record === undefined) {
             return;
         }
+        // Handlers see the turn span only while it is still open. `turn.completed`
+        // and `turn.failed` close it before `session.waiting`, `session.completed`,
+        // and `session.failed`. `onStart` is not an event.
+        if (event.turnId === undefined || this.otel === undefined) {
+            await this.dispatchEventHandlers(sessionId, event, context, record);
+            return;
+        }
+        await this.otel.runInOpenTurn({
+            sessionId: record.sessionId,
+            session: this.sessionInfo(record),
+            turnId: event.turnId,
+        }, () => this.dispatchEventHandlers(sessionId, event, context, record));
+    }
+    async dispatchEventHandlers(sessionId, event, context, record) {
         const channelState = context === undefined ? (record.channelState ?? null) : context.channelState;
         const sessionCtx = {
             session: context?.session ?? this.sessionInfo(record),
@@ -4223,12 +4387,13 @@ export class SessionEngine {
             ...(record.sdkAgentId === undefined ? {} : { sdkAgentId: record.sdkAgentId }),
         };
     }
-    channelSession(sessionId, record, isNew, coalesced = false, since = 0) {
+    channelSession(sessionId, record, deliveryId, isNew, coalesced = false, since = 0) {
         return {
             id: sessionId,
             continuationToken: record.continuationKey,
             isNew,
             ...(coalesced ? { coalesced: true } : {}),
+            deliveryId,
             info: this.sessionInfo(record),
             getEventStream: (options) => this.eventStream(sessionId, options?.startIndex ?? since),
             waitForCompletion: () => this.waitForCompletion(sessionId),
@@ -4516,6 +4681,13 @@ export class SessionEngine {
         this.otel?.close();
     }
 }
+const DEPLOYED_AGENTS_DASHBOARD_URL = "https://cursor.com/dashboard/deployed-agents";
+function mcpAuthReconnectMessage(connection) {
+    if (isCursorAccountTransport(connection.transport)) {
+        return `Reconnect ${connection.name}: the MCP connection needs authorization. Ask the bot owner to reconnect ${connection.name} at ${DEPLOYED_AGENTS_DASHBOARD_URL}`;
+    }
+    return `Reconnect ${connection.name}: the MCP connection needs authorization. Run \`${CLI_COMMAND_NAME} mcp oauth ${connection.name}\`. Ask the bot owner if you cannot run it.`;
+}
 /** Parallel event-stream loads during the startup bulk restore. */
 const RESTORE_FETCH_CONCURRENCY = 8;
 /**

package/dist/internal/slack-provision-client.js

@@ -17,7 +17,7 @@
  * which flows through on {@link SlackProvisionApiError.code} so the CLI
  * can branch.
  */
-import { z } from "zod/v3";
+import * as z from "zod/v4";
 /**
  * Backend mount of the Slack control plane for each hosted architecture.
  * The backend validates the pairing: the v2 routes reject a wizard mint or

package/dist/internal/store-api-protocol.d.ts

@@ -7,7 +7,7 @@
  * forever. A breaking change means a new `v`, and the server keeps serving
  * every previous `v`.
  */
-import { z } from "zod/v3";
+import * as z from "zod/v4";
 export declare const STORE_API_PROTOCOL_VERSION = 1;
 /** Managed storage endpoint, with one trailing segment per call. */
 export declare const STORE_API_PATH = "/internal/agentsdk/store/api";

package/dist/internal/store-api-protocol.d.ts.map

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

package/dist/internal/store-api-protocol.js

@@ -7,7 +7,7 @@
  * forever. A breaking change means a new `v`, and the server keeps serving
  * every previous `v`.
  */
-import { z } from "zod/v3";
+import * as z from "zod/v4";
 export const STORE_API_PROTOCOL_VERSION = 1;
 /** Managed storage endpoint, with one trailing segment per call. */
 export const STORE_API_PATH = "/internal/agentsdk/store/api";