@cursor/bdk 0.2.15 → 0.2.16

package/dist/internal/session-engine.js

@@ -33,8 +33,9 @@ import { describeError, describeErrorCode } from "./describe-error.js";
 import { isDevMode } from "./dev-mode.js";
 import { EventLogStore } from "./event-log.js";
 import { TurnEventMapper } from "./event-mapper.js";
+import { createRootSubagentInherit, } from "./filesystem/subagent-inherit.js";
 import { applyWebScratchUpdate, ingestHostAgentToolsScratch, remapScratchPaths, } from "./filesystem/scratch.js";
-import { fileSystemTool, hostFileToolsFromAuthored, rootFileToolsFromAuthored, synthesizeFileSystemTools, } from "./filesystem/tools.js";
+import { fileSystemTool, hostFileToolsFromAuthored, isSynthesizedFileSystemToolName, rootFileToolsFromAuthored, runWithFileSystem, synthesizeFileSystemTools, } from "./filesystem/tools.js";
 import { selectFrameworkStorageDefinition } from "./framework-storage-selection.js";
 import { createHostFilesApi } from "./host-files.js";
 import { createHostKvApi } from "./host-kv.js";
@@ -394,6 +395,19 @@ export class SessionEngine {
         return (this.project.agent.connections.find((item) => item.name === name) ??
             this.project.agent.hostConnections?.find((item) => item.name === name));
     }
+    /**
+     * The agent that advertised-tool listing sees. A symbolic connection serve
+     * never resolved (a peer under `--mode single`) is left out, as it is from
+     * each turn's MCP servers, instead of failing every listing.
+     */
+    advertisingAgent() {
+        const { agent } = this.project;
+        const resolved = new Set(this.resolvedConnections.map(({ name }) => name));
+        return {
+            ...agent,
+            connections: agent.connections.filter(({ name, transport }) => !isSymbolicConnectionTransport(transport) || resolved.has(name)),
+        };
+    }
     setCloudServerToolsConnection(connection, resolveHeaders) {
         this.cloudServerToolsConnection = connection;
         this.cloudServerToolsHeaders = resolveHeaders;
@@ -1674,11 +1688,14 @@ export class SessionEngine {
             try {
                 if (record.workspaceOverride === undefined &&
                     this.project.agent.local?.workspaceDir !== undefined) {
+                    const endPrewarm = this.startTurnPhase(record, turnId, "prewarm");
                     await this.prewarmSharedWorkspace();
+                    endPrewarm();
                 }
                 // Scaffold agent files into the session workspace even when the harness
                 // cwd is overridden (e.g. a PR worktree).
                 if (!this.hasRootOverride()) {
+                    const endWorkspace = this.startTurnPhase(record, turnId, "workspace");
                     await materializeWorkspace({
                         agent: this.project.agent,
                         workspaceDir,
@@ -1695,10 +1712,13 @@ export class SessionEngine {
                         await ensureOwnGitRoot(harnessCwd);
                     }
                     await this.materializeNudgeCarrier(record, harnessCwd);
+                    endWorkspace();
                 }
                 // Baseline before the agent can run, so a follow-up that arrives and
                 // drains before the first tool boundary still counts as an increase.
+                const endNudges = this.startTurnPhase(record, turnId, "nudges");
                 await this.baselineDeliveredNudges(record);
+                endNudges();
                 const pendingFiles = record.pendingWorkspaceFiles;
                 const pendingImages = record.pendingImages;
                 const runtime = resolveSessionRuntime({
@@ -1727,7 +1747,10 @@ export class SessionEngine {
                         pendingImages: current.pendingImages === pendingImages ? undefined : current.pendingImages,
                     }));
                 }
+                let endFirstUpdate;
                 const onUpdate = async (update) => {
+                    endFirstUpdate?.();
+                    endFirstUpdate = undefined;
                     const turn = this.turnRoots.get(sessionId);
                     if (turn !== undefined) {
                         update = await applyWebScratchUpdate({
@@ -1750,13 +1773,19 @@ export class SessionEngine {
                         await yieldEventLoop();
                     }
                 };
+                const endBuildRequest = this.startTurnPhase(record, turnId, "build_request");
                 const request = await this.buildTurnRequest(record, turnId, message, isFirstTurn, emit, eventContext, onUpdate, signal, pendingImages);
+                endBuildRequest();
+                // Runner start (SDK agent create/resume, MCP connect, model request)
+                // until the first streamed update.
+                endFirstUpdate = this.startTurnPhase(record, turnId, "first_update");
                 this.activeToolContexts.set(sessionId, { record, turnId, emit });
                 this.stubbedCallIds.set(sessionId, stubbed);
                 try {
                     outcome = await this.runTurnExecute(record, turnId, () => this.runner.runTurn(request));
                 }
                 finally {
+                    endFirstUpdate?.();
                     this.activeToolContexts.delete(sessionId);
                     this.stubbedCallIds.delete(sessionId);
                 }
@@ -1790,6 +1819,7 @@ export class SessionEngine {
         }
         const finalResult = outcome.result ?? mapper.finalText;
         const finalUsage = outcome.usage ?? mapper.usage;
+        const preBoundaryDispatch = this.dispatchChains.get(sessionId);
         if (outcome.status === "finished") {
             const completed = await this.appendEvent(sessionId, {
                 type: "turn.completed",
@@ -1842,10 +1872,12 @@ export class SessionEngine {
                 data: {},
             }, eventContext);
         }
-        // Commit live channel state here. appendEvent does not wait for
-        // dispatch, and awaiting that chain deadlocks when an earlier handler
-        // is waiting on the next turn (defineResult refresh). Coalesce drain
-        // snapshots disk as soon as this returns.
+        // Commit live channel state here, once the handlers queued before this
+        // turn's boundary have run (for a coalesced follow-up, that includes the
+        // owner turn's boundary handlers). This turn's own boundary handlers stay
+        // unawaited: one may wait on the next turn, which cannot start until this
+        // returns. Coalesce drain snapshots disk as soon as this returns.
+        await preBoundaryDispatch?.catch(() => { });
         await this.updateRecord(sessionId, (current) => ({
             ...current,
             channelState: mergeChannelStateMutation({
@@ -2150,11 +2182,13 @@ export class SessionEngine {
                     includeScripts: this.hasBorrowedWorkspace(record),
                 })
             : undefined;
+        const childFiles = authoredRoot && root !== undefined ? createRootSubagentInherit(root) : undefined;
         return {
             sessionId: record.sessionId,
             ...(record.sdkAgentId === undefined ? {} : { sdkAgentId: record.sdkAgentId }),
             workspaceDir: this.harnessCwd(record),
             sandbox: authoredRoot ? false : agent.local?.sandbox === true,
+            subagentInherit: childFiles?.inherit,
             ...(runtime === "local" && harnessTools !== undefined
                 ? {
                     ...(harnessTools.tools === undefined ? {} : { tools: harnessTools.tools }),
@@ -2190,7 +2224,7 @@ export class SessionEngine {
                 ? { agentServeAgent: this.project.name }
                 : {}),
             customTools: runtime === "local"
-                ? await this.buildCustomTools(record, turnId, emit, synthesized, signal)
+                ? await this.buildCustomTools(record, turnId, emit, synthesized, signal, childFiles)
                 : {},
             mcpServers: this.buildMcpServers(runtime, record.sessionId, await this.evaluateConnectionAuth(record)),
             ...(runtime === "local" &&
@@ -2442,7 +2476,7 @@ export class SessionEngine {
         }
         return evaluated;
     }
-    async buildCustomTools(record, turnId, emit, extraTools = [], signal) {
+    async buildCustomTools(record, turnId, emit, extraTools = [], signal, childFiles) {
         const agent = this.project.agent;
         const tools = {};
         const register = (tool) => {
@@ -2459,7 +2493,7 @@ export class SessionEngine {
                 // ride into the harness listing once the dependency bumps.
                 ...(tool.annotations === undefined ? {} : { annotations: tool.annotations }),
                 execute: async (args, context) => {
-                    return this.executeServerTool({
+                    const run = () => this.executeServerTool({
                         tool,
                         input: args,
                         toolCallId: context.toolCallId,
@@ -2468,6 +2502,16 @@ export class SessionEngine {
                         emit,
                         signal,
                     });
+                    const sessionId = context.sessionId;
+                    if (childFiles === undefined ||
+                        sessionId === undefined ||
+                        sessionId === "" ||
+                        sessionId === record.sessionId ||
+                        sessionId === record.sdkAgentId ||
+                        !isSynthesizedFileSystemToolName(tool.name)) {
+                        return run();
+                    }
+                    return runWithFileSystem(childFiles.fileSystemForSession(sessionId), run);
                 },
             };
         };
@@ -2491,7 +2535,7 @@ export class SessionEngine {
             toolName: "mcp",
             emit,
         }, () => resolveAdvertisedTools({
-            agent,
+            agent: this.advertisingAgent(),
             session: this.sessionInfo(record),
             hostMcp: this.advertiseMcp(),
         }))) {
@@ -2661,6 +2705,10 @@ export class SessionEngine {
             turnId,
         }, run);
     }
+    /** Child span of the turn for one setup step; returns its end. No-op when OTel is off. */
+    startTurnPhase(record, turnId, phase) {
+        return (this.otel?.startPhase({ sessionId: record.sessionId, session: this.sessionInfo(record), turnId }, phase) ?? (() => { }));
+    }
     /**
      * Bind outbound inject (Factory / Cursor API `traceparent`) to the
      * tool span. No-op when OTel is off.
@@ -3148,7 +3196,7 @@ export class SessionEngine {
         const { session } = await this.resolveDirectCallIdentity(newToolCallId("catalog"), options);
         const connectionErrors = [];
         const advertised = await resolveAdvertisedTools({
-            agent: this.project.agent,
+            agent: this.advertisingAgent(),
             session,
             hostMcp: this.mcpHost,
             onConnectionError: (connection, error) => {
@@ -3220,7 +3268,7 @@ export class SessionEngine {
             // the same model-facing name a turn would. A listing failure fails
             // the call closed, like it fails a turn.
             const advertised = await resolveAdvertisedTools({
-                agent: this.project.agent,
+                agent: this.advertisingAgent(),
                 session,
                 hostMcp: this.advertiseMcp(),
             });

package/dist/internal/{convert-automation/slug.d.ts → slug.d.ts}

@@ -1,6 +1,9 @@
-/** Filename slugs for generated project files. */
+/** Slugs for generated project files and deployment names. */
 /** Lowercase, dashes, alphanumerics only; `fallback` when nothing survives. */
 export declare function slugify(name: string, fallback: string): string;
+export declare const DEPLOYMENT_SLUG_PATTERN: RegExp;
+/** Derive a valid deployment slug from a directory name, or undefined if impossible. */
+export declare function slugFromDirectoryName(name: string): string | undefined;
 /** Dedupes slugs with numeric suffixes: `linear`, `linear-2`, `linear-3`, … */
 export declare class SlugRegistry {
     private readonly used;

package/dist/internal/slug.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"slug.d.ts","sourceRoot":"","sources":["../../src/internal/slug.ts"],"names":[],"mappings":"AAAA,8DAA8D;AAE9D,+EAA+E;AAC/E,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAM9D;AAED,eAAO,MAAM,uBAAuB,EAAE,MAA6B,CAAC;AAEpE,wFAAwF;AACxF,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAOtE;AAED,+EAA+E;AAC/E,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAqB;IAE1C,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAY1B;CACF"}

package/dist/internal/{convert-automation/slug.js → slug.js}

@@ -1,4 +1,4 @@
-/** Filename slugs for generated project files. */
+/** Slugs for generated project files and deployment names. */
 /** Lowercase, dashes, alphanumerics only; `fallback` when nothing survives. */
 export function slugify(name, fallback) {
     const slug = name
@@ -7,6 +7,16 @@ export function slugify(name, fallback) {
         .replace(/^-+|-+$/g, "");
     return slug === "" ? fallback : slug;
 }
+export const DEPLOYMENT_SLUG_PATTERN = /^[a-z0-9_-]{1,64}$/;
+/** Derive a valid deployment slug from a directory name, or undefined if impossible. */
+export function slugFromDirectoryName(name) {
+    const slug = name
+        .toLowerCase()
+        .replace(/[^a-z0-9_-]+/g, "-")
+        .replace(/^-+|-+$/g, "")
+        .slice(0, 64);
+    return DEPLOYMENT_SLUG_PATTERN.test(slug) ? slug : undefined;
+}
 /** Dedupes slugs with numeric suffixes: `linear`, `linear-2`, `linear-3`, … */
 export class SlugRegistry {
     constructor() {