@cursor/july 0.1.101 → 0.1.103

package/dist/internal/session-engine.js

@@ -23,8 +23,9 @@ import { SLACK_CHANNEL_ID } from "../channels/slack/constants.js";
 import { materializeSlackNudgeCarrier } from "../channels/slack/nudge-carrier.js";
 import { SlackAskDedupeStore, SlackNudgeStore, } from "../channels/slack/nudge-store.js";
 import { resolveDedicatedSlackHostBinding } from "../channels/slack/slack-channel.js";
-import { AGENT_SERVE_USER_STORE_FILES_SOURCE_ID, agentStoreKeys, } from "../files.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 { storageKeysForArchitecture } from "../storage.js";
 import { DEFAULT_MODEL, DIRECT_TOOL_CALL_CHANNEL_ID, isCursorAccountTransport, isHostOauthConnectionTransport, isSymbolicConnectionTransport, } from "../types.js";
 import { ABCollector } from "./ab-collector.js";
 import { foldABStream } from "./ab-fold.js";
@@ -38,6 +39,7 @@ import { mergeCloudOptions, resolveSessionRuntime } from "./cloud-merge.js";
 import { applyCloudUsageToEvents, cloudSdkAgentIdFromEvents, isUnpricedCompletedTurn, mapSdkTokenUsage, } from "./cloud-turn-cost.js";
 import { applyAgentContinuationDefaults, channelContinuationIdentity, httpContinuationIdentity, } from "./continuation-channel.js";
 import { continuationSource, resolveV2Key, V2EngineError, } from "./continuation-identity.js";
+import { describeError } from "./describe-error.js";
 import { isDevMode } from "./dev-mode.js";
 import { EventLogStore } from "./event-log.js";
 import { TurnEventMapper } from "./event-mapper.js";
@@ -54,6 +56,7 @@ 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";
 import { assertCloudCanHonorAccountServersFilters } from "./resolved-connections.js";
+import { applyAuthoredResult } from "./result-output.js";
 import { sessionExternalLinks } from "./session-links.js";
 import { SessionStore } from "./session-store.js";
 import { syncSkillsToStore } from "./skills-sync.js";
@@ -65,7 +68,9 @@ import { estimateTurnCostFromApi, roundCostUsd, } from "./turn-cost.js";
 import { TurnGovernor } from "./turn-governor.js";
 import { TurnLeaseStore } from "./turn-lease-store.js";
 import { TurnOutbox } from "./turn-outbox.js";
-import { buildAgentsMdContent, buildCloudMemorySection, ensureOwnGitRoot, isNestedInGitRepo, materializeWorkspace, SERVER_TOOLS_MCP_SERVER_NAME, writeWorkspaceFiles, } from "./workspace.js";
+import { resolveAgentV2Hosting } from "./v2-hosting.js";
+import { buildAgentsMdContent, buildCloudMemorySection, buildCloudWorkspaceSection, ensureOwnGitRoot, isNestedInGitRepo, materializeWorkspace, SERVER_TOOLS_MCP_SERVER_NAME, writeWorkspaceFiles, } from "./workspace.js";
+import { syncWorkspaceToStore } from "./workspace-sync.js";
 export const HTTP_CHANNEL_ID = "http";
 export { SCHEDULE_CHANNEL_PREFIX } from "./prompt-context.js";
 export class SessionBusyError extends Error {
@@ -156,6 +161,8 @@ export class SessionEngine {
         var _a, _b, _c, _d, _e;
         /** In-flight lazy restores, deduped per channel + continuation key. */
         this.restoreInFlight = new Map();
+        /** In-flight authored files → Agent Store syncs (see syncToCloudStore). */
+        this.cloudSyncs = new Map();
         this.channelsById = new Map();
         /** Sessions with a turn being admitted (before the run promise exists). */
         this.pendingTurns = new Set();
@@ -246,16 +253,27 @@ export class SessionEngine {
                     agentName: options.project.name,
                     projectRoot: options.project.rootDir,
                     logger: this.logger,
+                    keys: storageKeysForArchitecture(options.project.agent.architecture),
                 });
         this.kvApi = createHostKvApi(Object.assign({ agentName: options.project.name, stateRoot: options.stateRoot }, (this.storage === undefined ? {} : { storage: this.storage })));
+        const v2Hosting = resolveAgentV2Hosting({
+            architecture: options.project.agent.architecture,
+        });
+        const managedV2Files = v2Hosting.kind === "cursor-managed"
+            ? () => cursorHostedFiles({
+                resolveStoreSourceId: () => v2Hosting.resolveStoreIds().deploymentStoreSourceId,
+            })
+            : undefined;
         this.filesApi = createHostFilesApi({
             agentName: options.project.name,
             stateRoot: options.stateRoot,
+            sink: managedV2Files === null || managedV2Files === void 0 ? void 0 : managedV2Files(),
         });
         this.artifactsStore = new ArtifactsStore({
             stateRoot: options.stateRoot,
             agentName: options.project.name,
             config: options.project.artifacts,
+            sink: managedV2Files === null || managedV2Files === void 0 ? void 0 : managedV2Files(),
         });
         this.abCollector = new ABCollector(options.project.abs, this.logger, (sessionId) => __awaiter(this, void 0, void 0, function* () { return (yield this.logs.get(sessionId)).snapshot(0); }), 
         // Samples flow to the defineStorage `abs` table (no-op without one).
@@ -340,9 +358,9 @@ export class SessionEngine {
         };
     }
     /**
-     * Host services with `files` bound to one session, so a relative path in a
-     * tool or hook resolves to that session's scope and can never be read as
-     * another session's. Unbound (no session) keeps `host.files` usable for
+     * Host services with `files` and `otel` bound to one session, so a relative
+     * path resolves to that session's scope and can never read another
+     * session's. Unbound (no session) keeps `host.files` usable for
      * `{ scope: "deployment" }` and fails loudly on session-scoped calls.
      */
     hostForSession(sessionId) {
@@ -1422,7 +1440,7 @@ export class SessionEngine {
                     this.activeToolContexts.set(sessionId, { record, turnId, emit });
                     this.stubbedCallIds.set(sessionId, stubbed);
                     try {
-                        outcome = yield this.runner.runTurn(request);
+                        outcome = yield this.runTurnExecute(record, turnId, () => this.runner.runTurn(request));
                     }
                     finally {
                         this.activeToolContexts.delete(sessionId);
@@ -1463,11 +1481,39 @@ export class SessionEngine {
             if (finalCost !== undefined) {
                 outcome = Object.assign(Object.assign({}, outcome), { cost: finalCost });
             }
+            const authored = this.project.result;
+            if (outcome.status === "finished" && authored !== undefined) {
+                const settled = yield applyAuthoredResult({
+                    definition: authored,
+                    text: finalResult,
+                    dryRun: record.dryRun === true,
+                    ctx: {
+                        session: this.sessionInfo(record),
+                        host: this.hostForSession(sessionId),
+                        artifacts: this.artifactsApi({ sessionId, turnId }),
+                        stateRoot: this.stateRoot,
+                        workspaceDir: harnessCwd,
+                    },
+                });
+                if (!settled.ok) {
+                    outcome = {
+                        status: "error",
+                        result: finalResult,
+                        errorMessage: `turn output failed: ${settled.message}`,
+                        usage: finalUsage,
+                        cost: finalCost,
+                    };
+                }
+            }
             if (outcome.status === "finished") {
                 yield this.appendEvent(sessionId, {
                     type: "turn.completed",
                     turnId,
-                    data: Object.assign(Object.assign(Object.assign({}, (finalResult === undefined ? {} : { result: finalResult })), (finalUsage === undefined ? {} : { usage: finalUsage })), (finalCost === undefined ? {} : { cost: finalCost })),
+                    data: {
+                        result: finalResult,
+                        usage: finalUsage,
+                        cost: finalCost,
+                    },
                 });
             }
             else {
@@ -1502,7 +1548,7 @@ export class SessionEngine {
                     data: {},
                 });
             }
-            return Object.assign(Object.assign(Object.assign({}, outcome), (finalResult === undefined ? {} : { result: finalResult })), (finalUsage === undefined ? {} : { usage: finalUsage }));
+            return Object.assign(Object.assign({}, outcome), { result: finalResult, usage: finalUsage });
         });
     }
     /**
@@ -1512,63 +1558,89 @@ export class SessionEngine {
      * first-turn S3 scan can discover them. False when the sync fails: the
      * turn then runs without store skills rather than pointing discovery at
      * paths that do not exist.
-     *
-     * With skills authored, every first cloud turn re-copies the authored
+     */
+    ensureCloudSkillsSynced(store) {
+        const skills = this.project.agent.skills;
+        return this.syncToCloudStore("skills", store, skills.length > 0, () => syncSkillsToStore({
+            sink: store.sink,
+            agentName: this.project.name,
+            skills,
+            skillsPrefix: store.skillsPrefix,
+        }));
+    }
+    /**
+     * Sync `agent/sandbox/workspace/**` seeds onto the Agent Store at
+     * `workspace/…` (hosted) or `agent-serve/<agent>/workspace/…`
+     * (personal-key local+cloud) before the first cloud prompt, which names
+     * the mounted directory (see buildCloudWorkspaceSection).
+     */
+    ensureCloudWorkspaceSynced(store) {
+        const seedFiles = this.project.agent.seedFiles;
+        return this.syncToCloudStore("workspace", store, seedFiles.length > 0, () => syncWorkspaceToStore({
+            sink: store.sink,
+            seedFiles,
+            workspacePrefix: store.workspacePrefix,
+        }));
+    }
+    /**
+     * With files authored, every first cloud turn re-copies the authored
      * bytes and the memo only dedupes concurrent first turns. The mount is
      * writable from cloud sessions, so a once-per-process copy would let one
      * session's edits masquerade as agent definition for every later session
      * until the engine restarts; re-syncing keeps the store true to discovery
      * the same way local materialization always rewrites skills. Without
-     * skills the sync is best-effort stale cleanup and one attempt per
-     * process is enough, success or not — a deployment without the files
+     * authored files the sync is best-effort stale cleanup and one attempt
+     * per process is enough, success or not — a deployment without the files
      * surface must not fail and log on every new session for a feature it
      * does not use.
      */
-    ensureCloudSkillsSynced() {
-        if (this.cloudSkillsSync !== undefined) {
-            return this.cloudSkillsSync;
-        }
-        const target = this.cloudSkillsStore();
-        if (target === undefined) {
-            this.cloudSkillsSync = Promise.resolve(false);
-            return this.cloudSkillsSync;
+    syncToCloudStore(surface, store, authored, run) {
+        const inFlight = this.cloudSyncs.get(surface);
+        if (inFlight !== undefined) {
+            return inFlight;
         }
-        const skills = this.project.agent.skills;
-        let sync = syncSkillsToStore({
-            sink: target.sink,
-            agentName: this.project.name,
-            skills,
-            skillsPrefix: target.skillsPrefix,
-        }).then(() => true, (error) => {
-            this.logger(`[skills] ${target.label} sync failed: ${error instanceof Error ? error.message : String(error)}`);
+        let sync = run().then(() => true, (error) => {
+            this.logger(`[${surface}] ${store.label} sync failed: ${error instanceof Error ? error.message : String(error)}`);
             return false;
         });
-        if (skills.length > 0) {
+        if (authored) {
             sync = sync.finally(() => {
-                this.cloudSkillsSync = undefined;
+                this.cloudSyncs.delete(surface);
             });
         }
-        this.cloudSkillsSync = sync;
+        this.cloudSyncs.set(surface, sync);
         return sync;
     }
     /**
      * Hosted deployments own the deployment store. Local `serve`/`run` with
      * a personal API key writes into the USER store under `agent-serve/`.
      */
-    cloudSkillsStore() {
-        if (isCursorHostedFilesAvailable()) {
-            return {
-                sink: cursorHostedFiles(),
-                skillsPrefix: agentStoreKeys.skillsPrefix(),
-                label: "deployment store",
-            };
+    cloudStore() {
+        const v2Hosting = resolveAgentV2Hosting({
+            architecture: this.project.agent.architecture,
+        });
+        const deployment = {
+            mountPath: DEPLOYMENT_STORE_MOUNT_PATH,
+            skillsPrefix: agentStoreKeys.skillsPrefix(),
+            workspacePrefix: agentStoreKeys.workspacePrefix(),
+            label: "deployment store",
+        };
+        if (v2Hosting.kind === "cursor-managed") {
+            return Object.assign({ sink: cursorHostedFiles({
+                    resolveStoreSourceId: () => v2Hosting.resolveStoreIds().deploymentStoreSourceId,
+                }) }, deployment);
+        }
+        if (v2Hosting.kind === "not-v2" && isCursorHostedFilesAvailable()) {
+            return Object.assign({ sink: cursorHostedFiles() }, deployment);
         }
         if (isCursorUserStoreFilesAvailable()) {
             return {
                 sink: cursorHostedFiles({
                     storeSourceId: AGENT_SERVE_USER_STORE_FILES_SOURCE_ID,
                 }),
+                mountPath: USER_STORE_MOUNT_PATH,
                 skillsPrefix: agentStoreKeys.userSkillsPrefix(this.project.name),
+                workspacePrefix: agentStoreKeys.userWorkspacePrefix(this.project.name),
                 label: "user store",
             };
         }
@@ -1621,13 +1693,14 @@ export class SessionEngine {
             if (isFirstTurn) {
                 if (runtime === "cloud") {
                     // Cloud VMs have no materialized workspace: ship the full context,
-                    // including agent tool script bodies. On hosted deployments authored
-                    // skills land on the store mount for native discovery, and the
-                    // shared memory journal is on that mount too — say where. When the
-                    // turn carries the session-bound server-tool MCP endpoint, the
-                    // preamble catalogs server tools under that MCP server name *before*
-                    // the agent-tool "write the script if missing" recipe, so a model
-                    // told to "use <server tool>" calls MCP instead of inventing a .sh.
+                    // including agent tool script bodies. Authored skills and workspace
+                    // seeds land on the store mount (skills for native discovery, seeds
+                    // for the model's file tools), and on hosted deployments the shared
+                    // memory journal is on that mount too — say where. When the turn
+                    // carries the session-bound server-tool MCP endpoint, the preamble
+                    // catalogs server tools under that MCP server name *before* the
+                    // agent-tool "write the script if missing" recipe, so a model told
+                    // to "use <server tool>" calls MCP instead of inventing a .sh.
                     const preamble = buildAgentsMdContent(agent, {
                         includeScripts: true,
                         serverToolsMcpName: this.cloudServerToolsConnection === undefined
@@ -1635,17 +1708,29 @@ export class SessionEngine {
                             : SERVER_TOOLS_MCP_SERVER_NAME,
                     });
                     const hosted = isCursorHostedFilesAvailable();
-                    // Synced whenever a store is reachable, not just when skills exist:
-                    // removing the last skill has to delete its store copies too.
-                    // Discovery is native (`--agent-store-skills-dir`); this only has
-                    // to land the bytes.
-                    if (hosted || isCursorUserStoreFilesAvailable()) {
-                        yield this.ensureCloudSkillsSynced();
+                    // Synced whenever a store is reachable, not just when skills or
+                    // seeds exist: removing the last one has to delete its store copies
+                    // too.
+                    const store = hosted || isCursorUserStoreFilesAvailable()
+                        ? this.cloudStore()
+                        : undefined;
+                    let sections = "";
+                    if (store !== undefined) {
+                        const [, seedsSynced] = yield Promise.all([
+                            this.ensureCloudSkillsSynced(store),
+                            this.ensureCloudWorkspaceSynced(store),
+                        ]);
+                        // Only name the mount when the bytes landed; a failed sync must
+                        // not send the model looking for files that are not there.
+                        if (seedsSynced && agent.seedFiles.length > 0) {
+                            const dir = `${store.mountPath}/${store.workspacePrefix}`;
+                            sections += `\n\n${buildCloudWorkspaceSection(dir)}`;
+                        }
+                    }
+                    if (hosted) {
+                        sections += `\n\n${buildCloudMemorySection(this.project.name)}`;
                     }
-                    const memorySection = hosted
-                        ? `\n\n${buildCloudMemorySection(this.project.name)}`
-                        : "";
-                    turnPrompt = `${preamble}${memorySection}\n\n${turnPrompt}`;
+                    turnPrompt = `${preamble}${sections}\n\n${turnPrompt}`;
                 }
                 else if (runtime === "local" && instructionsInvisibleToHarness) {
                     // Local workspace whose AGENTS.md the harness will not load. With a
@@ -1994,21 +2079,10 @@ export class SessionEngine {
                 return toolErrorResult(`Invalid input for tool "${args.tool.name}": ${validation.message}`);
             }
             const toolCallId = (_b = args.toolCallId) !== null && _b !== void 0 ? _b : newToolCallId(args.tool.name);
-            const toolCtx = {
-                toolCallId,
-                session: this.sessionInfo(args.record),
-                workspaceDir: this.harnessCwd(args.record),
-                stateRoot: this.stateRoot,
-                host: this.hostForSession(args.record.sessionId),
-                artifacts: this.artifactsApi({
+            const toolCtx = Object.assign({ toolCallId, session: this.sessionInfo(args.record), workspaceDir: this.harnessCwd(args.record), stateRoot: this.stateRoot, host: this.hostForSession(args.record.sessionId), artifacts: this.artifactsApi({
                     sessionId: args.record.sessionId,
                     turnId: args.turnId,
-                }),
-                send: (channelId, message, sendOptions = {}) => { var _a; return this.send(channelId, message, Object.assign(Object.assign({}, sendOptions), { auth: (_a = sendOptions.auth) !== null && _a !== void 0 ? _a : args.record.auth })); },
-                getSession: (channelId, sessionId) => this.getChannelSession(channelId, sessionId),
-                emit: args.emit,
-                now: sessionClock(args.record.asOf),
-            };
+                }), send: (channelId, message, sendOptions = {}) => { var _a; return this.send(channelId, message, Object.assign(Object.assign({}, sendOptions), { auth: (_a = sendOptions.auth) !== null && _a !== void 0 ? _a : args.record.auth })); }, getSession: (channelId, sessionId) => this.getChannelSession(channelId, sessionId), emit: args.emit, now: sessionClock(args.record.asOf) }, (args.record.asOf === undefined ? {} : { asOf: args.record.asOf }));
             try {
                 // Before the approval gate: a dry run is unattended, so parking a write
                 // for a human would hang the turn rather than answer it.
@@ -2056,13 +2130,18 @@ export class SessionEngine {
                 }
                 const started = Date.now();
                 this.logger(`[session] tool ${args.tool.name} start`);
-                const result = yield mcpAuthAls.run({
+                const result = yield this.runToolExecute({
+                    record: args.record,
+                    turnId: args.turnId,
+                    callId: toolCallId,
+                    toolName: args.tool.name,
+                }, () => mcpAuthAls.run({
                     sessionId: args.record.sessionId,
                     turnId: args.turnId,
                     callId: toolCallId,
                     toolName: args.tool.name,
                     emit: args.emit,
-                }, () => execute(validation.value, toolCtx));
+                }, () => execute(validation.value, toolCtx)));
                 this.logger(`[session] tool ${args.tool.name} done (${Date.now() - started}ms)`);
                 return normalizeToolResult(result);
             }
@@ -2072,6 +2151,41 @@ export class SessionEngine {
             }
         });
     }
+    /**
+     * Bind outbound inject (Factory / Cursor API `traceparent`) to the
+     * turn span for the whole harness run. Host files / VFS RPCs happen
+     * here, not under `runInCall`. No-op when OTel is off.
+     */
+    runTurnExecute(record, turnId, fn) {
+        const otel = this.otel;
+        const run = () => Promise.resolve(fn());
+        if (otel === undefined) {
+            return run();
+        }
+        return otel.runInTurn({
+            sessionId: record.sessionId,
+            session: this.sessionInfo(record),
+            turnId,
+        }, run);
+    }
+    /**
+     * Bind outbound inject (Factory / Cursor API `traceparent`) to the
+     * tool span. No-op when OTel is off.
+     */
+    runToolExecute(args, fn) {
+        const otel = this.otel;
+        const run = () => Promise.resolve(fn());
+        if (otel === undefined) {
+            return run();
+        }
+        return otel.runInCall({
+            sessionId: args.record.sessionId,
+            session: this.sessionInfo(args.record),
+            turnId: args.turnId,
+            callId: args.callId,
+            toolName: args.toolName,
+        }, run);
+    }
     /**
      * Park a server-tool call until a human approves or denies. Emits
      * `action.approval_requested` / `action.approval_resolved` on the
@@ -2717,35 +2831,34 @@ export class SessionEngine {
                     isError = false;
                 }
                 else {
-                    const run = () => execute(validation.value, {
-                        toolCallId: callId,
-                        session,
-                        workspaceDir,
-                        stateRoot: this.stateRoot,
-                        host: this.hostForSession(record === null || record === void 0 ? void 0 : record.sessionId),
+                    const run = () => execute(validation.value, Object.assign({ toolCallId: callId, session,
+                        workspaceDir, stateRoot: this.stateRoot, host: this.hostForSession(record === null || record === void 0 ? void 0 : record.sessionId), 
                         // Scratch calls have no real session; their facade stays unbound.
                         artifacts: record === undefined
                             ? this.artifactsApi()
                             : this.artifactsApi({
                                 sessionId: record.sessionId,
                                 turnId: callId,
-                            }),
-                        send: (channelId, message, sendOptions = {}) => this.send(channelId, message, Object.assign(Object.assign({}, sendOptions), { auth: sendOptions.auth !== undefined
+                            }), send: (channelId, message, sendOptions = {}) => this.send(channelId, message, Object.assign(Object.assign({}, sendOptions), { auth: sendOptions.auth !== undefined
                                 ? sendOptions.auth
-                                : session.auth })),
-                        getSession: (channelId, sessionId) => this.getChannelSession(channelId, sessionId),
-                        emit,
-                        now: sessionClock(record === null || record === void 0 ? void 0 : record.asOf),
-                    });
-                    result = normalizeToolResult(record !== undefined && emit !== undefined
-                        ? yield mcpAuthAls.run({
+                                : session.auth })), getSession: (channelId, sessionId) => this.getChannelSession(channelId, sessionId), emit, now: sessionClock(record === null || record === void 0 ? void 0 : record.asOf) }, ((record === null || record === void 0 ? void 0 : record.asOf) === undefined ? {} : { asOf: record.asOf })));
+                    const executeBody = record !== undefined && emit !== undefined
+                        ? () => mcpAuthAls.run({
                             sessionId: record.sessionId,
                             turnId: callId,
                             callId,
                             toolName,
                             emit,
                         }, run)
-                        : yield run());
+                        : run;
+                    result = normalizeToolResult(record !== undefined
+                        ? yield this.runToolExecute({
+                            record,
+                            turnId: callId,
+                            callId,
+                            toolName,
+                        }, executeBody)
+                        : yield executeBody());
                     isError = isErrorEnvelope(result);
                 }
             }
@@ -2910,7 +3023,10 @@ export class SessionEngine {
             if (record === undefined) {
                 return;
             }
-            const sessionCtx = { session: this.sessionInfo(record) };
+            const sessionCtx = {
+                session: this.sessionInfo(record),
+                host: this.hostForSession(record.sessionId),
+            };
             const channelEvents = this.channelEventHandlersFor(record.channelId);
             if (channelEvents !== undefined) {
                 // Handlers are declared against the narrowed event for their key; the
@@ -2949,20 +3065,13 @@ export class SessionEngine {
                         continue;
                     }
                     try {
-                        yield handler(event, {
-                            agent: { name: this.project.name },
-                            channel: {
+                        yield handler(event, Object.assign(Object.assign({}, sessionCtx), { agent: { name: this.project.name }, channel: {
                                 id: record.channelId,
                                 continuationToken: record.continuationKey,
-                            },
-                            session: this.sessionInfo(record),
-                            stateRoot: this.stateRoot,
-                            host: this.hostForSession(record.sessionId),
-                            artifacts: this.artifactsApi({
+                            }, stateRoot: this.stateRoot, artifacts: this.artifactsApi({
                                 sessionId: record.sessionId,
                                 turnId: event.turnId,
-                            }),
-                        });
+                            }) }));
                     }
                     catch (error) {
                         this.logger(`[agent-sdk] hook "${hook.name}" handler for ${event.type} threw: ${describeError(error)}`);
@@ -2970,9 +3079,9 @@ export class SessionEngine {
                 }
             }
             if (this.abCollector.enabled) {
-                yield this.abCollector.onEvent(event, this.sessionInfo(record), this.project.name);
+                yield this.abCollector.onEvent(event, sessionCtx.session, this.project.name);
             }
-            (_a = this.otel) === null || _a === void 0 ? void 0 : _a.onEvent(event, this.sessionInfo(record));
+            (_a = this.otel) === null || _a === void 0 ? void 0 : _a.onEvent(event, sessionCtx.session);
         });
     }
     channelEventHandlersFor(channelId) {
@@ -3874,9 +3983,6 @@ function subagentPrompt(subagent) {
 function buildRunnerSubagents(agent) {
     return agent.subagents.map((subagent) => { var _a; return (Object.assign({ name: subagent.name, description: (_a = subagent.description) !== null && _a !== void 0 ? _a : subagent.name, prompt: subagentPrompt(subagent) }, (subagent.model === undefined ? {} : { model: subagent.model }))); });
 }
-function describeError(error) {
-    return error instanceof Error ? error.message : String(error);
-}
 function toolErrorResult(message) {
     return {
         content: [{ type: "text", text: message }],

package/dist/internal/session-run-log.d.ts

@@ -15,7 +15,8 @@
  * persist so a store outage never changes the hosted-execution HTTP reply.
  *
  * Same flush moments as `hosted-execution.json` and the start.log tee —
- * see `hosted-execution-flush.ts`. Keys: {@link storageKeys.sessionRun}.
+ * see `hosted-execution-flush.ts`. Keys:
+ * {@link agentSdkStorageKeys.sessionRun}.
  */
 import type { FileSink } from "../files.js";
 import type { AgentProject } from "../types.js";

package/dist/internal/session-run-log.d.ts.map

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

package/dist/internal/session-run-log.js

@@ -15,7 +15,8 @@
  * persist so a store outage never changes the hosted-execution HTTP reply.
  *
  * Same flush moments as `hosted-execution.json` and the start.log tee —
- * see `hosted-execution-flush.ts`. Keys: {@link storageKeys.sessionRun}.
+ * see `hosted-execution-flush.ts`. Keys:
+ * {@link agentSdkStorageKeys.sessionRun}.
  */
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -26,11 +27,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { cursorFrameworkStoreSourceId, cursorHostedFiles, } from "../files-backends/cursor-hosted.js";
-import { storageKeys } from "../storage-protocol.js";
+import { cursorHostedFiles } from "../files-backends/cursor-hosted.js";
+import { agentSdkStorageKeys } from "../storage-protocol.js";
 import { resolveApiKeySync } from "./cursor/credentials.js";
-import { AGENT_SERVE_GENERATION_ENV_VAR } from "./cursor-relay-core.js";
 import { describeError } from "./describe-error.js";
+import { isRecord } from "./is-record.js";
+import { resolveAgentV2Hosting } from "./v2-hosting.js";
 export const SESSION_RUN_LOG_VERSION = 1;
 /** Last N log-ring lines kept on each execution. */
 export const SESSION_RUN_LOG_MAX_ENTRIES = 200;
@@ -98,9 +100,6 @@ export function snapshotSessionRunLogs(entries) {
         line: boundedText(entry.line, SESSION_RUN_LOG_MAX_LINE_CHARS),
     }));
 }
-function isRecord(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 function decodeSinkBody(body) {
     return body instanceof Uint8Array ? body : body.body;
 }
@@ -250,7 +249,7 @@ export function createSessionRunLogStore(input) {
     const logger = (_a = input.logger) !== null && _a !== void 0 ? _a : (() => { });
     let active;
     const readDocument = (sessionPublicId) => __awaiter(this, void 0, void 0, function* () {
-        const key = storageKeys.sessionRun(agentName, sessionPublicId);
+        const key = agentSdkStorageKeys.sessionRun(agentName, sessionPublicId);
         const body = yield sink.get(key);
         if (body === undefined) {
             return undefined;
@@ -281,7 +280,7 @@ export function createSessionRunLogStore(input) {
             updatedAt: fitted.writtenAt,
             executions,
         });
-        const key = storageKeys.sessionRun(agentName, document.sessionPublicId);
+        const key = agentSdkStorageKeys.sessionRun(agentName, document.sessionPublicId);
         try {
             yield sink.put(key, new TextEncoder().encode(JSON.stringify(document)));
         }
@@ -341,17 +340,15 @@ export function createSessionRunLogStore(input) {
  * local disk / today's behavior.
  */
 export function selectSessionRunLogStore(input) {
-    var _a;
-    if (input.project.agent.architecture !== "v2") {
-        return undefined;
-    }
-    const env = (_a = input.env) !== null && _a !== void 0 ? _a : process.env;
-    if (env[AGENT_SERVE_GENERATION_ENV_VAR] === undefined) {
+    const hosting = resolveAgentV2Hosting({
+        architecture: input.project.agent.architecture,
+        env: input.env,
+    });
+    if (hosting.kind !== "cursor-managed") {
         return undefined;
     }
-    const envSnapshot = env;
     return createSessionRunLogStore(Object.assign({ sink: cursorHostedFiles({
-            resolveStoreSourceId: () => cursorFrameworkStoreSourceId(envSnapshot),
+            resolveStoreSourceId: () => hosting.resolveStoreIds().frameworkStoreSourceId,
             resolveApiKey: () => { var _a; return (_a = resolveApiKeySync()) === null || _a === void 0 ? void 0 : _a.apiKey; },
         }), agentName: input.project.name, logger: input.logger }, (input.snapshotLogs === undefined
         ? {}

package/dist/internal/skills-sync.d.ts

@@ -11,10 +11,7 @@ import type { DiscoveredSkill } from "../types.js";
  * Mirror the agent's skills onto the store: write every SKILL.md (with the
  * same generated frontmatter local materialization uses) plus sibling files,
  * and delete keys no authored skill claims so redeploys drop removed skills.
- *
- * Everything loads and validates before the store is touched, and writes
- * land before stale deletes, so a failed sync never leaves a gap a
- * concurrent cloud reader could see.
+ * Everything loads and validates before the store is touched.
  */
 export declare function syncSkillsToStore(args: {
     sink: FileSink;

package/dist/internal/skills-sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skills-sync.d.ts","sourceRoot":"","sources":["../../src/internal/skills-sync.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAqC,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE/E,OAAO,KAAK,EAAE,eAAe,EAAmB,MAAM,aAAa,CAAC;AAQpE;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,IAAI,EAAE,QAAQ,CAAC;IACf,qFAAqF;IACrF,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,SAAS,eAAe,EAAE,CAAC;IACnC,6EAA6E;IAC7E,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC,IAAI,CAAC,CAuBhB"}
+{"version":3,"file":"skills-sync.d.ts","sourceRoot":"","sources":["../../src/internal/skills-sync.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE5D,OAAO,KAAK,EAAE,eAAe,EAAmB,MAAM,aAAa,CAAC;AASpE;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,IAAI,EAAE,QAAQ,CAAC;IACf,qFAAqF;IACrF,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,SAAS,eAAe,EAAE,CAAC;IACnC,6EAA6E;IAC7E,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBhB"}