@cursor/july 0.1.95 → 0.1.97

package/dist/internal/mcp-oauth.js

@@ -326,10 +326,17 @@ export class HostMcpOAuthProvider {
         });
     }
 }
+function clientForRedirect(info, redirectUrl) {
+    if (info === undefined || !info.redirect_uris.includes(redirectUrl)) {
+        return undefined;
+    }
+    return info;
+}
 export function createHostMcpOAuthProvider(args) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const store = (_a = args.store) !== null && _a !== void 0 ? _a : new FileMcpOAuthStore();
+        const redirectUrl = (_b = args.redirectUrl) !== null && _b !== void 0 ? _b : MCP_OAUTH_CALLBACK_URL;
         const [fileTokens, fileClient, omitResourceIndicator] = yield Promise.all([
             store.loadTokens(args.identifier, args.resourceUrl),
             store.loadClientInformation(args.identifier, args.resourceUrl),
@@ -339,8 +346,9 @@ export function createHostMcpOAuthProvider(args) {
             identifier: args.identifier,
             resourceUrl: args.resourceUrl,
             store,
+            redirectUrl,
             tokens: fileTokens !== null && fileTokens !== void 0 ? fileTokens : tokensFromEnv(args.identifier),
-            clientInformation: fileClient !== null && fileClient !== void 0 ? fileClient : clientIdFromEnv(args.identifier),
+            clientInformation: clientForRedirect(fileClient !== null && fileClient !== void 0 ? fileClient : clientIdFromEnv(args.identifier), redirectUrl),
             onRedirect: args.onRedirect,
             omitResourceIndicator,
         });

package/dist/internal/otel/collector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collector.d.ts","sourceRoot":"","sources":["../../../src/internal/otel/collector.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAaH,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,KAAK,SAAS,EAAS,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAIhD,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IACzD,KAAK,IAAI,IAAI,CAAC;IACd,yEAAyE;IACzE,oBAAoB,CAClB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACpC,IAAI,CAAC;IACR,mEAAmE;IACnE,oBAAoB,CAClB,SAAS,EAAE,MAAM,GAChB,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,SAAS,CAAC;CAC1C;AAgBD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAC1B,aAAa,CAgwBf"}
+{"version":3,"file":"collector.d.ts","sourceRoot":"","sources":["../../../src/internal/otel/collector.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAaH,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,KAAK,SAAS,EAAS,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAIhD,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IACzD,KAAK,IAAI,IAAI,CAAC;IACd,yEAAyE;IACzE,oBAAoB,CAClB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACpC,IAAI,CAAC;IACR,mEAAmE;IACnE,oBAAoB,CAClB,SAAS,EAAE,MAAM,GAChB,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,SAAS,CAAC;CAC1C;AAgBD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAC1B,aAAa,CA8xBf"}

package/dist/internal/otel/collector.js

@@ -45,8 +45,8 @@ export function createOtelCollector(runtime, agentName, log) {
         },
     };
     function handle(event, session) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-        var _p, _q;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+        var _t, _u;
         const at = Date.parse(event.at);
         const startTime = Number.isFinite(at) ? at : undefined;
         switch (event.type) {
@@ -144,7 +144,7 @@ export function createOtelCollector(runtime, agentName, log) {
                     return;
                 }
                 for (const call of event.data.calls) {
-                    const parentCtx = parentCtxFor(turn, (_p = event.data.parentCallId) !== null && _p !== void 0 ? _p : call.parentCallId);
+                    const parentCtx = parentCtxFor(turn, (_t = event.data.parentCallId) !== null && _t !== void 0 ? _t : call.parentCallId);
                     const span = runtime.tracer.startSpan("agent_sdk.tool", {
                         kind: SpanKind.INTERNAL,
                         startTime,
@@ -177,6 +177,19 @@ export function createOtelCollector(runtime, agentName, log) {
                 }), startTime);
                 return;
             }
+            case "action.auth_requested": {
+                (_k = (_j = ensureTurn(event, session, startTime)) === null || _j === void 0 ? void 0 : _j.tools.get(event.data.callId)) === null || _k === void 0 ? void 0 : _k.addEvent("auth_requested", undefined, startTime);
+                emitLog("action.auth_requested", SeverityNumber.INFO, attrs(Object.assign(Object.assign({}, baseLog(event, session)), { "cursor.tool.name": event.data.toolName, "agent_sdk.call_id": event.data.callId, "agent_sdk.mcp_connection": event.data.connection })));
+                return;
+            }
+            case "action.auth_resolved": {
+                (_m = (_l = ensureTurn(event, session, startTime)) === null || _l === void 0 ? void 0 : _l.tools.get(event.data.callId)) === null || _m === void 0 ? void 0 : _m.addEvent("auth_resolved", attrs({
+                    "agent_sdk.decision": event.data.decision,
+                    "agent_sdk.decision_by": event.data.by,
+                    "agent_sdk.mcp_connection": event.data.connection,
+                }), startTime);
+                return;
+            }
             case "action.result": {
                 const turn = ensureTurn(event, session, startTime);
                 const span = turn === null || turn === void 0 ? void 0 : turn.tools.get(event.data.callId);
@@ -211,7 +224,7 @@ export function createOtelCollector(runtime, agentName, log) {
                     event.turnId !== undefined) {
                     turn.span.setStatus({ code: SpanStatusCode.OK });
                     turn.span.end(startTime);
-                    (_j = sessions.get(event.sessionId)) === null || _j === void 0 ? void 0 : _j.turns.delete(event.turnId);
+                    (_o = sessions.get(event.sessionId)) === null || _o === void 0 ? void 0 : _o.turns.delete(event.turnId);
                 }
                 return;
             }
@@ -238,7 +251,7 @@ export function createOtelCollector(runtime, agentName, log) {
                 turn.subagents.set(event.data.callId, span);
                 metrics === null || metrics === void 0 ? void 0 : metrics.subagents.add(1, join(event.sessionId, {
                     "agent_sdk.agent": agentName,
-                    "agent_sdk.subagent_name": (_q = event.data.name) !== null && _q !== void 0 ? _q : "unknown",
+                    "agent_sdk.subagent_name": (_u = event.data.name) !== null && _u !== void 0 ? _u : "unknown",
                 }));
                 return;
             }
@@ -252,7 +265,7 @@ export function createOtelCollector(runtime, agentName, log) {
                 return;
             }
             case "artifact.tagged": {
-                (_k = ensureSession(event, session, startTime)) === null || _k === void 0 ? void 0 : _k.span.addEvent("artifact.tagged", attrs({
+                (_p = ensureSession(event, session, startTime)) === null || _p === void 0 ? void 0 : _p.span.addEvent("artifact.tagged", attrs({
                     "agent_sdk.artifact_id": event.data.id,
                     "agent_sdk.artifact_kind": event.data.kind,
                     "agent_sdk.artifact_key": event.data.key,
@@ -291,7 +304,7 @@ export function createOtelCollector(runtime, agentName, log) {
                 }
                 turn.span.setStatus({ code: SpanStatusCode.OK });
                 turn.span.end(startTime);
-                (_l = sessions.get(event.sessionId)) === null || _l === void 0 ? void 0 : _l.turns.delete(event.turnId);
+                (_q = sessions.get(event.sessionId)) === null || _q === void 0 ? void 0 : _q.turns.delete(event.turnId);
                 metrics === null || metrics === void 0 ? void 0 : metrics.turns.add(1, join(event.sessionId, {
                     "agent_sdk.agent": agentName,
                     "agent_sdk.turn_status": "completed",
@@ -315,7 +328,7 @@ export function createOtelCollector(runtime, agentName, log) {
                     turn.span.recordException(new Error(failureText));
                 }
                 turn.span.end(startTime);
-                (_m = sessions.get(event.sessionId)) === null || _m === void 0 ? void 0 : _m.turns.delete(event.turnId);
+                (_r = sessions.get(event.sessionId)) === null || _r === void 0 ? void 0 : _r.turns.delete(event.turnId);
                 metrics === null || metrics === void 0 ? void 0 : metrics.turns.add(1, join(event.sessionId, {
                     "agent_sdk.agent": agentName,
                     "agent_sdk.turn_status": "failed",
@@ -324,7 +337,7 @@ export function createOtelCollector(runtime, agentName, log) {
                 return;
             }
             case "session.waiting": {
-                (_o = ensureSession(event, session, startTime)) === null || _o === void 0 ? void 0 : _o.span.addEvent("session.waiting", undefined, startTime);
+                (_s = ensureSession(event, session, startTime)) === null || _s === void 0 ? void 0 : _s.span.addEvent("session.waiting", undefined, startTime);
                 return;
             }
             case "session.completed": {

package/dist/internal/runtime-dispatch-runner.d.ts

@@ -7,7 +7,7 @@
  */
 import type { RunnerTurnRequest, TurnOutcome } from "../types.js";
 import type { GrokBotRunnerOptions } from "./grokbot/runner.js";
-import type { AgentRunner, PrewarmOutcome, RunnerPrewarmRequest } from "./sdk-runner.js";
+import type { AgentRunner, PrewarmOutcome, RunnerPrewarmRequest, SteerAckOutcome } from "./sdk-runner.js";
 export interface RuntimeDispatchingRunnerOptions {
     sdkRunner: AgentRunner;
     grokbot?: GrokBotRunnerOptions;
@@ -24,6 +24,10 @@ export declare class RuntimeDispatchingRunner implements AgentRunner {
      */
     ensureGrokBotRunner(): AgentRunner;
     runTurn(request: RunnerTurnRequest): Promise<TurnOutcome>;
+    steer(request: {
+        sessionId: string;
+        text: string;
+    }): Promise<SteerAckOutcome>;
     prewarm(request: RunnerPrewarmRequest): Promise<PrewarmOutcome>;
     dispose(): Promise<void>;
 }

package/dist/internal/runtime-dispatch-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-dispatch-runner.d.ts","sourceRoot":"","sources":["../../src/internal/runtime-dispatch-runner.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAEhE,OAAO,KAAK,EACV,WAAW,EACX,cAAc,EACd,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,+BAA+B;IAC9C,SAAS,EAAE,WAAW,CAAC;IACvB,OAAO,CAAC,EAAE,oBAAoB,CAAC;IAC/B,4DAA4D;IAC5D,mBAAmB,CAAC,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,WAAW,CAAC;CACtE;AAED,qBAAa,wBAAyB,YAAW,WAAW;IAG9C,OAAO,CAAC,QAAQ,CAAC,OAAO;IAFpC,OAAO,CAAC,aAAa,CAA0B;IAE/C,YAA6B,OAAO,EAAE,+BAA+B,EAAI;IAEzE;;;OAGG;IACH,mBAAmB,IAAI,WAAW,CAKjC;IAEK,OAAO,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC,CAK9D;IAEK,OAAO,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,cAAc,CAAC,CASpE;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAG7B;CACF"}
+{"version":3,"file":"runtime-dispatch-runner.d.ts","sourceRoot":"","sources":["../../src/internal/runtime-dispatch-runner.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAEhE,OAAO,KAAK,EACV,WAAW,EACX,cAAc,EACd,oBAAoB,EACpB,eAAe,EAChB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,+BAA+B;IAC9C,SAAS,EAAE,WAAW,CAAC;IACvB,OAAO,CAAC,EAAE,oBAAoB,CAAC;IAC/B,4DAA4D;IAC5D,mBAAmB,CAAC,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,WAAW,CAAC;CACtE;AAED,qBAAa,wBAAyB,YAAW,WAAW;IAG9C,OAAO,CAAC,QAAQ,CAAC,OAAO;IAFpC,OAAO,CAAC,aAAa,CAA0B;IAE/C,YAA6B,OAAO,EAAE,+BAA+B,EAAI;IAEzE;;;OAGG;IACH,mBAAmB,IAAI,WAAW,CAKjC;IAEK,OAAO,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC,CAK9D;IAEK,KAAK,CAAC,OAAO,EAAE;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,IAAI,EAAE,MAAM,CAAC;KACd,GAAG,OAAO,CAAC,eAAe,CAAC,CAI3B;IAEK,OAAO,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,cAAc,CAAC,CASpE;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAG7B;CACF"}

package/dist/internal/runtime-dispatch-runner.js

@@ -38,6 +38,13 @@ export class RuntimeDispatchingRunner {
             return this.options.sdkRunner.runTurn(request);
         });
     }
+    steer(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            var _c;
+            return ((_c = (yield (_b = (_a = this.options.sdkRunner).steer) === null || _b === void 0 ? void 0 : _b.call(_a, request))) !== null && _c !== void 0 ? _c : "revert_to_followup");
+        });
+    }
     prewarm(request) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;

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

@@ -8,9 +8,15 @@
 import { type LocalAgentStore, type ModelSelection, type RunResult } from "@cursor/sdk";
 import { type ModelSetting, type RunnerTurnRequest, type TurnOutcome } from "../types.js";
 import type { ConversationMirror } from "./conversation-mirror.js";
+/** Mirrors @cursor/sdk's SteerAckOutcome; the published dist may predate it. */
+export type SteerAckOutcome = "complete_delivered" | "revert_to_followup";
 /** Internal seam between the session engine and the Cursor SDK harness. */
 export interface AgentRunner {
     runTurn(request: RunnerTurnRequest): Promise<TurnOutcome>;
+    steer?(request: {
+        sessionId: string;
+        text: string;
+    }): Promise<SteerAckOutcome>;
     /**
      * Resolve a local workspace before any session needs it, so the first turn
      * is not the one that pays for it. Best effort, hence the reported outcome:
@@ -83,11 +89,16 @@ export declare function isAuthErrorMessage(message: string | undefined): boolean
 export declare class CursorSdkRunner implements AgentRunner {
     private readonly options;
     private readonly agents;
+    private readonly activeRuns;
     private readonly stores;
     private readonly prewarmReleases;
     constructor(options?: CursorSdkRunnerOptions);
     runTurn(request: RunnerTurnRequest): Promise<TurnOutcome>;
     private runTurnAttempt;
+    steer(request: {
+        sessionId: string;
+        text: string;
+    }): Promise<SteerAckOutcome>;
     /**
      * Build the local executor for a workspace before any session asks for it.
      * The warmed executor is reference counted, so the lease is held until

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

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

package/dist/internal/sdk-runner.js

@@ -20,6 +20,7 @@ import { SqliteLocalAgentStore } from "@cursor/sdk/sqlite";
 import { DEFAULT_MODEL, } from "../types.js";
 import { mapSdkTokenUsage, usageTokenSum } from "./cloud-turn-cost.js";
 import { resolveApiKeySync } from "./cursor/credentials.js";
+import { describeError } from "./describe-error.js";
 /**
  * How long a non-`--dev` serve holds workspace scans (rules, skills,
  * `AGENTS.md`, ignore files). The SDK default is 20s for an editor whose
@@ -96,6 +97,7 @@ export class CursorSdkRunner {
     constructor(options = {}) {
         this.options = options;
         this.agents = new Map();
+        this.activeRuns = new Map();
         this.stores = new Map();
         this.prewarmReleases = [];
         if (options.workspaceScanCacheTtlMs !== undefined) {
@@ -199,15 +201,9 @@ export class CursorSdkRunner {
                     run.requestId !== "") {
                     yield request.onRequestId(run.requestId);
                 }
+                this.activeRuns.set(request.sessionId, run);
                 try {
                     const result = yield run.wait();
-                    // Mirror the conversation before replying: on hosted v2 the pod can
-                    // be parked as soon as the execution reply lands, so a
-                    // fire-and-forget write would race VM teardown. Failed turns still
-                    // checkpoint the user message, so they persist too.
-                    if (request.runtime === "local") {
-                        yield this.persistConversation(request, agent.agentId);
-                    }
                     let outcome = toTurnOutcome(result);
                     if (outcome.status === "error") {
                         // An error result usually means the handle's transport is poisoned
@@ -230,7 +226,23 @@ export class CursorSdkRunner {
                     return outcome;
                 }
                 finally {
+                    if (this.activeRuns.get(request.sessionId) === run) {
+                        this.activeRuns.delete(request.sessionId);
+                    }
                     signal === null || signal === void 0 ? void 0 : signal.removeEventListener("abort", onAbort);
+                    // Mirror the conversation before replying: on hosted v2 the pod can
+                    // be parked as soon as the execution reply lands, so a
+                    // fire-and-forget write would race VM teardown. In the `finally` so
+                    // a `wait()` that THROWS (transport death mid-turn, an abort with
+                    // no follow-up) still persists the checkpoints the turn already
+                    // wrote — the store is local SQLite, safe to read on the throw
+                    // path, and persistConversation swallows its own errors. Guarded
+                    // here (not just inside the helper) so unmirrored turns keep their
+                    // exact post-wait sequencing.
+                    if (request.runtime === "local" &&
+                        this.options.conversationMirror !== undefined) {
+                        yield this.persistConversation(request, agent.agentId);
+                    }
                 }
             }
             catch (error) {
@@ -241,6 +253,21 @@ export class CursorSdkRunner {
             }
         });
     }
+    steer(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const run = this.activeRuns.get(request.sessionId);
+            if ((run === null || run === void 0 ? void 0 : run.steer) === undefined) {
+                return "revert_to_followup";
+            }
+            try {
+                return yield run.steer(request.text);
+            }
+            catch (error) {
+                this.log(`[agent-sdk] session ${request.sessionId}: steer failed: ${describeError(error)}`);
+                return "revert_to_followup";
+            }
+        });
+    }
     /**
      * Build the local executor for a workspace before any session asks for it.
      * The warmed executor is reference counted, so the lease is held until
@@ -340,7 +367,11 @@ export class CursorSdkRunner {
      */
     buildLocalOptions(request) {
         return __awaiter(this, void 0, void 0, function* () {
-            const store = yield this.resolveStore(request);
+            var _a;
+            // Not resolveStore: an injected store is used synchronously (no
+            // microtask, no thenable assimilation), exactly as before the mirror
+            // existed.
+            const store = (_a = this.options.store) !== null && _a !== void 0 ? _a : (yield this.getStore(request.runnerStateDir));
             return Object.assign(Object.assign(Object.assign({}, this.buildSharedOptions(request)), (request.tools === undefined ? {} : { tools: request.tools })), { local: Object.assign({ cwd: request.workspaceDir, settingSources: ["project"], store }, (request.sandbox === true
                     ? { sandboxOptions: { enabled: true } }
                     : {})) });

package/dist/internal/server.d.ts

@@ -5,6 +5,7 @@
  * server-level health / info / dev-dispatch routes.
  */
 import type { AgentProject, AgentServeHandle, ServeOptions } from "../types.js";
+import type { McpOauthSecretsTarget } from "./mcp-oauth-persist.js";
 import { type AgentRunner } from "./sdk-runner.js";
 /** One agent to serve: its slug (empty for single-agent mode) and project. */
 export interface AgentMount {
@@ -15,6 +16,8 @@ export interface AgentMount {
 export interface StartServerInternalOptions {
     /** Test seam: replace the Cursor SDK runner (integration tests). */
     runner?: AgentRunner;
+    /** Test seam: bind the `--store` secrets client for on-demand MCP OAuth. */
+    mcpOauthSecrets?: McpOauthSecretsTarget;
 }
 /**
  * Start an HTTP server hosting one or more agents. A single agent with an

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

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/internal/server.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAoCH,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAOhB,YAAY,EACb,MAAM,aAAa,CAAC;AAyHrB,OAAO,EAAE,KAAK,WAAW,EAAmB,MAAM,iBAAiB,CAAC;AA2BpE,8EAA8E;AAC9E,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,YAAY,CAAC;CACvB;AAmCD,6EAA6E;AAC7E,MAAM,WAAW,0BAA0B;IACzC,oEAAoE;IACpE,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,UAAU,EAAE,EACpB,OAAO,GAAE,YAAY,GAAG,0BAA+B,GACtD,OAAO,CAAC,gBAAgB,CAAC,CAg8B3B"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/internal/server.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAoCH,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAOhB,YAAY,EACb,MAAM,aAAa,CAAC;AAqFrB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAyCpE,OAAO,EAAE,KAAK,WAAW,EAAmB,MAAM,iBAAiB,CAAC;AA2BpE,8EAA8E;AAC9E,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,YAAY,CAAC;CACvB;AAmCD,6EAA6E;AAC7E,MAAM,WAAW,0BAA0B;IACzC,oEAAoE;IACpE,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,4EAA4E;IAC5E,eAAe,CAAC,EAAE,qBAAqB,CAAC;CACzC;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,UAAU,EAAE,EACpB,OAAO,GAAE,YAAY,GAAG,0BAA+B,GACtD,OAAO,CAAC,gBAAgB,CAAC,CAw9B3B"}

package/dist/internal/server.js

@@ -64,6 +64,7 @@ import { DEFAULT_SERVE_PORT, listenHttpServer } from "./listen-port.js";
 import { createLocalControlPlane, } from "./local-control-plane.js";
 import { createLogRing } from "./log-ring.js";
 import { createAgentMcpEndpoint, createToolMcpEndpoint, MCP_ENDPOINT_PATH, TOOL_MCP_ENDPOINT_PATH, } from "./mcp-endpoint.js";
+import { mcpOauthServeCallbackPath, mcpOauthServeCallbackUrl, } from "./mcp-oauth-on-demand.js";
 import { isLoopbackAddress } from "./net.js";
 import { createOtelCollector } from "./otel/collector.js";
 import { pickAuthoredOtel, resolveOtelConfig } from "./otel/config.js";
@@ -116,8 +117,8 @@ function isV2Project(project) {
 export function startServer(mounts_1) {
     return __awaiter(this, arguments, void 0, function* (mounts, options = {}) {
         var _a, _b, _c, _d, _e, _f;
-        var _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2;
-        var _3;
+        var _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3;
+        var _4;
         if (mounts.length === 0) {
             throw new Error("startServer requires at least one agent mount");
         }
@@ -139,7 +140,7 @@ export function startServer(mounts_1) {
         // CURSOR_AGENTKIT_VERSION is still the env the SDK reads when building
         // its client-version header (wire prefix remains `agentkit-`). Setting it
         // here makes the internal-only agentkit_enabled gate apply to every turn.
-        (_m = (_3 = process.env).CURSOR_AGENTKIT_VERSION) !== null && _m !== void 0 ? _m : (_3.CURSOR_AGENTKIT_VERSION = packageVersion());
+        (_m = (_4 = process.env).CURSOR_AGENTKIT_VERSION) !== null && _m !== void 0 ? _m : (_4.CURSOR_AGENTKIT_VERSION = packageVersion());
         const authoredOtel = pickAuthoredOtel(mounts.map((m) => ({
             slug: m.slug,
             name: m.project.name,
@@ -420,6 +421,12 @@ export function startServer(mounts_1) {
                 otel: otelCollector,
                 otelMeter: otelRuntime === null || otelRuntime === void 0 ? void 0 : otelRuntime.meter,
             });
+            engine.oauthCallbackHub.secrets = options.mcpOauthSecrets;
+            engine.oauthCallbackHub.secretsBind = {
+                slug: slug === "" ? undefined : slug,
+                cloudToolsUrl: options.cloudToolsUrl,
+            };
+            engine.oauthCallbackHub.logger = logger;
             // Rehydrate sessions from the authored storage sink before any
             // channel or route can address them (continuation tokens must resolve).
             yield engine.restoreStoredSessions();
@@ -488,7 +495,7 @@ export function startServer(mounts_1) {
                 noControlPlane,
                 multi,
                 logger,
-                logRing }, (options.authToken === undefined
+                logRing, diagStateRoot: baseStateRoot }, (options.authToken === undefined
                 ? {}
                 : { authToken: options.authToken })), (options.allowAnonymous === true ? { allowAnonymous: true } : {})), (accountRefs !== undefined && accountBridge !== undefined
                 ? { accountBridge, accountRefs }
@@ -510,6 +517,7 @@ export function startServer(mounts_1) {
                             engine.trackBackground(promise);
                         },
                         resolveApproval: (sessionId, callId, decision, auth) => engine.resolveApproval(sessionId, callId, decision, auth),
+                        resolveAuth: (sessionId, callId, decision, auth) => engine.resolveAuth(sessionId, callId, decision, auth),
                         hasContinuationSession: (continuationToken) => engine.hasContinuationSession(channel.id, continuationToken),
                         isContinuationBusy: (continuationToken) => engine.isContinuationBusy(channel.id, continuationToken),
                         getContinuationLastBotMessageTs: (continuationToken) => engine.getContinuationLastBotMessageTs(channel.id, continuationToken),
@@ -700,6 +708,7 @@ export function startServer(mounts_1) {
         const address = server.address();
         const displayHost = host === "0.0.0.0" || host === "::" ? "127.0.0.1" : host;
         const url = `http://${displayHost}:${boundPort}`;
+        const oauthOrigin = ((_2 = options.publicUrl) !== null && _2 !== void 0 ? _2 : url).replace(/\/$/, "");
         // Resolve peer + Cursor account MCP connections now that the listen port is
         // known (see resolved-connections.ts for the URL/runtime rules).
         for (const runtime of runtimes) {
@@ -715,6 +724,18 @@ export function startServer(mounts_1) {
             if (resolved.length > 0) {
                 runtime.engine.setResolvedConnections(resolved);
             }
+            const oauthBase = runtime.slug === "" ? "" : `/${runtime.slug}`;
+            runtime.engine.setMcpOauthCallbackUrl(mcpOauthServeCallbackUrl(oauthOrigin, oauthBase));
+            if (accountBridge !== undefined && accountRefs !== undefined) {
+                const bridge = accountBridge;
+                runtime.engine.setCursorAccountAuthProbe((connection) => __awaiter(this, void 0, void 0, function* () {
+                    const ref = accountRefs.find((entry) => entry.name === connection);
+                    if (ref === undefined) {
+                        return undefined;
+                    }
+                    return yield bridge.probeAuthUrl(ref);
+                }));
+            }
             const hasServerTools = runtime.project.agent.tools.some((tool) => tool.execution === "server");
             // Host-bridged connections ride the same endpoint as server tools, so
             // the cloud tools connection is set whenever either needs it.
@@ -723,7 +744,7 @@ export function startServer(mounts_1) {
                 runtime.project.agent.cloud !== undefined;
             if ((hasServerTools || bridgeableNames.length > 0) && cloudCapable) {
                 const basePath = runtime.slug === "" ? "" : `/${runtime.slug}`;
-                const publicToolsUrl = (_2 = options.cloudToolsUrl) !== null && _2 !== void 0 ? _2 : (options.publicUrl === undefined
+                const publicToolsUrl = (_3 = options.cloudToolsUrl) !== null && _3 !== void 0 ? _3 : (options.publicUrl === undefined
                     ? undefined
                     : `${options.publicUrl.replace(/\/$/, "")}${basePath}${TOOL_MCP_ENDPOINT_PATH}`);
                 if (publicToolsUrl === undefined) {
@@ -929,16 +950,14 @@ function mountAgentRoutes(router, runtime, args) {
         return null;
     };
     if (noControlPlane === true && isV2Project(project)) {
-        registerHostedDeliveryRoute({
-            router,
-            base,
-            channels: project.channels,
-            buildHandlerArgs: (channelId, hostedSessionId) => buildChannelHandlerArgs({
+        registerHostedDeliveryRoute(Object.assign({ router,
+            base, channels: project.channels, buildHandlerArgs: (channelId, hostedSessionId) => buildChannelHandlerArgs({
                 runtime,
                 channelId,
                 hostedSessionId,
-            }),
-        });
+            }), drainSessionDurability: (sessionId) => engine.drainSessionDurability(sessionId) }, (args.diagStateRoot === undefined
+            ? {}
+            : { stateRoot: args.diagStateRoot })));
     }
     // Playground lists/opens Slack (and other channel) sessions across
     // principals when `--dev` (loopback) or `--allow-anonymous` (trusted
@@ -951,6 +970,12 @@ function mountAgentRoutes(router, runtime, args) {
     // Separate from read-relax: playground Approve/Deny on Slack-owned parked
     // tools (Slack principals never match local/anonymous HTTP auth).
     const relaxSessionApprovalAuth = relaxSessionReadAuth;
+    router.add({
+        method: "GET",
+        pattern: `${base}${mcpOauthServeCallbackPath()}`,
+        auth: "none",
+        handler: (request) => engine.oauthCallbackHub.handleCallback(request),
+    });
     router.add({
         method: "GET",
         pattern: `${base}/v1/health`,
@@ -1022,7 +1047,7 @@ function mountAgentRoutes(router, runtime, args) {
         method: "GET",
         pattern: `${base}/v1/sessions`,
         auth: httpAuth,
-        handler: (_request, ctx) => __awaiter(this, void 0, void 0, function* () {
+        handler: (request, ctx) => __awaiter(this, void 0, void 0, function* () {
             // Same gate as requireSessionOwner / relaxSessionReadAuth: never with
             // bearer or custom channel auth (strict per-principal isolation).
             // `--allow-anonymous` alone is a shared-principal trust boundary (corp
@@ -1031,9 +1056,13 @@ function mountAgentRoutes(router, runtime, args) {
                 (relaxSessionReadAuthBeyondLoopback ||
                     (typeof ctx.requestIp === "string" &&
                         isLoopbackAddress(ctx.requestIp)));
-            const listed = yield engine.listSessionsWithSource(ctx.auth, {
-                includeAll,
-            });
+            // `?latest=1` — only the newest visible session. Clients binding a
+            // default session (agsh) do not need the whole list, and on hosted
+            // storage the whole list is a database scan.
+            const latest = new URL(request.url).searchParams.get("latest");
+            const listed = latest === "1" || latest === "true"
+                ? yield engine.latestSessionWithSource(ctx.auth, { includeAll })
+                : yield engine.listSessionsWithSource(ctx.auth, { includeAll });
             return jsonResponse({
                 sessions: listed.sessions,
                 source: listed.source,
@@ -1206,17 +1235,16 @@ function mountAgentRoutes(router, runtime, args) {
                 return binding.errorResponse;
             }
             try {
-                const catalog = yield engine.listCatalogTools(Object.assign({ auth: ctx.auth }, binding));
-                const tool = catalog.tools.find((t) => t.name === toolName);
-                if (tool === undefined) {
+                const described = yield engine.describeCatalogTool(toolName, Object.assign({ auth: ctx.auth }, binding));
+                if (described.tool === undefined) {
                     return jsonResponse({
                         ok: false,
                         error: "unknown_tool",
                         message: `Unknown tool "${toolName}".`,
-                        availableTools: catalog.tools.map((t) => t.name),
+                        availableTools: described.availableTools,
                     }, { status: 404 });
                 }
-                return jsonResponse(catalogDetailEntry(tool));
+                return jsonResponse(catalogDetailEntry(described.tool));
             }
             catch (error) {
                 if (error instanceof InvalidContinuationTokenError) {