@cursor/bdk 0.2.15 → 0.2.17

package/dist/internal/eval-judge-model.d.ts

@@ -7,17 +7,22 @@
  * prompt injection needs. A reply that talks the judge into running a tool would
  * do so on the machine running the eval CLI, under the runner's credentials.
  *
- * The session is therefore confined on every axis the SDK exposes:
+ * The session is therefore given nothing to act with:
  *
- * - `sandboxOptions.enabled` so any tool call the judge is talked into is
- *   confined rather than run directly against the host.
+ * - `tools: []` so the model is offered no built-in tools and can only reply
+ *   with text. An injected reply has no shell, file, or MCP call to invoke.
+ *   Omitting `tools` leaves the default toolset in place.
  * - `mcpServers: {}` so no MCP surface is reachable.
  * - `settingSources: []` plus an empty temp `cwd`, so there is no repo to act on
  *   and no ambient `AGENTS.md` / `.cursor` rule can steer a verdict.
+ * - `sandboxOptions: { enabled: false }` so grading never requests a local
+ *   sandbox. Omitting the field is not the same: a `~/.cursor/sandbox.json`
+ *   policy still counts as a sandbox request and throws on hosts that cannot
+ *   sandbox. With no tools left, there is nothing for a sandbox to confine.
  *
  * The prompt side is hardened separately: `evals/judge.ts` fences untrusted
- * content behind a per-call boundary. Both halves matter — this one limits blast
- * radius, that one removes the instruction channel.
+ * content behind a per-call boundary. Both halves matter — this one removes
+ * the tool channel, that one removes the instruction channel.
  *
  * Grading also declines outright when the credential's backend and the SDK's
  * backend disagree, rather than sending a key somewhere it was not minted for

package/dist/internal/eval-judge-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"eval-judge-model.d.ts","sourceRoot":"","sources":["../../src/internal/eval-judge-model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAKH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,0EAA0E;AAC1E,eAAO,MAAM,oBAAoB,8BAA8B,CAAC;AAoBhE;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CACrC,oBAAoB,EAAE,MAAM,EAC5B,UAAU,GAAE,MAAwB,GACnC,IAAI,CASN;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE;IACxC,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,SAAS,CAAC,EAAE,YAAY,CAAC;IACzB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1B,GAAG,YAAY,GAAG,SAAS,CAQ3B;AAED;;;;;GAKG;AACH,eAAO,MAAM,cAAc,EAAE,eAoC5B,CAAC"}
+{"version":3,"file":"eval-judge-model.d.ts","sourceRoot":"","sources":["../../src/internal/eval-judge-model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAKH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,0EAA0E;AAC1E,eAAO,MAAM,oBAAoB,8BAA8B,CAAC;AAoBhE;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CACrC,oBAAoB,EAAE,MAAM,EAC5B,UAAU,GAAE,MAAwB,GACnC,IAAI,CASN;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE;IACxC,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,SAAS,CAAC,EAAE,YAAY,CAAC;IACzB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1B,GAAG,YAAY,GAAG,SAAS,CAQ3B;AAED;;;;;GAKG;AACH,eAAO,MAAM,cAAc,EAAE,eAyC5B,CAAC"}

package/dist/internal/eval-judge-model.js

@@ -7,17 +7,22 @@
  * prompt injection needs. A reply that talks the judge into running a tool would
  * do so on the machine running the eval CLI, under the runner's credentials.
  *
- * The session is therefore confined on every axis the SDK exposes:
+ * The session is therefore given nothing to act with:
  *
- * - `sandboxOptions.enabled` so any tool call the judge is talked into is
- *   confined rather than run directly against the host.
+ * - `tools: []` so the model is offered no built-in tools and can only reply
+ *   with text. An injected reply has no shell, file, or MCP call to invoke.
+ *   Omitting `tools` leaves the default toolset in place.
  * - `mcpServers: {}` so no MCP surface is reachable.
  * - `settingSources: []` plus an empty temp `cwd`, so there is no repo to act on
  *   and no ambient `AGENTS.md` / `.cursor` rule can steer a verdict.
+ * - `sandboxOptions: { enabled: false }` so grading never requests a local
+ *   sandbox. Omitting the field is not the same: a `~/.cursor/sandbox.json`
+ *   policy still counts as a sandbox request and throws on hosts that cannot
+ *   sandbox. With no tools left, there is nothing for a sandbox to confine.
  *
  * The prompt side is hardened separately: `evals/judge.ts` fences untrusted
- * content behind a per-call boundary. Both halves matter — this one limits blast
- * radius, that one removes the instruction channel.
+ * content behind a per-call boundary. Both halves matter — this one removes
+ * the tool channel, that one removes the instruction channel.
  *
  * Grading also declines outright when the credential's backend and the SDK's
  * backend disagree, rather than sending a key somewhere it was not minted for
@@ -89,30 +94,36 @@ export const callJudgeModel = async ({ prompt, model }) => {
     // Imported lazily so a tree of fully deterministic evals never loads the SDK.
     const { Agent } = await import("@cursor/sdk");
     const cwd = await mkdtemp(join(tmpdir(), "agentkit-eval-judge-"));
-    const agent = await Agent.create({
-        apiKey: resolved.apiKey,
-        model: typeof model === "string" ? { id: model } : model,
-        // See the module comment: grading embeds untrusted agent output, so the
-        // session gets no MCP surface, no ambient settings, an empty working
-        // directory, and a sandbox around anything it does attempt.
-        mcpServers: {},
-        local: {
-            cwd,
-            settingSources: [],
-            sandboxOptions: { enabled: true },
-        },
-    });
     try {
-        const run = await agent.send(prompt);
-        const result = await run.wait();
-        if (result.status === "error" || result.status === "cancelled") {
-            const detail = result.error?.message ?? result.result ?? result.status;
-            throw new Error(`eval judge run failed: ${detail}`);
+        const agent = await Agent.create({
+            apiKey: resolved.apiKey,
+            model: typeof model === "string" ? { id: model } : model,
+            // See the module comment: grading embeds untrusted agent output, so the
+            // session gets no tools, no MCP surface, no ambient settings, and an
+            // empty working directory. Sandbox is explicitly off so a per-user
+            // sandbox config cannot re-request one.
+            tools: [],
+            mcpServers: {},
+            local: {
+                cwd,
+                settingSources: [],
+                sandboxOptions: { enabled: false },
+            },
+        });
+        try {
+            const run = await agent.send(prompt);
+            const result = await run.wait();
+            if (result.status === "error" || result.status === "cancelled") {
+                const detail = result.error?.message ?? result.result ?? result.status;
+                throw new Error(`eval judge run failed: ${detail}`);
+            }
+            return result.result ?? "";
+        }
+        finally {
+            agent.close();
         }
-        return result.result ?? "";
     }
     finally {
-        agent.close();
         await rm(cwd, { recursive: true, force: true }).catch(() => undefined);
     }
 };

package/dist/internal/filesystem/subagent-inherit.d.ts

@@ -0,0 +1,39 @@
+/**
+ * Task-child inherit for an authored virtual root.
+ *
+ * The SDK calls `resourceProviderOptions` once per child session id,
+ * including nested `Task` grandchildren, and reuses that result for the
+ * child runtime. Each id gets its own {@link childOverlayFs} over the
+ * session union (authored tree plus `/tmp` scratch), so a child write
+ * cannot clobber the parent or a sibling. The FileSystem handle is not
+ * placed on the SDK request.
+ *
+ * Native executor overrides load on the first child. A static import
+ * would pull workspace-only packages into every CLI start. The published
+ * package omits that module; children then keep shell suppressed and
+ * reach the same overlay through synthesized file tools.
+ */
+import type { LocalSubagentInherit, LocalSubagentResourceProviderFields } from "@cursor/sdk";
+import { type FileSystem } from "../../filesystem.js";
+/**
+ * Structural view of the checkout-only executor module. Naming that module
+ * in a type query would pull it into `tsc -p tsconfig.build.json` even
+ * though the build config excludes it, and the published program cannot
+ * see its workspace-only imports.
+ */
+type ChildToolExecutor = NonNullable<LocalSubagentResourceProviderFields["overrideReadExecutor"]>;
+interface FileSystemExecutorModule {
+    createFileSystemReadExecutor(root: FileSystem): ChildToolExecutor;
+    createFileSystemWriteExecutor(root: FileSystem): ChildToolExecutor;
+    createFileSystemGrepExecutor(root: FileSystem): ChildToolExecutor;
+    createFileSystemLsExecutor(root: FileSystem): ChildToolExecutor;
+}
+export interface RootSubagentBinding {
+    readonly inherit: LocalSubagentInherit;
+    /** Overlay for a Task child. Do not pass the parent session id. */
+    fileSystemForSession(sessionId: string): FileSystem;
+}
+export declare function createRootSubagentInherit(parent: FileSystem): RootSubagentBinding;
+export declare function resourceFieldsForChild(overlay: FileSystem, executors: FileSystemExecutorModule | undefined): LocalSubagentResourceProviderFields;
+export {};
+//# sourceMappingURL=subagent-inherit.d.ts.map

package/dist/internal/filesystem/subagent-inherit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"subagent-inherit.d.ts","sourceRoot":"","sources":["../../../src/internal/filesystem/subagent-inherit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,oBAAoB,EAAE,mCAAmC,EAAE,MAAM,aAAa,CAAC;AAC7F,OAAO,EAAkB,KAAK,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtE;;;;;GAKG;AACH,KAAK,iBAAiB,GAAG,WAAW,CAAC,mCAAmC,CAAC,sBAAsB,CAAC,CAAC,CAAC;AAElG,UAAU,wBAAwB;IAChC,4BAA4B,CAAC,IAAI,EAAE,UAAU,GAAG,iBAAiB,CAAC;IAClE,6BAA6B,CAAC,IAAI,EAAE,UAAU,GAAG,iBAAiB,CAAC;IACnE,4BAA4B,CAAC,IAAI,EAAE,UAAU,GAAG,iBAAiB,CAAC;IAClE,0BAA0B,CAAC,IAAI,EAAE,UAAU,GAAG,iBAAiB,CAAC;CACjE;AAUD,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,OAAO,EAAE,oBAAoB,CAAC;IACvC,mEAAmE;IACnE,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,CAAC;CACrD;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,UAAU,GAAG,mBAAmB,CAcjF;AAED,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,wBAAwB,GAAG,SAAS,GAC9C,mCAAmC,CAWrC"}

package/dist/internal/filesystem/subagent-inherit.js

@@ -0,0 +1,96 @@
+/**
+ * Task-child inherit for an authored virtual root.
+ *
+ * The SDK calls `resourceProviderOptions` once per child session id,
+ * including nested `Task` grandchildren, and reuses that result for the
+ * child runtime. Each id gets its own {@link childOverlayFs} over the
+ * session union (authored tree plus `/tmp` scratch), so a child write
+ * cannot clobber the parent or a sibling. The FileSystem handle is not
+ * placed on the SDK request.
+ *
+ * Native executor overrides load on the first child. A static import
+ * would pull workspace-only packages into every CLI start. The published
+ * package omits that module; children then keep shell suppressed and
+ * reach the same overlay through synthesized file tools.
+ */
+import { childOverlayFs } from "../../filesystem.js";
+/**
+ * Widened to `string` on purpose. A string-literal dynamic import is still
+ * a static dependency, so the published declaration build would compile the
+ * excluded executor module. Node and the test runner resolve this relative
+ * to this file.
+ */
+const FILE_SYSTEM_EXECUTORS_SPECIFIER = "../../filesystem-executors.js";
+export function createRootSubagentInherit(parent) {
+    const overlays = new Map();
+    return {
+        inherit: {
+            reportedWorkspacePath: "/",
+            resourceProviderOptions: async (context) => {
+                const overlay = childOverlayFor(overlays, parent, context.sessionId);
+                return resourceFieldsForChild(overlay, await loadFileSystemExecutors());
+            },
+        },
+        fileSystemForSession(sessionId) {
+            return childOverlayFor(overlays, parent, sessionId);
+        },
+    };
+}
+export function resourceFieldsForChild(overlay, executors) {
+    if (executors === undefined) {
+        return { suppressDefaultShellExecutor: true };
+    }
+    return {
+        overrideReadExecutor: executors.createFileSystemReadExecutor(overlay),
+        overrideWriteExecutor: executors.createFileSystemWriteExecutor(overlay),
+        overrideGrepExecutor: executors.createFileSystemGrepExecutor(overlay),
+        overrideLsExecutor: executors.createFileSystemLsExecutor(overlay),
+        suppressDefaultShellExecutor: true,
+    };
+}
+async function loadFileSystemExecutors() {
+    try {
+        const loaded = await import(FILE_SYSTEM_EXECUTORS_SPECIFIER);
+        if (!isFileSystemExecutorModule(loaded)) {
+            throw new Error("filesystem executors module is missing its factories");
+        }
+        return loaded;
+    }
+    catch (error) {
+        if (isMissingModule(error)) {
+            return undefined;
+        }
+        throw error;
+    }
+}
+function isFileSystemExecutorModule(value) {
+    if (typeof value !== "object" || value === null) {
+        return false;
+    }
+    const candidate = value;
+    return (typeof candidate.createFileSystemReadExecutor === "function" &&
+        typeof candidate.createFileSystemWriteExecutor === "function" &&
+        typeof candidate.createFileSystemGrepExecutor === "function" &&
+        typeof candidate.createFileSystemLsExecutor === "function");
+}
+function isMissingModule(error) {
+    if (typeof error !== "object" || error === null) {
+        return false;
+    }
+    if ("code" in error && error.code === "ERR_MODULE_NOT_FOUND") {
+        return true;
+    }
+    return "cause" in error && isMissingModule(error.cause);
+}
+function childOverlayFor(overlays, parent, sessionId) {
+    if (sessionId === undefined || sessionId === "") {
+        return childOverlayFs(parent);
+    }
+    const existing = overlays.get(sessionId);
+    if (existing !== undefined) {
+        return existing;
+    }
+    const created = childOverlayFs(parent);
+    overlays.set(sessionId, created);
+    return created;
+}

package/dist/internal/filesystem/tools.d.ts

@@ -38,5 +38,11 @@ export declare function synthesizedFileSystemToolNames(options: {
 export declare function fileSystemTool(root: FileSystem, name: string, input?: Record<string, unknown>): DiscoveredTool | undefined;
 /** Validate and run the same tool a turn or `callTool` would. */
 export declare function runFileSystemTool(root: FileSystem, name: string, input?: Record<string, unknown>): Promise<unknown>;
+/**
+ * Run `fn` with synthesized file tools bound to `root`. Task children use
+ * this so Read/Write/Delete hit their overlay instead of the parent tree
+ * the tools were built against.
+ */
+export declare function runWithFileSystem<T>(root: FileSystem, fn: () => Promise<T>): Promise<T>;
 export declare function synthesizeFileSystemTools(root: FileSystem, filter?: readonly FileSystemToolName[]): DiscoveredTool[];
 //# sourceMappingURL=tools.d.ts.map

package/dist/internal/filesystem/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../../src/internal/filesystem/tools.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,EAIL,KAAK,UAAU,EACf,KAAK,kBAAkB,EAYxB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,cAAc,EAAkB,MAAM,gBAAgB,CAAC;AAgCrE,eAAO,MAAM,kCAAkC,YAC7C,MAAM,EACN,IAAI,EACJ,MAAM,EACN,MAAM,EACN,OAAO,EACP,YAAY,EACZ,QAAQ,EACR,gBAAgB,CACR,CAAC;AAEX,MAAM,MAAM,6BAA6B,GAAG,CAAC,OAAO,kCAAkC,CAAC,CAAC,MAAM,CAAC,CAAC;AAIhG,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAMrE;AAED,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,GACnC,kBAAkB,EAAE,GAAG,SAAS,CAmBlC;AAED;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,GACnC,kBAAkB,EAAE,GAAG,SAAS,CAKlC;AAKD;;;GAGG;AACH,wBAAgB,8BAA8B,CAAC,OAAO,EAAE;IACtD,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC3B,GAAG,SAAS,6BAA6B,EAAE,CAW3C;AA2lBD;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,MAAM,EACZ,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAClC,cAAc,GAAG,SAAS,CAS5B;AAED,iEAAiE;AACjE,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,MAAM,EACZ,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAClC,OAAO,CAAC,OAAO,CAAC,CAclB;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,UAAU,EAChB,MAAM,CAAC,EAAE,SAAS,kBAAkB,EAAE,GACrC,cAAc,EAAE,CAQlB"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../../src/internal/filesystem/tools.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAMH,OAAO,EAIL,KAAK,UAAU,EACf,KAAK,kBAAkB,EAYxB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,cAAc,EAAkB,MAAM,gBAAgB,CAAC;AAgCrE,eAAO,MAAM,kCAAkC,YAC7C,MAAM,EACN,IAAI,EACJ,MAAM,EACN,MAAM,EACN,OAAO,EACP,YAAY,EACZ,QAAQ,EACR,gBAAgB,CACR,CAAC;AAEX,MAAM,MAAM,6BAA6B,GAAG,CAAC,OAAO,kCAAkC,CAAC,CAAC,MAAM,CAAC,CAAC;AAIhG,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAMrE;AAED,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,GACnC,kBAAkB,EAAE,GAAG,SAAS,CAmBlC;AAED;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,GACnC,kBAAkB,EAAE,GAAG,SAAS,CAKlC;AAKD;;;GAGG;AACH,wBAAgB,8BAA8B,CAAC,OAAO,EAAE;IACtD,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC3B,GAAG,SAAS,6BAA6B,EAAE,CAW3C;AA2lBD;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,MAAM,EACZ,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAClC,cAAc,GAAG,SAAS,CAS5B;AAED,iEAAiE;AACjE,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,MAAM,EACZ,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAClC,OAAO,CAAC,OAAO,CAAC,CAclB;AAID;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAEvF;AA8BD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,UAAU,EAChB,MAAM,CAAC,EAAE,SAAS,kBAAkB,EAAE,GACrC,cAAc,EAAE,CAQlB"}

package/dist/internal/filesystem/tools.js

@@ -5,6 +5,7 @@
  * Each tool is a `defineTool` whose runtime `inputSchema` accepts those
  * fields plus the native aliases the harness still sends.
  */
+import { AsyncLocalStorage } from "node:async_hooks";
 import { Buffer } from "node:buffer";
 import { minimatch } from "minimatch";
 import { z } from "zod";
@@ -600,11 +601,47 @@ export async function runFileSystemTool(root, name, input = {}) {
     }
     return execute(validation.value, {});
 }
+const fileSystemStorage = new AsyncLocalStorage();
+/**
+ * Run `fn` with synthesized file tools bound to `root`. Task children use
+ * this so Read/Write/Delete hit their overlay instead of the parent tree
+ * the tools were built against.
+ */
+export function runWithFileSystem(root, fn) {
+    return fileSystemStorage.run(root, fn);
+}
+function bindActiveFileSystem(root, tool) {
+    const execute = tool.definition.execute;
+    if (execute === undefined) {
+        return tool;
+    }
+    return {
+        ...tool,
+        definition: {
+            ...tool.definition,
+            execute: (input, ctx) => {
+                const active = fileSystemStorage.getStore();
+                if (active === undefined || active === root) {
+                    return execute(input, ctx);
+                }
+                const canonical = canonicalizeFileSystemToolName(tool.name);
+                if (canonical === undefined) {
+                    return execute(input, ctx);
+                }
+                const reboundExecute = FILE_SYSTEM_TOOL_FACTORIES[canonical](active).definition.execute;
+                if (reboundExecute === undefined) {
+                    return execute(input, ctx);
+                }
+                return reboundExecute(input, ctx);
+            },
+        },
+    };
+}
 export function synthesizeFileSystemTools(root, filter) {
     const tools = [];
     for (const name of SYNTHESIZED_FILE_SYSTEM_TOOL_NAMES) {
         if (wantsTool(filter, name)) {
-            tools.push(FILE_SYSTEM_TOOL_FACTORIES[name](root));
+            tools.push(bindActiveFileSystem(root, FILE_SYSTEM_TOOL_FACTORIES[name](root)));
         }
     }
     return tools;

package/dist/internal/hosted-delivery.d.ts.map

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

package/dist/internal/hosted-delivery.js

@@ -1,5 +1,5 @@
 import { randomBytes } from "node:crypto";
-import { metrics } from "@opentelemetry/api";
+import { metrics, trace } from "@opentelemetry/api";
 import { packageVersion } from "./distribution.js";
 import { dispatchOutcome } from "./channel-dispatch.js";
 import { consumeHostedBoundSecrets, } from "./cursor/hosted-bound-secrets.js";
@@ -482,11 +482,16 @@ export function registerHostedDeliveryRoute(input) {
             if (definition === undefined) {
                 return await responseToReply(finish(terminalHostedError(404, "channel_not_found", `No channel named "${delivery.channelId}" is mounted.`)));
             }
+            const endHandler = startHostedSpan("admission.handler", {
+                "agent_sdk.channel_kind": delivery.channelKind,
+                "agent_sdk.delivery_id": delivery.deliveryId,
+            });
             const admitted = await dispatchHostedAdmission({
                 delivery,
                 definition,
                 args: input.buildHandlerArgs(delivery.channelId),
             });
+            endHandler();
             if (admitted.pendingSend === undefined) {
                 return await responseToReply(finish(admitted.response));
             }
@@ -682,7 +687,13 @@ export function registerHostedDeliveryRoute(input) {
                 admitted.expiresAt = Date.now() + ownerTurnPendingTtlMs;
             }
             admitted.execution ??= afterHostedWork(input.flushOtel, async () => {
+                const spanAttributes = {
+                    "agent_sdk.channel_kind": admitted.channelKind,
+                    "agent_sdk.session_public_id": execution.sessionPublicId,
+                };
+                const endNetworkWait = startHostedSpan("execute.network_wait", spanAttributes);
                 const network = await finishNetworkWait("execution");
+                endNetworkWait();
                 guestNetwork = network.timing;
                 if (network.response !== undefined) {
                     return await responseToReply(finish(network.response));
@@ -729,10 +740,12 @@ export function registerHostedDeliveryRoute(input) {
                 // still be running; the marker prevents it from surfacing the
                 // previous delivery's terminal record. The store copies are
                 // dashboard history, so the turn does not wait on them.
+                const endClaim = startHostedSpan("execute.claim", spanAttributes);
                 await writeDiag({
                     sessionId: "",
                     turnStatus: HOSTED_EXECUTION_DIAG_RUNNING_STATUS,
                 }, { awaitDurable: false });
+                endClaim();
                 let sessionId = "";
                 const owner = {
                     primaryDeliveryId: admitted.deliveryId,
@@ -753,6 +766,7 @@ export function registerHostedDeliveryRoute(input) {
                                 key: admitted.send.mailboxContinuationKey,
                             },
                         };
+                        const endSend = startHostedSpan("execute.send", spanAttributes);
                         const session = input.startSend === undefined
                             ? await args.send(admitted.send.message, options)
                             : await input.startSend({
@@ -761,6 +775,7 @@ export function registerHostedDeliveryRoute(input) {
                                 options,
                                 sessionPublicId: execution.sessionPublicId,
                             });
+                        endSend();
                         sessionId = session.id;
                         // The pre-turn claim used an empty sessionId. Stamp the
                         // engine id now so a dashboard / session-view poll that
@@ -1033,6 +1048,14 @@ function hostedFailureForUnfinishedTurn(outcome) {
     }
     return { error: "turn_failed", retry: HOSTED_GUEST_RETRY_TERMINAL };
 }
+/**
+ * `agent_sdk.hosted.<step>` span; call the result to end it. The delivery
+ * replies before this work finishes, so the inbound HTTP span never covers it.
+ */
+function startHostedSpan(step, attributes) {
+    const span = trace.getTracer("agent_sdk").startSpan(`agent_sdk.hosted.${step}`, { attributes });
+    return () => span.end();
+}
 async function afterHostedWork(flushOtel, work) {
     try {
         const result = await work();

package/dist/internal/hosting.d.ts

@@ -51,6 +51,6 @@ export declare function hostingEntryErrors(declared: {
  * grammar plus platform-managed names (`CURSOR_*`, hosted storage).
  */
 export declare function validateSettableSecretName(name: string): string | undefined;
-/** `owner/name` — mirrors the backend's cursor-event repo grammar. */
+/** `owner/name`, `gitlab.com/<group>/…/<project>`, or `bitbucket.org/<workspace>/<repo>`. Mirrors the backend's deploy repository grammar. */
 export declare function isValidCursorEventRepo(repo: string): boolean;
 //# sourceMappingURL=hosting.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"hosting.d.ts","sourceRoot":"","sources":["../../src/internal/hosting.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,+EAA+E;AAC/E,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,kCAAkC;AAClC,eAAO,MAAM,WAAW,KAAK,CAAC;AAC9B,sCAAsC;AACtC,eAAO,MAAM,sBAAsB,OAAO,CAAC;AAC3C,8BAA8B;AAC9B,eAAO,MAAM,sBAAsB,KAAK,CAAC;AACzC,mEAAmE;AACnE,eAAO,MAAM,2BAA2B,YAAY,CAAC;AACrD,oEAAoE;AACpE,eAAO,MAAM,oBAAoB,MAAM,CAAC;AACxC,sDAAsD;AACtD,eAAO,MAAM,yBAAyB,EAAE,MAA+B,CAAC;AAIxE,gFAAgF;AAChF,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAK3E;AAED;;;GAGG;AACH,eAAO,MAAM,oCAAoC,YAAI,2BAA2B,CAAU,CAAC;AAW3F,4EAA4E;AAC5E,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CASvE;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAQnE;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAQ1D;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE;IAC3C,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACjC,GAAG,MAAM,EAAE,CAmBX;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAS3E;AAID,sEAAsE;AACtE,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE5D"}
+{"version":3,"file":"hosting.d.ts","sourceRoot":"","sources":["../../src/internal/hosting.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,+EAA+E;AAC/E,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,kCAAkC;AAClC,eAAO,MAAM,WAAW,KAAK,CAAC;AAC9B,sCAAsC;AACtC,eAAO,MAAM,sBAAsB,OAAO,CAAC;AAC3C,8BAA8B;AAC9B,eAAO,MAAM,sBAAsB,KAAK,CAAC;AACzC,mEAAmE;AACnE,eAAO,MAAM,2BAA2B,YAAY,CAAC;AACrD,oEAAoE;AACpE,eAAO,MAAM,oBAAoB,MAAM,CAAC;AACxC,sDAAsD;AACtD,eAAO,MAAM,yBAAyB,EAAE,MAA+B,CAAC;AAIxE,gFAAgF;AAChF,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAK3E;AAED;;;GAGG;AACH,eAAO,MAAM,oCAAoC,YAAI,2BAA2B,CAAU,CAAC;AAW3F,4EAA4E;AAC5E,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CASvE;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAQnE;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAQ1D;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE;IAC3C,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACjC,GAAG,MAAM,EAAE,CAmBX;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAS3E;AAQD,8IAA8I;AAC9I,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE5D"}

package/dist/internal/hosting.js

@@ -110,8 +110,12 @@ export function validateSettableSecretName(name) {
     }
     return undefined;
 }
-const CURSOR_EVENT_REPO_PATTERN = /^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/;
-/** `owner/name` — mirrors the backend's cursor-event repo grammar. */
+const CURSOR_EVENT_REPO_PATTERNS = [
+    /^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/,
+    /^gitlab\.com\/[a-z0-9_.-]+(?:\/[a-z0-9_.-]+){1,9}$/i,
+    /^bitbucket\.org\/[a-z0-9_-]+\/[a-z0-9_.-]+$/i,
+];
+/** `owner/name`, `gitlab.com/<group>/…/<project>`, or `bitbucket.org/<workspace>/<repo>`. Mirrors the backend's deploy repository grammar. */
 export function isValidCursorEventRepo(repo) {
-    return CURSOR_EVENT_REPO_PATTERN.test(repo) && !repo.includes("..");
+    return CURSOR_EVENT_REPO_PATTERNS.some((pattern) => pattern.test(repo)) && !repo.includes("..");
 }

package/dist/internal/init-interview.d.ts

@@ -2,7 +2,9 @@
  * Template `init.json`: questions `init` asks, and string replacements
  * it applies while copying the scaffold.
  */
+import { type InterviewQuestion } from "./interview/question.js";
 export declare const TEMPLATE_INIT_FILE = "init.json";
+/** The JSON-authorable subset of {@link InterviewQuestion}. */
 export interface TemplateQuestion {
     id: string;
     prompt: string;
@@ -54,13 +56,9 @@ export interface CollectAnswersInput {
     spec: TemplateInitSpec;
     vars?: Record<string, string>;
     interactive: boolean;
-    ask?: (question: TemplateQuestion) => Promise<string>;
+    ask?: (question: InterviewQuestion) => Promise<string>;
     out?: (text: string) => void;
 }
 export declare function collectTemplateAnswers(input: CollectAnswersInput): Promise<ParseAnswersResult>;
 export declare function applyInitReplacements(contents: string, rel: string, spec: TemplateInitSpec, answers: Record<string, string>): string;
-export declare function promptTemplateQuestion(question: TemplateQuestion, options?: {
-    input?: NodeJS.ReadableStream;
-    output?: NodeJS.WritableStream;
-}): Promise<string>;
 //# sourceMappingURL=init-interview.d.ts.map

package/dist/internal/init-interview.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init-interview.d.ts","sourceRoot":"","sources":["../../src/internal/init-interview.ts"],"names":[],"mappings":"AAAA;;;GAGG;AASH,eAAO,MAAM,kBAAkB,cAAc,CAAC;AAE9C,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,KAAK,CAAC,EAAE,iBAAiB,CAAC;CAC3B;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,gBAAgB,EAAE,CAAC;IAC9B,OAAO,EAAE,eAAe,EAAE,CAAC;CAC5B;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE5C;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAOvD;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,gBAAgB,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAGxF;AAED,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAUvC;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,gBAAgB,CAStE;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAa1F;AAED,MAAM,MAAM,kBAAkB,GAC1B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GAC7C;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjC,MAAM,MAAM,qBAAqB,GAC7B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,IAAI,CAAC,EAAE,gBAAgB,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GACvE;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjC,4DAA4D;AAC5D,wBAAsB,eAAe,CAAC,KAAK,EAAE;IAC3C,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;CACtB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAkBjC;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,gBAAgB,CAAC;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,WAAW,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,gBAAgB,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACtD,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9B;AAED,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,mBAAmB,GACzB,OAAO,CAAC,kBAAkB,CAAC,CAoC7B;AAED,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,MAAM,CAiBR;AAED,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,GAAE;IACP,KAAK,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;CAC3B,GACL,OAAO,CAAC,MAAM,CAAC,CAejB"}
+{"version":3,"file":"init-interview.d.ts","sourceRoot":"","sources":["../../src/internal/init-interview.ts"],"names":[],"mappings":"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"}

package/dist/internal/init-interview.js

@@ -4,9 +4,9 @@
  */
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
-import { createInterface } from "node:readline";
 import { parseCursorGithubRepoScope } from "../channels/github/cursor-account.js";
 import { describeError } from "./describe-error.js";
+import { collectAnswers } from "./interview/question.js";
 import { isRecord } from "./is-record.js";
 export const TEMPLATE_INIT_FILE = "init.json";
 export function posixRel(rel) {
@@ -81,40 +81,21 @@ export async function runTemplateInit(input) {
         return { ok: false, error: describeError(error) };
     }
 }
+const PARSERS = {
+    "owner-repo-list": (value) => parseCursorGithubRepoScope(value.split(",").map((repo) => repo.trim())).repos.join(", "),
+};
 export async function collectTemplateAnswers(input) {
-    const vars = input.vars ?? {};
-    const answers = {};
-    const ask = input.ask ?? promptTemplateQuestion;
-    const out = input.out ?? ((text) => process.stdout.write(text));
-    for (const question of input.spec.questions) {
-        if (question.id in vars || !input.interactive) {
-            const raw = vars[question.id]?.trim() || question.default;
-            if (raw === undefined) {
-                // Skipping would scaffold the template's sample answer (e.g. owner/repo).
-                return {
-                    ok: false,
-                    error: `${question.id} is required: pass --var ${question.id}=... (${question.prompt})`,
-                };
-            }
-            const parsed = parseQuestionValue(question, raw);
-            if (!parsed.ok) {
-                return parsed;
-            }
-            answers[question.id] = parsed.value;
-            continue;
-        }
-        for (;;) {
-            const line = await ask(question);
-            const value = line.trim() === "" && question.default !== undefined ? question.default : line;
-            const parsed = parseQuestionValue(question, value);
-            if (parsed.ok) {
-                answers[question.id] = parsed.value;
-                break;
-            }
-            out(`${parsed.error}\n`);
-        }
-    }
-    return { ok: true, answers };
+    const collected = await collectAnswers({
+        questions: input.spec.questions.map((question) => ({
+            ...question,
+            parse: question.parse === undefined ? undefined : PARSERS[question.parse],
+        })),
+        given: input.vars,
+        interactive: input.interactive,
+        ask: input.ask,
+        out: input.out,
+    });
+    return collected.ok ? { ok: true, answers: collected.answers } : collected;
 }
 export function applyInitReplacements(contents, rel, spec, answers) {
     const file = posixRel(rel);
@@ -134,63 +115,9 @@ export function applyInitReplacements(contents, rel, spec, answers) {
     }
     return next;
 }
-export async function promptTemplateQuestion(question, options = {}) {
-    const input = options.input ?? process.stdin;
-    const output = options.output ?? process.stdout;
-    const rl = createInterface({ input, output });
-    const suffix = promptSuffix(question);
-    try {
-        if (question.hint !== undefined) {
-            output.write(`  ${question.hint}\n`);
-        }
-        return await new Promise((resolve) => {
-            rl.question(`${question.prompt}${suffix} `, resolve);
-        });
-    }
-    finally {
-        rl.close();
-    }
-}
 function replaceLiteral(haystack, find, value) {
     return haystack.replaceAll(find, () => value);
 }
-function promptSuffix(question) {
-    if (question.choices !== undefined && question.choices.length > 0) {
-        return ` [${question.choices.join("/")}]`;
-    }
-    if (question.default !== undefined) {
-        return ` [${question.default}]`;
-    }
-    if (question.placeholder !== undefined) {
-        return ` (${question.placeholder})`;
-    }
-    return "";
-}
-function parseQuestionValue(question, raw) {
-    const trimmed = raw.trim();
-    if (trimmed === "") {
-        return { ok: false, error: `${question.id} is required.` };
-    }
-    if (question.choices !== undefined && question.choices.length > 0) {
-        if (!question.choices.includes(trimmed)) {
-            return {
-                ok: false,
-                error: `${question.id} must be one of ${question.choices.join(", ")}.`,
-            };
-        }
-        return { ok: true, value: trimmed };
-    }
-    if (question.parse === "owner-repo-list") {
-        try {
-            const scope = parseCursorGithubRepoScope(trimmed.split(",").map((repo) => repo.trim()));
-            return { ok: true, value: scope.repos.join(", ") };
-        }
-        catch (error) {
-            return { ok: false, error: describeError(error) };
-        }
-    }
-    return { ok: true, value: trimmed };
-}
 function formatReplaceValue(rule, answers) {
     const raw = answers[rule.answer];
     if (raw === undefined || raw === "") {