@cursor/july 0.1.2 → 0.1.4

package/dist/internal/discovery.js

@@ -38,6 +38,7 @@ import { parseFrontmatter } from "./frontmatter.js";
 import { isReservedSecretName, MAX_EGRESS_DOMAINS, validateEgressDomain, validateSecretName, } from "./hosting.js";
 import { toolInputJsonSchema } from "./json-schema.js";
 import { MCP_ENDPOINT_PATH, mcpEndpointToolNames } from "./mcp-endpoint.js";
+import { withIdentityPreamble } from "./workspace.js";
 const MODULE_EXTENSIONS = new Set([".ts", ".mts", ".js", ".mjs"]);
 const NAME_PATTERN = /^[A-Za-z0-9][A-Za-z0-9_-]*$/;
 const SKILL_DESCRIPTION_FALLBACK = (name) => `Instructions for the ${name} skill.`;
@@ -64,17 +65,15 @@ export function isAgentProjectDir(dir) {
     });
 }
 /**
- * Discover the agent projects directly under `rootDir` (one level deep):
- * each immediate child directory that is itself an agent project becomes a
- * mounted agent, keyed by a slug derived from its directory name. Used for
- * multi-agent serving, where one server hosts many agents under
- * `/<slug>/...`. Throws when no child projects are found.
+ * List agent projects directly under `rootDir` (one level deep) without
+ * loading them. Empty when the path is missing or has no child agents.
+ * Slug rules match {@link loadAgentProjects} / multi-agent serve.
  */
-export function loadAgentProjects(rootDir_1) {
-    return __awaiter(this, arguments, void 0, function* (rootDir, options = {}) {
+export function listChildAgentDirs(rootDir) {
+    return __awaiter(this, void 0, void 0, function* () {
         const resolved = resolve(rootDir);
         if (!(yield isDirectory(resolved))) {
-            throw new Error(`Agent projects directory does not exist: ${resolved}`);
+            return [];
         }
         const results = [];
         const seenSlugs = new Set();
@@ -94,11 +93,35 @@ export function loadAgentProjects(rootDir_1) {
                 throw new Error(`Duplicate agent slug "${slug}" under ${resolved}.`);
             }
             seenSlugs.add(slug);
-            results.push({ slug, project: yield loadAgentProject(childDir, options) });
+            results.push({ slug, dir: childDir });
         }
-        if (results.length === 0) {
+        return results;
+    });
+}
+/**
+ * Discover the agent projects directly under `rootDir` (one level deep):
+ * each immediate child directory that is itself an agent project becomes a
+ * mounted agent, keyed by a slug derived from its directory name. Used for
+ * multi-agent serving, where one server hosts many agents under
+ * `/<slug>/...`. Throws when no child projects are found.
+ */
+export function loadAgentProjects(rootDir_1) {
+    return __awaiter(this, arguments, void 0, function* (rootDir, options = {}) {
+        const resolved = resolve(rootDir);
+        if (!(yield isDirectory(resolved))) {
+            throw new Error(`Agent projects directory does not exist: ${resolved}`);
+        }
+        const children = yield listChildAgentDirs(resolved);
+        if (children.length === 0) {
             throw new Error(`No agent projects found directly under ${resolved}. Each agent should be a subdirectory with its own agent/ directory (or flat-layout markers).`);
         }
+        const results = [];
+        for (const child of children) {
+            results.push({
+                slug: child.slug,
+                project: yield loadAgentProject(child.dir, options),
+            });
+        }
         return results;
     });
 }
@@ -215,15 +238,21 @@ export function formatDiagnostics(diagnostics) {
 function loadAgent(ctx, agentDir, options) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
-        var _b, _c;
+        var _b;
         const config = yield loadAgentConfig(ctx, agentDir, options.isRoot);
-        const instructions = yield loadInstructions(ctx, agentDir, config, options.isRoot);
+        const name = (_b = config === null || config === void 0 ? void 0 : config.name) !== null && _b !== void 0 ? _b : options.name;
+        const authoredInstructions = yield loadInstructions(ctx, agentDir, config, options.isRoot);
+        // Root agents without authored instructions stay undefined (diagnostic
+        // already recorded). Subagents still get the identity line alone.
+        const instructions = authoredInstructions === undefined && options.isRoot
+            ? undefined
+            : withIdentityPreamble(name, authoredInstructions);
         // Subagents run as Cursor SDK custom subagents (prompt + description +
         // model); their other slots are inert today, so don't load them — just
         // warn that they exist.
         if (!options.isRoot) {
             yield warnUnsupportedSubagentSlots(ctx, agentDir);
-            return Object.assign(Object.assign(Object.assign(Object.assign({ name: (_b = config === null || config === void 0 ? void 0 : config.name) !== null && _b !== void 0 ? _b : options.name }, ((config === null || config === void 0 ? void 0 : config.description) === undefined
+            return Object.assign(Object.assign(Object.assign(Object.assign({ name }, ((config === null || config === void 0 ? void 0 : config.description) === undefined
                 ? {}
                 : { description: config.description })), ((config === null || config === void 0 ? void 0 : config.model) === undefined ? {} : { model: config.model })), (instructions === undefined ? {} : { instructions })), { runtime: "local", tools: [], skills: [], connections: [], subagents: [], seedFiles: [] });
         }
@@ -253,7 +282,7 @@ function loadAgent(ctx, agentDir, options) {
             });
         }
         return {
-            name: (_c = config === null || config === void 0 ? void 0 : config.name) !== null && _c !== void 0 ? _c : options.name,
+            name,
             description: config === null || config === void 0 ? void 0 : config.description,
             // Root agents always get a concrete model: authored value or DEFAULT_MODEL.
             model: isValidModelSetting(config === null || config === void 0 ? void 0 : config.model) ? config.model : DEFAULT_MODEL,

package/dist/internal/distribution.d.ts

@@ -17,6 +17,13 @@ export declare const LEGACY_PACKAGE_NAME = "@anysphere/agent-serve";
  * as PACKAGE_NAME so the eventual rename keeps authored imports working.
  */
 export declare const AGENTKIT_PACKAGE_NAME = "@cursor/agentkit";
+/**
+ * Bracketed product tag for stderr / ServeOptions.logger lines
+ * (`[agentkit] …`, `[agentkit/slack] …`).
+ */
+export declare const LOG_PRODUCT = "agentkit";
+export declare const LOG_PREFIX: string;
+export declare const SLACK_LOG_PREFIX: string;
 /**
  * Command name this CLI was invoked as. Both bins point at the same entry;
  * keep help text and hints copy-pasteable for whichever the user typed.

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

@@ -1 +1 @@
-{"version":3,"file":"distribution.d.ts","sourceRoot":"","sources":["../../src/internal/distribution.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAMH,qEAAqE;AACrE,eAAO,MAAM,YAAY,iBAAiB,CAAC;AAE3C,6EAA6E;AAC7E,eAAO,MAAM,mBAAmB,2BAA2B,CAAC;AAE5D;;;GAGG;AACH,eAAO,MAAM,qBAAqB,qBAAqB,CAAC;AAExD;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAA+B,CAAC;AAc/D;;;;;GAKG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAGhD;AAED;;;GAGG;AACH,wBAAgB,cAAc,IAAI,MAAM,CAEvC;AAED,kEAAkE;AAClE,wBAAgB,cAAc,IAAI,MAAM,CAOvC;AAED;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB,EAAE,aAAa,CAC/C,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAezC,CAAC"}
+{"version":3,"file":"distribution.d.ts","sourceRoot":"","sources":["../../src/internal/distribution.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAMH,qEAAqE;AACrE,eAAO,MAAM,YAAY,iBAAiB,CAAC;AAE3C,6EAA6E;AAC7E,eAAO,MAAM,mBAAmB,2BAA2B,CAAC;AAE5D;;;GAGG;AACH,eAAO,MAAM,qBAAqB,qBAAqB,CAAC;AAExD;;;GAGG;AACH,eAAO,MAAM,WAAW,aAAa,CAAC;AACtC,eAAO,MAAM,UAAU,EAAE,MAA2B,CAAC;AACrD,eAAO,MAAM,gBAAgB,EAAE,MAAiC,CAAC;AAEjE;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAA+B,CAAC;AAc/D;;;;;GAKG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAGhD;AAED;;;GAGG;AACH,wBAAgB,cAAc,IAAI,MAAM,CAEvC;AAED,kEAAkE;AAClE,wBAAgB,cAAc,IAAI,MAAM,CAOvC;AAED;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB,EAAE,aAAa,CAC/C,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAezC,CAAC"}

package/dist/internal/distribution.js

@@ -20,6 +20,13 @@ export const LEGACY_PACKAGE_NAME = "@anysphere/agent-serve";
  * as PACKAGE_NAME so the eventual rename keeps authored imports working.
  */
 export const AGENTKIT_PACKAGE_NAME = "@cursor/agentkit";
+/**
+ * Bracketed product tag for stderr / ServeOptions.logger lines
+ * (`[agentkit] …`, `[agentkit/slack] …`).
+ */
+export const LOG_PRODUCT = "agentkit";
+export const LOG_PREFIX = `[${LOG_PRODUCT}]`;
+export const SLACK_LOG_PREFIX = `[${LOG_PRODUCT}/slack]`;
 /**
  * Command name this CLI was invoked as. Both bins point at the same entry;
  * keep help text and hints copy-pasteable for whichever the user typed.

package/dist/internal/docs-site.js

@@ -100,10 +100,10 @@ export function ensureDocsSiteBundle() {
         }
         const toolchain = resolveDocsToolchain();
         if (toolchain === undefined) {
-            logger("[agent-serve] docs site missing and vitepress toolchain unavailable; /docs will show a build hint");
+            logger("[agentkit] docs site missing and vitepress toolchain unavailable; /docs will show a build hint");
             return;
         }
-        logger("[agent-serve] building docs site (vitepress)...");
+        logger("[agentkit] building docs site (vitepress)...");
         const code = yield new Promise((resolve, reject) => {
             const child = spawn(process.execPath, [toolchain.vitepressCli, "build", "docs"], { cwd: toolchain.packageRoot, env: process.env, stdio: "inherit" });
             child.on("error", reject);
@@ -115,7 +115,7 @@ export function ensureDocsSiteBundle() {
         if (!docsSiteExists()) {
             throw new Error("docs vitepress build finished but dist/docs/index.html is missing");
         }
-        logger("[agent-serve] docs site build complete");
+        logger("[agentkit] docs site build complete");
     });
 }
 /** True when docs sources + a resolvable `vitepress` CLI are present. */

package/dist/internal/eval-run-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"eval-run-store.d.ts","sourceRoot":"","sources":["../../src/internal/eval-run-store.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAGL,KAAK,kBAAkB,EACvB,KAAK,eAAe,EAErB,MAAM,aAAa,CAAC;AASrB,YAAY,EACV,eAAe,EACf,iBAAiB,IAAI,cAAc,EACnC,gBAAgB,EAChB,eAAe,GAChB,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qDAAqD;IACrD,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC;AAOF,qBAAa,YAAY;IAWrB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC;IAhBvC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAsC;IAC3D,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,cAAc,CAA4B;IAClD,OAAO,CAAC,QAAQ,CAAS;IACzB,wFAAwF;IACxF,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAoC;IAClE,wEAAwE;IACxE,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC,YACmB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI;IAC/C;;;OAGG;IACc,mBAAmB,CAAC,EAAE,kBAAkB,YAAA,EACvD;IAEJ,yEAAyE;IACzE,OAAO,CAAC,cAAc;IAMhB,IAAI,IAAI,OAAO,CAAC;QACpB,KAAK,EAAE,KAAK,CAAC;YACX,EAAE,EAAE,MAAM,CAAC;YACX,MAAM,EAAE,MAAM,CAAC;YACf,WAAW,CAAC,EAAE,MAAM,CAAC;YACrB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;SACjB,CAAC,CAAC;QACH,MAAM,EAAE,cAAc,CAAC;KACxB,CAAC,CAiBD;IAEK,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAG7D;IAED,+EAA+E;IACzE,QAAQ,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC,CAG3C;IAED;;;;OAIG;IACG,kBAAkB,IAAI,OAAO,CAAC;QAClC,IAAI,EAAE,eAAe,EAAE,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC,CAOD;IAED,cAAc,IAAI,MAAM,GAAG,SAAS,CAEnC;IAEK,KAAK,CAAC,KAAK,GAAE,iBAAsB,GAAG,OAAO,CAAC,eAAe,CAAC,CA+DnE;IAED,OAAO,CAAC,UAAU;IAMlB;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAQ7B;YAEa,sBAAsB;YAkDtB,YAAY;IAe1B;;;;OAIG;IACH,OAAO,CAAC,cAAc;YAgBR,WAAW;YAcX,aAAa;YAiBb,OAAO;IAmGrB,OAAO,CAAC,eAAe;CAqCxB;AAwDD,qBAAa,oBAAqB,SAAQ,KAAK;IACjC,QAAQ,CAAC,WAAW,EAAE,MAAM;IAAxC,YAAqB,WAAW,EAAE,MAAM,EAGvC;CACF;AAED,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,cAGC;CACF"}
+{"version":3,"file":"eval-run-store.d.ts","sourceRoot":"","sources":["../../src/internal/eval-run-store.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAGL,KAAK,kBAAkB,EACvB,KAAK,eAAe,EAErB,MAAM,aAAa,CAAC;AASrB,YAAY,EACV,eAAe,EACf,iBAAiB,IAAI,cAAc,EACnC,gBAAgB,EAChB,eAAe,GAChB,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qDAAqD;IACrD,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC;AAOF,qBAAa,YAAY;IAWrB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC;IAhBvC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAsC;IAC3D,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,cAAc,CAA4B;IAClD,OAAO,CAAC,QAAQ,CAAS;IACzB,wFAAwF;IACxF,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAoC;IAClE,wEAAwE;IACxE,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC,YACmB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI;IAC/C;;;OAGG;IACc,mBAAmB,CAAC,EAAE,kBAAkB,YAAA,EACvD;IAEJ,yEAAyE;IACzE,OAAO,CAAC,cAAc;IAMhB,IAAI,IAAI,OAAO,CAAC;QACpB,KAAK,EAAE,KAAK,CAAC;YACX,EAAE,EAAE,MAAM,CAAC;YACX,MAAM,EAAE,MAAM,CAAC;YACf,WAAW,CAAC,EAAE,MAAM,CAAC;YACrB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;SACjB,CAAC,CAAC;QACH,MAAM,EAAE,cAAc,CAAC;KACxB,CAAC,CAiBD;IAEK,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAG7D;IAED,+EAA+E;IACzE,QAAQ,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC,CAG3C;IAED;;;;OAIG;IACG,kBAAkB,IAAI,OAAO,CAAC;QAClC,IAAI,EAAE,eAAe,EAAE,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC,CAOD;IAED,cAAc,IAAI,MAAM,GAAG,SAAS,CAEnC;IAEK,KAAK,CAAC,KAAK,GAAE,iBAAsB,GAAG,OAAO,CAAC,eAAe,CAAC,CA+DnE;IAED,OAAO,CAAC,UAAU;IAMlB;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAQ7B;YAEa,sBAAsB;YAkDtB,YAAY;IAe1B;;;;OAIG;IACH,OAAO,CAAC,cAAc;YAgBR,WAAW;YAcX,aAAa;YAeb,OAAO;IAoGrB,OAAO,CAAC,eAAe;CAqCxB;AAwDD,qBAAa,oBAAqB,SAAQ,KAAK;IACjC,QAAQ,CAAC,WAAW,EAAE,MAAM;IAAxC,YAAqB,WAAW,EAAE,MAAM,EAGvC;CACF;AAED,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,cAGC;CACF"}

package/dist/internal/eval-run-store.js

@@ -120,7 +120,7 @@ export class EvalRunStore {
             this.activeRunId = runId;
             yield this.pruneOldRuns(config);
             yield this.enqueuePersist(snapshot, this.resolvePersist(config));
-            this.logger(`[agent-serve] eval run ${runId}: starting ${cases.length} case(s)`);
+            this.logger(`[agentkit] eval run ${runId}: starting ${cases.length} case(s)`);
             void this.execute(runId, Object.assign(Object.assign({ baseUrl: loopbackUrl, evals: selected, config }, (input.bearerToken === undefined
                 ? {}
                 : { bearerToken: input.bearerToken })), (input.verbose === undefined ? {} : { verbose: input.verbose })));
@@ -159,7 +159,7 @@ export class EvalRunStore {
                 }
                 const loaded = yield persist.load({ projectRoot: this.projectRoot });
                 if (!Array.isArray(loaded)) {
-                    this.logger("[agent-serve] eval persistRuns.load() did not return an array; ignoring");
+                    this.logger("[agentkit] eval persistRuns.load() did not return an array; ignoring");
                     this.hydrated = true;
                     return;
                 }
@@ -182,11 +182,11 @@ export class EvalRunStore {
                     yield this.enqueuePersist(run, persist);
                 }
                 yield this.pruneOldRuns(config);
-                this.logger(`[agent-serve] hydrated ${this.runs.size} playground eval run(s) from persistRuns`);
+                this.logger(`[agentkit] hydrated ${this.runs.size} playground eval run(s) from persistRuns`);
             }
             catch (error) {
                 const message = error instanceof Error ? error.message : String(error);
-                this.logger(`[agent-serve] failed to hydrate playground eval runs: ${message}`);
+                this.logger(`[agentkit] failed to hydrate playground eval runs: ${message}`);
             }
             finally {
                 this.hydrated = true;
@@ -234,7 +234,7 @@ export class EvalRunStore {
             }
             catch (error) {
                 const message = error instanceof Error ? error.message : String(error);
-                this.logger(`[agent-serve] persistRuns.save(${run.runId}) failed: ${message}`);
+                this.logger(`[agentkit] persistRuns.save(${run.runId}) failed: ${message}`);
             }
         });
     }
@@ -248,7 +248,7 @@ export class EvalRunStore {
             }
             catch (error) {
                 const message = error instanceof Error ? error.message : String(error);
-                this.logger(`[agent-serve] persistRuns.delete(${runId}) failed: ${message}`);
+                this.logger(`[agentkit] persistRuns.delete(${runId}) failed: ${message}`);
             }
         });
     }
@@ -294,7 +294,8 @@ export class EvalRunStore {
                             c.inputs = [...((_c = c.inputs) !== null && _c !== void 0 ? _c : []), event.data.text];
                         }
                         if (event.type === "message.completed" &&
-                            typeof ((_b = event.data) === null || _b === void 0 ? void 0 : _b.text) === "string") {
+                            typeof ((_b = event.data) === null || _b === void 0 ? void 0 : _b.text) === "string" &&
+                            event.data.parentCallId === undefined) {
                             c.finalText = event.data.text;
                         }
                     }, onCaseDone: (result) => {
@@ -311,7 +312,7 @@ export class EvalRunStore {
                 run.status = "completed";
                 run.finishedAt = new Date().toISOString();
                 yield this.enqueuePersist(run, this.resolvePersist(opts.config));
-                this.logger(`[agent-serve] eval run ${runId}: done — ${run.summary.passed} passed, ${run.summary.failed} failed`);
+                this.logger(`[agentkit] eval run ${runId}: done — ${run.summary.passed} passed, ${run.summary.failed} failed`);
             }
             catch (error) {
                 const run = this.runs.get(runId);
@@ -322,7 +323,7 @@ export class EvalRunStore {
                 run.finishedAt = new Date().toISOString();
                 run.error = error instanceof Error ? error.message : String(error);
                 yield this.enqueuePersist(run, this.resolvePersist(opts.config));
-                this.logger(`[agent-serve] eval run ${runId}: failed — ${run.error}`);
+                this.logger(`[agentkit] eval run ${runId}: failed — ${run.error}`);
             }
             finally {
                 if (this.activeRunId === runId) {

package/dist/internal/eval-runner.d.ts

@@ -48,6 +48,8 @@ export interface RunEvalsOptions extends EvalSelectionOptions {
     baseUrl: string;
     timeoutMs?: number;
     bearerToken?: string;
+    /** Extra request headers (e.g. hosted engineAccess). */
+    headers?: Record<string, string>;
     verbose?: boolean;
     onEvent?: (event: SessionEvent) => void;
     /** Fired when a case begins executing (after concurrency slot acquired). */

package/dist/internal/eval-runner.d.ts.map

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

package/dist/internal/eval-runner.js

@@ -149,6 +149,7 @@ export function runDiscoveredEvals(options) {
                 baseUrl: options.baseUrl,
                 defaultTimeoutMs,
                 bearerToken: options.bearerToken,
+                headers: options.headers,
                 verbose: Boolean(options.verbose),
                 onEvent: (event) => {
                     var _a, _b;
@@ -209,6 +210,7 @@ function runOneEval(discovered, opts) {
                         // Keep defineEval traffic out of live defineAB enrollment/metrics.
                         purpose: "eval",
                         bearerToken: opts.bearerToken,
+                        headers: opts.headers,
                         workspaceDir: options.workspaceDir,
                         workspaceFiles: options.workspaceFiles,
                         timeoutMs,

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

@@ -3,8 +3,53 @@
  * (`InteractionUpdate`) onto the framework's channel event vocabulary
  * (`SessionEvent` payloads). One mapper instance covers one turn.
  */
-import type { InteractionUpdate, ToolCall } from "@cursor/sdk";
+import type { InteractionUpdate as SdkInteractionUpdate, ToolCall } from "@cursor/sdk";
 import type { SessionEventPayload, TurnUsage } from "../types.js";
+/**
+ * Nested interaction updates from a task/subagent tool-call-delta.
+ * Mirrored locally so agent-serve typechecks against published `@cursor/sdk`
+ * versions that do not yet export `NestedTaskUpdate` / `tool-call-delta`.
+ */
+type NestedTaskUpdate = {
+    type: "text-delta";
+    text: string;
+} | {
+    type: "thinking-delta";
+    text: string;
+} | {
+    type: "thinking-completed";
+    thinkingDurationMs: number;
+} | {
+    type: "tool-call-started";
+    callId: string;
+    toolCall: ToolCall;
+    modelCallId: string;
+} | {
+    type: "tool-call-completed";
+    callId: string;
+    toolCall: ToolCall;
+    modelCallId: string;
+} | {
+    type: "partial-tool-call";
+    callId: string;
+    toolCall: ToolCall;
+    modelCallId: string;
+} | {
+    type: "step-started";
+    stepId: number;
+} | {
+    type: "step-completed";
+    stepId: number;
+    stepDurationMs: number;
+};
+type ToolCallDeltaUpdate = {
+    type: "tool-call-delta";
+    callId: string;
+    modelCallId: string;
+    taskUpdate: NestedTaskUpdate;
+};
+/** SDK updates plus nested task deltas once the SDK exposes them. */
+type InteractionUpdate = SdkInteractionUpdate | ToolCallDeltaUpdate;
 export interface ToolCallDescription {
     toolName: string;
     args?: unknown;
@@ -24,6 +69,8 @@ export declare class TurnEventMapper {
     private usageTotal;
     private lastAssistantText;
     private summaryTitle;
+    /** Per-parent-call accumulators for nested subagent streams. */
+    private readonly nested;
     constructor(emit: (payload: SessionEventPayload) => void);
     /** Per-turn token usage summed across model steps. */
     get usage(): TurnUsage | undefined;
@@ -34,7 +81,12 @@ export declare class TurnEventMapper {
     handleUpdate(update: InteractionUpdate): void;
     /** Close out the turn: finalize any open assistant text block. */
     finish(): void;
+    private handleNestedTaskUpdate;
+    private emitToolStarted;
+    private emitToolCompleted;
+    private ensureNested;
     private flushAssistantText;
+    private flushNestedAssistantText;
 }
 /**
  * Human-meaningful tool identity for stream events. In-process tools calls
@@ -43,4 +95,5 @@ export declare class TurnEventMapper {
  */
 export declare function describeToolCall(toolCall: ToolCall): ToolCallDescription;
 export declare function describeToolResult(toolCall: ToolCall): ToolResultDescription;
+export {};
 //# sourceMappingURL=event-mapper.d.ts.map

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":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAIlE,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACpD;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,qBAAa,eAAe;IAOd,OAAO,CAAC,QAAQ,CAAC,IAAI;IANjC,OAAO,CAAC,eAAe,CAAM;IAC7B,OAAO,CAAC,oBAAoB,CAAM;IAClC,OAAO,CAAC,UAAU,CAAwB;IAC1C,OAAO,CAAC,iBAAiB,CAAqB;IAC9C,OAAO,CAAC,YAAY,CAAqB;IAEzC,YAA6B,IAAI,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,IAAI,EAAI;IAE7E,sDAAsD;IACtD,IAAI,KAAK,IAAI,SAAS,GAAG,SAAS,CAEjC;IAED,yEAAyE;IACzE,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAElC;IAED,4EAA4E;IAC5E,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAED,YAAY,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,CA4G5C;IAED,kEAAkE;IAClE,MAAM,IAAI,IAAI,CAEb;IAED,OAAO,CAAC,kBAAkB;CAY3B;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,GAAG,mBAAmB,CA0CxE;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,GAAG,qBAAqB,CA4B5E"}
+{"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

@@ -4,11 +4,19 @@
  * (`SessionEvent` payloads). One mapper instance covers one turn.
  */
 const CUSTOM_TOOLS_PROVIDER = "custom-user-tools";
+function asToolCallDelta(update) {
+    if (update.type !== "tool-call-delta") {
+        return undefined;
+    }
+    return update;
+}
 export class TurnEventMapper {
     constructor(emit) {
         this.emit = emit;
         this.textAccumulator = "";
         this.reasoningAccumulator = "";
+        /** Per-parent-call accumulators for nested subagent streams. */
+        this.nested = new Map();
     }
     /** Per-turn token usage summed across model steps. */
     get usage() {
@@ -52,49 +60,11 @@ export class TurnEventMapper {
             }
             case "tool-call-started": {
                 this.flushAssistantText("tool_call");
-                const description = describeToolCall(update.toolCall);
-                this.emit({
-                    type: "actions.requested",
-                    data: {
-                        calls: [
-                            {
-                                callId: update.callId,
-                                toolName: description.toolName,
-                                args: description.args,
-                            },
-                        ],
-                    },
-                });
-                if (description.subagent !== undefined) {
-                    this.emit({
-                        type: "subagent.called",
-                        data: {
-                            callId: update.callId,
-                            name: description.subagent.name,
-                            description: description.subagent.description,
-                        },
-                    });
-                }
+                this.emitToolStarted(update.callId, update.toolCall);
                 return;
             }
             case "tool-call-completed": {
-                const description = describeToolCall(update.toolCall);
-                const result = describeToolResult(update.toolCall);
-                this.emit({
-                    type: "action.result",
-                    data: {
-                        callId: update.callId,
-                        toolName: description.toolName,
-                        output: result.output,
-                        isError: result.isError,
-                    },
-                });
-                if (description.subagent !== undefined) {
-                    this.emit({
-                        type: "subagent.completed",
-                        data: { callId: update.callId, name: description.subagent.name },
-                    });
-                }
+                this.emitToolCompleted(update.callId, update.toolCall);
                 return;
             }
             case "step-started": {
@@ -126,7 +96,13 @@ export class TurnEventMapper {
             case "shell-output-delta":
                 return;
             default: {
-                // Future harness update types are ignored rather than fatal.
+                // Nested task/subagent progress (tool-call-delta) — accepted via
+                // structural check so we typecheck against older published SDKs.
+                const delta = asToolCallDelta(update);
+                if (delta !== undefined) {
+                    this.handleNestedTaskUpdate(delta.callId, delta.taskUpdate);
+                    return;
+                }
                 return;
             }
         }
@@ -134,6 +110,128 @@ export class TurnEventMapper {
     /** Close out the turn: finalize any open assistant text block. */
     finish() {
         this.flushAssistantText("stop");
+        for (const parentCallId of this.nested.keys()) {
+            this.flushNestedAssistantText(parentCallId, "stop");
+        }
+    }
+    handleNestedTaskUpdate(parentCallId, update) {
+        switch (update.type) {
+            case "text-delta": {
+                const acc = this.ensureNested(parentCallId);
+                acc.text += update.text;
+                this.emit({
+                    type: "message.appended",
+                    data: {
+                        delta: update.text,
+                        text: acc.text,
+                        parentCallId,
+                    },
+                });
+                return;
+            }
+            case "thinking-delta": {
+                const acc = this.ensureNested(parentCallId);
+                acc.reasoning += update.text;
+                this.emit({
+                    type: "reasoning.appended",
+                    data: {
+                        delta: update.text,
+                        text: acc.reasoning,
+                        parentCallId,
+                    },
+                });
+                return;
+            }
+            case "thinking-completed": {
+                const acc = this.nested.get(parentCallId);
+                if (acc !== undefined && acc.reasoning !== "") {
+                    acc.reasoning = "";
+                }
+                this.emit({
+                    type: "reasoning.completed",
+                    data: {
+                        durationMs: update.thinkingDurationMs,
+                        parentCallId,
+                    },
+                });
+                return;
+            }
+            case "tool-call-started": {
+                this.flushNestedAssistantText(parentCallId, "tool_call");
+                this.emitToolStarted(update.callId, update.toolCall, parentCallId);
+                return;
+            }
+            case "tool-call-completed": {
+                this.emitToolCompleted(update.callId, update.toolCall, parentCallId);
+                return;
+            }
+            case "partial-tool-call":
+            case "step-started":
+            case "step-completed":
+                return;
+            default: {
+                return;
+            }
+        }
+    }
+    emitToolStarted(callId, toolCall, parentCallId) {
+        const description = describeToolCall(toolCall);
+        this.emit({
+            type: "actions.requested",
+            data: {
+                calls: [
+                    {
+                        callId,
+                        toolName: description.toolName,
+                        args: description.args,
+                        parentCallId,
+                    },
+                ],
+                parentCallId,
+            },
+        });
+        // 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) {
+            this.emit({
+                type: "subagent.called",
+                data: {
+                    callId,
+                    name: description.subagent.name,
+                    description: description.subagent.description,
+                },
+            });
+        }
+    }
+    emitToolCompleted(callId, toolCall, parentCallId) {
+        const description = describeToolCall(toolCall);
+        const result = describeToolResult(toolCall);
+        this.emit({
+            type: "action.result",
+            data: {
+                callId,
+                toolName: description.toolName,
+                output: result.output,
+                isError: result.isError,
+                parentCallId,
+            },
+        });
+        if (description.subagent !== undefined && parentCallId === undefined) {
+            this.flushNestedAssistantText(callId, "stop");
+            this.nested.delete(callId);
+            this.emit({
+                type: "subagent.completed",
+                data: { callId, name: description.subagent.name },
+            });
+        }
+    }
+    ensureNested(parentCallId) {
+        let acc = this.nested.get(parentCallId);
+        if (acc === undefined) {
+            acc = { text: "", reasoning: "" };
+            this.nested.set(parentCallId, acc);
+        }
+        return acc;
     }
     flushAssistantText(finishReason) {
         if (this.textAccumulator === "") {
@@ -147,6 +245,18 @@ export class TurnEventMapper {
             data: { text, finishReason },
         });
     }
+    flushNestedAssistantText(parentCallId, finishReason) {
+        const acc = this.nested.get(parentCallId);
+        if (acc === undefined || acc.text === "") {
+            return;
+        }
+        const text = acc.text;
+        acc.text = "";
+        this.emit({
+            type: "message.completed",
+            data: { text, finishReason, parentCallId },
+        });
+    }
 }
 /**
  * Human-meaningful tool identity for stream events. In-process tools calls

package/dist/internal/github-fanout.js

@@ -105,13 +105,13 @@ export function fanoutDelivery(body_1, headers_1, targets_1) {
                     body: payload,
                 });
                 if (!response.ok) {
-                    log(`[agent-serve] delivery to ${label} failed: HTTP ${response.status}\n`);
+                    log(`[agentkit] delivery to ${label} failed: HTTP ${response.status}\n`);
                     return;
                 }
                 delivered.push(label);
             }
             catch (error) {
-                log(`[agent-serve] delivery to ${label} failed: ${error instanceof Error ? error.message : String(error)}\n`);
+                log(`[agentkit] delivery to ${label} failed: ${error instanceof Error ? error.message : String(error)}\n`);
             }
         })));
         if (recipients.length > 0 && delivered.length === 0) {