@cursor/bdk 0.2.17 → 0.2.20

package/dist/internal/request-error-status.js

@@ -3,6 +3,7 @@ import { InvalidAsOfError, VacuousTimeArgsError } from "./as-of.js";
 import { V2EngineError } from "./continuation-identity.js";
 import { GUEST_CONNECT_STALLED, GUEST_NETWORK_UNAVAILABLE, GuestNetworkUnavailableError, hasGuestNetworkErrno, isQuietGuestConnectStall, } from "./guest-network.js";
 import { HOSTED_GUEST_RETRY_TERMINAL, HOSTED_GUEST_RETRY_TRANSIENT, } from "./hosted-delivery-protocol.js";
+import { InvalidModelConfigError } from "./model-config.js";
 import { SessionAuthError, SessionBusyError } from "./session-engine.js";
 /**
  * Expected throw → HTTP mapping used by `handleRequest` and hosted flush.
@@ -41,7 +42,9 @@ export function mapThrownRequestError(error) {
             retry: HOSTED_GUEST_RETRY_TERMINAL,
         };
     }
-    if (error instanceof InvalidAsOfError || error instanceof VacuousTimeArgsError) {
+    if (error instanceof InvalidAsOfError ||
+        error instanceof VacuousTimeArgsError ||
+        error instanceof InvalidModelConfigError) {
         return {
             status: 400,
             code: "invalid_request",

package/dist/internal/resolved-connections.d.ts

@@ -4,7 +4,8 @@
  * account bridge — resolve to concrete URLs and join the engine's
  * resolved-connection set. Local turns call both over loopback; cloud
  * turns use the serve `publicUrl` for peers and the account's native
- * connectors instead of the bridge.
+ * connectors instead of the bridge. A single-agent serve with a peers URL
+ * reaches its peers there from both runtimes.
  */
 import { type AgentProject } from "../types.js";
 import { type CursorAccountConnectionRef, type CursorAccountMcpBridge } from "./cursor/account-mcp.js";
@@ -55,6 +56,8 @@ export declare function resolveMountConnections(args: {
     accountBridge?: CursorAccountMcpBridge;
     publicUrl?: string;
     authToken?: string;
+    /** Resolves `peerRefs` on another host; see `resolveHostedPeerConnections`. */
+    peersUrl?: string;
     /** See {@link validateMountConnectionsConfig}. */
     cloudToolsBridge?: boolean;
     logger: (line: string) => void;

package/dist/internal/resolved-connections.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolved-connections.d.ts","sourceRoot":"","sources":["../../src/internal/resolved-connections.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,KAAK,YAAY,EAAkC,MAAM,aAAa,CAAC;AAChF,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,sBAAsB,EAE5B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,KAAK,iBAAiB,EAA0B,MAAM,uBAAuB,CAAC;AACvF,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAEpE,+EAA+E;AAC/E,wBAAgB,8BAA8B,CAAC,IAAI,EAAE;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,YAAY,CAAC;IACtB,WAAW,CAAC,EAAE,0BAA0B,EAAE,CAAC;IAC3C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,GAAG,IAAI,CA0BP;AAED,qEAAqE;AACrE,wBAAgB,wCAAwC,CAAC,IAAI,EAAE;IAC7D,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC;IAC3B,mBAAmB,EAAE,SAAS,wBAAwB,EAAE,CAAC;IACzD;;;;OAIG;IACH,YAAY,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CACpC,GAAG,IAAI,CAoBP;AAED,iFAAiF;AACjF,wBAAgB,oCAAoC,CAAC,IAAI,EAAE;IACzD,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;;OAIG;IACH,8BAA8B,CAAC,EAAE,OAAO,CAAC;IACzC,qBAAqB,EAAE,OAAO,CAAC;CAChC,GAAG,IAAI,CAUP;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,YAAY,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAC/B,WAAW,CAAC,EAAE,0BAA0B,EAAE,CAAC;IAC3C,aAAa,CAAC,EAAE,sBAAsB,CAAC;IACvC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kDAAkD;IAClD,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAChC,GAAG,wBAAwB,EAAE,CAgE7B"}
+{"version":3,"file":"resolved-connections.d.ts","sourceRoot":"","sources":["../../src/internal/resolved-connections.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,KAAK,YAAY,EAAkC,MAAM,aAAa,CAAC;AAChF,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,sBAAsB,EAE5B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,KAAK,iBAAiB,EAGvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAEpE,+EAA+E;AAC/E,wBAAgB,8BAA8B,CAAC,IAAI,EAAE;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,YAAY,CAAC;IACtB,WAAW,CAAC,EAAE,0BAA0B,EAAE,CAAC;IAC3C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,GAAG,IAAI,CA0BP;AAED,qEAAqE;AACrE,wBAAgB,wCAAwC,CAAC,IAAI,EAAE;IAC7D,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC;IAC3B,mBAAmB,EAAE,SAAS,wBAAwB,EAAE,CAAC;IACzD;;;;OAIG;IACH,YAAY,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CACpC,GAAG,IAAI,CAoBP;AAED,iFAAiF;AACjF,wBAAgB,oCAAoC,CAAC,IAAI,EAAE;IACzD,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;;OAIG;IACH,8BAA8B,CAAC,EAAE,OAAO,CAAC;IACzC,qBAAqB,EAAE,OAAO,CAAC;CAChC,GAAG,IAAI,CAUP;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,YAAY,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAC/B,WAAW,CAAC,EAAE,0BAA0B,EAAE,CAAC;IAC3C,aAAa,CAAC,EAAE,sBAAsB,CAAC;IACvC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,+EAA+E;IAC/E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kDAAkD;IAClD,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAChC,GAAG,wBAAwB,EAAE,CAmE7B"}

package/dist/internal/resolved-connections.js

@@ -4,11 +4,12 @@
  * account bridge — resolve to concrete URLs and join the engine's
  * resolved-connection set. Local turns call both over loopback; cloud
  * turns use the serve `publicUrl` for peers and the account's native
- * connectors instead of the bridge.
+ * connectors instead of the bridge. A single-agent serve with a peers URL
+ * reaches its peers there from both runtimes.
  */
 import { isHostOauthConnectionTransport } from "../types.js";
 import { resolveCursorAccountConnections, } from "./cursor/account-mcp.js";
-import { resolvePeerConnections } from "./peer-connections.js";
+import { resolveHostedPeerConnections, resolvePeerConnections, } from "./peer-connections.js";
 /** Fail fast before listen when static cloud config cannot honor `servers`. */
 export function validateMountConnectionsConfig(args) {
     if (args.accountRefs === undefined || args.accountRefs.length === 0) {
@@ -69,9 +70,13 @@ export function resolveMountConnections(args) {
                 : `[bdk] warning: agent "${label}" has host-OAuth MCP connections (${hostOauthNames.join(", ")}) whose tokens live on this serve host; cloud-runtime turns omit them. Serve with a cloud tools URL so they reach turns through the host connection bridge, or drop \`oauth\` and authorize the server another way.`);
         }
     }
-    if (args.peerRefs !== undefined && args.peerRefs.length > 0) {
+    const peerRefs = args.peerRefs ?? [];
+    if (args.peersUrl !== undefined) {
+        resolved.push(...resolveHostedPeerConnections({ refs: peerRefs, peersUrl: args.peersUrl }));
+    }
+    else if (peerRefs.length > 0) {
         const peers = resolvePeerConnections({
-            refs: args.peerRefs,
+            refs: peerRefs,
             serverUrl: args.serverUrl,
             ...(args.publicUrl === undefined ? {} : { publicUrl: args.publicUrl }),
             ...(args.authToken === undefined ? {} : { authToken: args.authToken }),

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

@@ -9,7 +9,7 @@ import { mkdir } from "node:fs/promises";
 import { Agent, Cursor, createAgentPlatform, } from "@cursor/sdk";
 import { SqliteLocalAgentStore } from "@cursor/sdk/sqlite";
 import { DEFAULT_MODEL, } from "../types.js";
-import { mapSdkTokenUsage, usageTokenSum } from "./cloud-turn-cost.js";
+import { mapSdkTokenUsage, usageTokenSum } from "./cloud-turn-usage.js";
 import { resolveApiKeySync, SIGN_IN_HINT } from "./cursor/credentials.js";
 import { describeError } from "./describe-error.js";
 import { installedSdkAppliesSubagentInherit } from "./sdk-subagent-inherit-support.js";
@@ -262,6 +262,7 @@ export class CursorSdkRunner {
      */
     async runTurnWithTransportRetry(request, onStreamed) {
         let sawUpdate = false;
+        let mintedSdkAgentId;
         const tracked = {
             ...request,
             onUpdate: (update) => {
@@ -269,6 +270,10 @@ export class CursorSdkRunner {
                 onStreamed();
                 return request.onUpdate(update);
             },
+            onSdkAgentId: async (sdkAgentId) => {
+                mintedSdkAgentId = sdkAgentId;
+                await request.onSdkAgentId?.(sdkAgentId);
+            },
         };
         const outcome = await this.runTurnAttempt(tracked);
         if (outcome.status !== "error" || sawUpdate || request.signal?.aborted === true) {
@@ -281,8 +286,13 @@ export class CursorSdkRunner {
         // Log the original error even when the retry succeeds so the expiry
         // still shows up in Datadog.
         this.log(`[bdk] session ${request.sessionId}: ${reason}: ${outcome.errorMessage}; retrying the turn`);
+        // The failed attempt already minted this cloud agent; resuming it is what
+        // keeps one trigger from leaving two `bc-…` agents behind.
+        const retried = mintedSdkAgentId !== undefined && isServerMintedCloudAgentId(mintedSdkAgentId)
+            ? { ...tracked, sdkAgentId: mintedSdkAgentId }
+            : tracked;
         try {
-            return await this.runTurnAttempt(tracked);
+            return await this.runTurnAttempt(retried);
         }
         catch {
             return outcome;
@@ -366,11 +376,6 @@ export class CursorSdkRunner {
             try {
                 const result = await run.wait();
                 let outcome = toTurnOutcome(result);
-                if (request.runtime === "cloud" && isCloudRunId(result.id)) {
-                    // The cost endpoint prices billed usage per run only when told
-                    // which run; a local run label is not resolvable there.
-                    outcome = { ...outcome, runId: result.id };
-                }
                 if (outcome.status === "error") {
                     // An error result usually means the handle's transport is poisoned
                     // — most often a cached access token that aged past its 60-minute
@@ -386,7 +391,7 @@ export class CursorSdkRunner {
                     result.id !== "") {
                     // Cloud `wait()` drops usage after stream reconnect / getRun replay,
                     // or returns an all-zero stub. `getUsage` still has the run's tokens
-                    // (eventually); without them traces never record an estimated cost.
+                    // (eventually); without them traces never record the turn's tokens.
                     outcome = await fillMissingCloudUsage(agent, result.id, outcome);
                 }
                 return outcome;
@@ -770,15 +775,12 @@ function toTurnOutcome(result) {
         ...(usage === undefined ? {} : { usage }),
     };
 }
-function isCloudRunId(id) {
-    return typeof id === "string" && id.startsWith("run-");
-}
-/** Billing can lag briefly after `wait()`; retry before giving up on cost. */
+/** Billing can lag briefly after `wait()`; retry before giving up on usage. */
 const CLOUD_USAGE_RETRY_DELAYS_MS = [0, 400, 1200];
 /**
  * Cloud `wait()` often omits usage after a stream drop. Pull the run's
- * tokens from the usage API so the engine can still price the turn.
- * Failures are ignored: a missing estimate is better than failing the turn.
+ * tokens from the usage API so the turn still records them.
+ * Failures are ignored: missing usage is better than failing the turn.
  */
 async function fillMissingCloudUsage(agent, runId, outcome) {
     for (const delayMs of CLOUD_USAGE_RETRY_DELAYS_MS) {

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;AAIH,OAAO,EAAsC,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AA6CpF,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAQhB,YAAY,EACb,MAAM,aAAa,CAAC;AA6FrB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAgDpE,OAAO,EAAE,KAAK,WAAW,EAAmB,MAAM,iBAAiB,CAAC;AAUpE,OAAO,EAEL,wBAAwB,EAEzB,MAAM,sBAAsB,CAAC;AAO9B,OAAO,EAAsB,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAW/E,8EAA8E;AAC9E,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,YAAY,CAAC;CACvB;AAuCD,6EAA6E;AAC7E,MAAM,WAAW,0BAA0B;IACzC,oEAAoE;IACpE,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,4EAA4E;IAC5E,eAAe,CAAC,EAAE,qBAAqB,CAAC;IACxC,yEAAyE;IACzE,aAAa,CAAC,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC;IAC5D,wEAAwE;IACxE,aAAa,CAAC,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;IACvD;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,UAAU,EAAE,EACpB,OAAO,GAAE,YAAY,GAAG,0BAA+B,GACtD,OAAO,CAAC,gBAAgB,CAAC,CA0nC3B;AAkmDD,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,cAAc,EACnB,MAAM,SAAQ,GACb,OAAO,CAAC,IAAI,CAAC,CAkDf"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/internal/server.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAsC,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AA6CpF,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAQhB,YAAY,EACb,MAAM,aAAa,CAAC;AA6FrB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAgDpE,OAAO,EAAE,KAAK,WAAW,EAAmB,MAAM,iBAAiB,CAAC;AAUpE,OAAO,EAEL,wBAAwB,EAEzB,MAAM,sBAAsB,CAAC;AAO9B,OAAO,EAAsB,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAW/E,8EAA8E;AAC9E,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,YAAY,CAAC;CACvB;AAuCD,6EAA6E;AAC7E,MAAM,WAAW,0BAA0B;IACzC,oEAAoE;IACpE,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,4EAA4E;IAC5E,eAAe,CAAC,EAAE,qBAAqB,CAAC;IACxC,yEAAyE;IACzE,aAAa,CAAC,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC;IAC5D,wEAAwE;IACxE,aAAa,CAAC,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;IACvD;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,UAAU,EAAE,EACpB,OAAO,GAAE,YAAY,GAAG,0BAA+B,GACtD,OAAO,CAAC,gBAAgB,CAAC,CA2nC3B;AAkmDD,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,cAAc,EACnB,MAAM,SAAQ,GACb,OAAO,CAAC,IAAI,CAAC,CAkDf"}

package/dist/internal/server.js

@@ -481,7 +481,7 @@ export async function startServer(mounts, options = {}) {
     // Validate peer MCP connections (defineConnection({ agent })) against the
     // mount set before anything starts. URLs resolve after listen, once the
     // port is known.
-    const peerRefsBySlug = collectPeerConnections(mounts, logger);
+    const peerRefsBySlug = collectPeerConnections(mounts, logger, options.peersUrl);
     // Cursor account MCP connections (defineConnection({ cursorAccount: true }))
     // need a signed-in host: their tools execute on the Cursor backend with
     // the account's stored OAuth credentials. Fail fast at serve start instead
@@ -929,6 +929,7 @@ export async function startServer(mounts, options = {}) {
                 : {}),
             ...(options.publicUrl === undefined ? {} : { publicUrl: options.publicUrl }),
             ...(options.authToken === undefined ? {} : { authToken: options.authToken }),
+            peersUrl: options.peersUrl,
             cloudToolsBridge: options.cloudToolsUrl !== undefined,
             logger,
         });

package/dist/internal/session-cost.d.ts

@@ -1,50 +1,49 @@
 /**
- * Per-session cost metrics folded from a durable session event stream.
+ * Per-session usage and cost report for `bdk cost [sessionId]`.
  *
- * Powers `agent-sdk cost [sessionId]`: each `turn.completed` event carries
- * the turn's token usage and the estimated dollar cost recorded by the
- * engine via `POST /v1/models/estimate-cost`, so a session's spend is a
- * pure fold over its `events.ndjson`. `GET /v1/session/:id/cost` is the
- * live billed total.
+ * Token usage is a pure fold over the session's `turn.completed` events.
+ * Dollars are priced for the whole session by `GET /v1/session/:id/cost`;
+ * turns are never priced on their own.
  */
-import type { SessionEvent, TurnCost, TurnUsage } from "../types.js";
-/** One agent loop pass (turn) with its usage and estimated cost. */
+import type { SessionCost, SessionEvent, TurnUsage } from "../types.js";
+/** One agent loop pass (turn) with its token usage. */
 export interface SessionCostTurn {
     turnId: string;
     failed: boolean;
     usage?: TurnUsage;
-    cost?: TurnCost;
 }
-export interface SessionCostTotals {
+export interface SessionUsageTotals {
     turns: number;
     turnFailures: number;
     inputTokens: number;
     outputTokens: number;
     cacheReadTokens: number;
     cacheWriteTokens: number;
-    /** Sum of per-turn estimated costs (USD). */
-    costUsd: number;
-    /** Turns that reported usage but had no known model rates. */
-    unpricedTurns: number;
 }
 export interface SessionCostReport {
     sessionId: string;
     turns: SessionCostTurn[];
-    totals: SessionCostTotals;
+    totals: SessionUsageTotals;
+    /** Whole-session cost; absent when the server could not price it. */
+    cost?: SessionCost;
 }
-export declare function emptySessionCostTotals(): SessionCostTotals;
-export declare function addSessionCostTotals(target: SessionCostTotals, delta: SessionCostTotals): void;
-/** Fold a session event stream into per-turn and total cost metrics. */
-export declare function buildSessionCostReport(events: readonly SessionEvent[]): SessionCostReport;
-/** Per-turn table for `agent-sdk cost <sessionId>`. */
+export declare function emptySessionUsageTotals(): SessionUsageTotals;
+export declare function addSessionUsageTotals(target: SessionUsageTotals, delta: SessionUsageTotals): void;
+/** Fold a session event stream into per-turn and total token usage. */
+export declare function buildSessionCostReport(events: readonly SessionEvent[], cost?: SessionCost): SessionCostReport;
+/** Per-turn token table plus the session cost for `bdk cost <sessionId>`. */
 export declare function formatSessionCostText(report: SessionCostReport): string;
 export interface SessionCostRow {
     sessionId: string;
     channelId: string;
     title?: string;
     updatedAt?: string;
-    totals: SessionCostTotals;
+    totals: SessionUsageTotals;
 }
-/** All-sessions table for `agent-sdk cost` (no session id). */
+/**
+ * All-sessions token table for `bdk cost` (no session id). Pricing every
+ * session would run one billed lookup per session, so dollars are left to
+ * `bdk cost <sessionId>`.
+ */
 export declare function formatSessionsCostText(rows: SessionCostRow[]): string;
 //# sourceMappingURL=session-cost.d.ts.map

package/dist/internal/session-cost.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-cost.d.ts","sourceRoot":"","sources":["../../src/internal/session-cost.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGrE,oEAAoE;AACpE,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,IAAI,CAAC,EAAE,QAAQ,CAAC;CACjB;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,6CAA6C;IAC7C,OAAO,EAAE,MAAM,CAAC;IAChB,8DAA8D;IAC9D,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,eAAe,EAAE,CAAC;IACzB,MAAM,EAAE,iBAAiB,CAAC;CAC3B;AAED,wBAAgB,sBAAsB,IAAI,iBAAiB,CAW1D;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,iBAAiB,GAAG,IAAI,CAS9F;AAED,wEAAwE;AACxE,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,iBAAiB,CAyCzF;AAMD,uDAAuD;AACvD,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAiCvE;AAED,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;CAC3B;AAED,+DAA+D;AAC/D,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,MAAM,CA8BrE"}
+{"version":3,"file":"session-cost.d.ts","sourceRoot":"","sources":["../../src/internal/session-cost.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAIxE,uDAAuD;AACvD,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,eAAe,EAAE,CAAC;IACzB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,qEAAqE;IACrE,IAAI,CAAC,EAAE,WAAW,CAAC;CACpB;AAED,wBAAgB,uBAAuB,IAAI,kBAAkB,CAS5D;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,kBAAkB,GAAG,IAAI,CAOjG;AAED,uEAAuE;AACvE,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,SAAS,YAAY,EAAE,EAC/B,IAAI,CAAC,EAAE,WAAW,GACjB,iBAAiB,CAsCnB;AAcD,6EAA6E;AAC7E,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CA0BvE;AAED,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,MAAM,CA8BrE"}

package/dist/internal/session-cost.js

@@ -1,14 +1,13 @@
 /**
- * Per-session cost metrics folded from a durable session event stream.
+ * Per-session usage and cost report for `bdk cost [sessionId]`.
  *
- * Powers `agent-sdk cost [sessionId]`: each `turn.completed` event carries
- * the turn's token usage and the estimated dollar cost recorded by the
- * engine via `POST /v1/models/estimate-cost`, so a session's spend is a
- * pure fold over its `events.ndjson`. `GET /v1/session/:id/cost` is the
- * live billed total.
+ * Token usage is a pure fold over the session's `turn.completed` events.
+ * Dollars are priced for the whole session by `GET /v1/session/:id/cost`;
+ * turns are never priced on their own.
  */
-import { formatCostUsd, roundCostUsd } from "./trajectory.js";
-export function emptySessionCostTotals() {
+import { CLI_COMMAND_NAME } from "./distribution.js";
+import { formatCostUsd } from "./trajectory.js";
+export function emptySessionUsageTotals() {
     return {
         turns: 0,
         turnFailures: 0,
@@ -16,25 +15,21 @@ export function emptySessionCostTotals() {
         outputTokens: 0,
         cacheReadTokens: 0,
         cacheWriteTokens: 0,
-        costUsd: 0,
-        unpricedTurns: 0,
     };
 }
-export function addSessionCostTotals(target, delta) {
+export function addSessionUsageTotals(target, delta) {
     target.turns += delta.turns;
     target.turnFailures += delta.turnFailures;
     target.inputTokens += delta.inputTokens;
     target.outputTokens += delta.outputTokens;
     target.cacheReadTokens += delta.cacheReadTokens;
     target.cacheWriteTokens += delta.cacheWriteTokens;
-    target.costUsd = roundCostUsd(target.costUsd + delta.costUsd);
-    target.unpricedTurns += delta.unpricedTurns;
 }
-/** Fold a session event stream into per-turn and total cost metrics. */
-export function buildSessionCostReport(events) {
+/** Fold a session event stream into per-turn and total token usage. */
+export function buildSessionCostReport(events, cost) {
     let sessionId = "";
     const turns = [];
-    const totals = emptySessionCostTotals();
+    const totals = emptySessionUsageTotals();
     for (const event of events) {
         if (sessionId === "" && typeof event.sessionId === "string") {
             sessionId = event.sessionId;
@@ -60,38 +55,39 @@ export function buildSessionCostReport(events) {
             totals.cacheReadTokens += usage.cacheReadTokens;
             totals.cacheWriteTokens += usage.cacheWriteTokens;
         }
-        const cost = event.data.cost;
-        if (cost !== undefined) {
-            turn.cost = cost;
-            totals.costUsd = roundCostUsd(totals.costUsd + cost.totalUsd);
-        }
-        else if (usage !== undefined) {
-            totals.unpricedTurns += 1;
-        }
         turns.push(turn);
     }
-    return { sessionId, turns, totals };
+    const report = { sessionId, turns, totals };
+    if (cost !== undefined && cost.source !== "unavailable") {
+        report.cost = cost;
+    }
+    return report;
 }
 function formatCount(value) {
     return String(value);
 }
-/** Per-turn table for `agent-sdk cost <sessionId>`. */
+function formatSessionCost(cost) {
+    if (cost === undefined) {
+        return "unavailable";
+    }
+    const model = cost.model === undefined ? "" : `, ${cost.model}`;
+    return `${formatCostUsd(cost.costUsd)} (${cost.source}${model})`;
+}
+/** Per-turn token table plus the session cost for `bdk cost <sessionId>`. */
 export function formatSessionCostText(report) {
     const lines = [];
-    lines.push(`session ${report.sessionId || "(unknown)"}  cost: ${formatCostUsd(report.totals.costUsd)}`);
+    lines.push(`session ${report.sessionId || "(unknown)"}  cost: ${formatSessionCost(report.cost)}`);
     if (report.turns.length === 0) {
         lines.push("No turns recorded.");
         return `${lines.join("\n")}\n`;
     }
-    const header = ["TURN", "IN", "OUT", "CACHE R", "CACHE W", "COST", "MODEL", "STATUS"];
+    const header = ["TURN", "IN", "OUT", "CACHE R", "CACHE W", "STATUS"];
     const rows = report.turns.map((turn) => [
         turn.turnId,
         turn.usage === undefined ? "—" : formatCount(turn.usage.inputTokens),
         turn.usage === undefined ? "—" : formatCount(turn.usage.outputTokens),
         turn.usage === undefined ? "—" : formatCount(turn.usage.cacheReadTokens),
         turn.usage === undefined ? "—" : formatCount(turn.usage.cacheWriteTokens),
-        turn.cost === undefined ? "—" : formatCostUsd(turn.cost.totalUsd),
-        turn.cost?.model ?? "—",
         turn.failed ? "failed" : "ok",
     ]);
     rows.push([
@@ -100,30 +96,30 @@ export function formatSessionCostText(report) {
         formatCount(report.totals.outputTokens),
         formatCount(report.totals.cacheReadTokens),
         formatCount(report.totals.cacheWriteTokens),
-        formatCostUsd(report.totals.costUsd),
-        "",
         report.totals.turnFailures > 0 ? `${report.totals.turnFailures} failed` : "",
     ]);
     lines.push(renderTable(header, rows));
-    appendUnpricedNote(lines, report.totals.unpricedTurns);
     return `${lines.join("\n")}\n`;
 }
-/** All-sessions table for `agent-sdk cost` (no session id). */
+/**
+ * All-sessions token table for `bdk cost` (no session id). Pricing every
+ * session would run one billed lookup per session, so dollars are left to
+ * `bdk cost <sessionId>`.
+ */
 export function formatSessionsCostText(rows) {
     if (rows.length === 0) {
         return "No sessions.\n";
     }
-    const header = ["SESSION", "CHANNEL", "TURNS", "IN", "OUT", "COST", "UPDATED"];
-    const totals = emptySessionCostTotals();
+    const header = ["SESSION", "CHANNEL", "TURNS", "IN", "OUT", "UPDATED"];
+    const totals = emptySessionUsageTotals();
     const body = rows.map((row) => {
-        addSessionCostTotals(totals, row.totals);
+        addSessionUsageTotals(totals, row.totals);
         return [
             row.sessionId,
             row.channelId,
             formatCount(row.totals.turns),
             formatCount(row.totals.inputTokens),
             formatCount(row.totals.outputTokens),
-            formatCostUsd(row.totals.costUsd),
             row.updatedAt ?? "",
         ];
     });
@@ -133,18 +129,14 @@ export function formatSessionsCostText(rows) {
         formatCount(totals.turns),
         formatCount(totals.inputTokens),
         formatCount(totals.outputTokens),
-        formatCostUsd(totals.costUsd),
         "",
     ]);
-    const lines = [renderTable(header, body)];
-    appendUnpricedNote(lines, totals.unpricedTurns);
+    const lines = [
+        renderTable(header, body),
+        `Run \`${CLI_COMMAND_NAME} cost <sessionId>\` for a session's cost.`,
+    ];
     return `${lines.join("\n")}\n`;
 }
-function appendUnpricedNote(lines, unpricedTurns) {
-    if (unpricedTurns > 0) {
-        lines.push(`note: ${unpricedTurns} turn(s) reported usage with no priced cost; cost totals exclude them.`);
-    }
-}
 function renderTable(header, rows) {
     const widths = header.map((h, i) => Math.max(h.length, ...rows.map((row) => (row[i] ?? "").length)));
     const renderRow = (row) => row

package/dist/internal/session-engine.d.ts

@@ -14,8 +14,8 @@ declare module "@cursor/sdk" {
 }
 import type { Meter } from "@opentelemetry/api";
 import { SlackAskDedupeStore, SlackNudgeStore } from "../channels/slack/nudge-store.js";
-import { type AgentProject, type ApprovalDecision, type ArtifactListFilter, type ArtifactPage, type ArtifactRecord, type ArtifactsApi, type AuthContext, type CallToolOptions, type ChannelDefinition, type ChannelSession, type ConnectionTransport, type DiscoveredTool, type EvalCaseResultEventData, type HostContext, type HttpChannelDefinition, type PendingApproval, type PendingAuth, type ReceiveInput, type SendMessageOptions, type SessionEvent, type SessionInfo, type SessionListSource, type SessionRecord, type SessionSummary, type ToolCallOutcome, type TurnOutcome } from "../types.js";
-import { type CloudAgentUsage } from "./cloud-turn-cost.js";
+import { type AgentProject, type ApprovalDecision, type ArtifactListFilter, type ArtifactPage, type ArtifactRecord, type ArtifactsApi, type AuthContext, type CallToolOptions, type ChannelDefinition, type ChannelSession, type ConnectionTransport, type DiscoveredTool, type EvalCaseResultEventData, type HostContext, type HttpChannelDefinition, type PendingApproval, type PendingAuth, type ReceiveInput, type SendMessageOptions, type SessionCost, type SessionEvent, type SessionInfo, type SessionListSource, type SessionRecord, type SessionSummary, type ToolCallOutcome, type TurnOutcome } from "../types.js";
+import { type CloudAgentUsage } from "./cloud-turn-usage.js";
 import { type EventLogMemoryStats } from "./event-log.js";
 import { type HostPlatforms } from "./host-platforms.js";
 import { McpOauthOnDemandHub } from "./mcp-oauth-on-demand.js";
@@ -23,7 +23,7 @@ import type { OtelCollector } from "./otel/collector.js";
 import type { AgentRunner } from "./sdk-runner.js";
 import { SessionStore } from "./session-store.js";
 import { StorageCoordinator } from "./storage-coordinator.js";
-import { type EstimateTurnCostFn } from "./turn-cost.js";
+import { type EstimateCostFn } from "./estimate-cost.js";
 import { TurnLeaseStore } from "./turn-lease-store.js";
 import { TurnOutbox } from "./turn-outbox.js";
 export declare const HTTP_CHANNEL_ID = "http";
@@ -91,15 +91,15 @@ export interface SessionEngineOptions {
     platforms?: HostPlatforms;
     /**
      * Test seam / override for cloud billed usage (`Agent.getUsage`). Used to
-     * backfill `turn.completed` rows that older engines persisted without
-     * usage/cost so the playground Trace tab can still show an estimate.
+     * backfill `turn.completed` rows that finished without usage so the
+     * playground Trace tab can still show their tokens.
      */
     getCloudUsage?: (sdkAgentId: string) => Promise<CloudAgentUsage | undefined>;
     /**
-     * Resolve turn cost via `POST /v1/models/estimate-cost`. Tests inject a
+     * Price a whole session via `POST /v1/models/estimate-cost`. Tests inject a
      * stub; production uses billed usage events when an agent id is known.
      */
-    estimateTurnCost?: EstimateTurnCostFn;
+    estimateSessionCost?: EstimateCostFn;
     /** Process-level OTel collector; observe-only, never fatal. */
     otel?: OtelCollector;
     /** Process-level meter for {@link HostContext.otel}. Absent → no-op counters. */
@@ -254,11 +254,11 @@ export declare class SessionEngine {
     /** Lazily resolved Cursor credential for managed cloud tools. */
     private cloudServerToolsHeaders;
     private readonly getCloudUsage;
-    private readonly estimateTurnCost;
-    /** Sessions whose completed turns are fully priced (no further backfill). */
-    private readonly cloudCostBackfillDone;
-    /** Deduped in-flight cloud cost backfills, keyed by session id. */
-    private readonly cloudCostBackfill;
+    private readonly estimateSessionCost;
+    /** Sessions whose completed turns all carry usage (no further backfill). */
+    private readonly cloudUsageBackfillDone;
+    /** Deduped in-flight cloud usage backfills, keyed by session id. */
+    private readonly cloudUsageBackfill;
     /** Per-session FileSystem handle cache (not a tree snapshot). */
     private readonly sessionRoots;
     /** In-flight factory resolves, so the first turn and a racing callTool share one handle. */
@@ -364,6 +364,7 @@ export declare class SessionEngine {
      * up `(agentId, cKey)` from a mailbox stamp or structured claim.
      */
     send(channelId: string, message: string, options?: EngineSendOptions): Promise<ChannelSession>;
+    private rejectMismatchedModelConfig;
     /**
      * Atomically validate and rotate an HTTP follow-up credential, then admit
      * the message to its exact session without changing the owning channel key.
@@ -371,7 +372,7 @@ export declare class SessionEngine {
     followUpHttp(sessionId: string, token: {
         channelId: string;
         key: string;
-    }, message: string): Promise<string | undefined>;
+    }, message: string, modelConfig?: unknown): Promise<string | undefined>;
     /** Whether a continuation token already maps to a session on this channel. */
     hasContinuationSession(channelId: string, continuationToken: string): Promise<boolean>;
     /** Look up a session as a channel-scoped handle. */
@@ -515,6 +516,7 @@ export declare class SessionEngine {
      * durable state directory instead.
      */
     private cloudStore;
+    private turnModel;
     private buildTurnRequest;
     /**
      * Connection names a cloud turn can only reach through the host connection
@@ -827,40 +829,22 @@ export declare class SessionEngine {
     /** Append a hosted eval case's verdict to its session log, after its last turn. */
     recordEvalCaseResult(sessionId: string, data: EvalCaseResultEventData): Promise<void>;
     /**
-     * Cost is a display figure resolved over the network, and the session holds
-     * its delivery lease until `turn.completed`, so it is stamped onto the
-     * recorded event afterwards rather than delaying the event. A host that
-     * stops before the estimate lands leaves the turn unpriced; `sessionCost`
-     * prices the session on read.
+     * Billed/catalog cost of the whole session, priced once per call. Powers
+     * the playground, `bdk run`, and `bdk cost` via `GET /v1/session/:id/cost`.
+     * The billed lookup is expensive, so nothing on the turn path calls this.
      */
-    private stampTurnCost;
-    private priceTurn;
-    /**
-     * Billed/catalog cost for a session. Powers playground, traces, and
-     * `agent-sdk cost` via `GET /v1/session/:id/cost`.
-     */
-    sessionCost(sessionId: string): Promise<{
-        sessionId: string;
-        source: "usage" | "catalog" | "unavailable";
-        cost: {
-            rawCostCents: number;
-            chargedCents: number;
-        };
-        costUsd: number;
-        rawCostUsd: number;
-        model?: string;
-    }>;
+    sessionCost(sessionId: string): Promise<SessionCost>;
     /** Snapshot of recorded events (for download / offline trace). */
     listEvents(sessionId: string, startIndex?: number, options?: {
-        backfillCloudCost?: boolean;
+        backfillCloudUsage?: boolean;
     }): Promise<SessionEvent[]>;
     /**
-     * Historical cloud turns may lack usage/cost on `turn.completed` (pre-0.1.29
-     * engines, or getUsage still zero at turn end). Fill them from billed usage
-     * before the playground replays the stream so Trace can show cost.
+     * Cloud turns may lack usage on `turn.completed` (pre-0.1.29 engines, or
+     * getUsage still zero at turn end). Fill them from billed usage before the
+     * playground replays the stream so Trace can show their tokens.
      */
-    private backfillCloudTurnCosts;
-    private runCloudTurnCostBackfill;
+    private backfillCloudTurnUsage;
+    private runCloudTurnUsageBackfill;
     setContinuationToken(sessionId: string, token: string | null): Promise<void>;
     isTurnRunning(sessionId: string): boolean;
     sessionInfo(record: SessionRecord): SessionInfo;