@cursor/bdk 0.2.16 → 0.2.18

package/dist/internal/storage-coordinator.js

@@ -71,6 +71,17 @@ export const MAX_VOLATILE_RECORD_SKIPS = 20;
 function resumeProjectionJson(record) {
     return JSON.stringify({ ...record, turnCount: 0, updatedAt: "" });
 }
+/**
+ * Stamp written with a continuation pointer. Newer than the durable
+ * record's `updatedAt` means the record write lagged the pointer.
+ */
+function continuationPointerUpdatedAt(pointer) {
+    if (typeof pointer !== "object" || pointer === null || Array.isArray(pointer)) {
+        return undefined;
+    }
+    const stamp = pointer.recordUpdatedAt;
+    return typeof stamp === "string" && stamp.length > 0 ? stamp : undefined;
+}
 /** Session records out of raw sink entries; rows without a usable id are dropped. */
 function sessionRecordsOf(entries) {
     return entries
@@ -82,8 +93,9 @@ export class StorageCoordinator {
         /** Per-session pending state (events + coalesced record). */
         this.buffers = new Map();
         /**
-         * Last continuation key written to the sink per session, so a token
-         * change emits a delete for the stale index entry alongside the new put.
+         * Last continuation key this process has seen for a session. A hit
+         * avoids a durable read; a miss reads the stored session record so a
+         * fresh process still deletes the previous pointer.
          */
         this.continuationIndex = new Map();
         /**
@@ -231,11 +243,15 @@ export class StorageCoordinator {
                 recordAck = { sessionId, json: recordJson, projection };
             }
         }
+        const continuation = record === undefined ? undefined : this.planContinuation(record);
+        if (continuation !== undefined) {
+            ops.push(...continuation.leading);
+        }
         if (puts.length > 0) {
             ops.push(this.putsOp(puts, recordAck));
         }
-        if (record !== undefined) {
-            ops.push(...this.continuationOps(record));
+        if (continuation !== undefined) {
+            ops.push(...continuation.trailing);
         }
         if (ops.length > 0) {
             this.enqueue(ops, reason);
@@ -309,39 +325,76 @@ export class StorageCoordinator {
         };
     }
     /**
-     * Index maintenance for `continuation/{channelId}/{token}` → sessionId:
-     * put the current token, delete the previous one when it changed.
+     * Index maintenance for `continuation/{channelId}/{token}` → sessionId.
+     * Put the current token and delete the previous one. The in-process
+     * index is a fast path; a fresh process reads the durable session
+     * record (before this flush overwrites it) and deletes that key too.
+     * Leading ops must run before the session-record put.
      */
-    continuationOps(record) {
-        const previous = this.continuationIndex.get(record.sessionId);
+    planContinuation(record) {
         const next = record.continuationKey;
-        if (previous === next) {
-            return [];
+        const indexKnows = this.continuationIndex.has(record.sessionId);
+        const known = indexKnows ? this.continuationIndex.get(record.sessionId) : undefined;
+        if (indexKnows && known === next) {
+            return undefined;
         }
-        this.continuationIndex.set(record.sessionId, next);
-        const ops = [];
-        if (previous != null) {
-            ops.push(this.deleteOp(this.keys.continuation(this.agentName, record.channelId, previous)));
+        const staleKeys = [];
+        if (indexKnows && typeof known === "string" && known !== next) {
+            staleKeys.push(this.keys.continuation(this.agentName, record.channelId, known));
         }
-        if (next != null) {
-            ops.push(this.putOp(this.keys.continuation(this.agentName, record.channelId, next), {
-                sessionId: record.sessionId,
-            }));
+        this.continuationIndex.set(record.sessionId, next);
+        const leading = [];
+        const get = this.definition.get;
+        if (!indexKnows && get !== undefined) {
+            leading.push({
+                label: `continuation-previous(${record.sessionId})`,
+                run: async (ctx) => {
+                    const stored = (await get(this.keys.session(this.agentName, record.sessionId), ctx));
+                    const previous = stored?.continuationKey;
+                    if (typeof previous !== "string" || previous.length === 0 || previous === next) {
+                        return;
+                    }
+                    const channelId = stored != null && typeof stored.channelId === "string" && stored.channelId.length > 0
+                        ? stored.channelId
+                        : record.channelId;
+                    staleKeys.push(this.keys.continuation(this.agentName, channelId, previous));
+                },
+            });
         }
-        return ops;
-    }
-    /** KV upsert op on the sink's `put`. */
-    putOp(key, value) {
-        return {
-            label: `put(${key})`,
-            run: (ctx) => this.definition.put(key, value, ctx),
-        };
-    }
-    /** KV delete op on the sink's `delete` (skipped when the hook is absent). */
-    deleteOp(key) {
         return {
-            label: `delete(${key})`,
-            run: (ctx) => this.definition.delete?.(key, ctx),
+            leading,
+            trailing: [
+                {
+                    label: `continuation(${record.sessionId})`,
+                    run: async (ctx) => {
+                        // A delete failure must not skip the new pointer. These used to
+                        // be separate queue ops, so a thrown delete still reached the put.
+                        for (const key of staleKeys) {
+                            try {
+                                await this.definition.delete?.(key, ctx);
+                            }
+                            catch (error) {
+                                this.logger(`[bdk] storage delete(${key}) failed: ${describeError(error)}`);
+                            }
+                        }
+                        if (next == null) {
+                            return;
+                        }
+                        try {
+                            await this.definition.put(this.keys.continuation(this.agentName, record.channelId, next), {
+                                sessionId: record.sessionId,
+                                recordUpdatedAt: record.updatedAt,
+                            }, ctx);
+                        }
+                        catch (error) {
+                            // Plan time already advanced the in-process index. Drop it so
+                            // a later flush retries this pointer instead of treating it as current.
+                            this.continuationIndex.delete(record.sessionId);
+                            throw error;
+                        }
+                    },
+                },
+            ],
         };
     }
     // ==========================================================================
@@ -472,11 +525,38 @@ export class StorageCoordinator {
             this.logger(`[bdk] storage continuation entry points at missing session ${sessionId}; treating as a miss`);
             return undefined;
         }
-        // The sink must answer for the exact key it was asked about — a
-        // mismatched row is a broken store, not a miss; treating it as a miss
-        // would fork the continuation token onto a new session.
-        if (record.channelId !== channelId || record.continuationKey !== continuationKey) {
-            throw new Error(`storage returned a session that does not match the requested continuation (channel ${channelId})`);
+        // A different channel is a broken store. Same channel with a different
+        // key is a leftover pointer when the durable record is newer, and the
+        // live token when that record write lagged the pointer.
+        if (record.channelId !== channelId) {
+            throw new Error(`storage returned a session that does not match the requested continuation (channel ${channelId}, requestedContinuationKey=${continuationKey}, recordChannelId=${record.channelId}, recordContinuationKey=${String(record.continuationKey)})`);
+        }
+        if (record.continuationKey !== continuationKey) {
+            const pointerUpdatedAt = continuationPointerUpdatedAt(pointer);
+            const recordUpdatedAt = typeof record.updatedAt === "string" ? record.updatedAt : undefined;
+            // The pointer was written for a newer record than the one that landed.
+            // Deleting it would drop the live token; the record is the one that lagged.
+            if (pointerUpdatedAt !== undefined &&
+                recordUpdatedAt !== undefined &&
+                pointerUpdatedAt > recordUpdatedAt) {
+                this.logger(`[bdk] storage continuation record lags the pointer for channel ${channelId}; keeping the pointer`);
+                // The caller persists this record. Leaving the old token on it makes
+                // the next flush advance `updatedAt` past the pointer stamp, and the
+                // following lookup of the live key then deletes that pointer.
+                return {
+                    ...record,
+                    continuationKey,
+                    updatedAt: pointerUpdatedAt,
+                };
+            }
+            this.logger(`[bdk] storage continuation pointer is stale for channel ${channelId}; treating as a miss`);
+            try {
+                await this.definition.delete?.(this.keys.continuation(this.agentName, channelId, continuationKey), ctx);
+            }
+            catch (error) {
+                this.logger(`[bdk] storage delete of stale continuation pointer failed: ${describeError(error)}`);
+            }
+            return undefined;
         }
         return record;
     }

package/dist/internal/testing/factory-resource-fixtures.d.ts

@@ -5,6 +5,7 @@
  */
 export declare const FACTORY_CHECKPOINT_NAME: string;
 export declare const FACTORY_ISSUE_NAME: string;
+export declare const FACTORY_RUN_NAME: string;
 export interface FactoryCheckpointResourceFixture {
     name: string;
     deployment: string;
@@ -27,6 +28,13 @@ export interface FactoryIssueResourceFixture {
     path: string;
     etag: string;
 }
+export interface FactoryRunResourceFixture {
+    name: string;
+    environment: string;
+    services: string[];
+    deployVersion: string;
+    createTime: string;
+}
 export interface CheckpointCreatedPayloadFixture {
     eventId: string;
     eventType: "checkpoint.created";
@@ -41,8 +49,16 @@ export interface IssueCreatedPayloadFixture {
     occurredAtMs: number;
     issue: FactoryIssueResourceFixture;
 }
+export interface RunCreatedPayloadFixture {
+    eventId: string;
+    eventType: "run.created";
+    teamId: string;
+    occurredAtMs: number;
+    run: FactoryRunResourceFixture;
+}
 export declare const FACTORY_CHECKPOINT_RESOURCE: FactoryCheckpointResourceFixture;
 export declare const FACTORY_ISSUE_RESOURCE: FactoryIssueResourceFixture;
 export declare const CHECKPOINT_CREATED_PAYLOAD: CheckpointCreatedPayloadFixture;
 export declare const ISSUE_CREATED_PAYLOAD: IssueCreatedPayloadFixture;
+export declare const RUN_CREATED_PAYLOAD: RunCreatedPayloadFixture;
 //# sourceMappingURL=factory-resource-fixtures.d.ts.map

package/dist/internal/testing/factory-resource-fixtures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory-resource-fixtures.d.ts","sourceRoot":"","sources":["../../../src/internal/testing/factory-resource-fixtures.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,eAAO,MAAM,uBAAuB,EAAE,MAA+C,CAAC;AACtF,eAAO,MAAM,kBAAkB,EAAE,MAAuB,CAAC;AAEzD,MAAM,WAAW,gCAAgC;IAC/C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,YAAY,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,+BAA+B;IAC9C,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,oBAAoB,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,gCAAgC,CAAC;CAC9C;AAED,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,eAAe,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,2BAA2B,CAAC;CACpC;AAED,eAAO,MAAM,2BAA2B,EAAE,gCASzC,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,2BASpC,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,+BAMxC,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,0BAMnC,CAAC"}
+{"version":3,"file":"factory-resource-fixtures.d.ts","sourceRoot":"","sources":["../../../src/internal/testing/factory-resource-fixtures.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,eAAO,MAAM,uBAAuB,EAAE,MAA+C,CAAC;AACtF,eAAO,MAAM,kBAAkB,EAAE,MAAuB,CAAC;AACzD,eAAO,MAAM,gBAAgB,EAAE,MAAyC,CAAC;AAEzE,MAAM,WAAW,gCAAgC;IAC/C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,YAAY,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,+BAA+B;IAC9C,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,oBAAoB,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,gCAAgC,CAAC;CAC9C;AAED,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,eAAe,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,2BAA2B,CAAC;CACpC;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,yBAAyB,CAAC;CAChC;AAED,eAAO,MAAM,2BAA2B,EAAE,gCASzC,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,2BASpC,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,+BAMxC,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,0BAMnC,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,wBAYjC,CAAC"}

package/dist/internal/testing/factory-resource-fixtures.js

@@ -5,6 +5,7 @@
  */
 export const FACTORY_CHECKPOINT_NAME = "changeMonitors/cm-1/checkpoints/cp-1";
 export const FACTORY_ISSUE_NAME = "issues/iss-1";
+export const FACTORY_RUN_NAME = "changeMonitors/cm-1/runs/run-1";
 export const FACTORY_CHECKPOINT_RESOURCE = {
     name: FACTORY_CHECKPOINT_NAME,
     deployment: "deployments/11111111-1111-4111-8111-111111111111",
@@ -39,3 +40,16 @@ export const ISSUE_CREATED_PAYLOAD = {
     occurredAtMs: 1,
     issue: FACTORY_ISSUE_RESOURCE,
 };
+export const RUN_CREATED_PAYLOAD = {
+    eventId: "evt-mr-1",
+    eventType: "run.created",
+    teamId: "team-1",
+    occurredAtMs: 1,
+    run: {
+        name: FACTORY_RUN_NAME,
+        environment: "environments/production",
+        services: ["services/portal-website"],
+        deployVersion: "3e165785dd2cfecb24b032176d758933a343726e",
+        createTime: "2026-09-08T21:00:00Z",
+    },
+};

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

@@ -33,7 +33,7 @@ export declare function isOpenAiCompatGrossCacheModel(model: ModelSetting): bool
 export declare function toCatalogDisjointUsage(usage: TurnUsage, model?: ModelSetting): TurnUsage;
 export declare function roundCostUsd(usd: number): number;
 export declare function turnCostFromCents(args: {
-    model: string | ModelSetting;
+    model: ModelSetting;
     cost: UsageCostCents;
     source: TurnCost["source"];
 }): TurnCost;

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

@@ -1 +1 @@
-{"version":3,"file":"turn-cost.d.ts","sourceRoot":"","sources":["../../src/internal/turn-cost.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGrE,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,YAAY,CAAC;IACpB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,kBAAkB,GAAG,CAAC,KAAK,EAAE,qBAAqB,KAAK,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC;AAEjG,wBAAgB,cAAc,CAAC,KAAK,EAAE,YAAY,GAAG,MAAM,CAE1D;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAK1E;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,YAAY,GAAG,SAAS,CAYxF;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,KAAK,EAAE,MAAM,GAAG,YAAY,CAAC;IAC7B,IAAI,EAAE,cAAc,CAAC;IACrB,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;CAC5B,GAAG,QAAQ,CAcX;AAeD,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAkB/B"}
+{"version":3,"file":"turn-cost.d.ts","sourceRoot":"","sources":["../../src/internal/turn-cost.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGrE,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,YAAY,CAAC;IACpB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,kBAAkB,GAAG,CAAC,KAAK,EAAE,qBAAqB,KAAK,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC;AAEjG,wBAAgB,cAAc,CAAC,KAAK,EAAE,YAAY,GAAG,MAAM,CAE1D;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAK1E;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,YAAY,GAAG,SAAS,CAYxF;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,KAAK,EAAE,YAAY,CAAC;IACpB,IAAI,EAAE,cAAc,CAAC;IACrB,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;CAC5B,GAAG,QAAQ,CAeX;AAeD,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAgB/B"}

package/dist/internal/turn-cost.js

@@ -41,14 +41,15 @@ export function roundCostUsd(usd) {
 }
 export function turnCostFromCents(args) {
     const totalUsd = roundCostUsd(args.cost.chargedCents / 100);
-    const model = typeof args.model === "string" ? args.model : modelSettingId(args.model);
+    const modelParams = typeof args.model === "string" ? undefined : args.model.params;
     return {
         totalUsd,
         inputUsd: 0,
         outputUsd: 0,
         cacheReadUsd: 0,
         cacheWriteUsd: 0,
-        model,
+        model: modelSettingId(args.model),
+        modelParams,
         source: args.source,
         rawCostCents: args.cost.rawCostCents,
         chargedCents: args.cost.chargedCents,
@@ -69,11 +70,10 @@ export async function estimateTurnCostFromApi(input) {
     if (priced !== undefined) {
         return priced;
     }
-    // A run-scoped lookup can miss while billing catches up. Catalog-price
-    // this turn; a retry without the run id is the agent's cumulative total.
-    const askedForBilledRun = input.runId !== undefined &&
-        (input.agentId !== undefined || input.conversationId !== undefined);
-    if (!askedForBilledRun || input.usage === undefined) {
+    // The first lookup can time out or miss. Catalog-price this turn from
+    // the local usage whether or not a run id was sent. The retry omits the
+    // run id so it does not ask for billed events again.
+    if (input.usage === undefined) {
         return undefined;
     }
     return requestEstimate(resolved.apiKey, { model: input.model, usage: input.usage });
@@ -119,7 +119,7 @@ async function requestEstimate(apiKey, input) {
         return undefined;
     }
     return turnCostFromCents({
-        model: body.model ?? model,
+        model: input.model,
         cost: body.cost,
         source: body.source === "usage" ? "usage" : "catalog",
     });