audit-tools 0.33.9 → 0.33.11

package/dist/shared/quota/quotaSource.d.ts

@@ -4,27 +4,93 @@ import { z } from "zod";
  * that scale on DIFFERENT denominators (e.g. Claude's 5-hour `session` vs 7-day
  * `weekly`; Codex's primary vs secondary). The same N tokens is a large percent
  * of a small window and a tiny percent of a big one, so tokens→percent slope is
- * learned per (pool, window-label) and the pool's budget is the MIN across
- * windows. `label` is an AGNOSTIC string ("session","weekly",…) — never a
+ * learned per (pool, {@link windowSlopeKey}) and each window meters against its own
+ * allowance. `label` is an AGNOSTIC string ("session","weekly",…) — never a
  * provider/model identity — so any source can add its own windows.
  */
+/**
+ * Whether a window's allowance is shared by every model on the credential, or
+ * belongs to one model alone. This is the METERING PARTITION and it is decided
+ * HERE, by the producer that knows — never re-derived downstream from pool
+ * identity, which is what four refused repair attempts each tried and got wrong.
+ *
+ *  - `account` — one allowance shared across all of the credential's models
+ *    (Claude's `five_hour`/`seven_day`, an unscoped `limits[]` entry). Meters on
+ *    `(accountKey, label)`: N models on one credential draw down ONE budget.
+ *  - `model` — applies to this model alone (a `limits[]` entry carrying
+ *    `scope.model`). Meters on `(poolId, label)`: sharing it would falsely
+ *    throttle siblings that the limit does not cover.
+ *
+ * REQUIRED, with no default, on every window from every source. A source that
+ * cannot distinguish the two emits `account` for all of its windows — that IS
+ * the fallback ("provider exposes only account-wide quota ⇒ it applies to all
+ * their models"), stated rather than assumed. The absence of a default is
+ * deliberate: a default is how the next provider gets silently special-cased.
+ *
+ * Orthogonal to the learned slope. `tokens_per_pct` stays per (pool, window)
+ * unconditionally — even under an account-scoped window, where N models share
+ * one percent allowance but each converts it to tokens at its OWN rate. Scope
+ * partitions the ALLOWANCE; the slope prices it per model.
+ */
+export declare const QuotaWindowScopeSchema: z.ZodEnum<["account", "model"]>;
+export type QuotaWindowScope = z.infer<typeof QuotaWindowScopeSchema>;
+/**
+ * A `tokens_per_pct` map key, as produced by {@link windowSlopeKey}. Branded so the
+ * slope map cannot be read or written with a bare window label: the two key spaces
+ * are both strings, and an unbranded parameter left the guarantee to whoever
+ * remembered it — which a test promptly got wrong, writing under `"weekly"` where
+ * production only ever reads `"account:weekly"`.
+ */
+export type WindowSlopeKey = string & {
+    readonly __windowSlopeKey: unique symbol;
+};
+/**
+ * The key a window's learned tokens-per-percent slope is stored under, within a
+ * pool's quota-state entry. **The single resolution point for slope lookup** — the
+ * only way to obtain a {@link WindowSlopeKey}, and every read and write of
+ * `tokens_per_pct` requires one, so the map cannot be keyed one way by the producer
+ * and another by the consumer.
+ *
+ * Keyed by `(scope, label)`, not label alone: an account-scoped and a model-scoped
+ * window can share a group name (both `session`) while pricing different allowances,
+ * and collapsing them onto one entry would silently blend two exchange rates into a
+ * single wrong one.
+ *
+ * ⚠ Changing this key ORPHANS previously-learned slopes (they were stored under the
+ * bare label). That is deliberate and self-healing: an orphaned window reads as
+ * uncalibrated, which routes the pool through the cold-start probe path and re-learns
+ * within a few dispatches. A migration shim would instead carry a slope forward onto a
+ * partition it was never measured against.
+ *
+ * This is also the seam for the deferred sibling-derived slope prior (design of
+ * record, "Deferred seam"): a prior can be injected at this one lookup point without
+ * touching admission.
+ */
+export declare function windowSlopeKey(scope: QuotaWindowScope, label: string): WindowSlopeKey;
 export declare const QuotaWindowSchema: z.ZodObject<{
     label: z.ZodString;
+    scope: z.ZodEnum<["account", "model"]>;
     remaining_pct: z.ZodNullable<z.ZodNumber>;
     reset_at: z.ZodNullable<z.ZodString>;
     tokens_remaining: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
 }, "strict", z.ZodTypeAny, {
     label: string;
+    scope: "model" | "account";
     remaining_pct: number | null;
     reset_at: string | null;
     tokens_remaining?: number | null | undefined;
 }, {
     label: string;
+    scope: "model" | "account";
     remaining_pct: number | null;
     reset_at: string | null;
     tokens_remaining?: number | null | undefined;
 }>;
 export type QuotaWindow = z.infer<typeof QuotaWindowSchema>;
+/** Whether a window carries a usable metering scope. */
+export declare function hasWindowScope(window: {
+    scope?: unknown;
+}): boolean;
 export declare const QuotaUsageSnapshotSchema: z.ZodObject<{
     remaining_pct: z.ZodNullable<z.ZodNumber>;
     reset_at: z.ZodNullable<z.ZodString>;
@@ -40,16 +106,19 @@ export declare const QuotaUsageSnapshotSchema: z.ZodObject<{
      */
     windows: z.ZodOptional<z.ZodArray<z.ZodObject<{
         label: z.ZodString;
+        scope: z.ZodEnum<["account", "model"]>;
         remaining_pct: z.ZodNullable<z.ZodNumber>;
         reset_at: z.ZodNullable<z.ZodString>;
         tokens_remaining: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
     }, "strict", z.ZodTypeAny, {
         label: string;
+        scope: "model" | "account";
         remaining_pct: number | null;
         reset_at: string | null;
         tokens_remaining?: number | null | undefined;
     }, {
         label: string;
+        scope: "model" | "account";
         remaining_pct: number | null;
         reset_at: string | null;
         tokens_remaining?: number | null | undefined;
@@ -63,6 +132,7 @@ export declare const QuotaUsageSnapshotSchema: z.ZodObject<{
     source: string;
     windows?: {
         label: string;
+        scope: "model" | "account";
         remaining_pct: number | null;
         reset_at: string | null;
         tokens_remaining?: number | null | undefined;
@@ -76,6 +146,7 @@ export declare const QuotaUsageSnapshotSchema: z.ZodObject<{
     source: string;
     windows?: {
         label: string;
+        scope: "model" | "account";
         remaining_pct: number | null;
         reset_at: string | null;
         tokens_remaining?: number | null | undefined;

package/dist/shared/quota/quotaSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quotaSource.d.ts","sourceRoot":"","sources":["../../../src/shared/quota/quotaSource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;;;;;GAQG;AACH,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;EAOnB,CAAC;AACZ,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAE5D,eAAO,MAAM,wBAAwB;;;;;;;IAQjC;;;;;OAKG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGI,CAAC;AACZ,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,MAAM,gBAAgB,GAAG,IAAI,GAAG,UAAU,GAAG,gBAAgB,CAAC;AAEpE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACpC,MAAM,EAAE,gBAAgB,CAAC;CAC1B;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAC;IAChF;;;;;;OAMG;IACH,UAAU,CAAC,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACjE;;;;;;;OAOG;IACH,gBAAgB,CAAC,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACpE;;;;;;OAMG;IACH,cAAc,CAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;CAC5C;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,WAAW,EACnB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAOxB;AAED;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,WAAW,EACnB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,gBAAgB,CAAC,CAQ3B"}
+{"version":3,"file":"quotaSource.d.ts","sourceRoot":"","sources":["../../../src/shared/quota/quotaSource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;;;;;GAQG;AACH;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,sBAAsB,iCAA+B,CAAC;AACnE,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAEtE;;;;;;GAMG;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG;IAAE,QAAQ,CAAC,gBAAgB,EAAE,OAAO,MAAM,CAAA;CAAE,CAAC;AAEnF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,GAAG,cAAc,CAErF;AAED,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;EAQnB,CAAC;AACZ,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAE5D,wDAAwD;AACxD,wBAAgB,cAAc,CAAC,MAAM,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAEnE;AAED,eAAO,MAAM,wBAAwB;;;;;;;IAQjC;;;;;OAKG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGI,CAAC;AACZ,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,MAAM,gBAAgB,GAAG,IAAI,GAAG,UAAU,GAAG,gBAAgB,CAAC;AAEpE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACpC,MAAM,EAAE,gBAAgB,CAAC;CAC1B;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAC;IAChF;;;;;;OAMG;IACH,UAAU,CAAC,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACjE;;;;;;;OAOG;IACH,gBAAgB,CAAC,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACpE;;;;;;OAMG;IACH,cAAc,CAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;CAC5C;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,WAAW,EACnB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAOxB;AAED;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,WAAW,EACnB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,gBAAgB,CAAC,CAQ3B"}

package/dist/shared/quota/quotaSource.js

@@ -4,18 +4,73 @@ import { z } from "zod";
  * that scale on DIFFERENT denominators (e.g. Claude's 5-hour `session` vs 7-day
  * `weekly`; Codex's primary vs secondary). The same N tokens is a large percent
  * of a small window and a tiny percent of a big one, so tokens→percent slope is
- * learned per (pool, window-label) and the pool's budget is the MIN across
- * windows. `label` is an AGNOSTIC string ("session","weekly",…) — never a
+ * learned per (pool, {@link windowSlopeKey}) and each window meters against its own
+ * allowance. `label` is an AGNOSTIC string ("session","weekly",…) — never a
  * provider/model identity — so any source can add its own windows.
  */
+/**
+ * Whether a window's allowance is shared by every model on the credential, or
+ * belongs to one model alone. This is the METERING PARTITION and it is decided
+ * HERE, by the producer that knows — never re-derived downstream from pool
+ * identity, which is what four refused repair attempts each tried and got wrong.
+ *
+ *  - `account` — one allowance shared across all of the credential's models
+ *    (Claude's `five_hour`/`seven_day`, an unscoped `limits[]` entry). Meters on
+ *    `(accountKey, label)`: N models on one credential draw down ONE budget.
+ *  - `model` — applies to this model alone (a `limits[]` entry carrying
+ *    `scope.model`). Meters on `(poolId, label)`: sharing it would falsely
+ *    throttle siblings that the limit does not cover.
+ *
+ * REQUIRED, with no default, on every window from every source. A source that
+ * cannot distinguish the two emits `account` for all of its windows — that IS
+ * the fallback ("provider exposes only account-wide quota ⇒ it applies to all
+ * their models"), stated rather than assumed. The absence of a default is
+ * deliberate: a default is how the next provider gets silently special-cased.
+ *
+ * Orthogonal to the learned slope. `tokens_per_pct` stays per (pool, window)
+ * unconditionally — even under an account-scoped window, where N models share
+ * one percent allowance but each converts it to tokens at its OWN rate. Scope
+ * partitions the ALLOWANCE; the slope prices it per model.
+ */
+export const QuotaWindowScopeSchema = z.enum(["account", "model"]);
+/**
+ * The key a window's learned tokens-per-percent slope is stored under, within a
+ * pool's quota-state entry. **The single resolution point for slope lookup** — the
+ * only way to obtain a {@link WindowSlopeKey}, and every read and write of
+ * `tokens_per_pct` requires one, so the map cannot be keyed one way by the producer
+ * and another by the consumer.
+ *
+ * Keyed by `(scope, label)`, not label alone: an account-scoped and a model-scoped
+ * window can share a group name (both `session`) while pricing different allowances,
+ * and collapsing them onto one entry would silently blend two exchange rates into a
+ * single wrong one.
+ *
+ * ⚠ Changing this key ORPHANS previously-learned slopes (they were stored under the
+ * bare label). That is deliberate and self-healing: an orphaned window reads as
+ * uncalibrated, which routes the pool through the cold-start probe path and re-learns
+ * within a few dispatches. A migration shim would instead carry a slope forward onto a
+ * partition it was never measured against.
+ *
+ * This is also the seam for the deferred sibling-derived slope prior (design of
+ * record, "Deferred seam"): a prior can be injected at this one lookup point without
+ * touching admission.
+ */
+export function windowSlopeKey(scope, label) {
+    return `${scope}:${label}`;
+}
 export const QuotaWindowSchema = z
     .object({
     label: z.string(),
+    scope: QuotaWindowScopeSchema,
     remaining_pct: z.number().nullable(),
     reset_at: z.string().nullable(),
     tokens_remaining: z.number().int().nullable().optional(),
 })
     .strict();
+/** Whether a window carries a usable metering scope. */
+export function hasWindowScope(window) {
+    return window.scope === "account" || window.scope === "model";
+}
 export const QuotaUsageSnapshotSchema = z
     .object({
     remaining_pct: z.number().nullable(),

package/dist/shared/quota/quotaSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"quotaSource.js","sourceRoot":"","sources":["../../../src/shared/quota/quotaSource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC;KAC/B,MAAM,CAAC;IACN,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;IACjB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACpC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC/B,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;CACzD,CAAC;KACD,MAAM,EAAE,CAAC;AAGZ,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC;KACtC,MAAM,CAAC;IACN,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACpC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC/B,kBAAkB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;IAC/C,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;IAC7C,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE;IACvB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB;;;;;OAKG;IACH,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,QAAQ,EAAE;CAC/C,CAAC;KACD,MAAM,EAAE,CAAC;AA2DZ;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,MAAmB,EACnB,gBAAwB;IAExB,IAAI,CAAC,MAAM,CAAC,gBAAgB;QAAE,OAAO,IAAI,CAAC;IAC1C,IAAI,CAAC;QACH,OAAO,MAAM,MAAM,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;IACzD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,MAAmB,EACnB,gBAAwB;IAExB,IAAI,MAAM,CAAC,UAAU;QAAE,OAAO,MAAM,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAClE,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;QAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAClE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;IAChD,CAAC;AACH,CAAC"}
+{"version":3,"file":"quotaSource.js","sourceRoot":"","sources":["../../../src/shared/quota/quotaSource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;;;;;GAQG;AACH;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;AAYnE;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,UAAU,cAAc,CAAC,KAAuB,EAAE,KAAa;IACnE,OAAO,GAAG,KAAK,IAAI,KAAK,EAAoB,CAAC;AAC/C,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC;KAC/B,MAAM,CAAC;IACN,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;IACjB,KAAK,EAAE,sBAAsB;IAC7B,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACpC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC/B,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;CACzD,CAAC;KACD,MAAM,EAAE,CAAC;AAGZ,wDAAwD;AACxD,MAAM,UAAU,cAAc,CAAC,MAA2B;IACxD,OAAO,MAAM,CAAC,KAAK,KAAK,SAAS,IAAI,MAAM,CAAC,KAAK,KAAK,OAAO,CAAC;AAChE,CAAC;AAED,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC;KACtC,MAAM,CAAC;IACN,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACpC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC/B,kBAAkB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;IAC/C,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;IAC7C,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE;IACvB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB;;;;;OAKG;IACH,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,QAAQ,EAAE;CAC/C,CAAC;KACD,MAAM,EAAE,CAAC;AA2DZ;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,MAAmB,EACnB,gBAAwB;IAExB,IAAI,CAAC,MAAM,CAAC,gBAAgB;QAAE,OAAO,IAAI,CAAC;IAC1C,IAAI,CAAC;QACH,OAAO,MAAM,MAAM,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;IACzD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,MAAmB,EACnB,gBAAwB;IAExB,IAAI,MAAM,CAAC,UAAU;QAAE,OAAO,MAAM,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAClE,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;QAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAClE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;IAChD,CAAC;AACH,CAAC"}

package/dist/shared/quota/reservationLedger.d.ts

@@ -19,25 +19,85 @@ export interface ReservationLease {
     /** Epoch ms after which the lease no longer counts toward outstanding. */
     expiresAt: number;
 }
-/** Outcome of an admission attempt against one resourceKey's shared budget. */
+/**
+ * One metered allowance a dispatch must fit inside. A packet is admitted only if it
+ * clears EVERY constraint that applies to it — an account-wide window shared with
+ * every sibling model on the credential, plus any window scoped to this model alone.
+ *
+ * ⚠ **`budget` and `cost` are in the WINDOW's own unit, and the caller owns the
+ * conversion.** There is no unit shared across windows: a 5-hour `session` and a
+ * 7-day `weekly` scale on different denominators, so the same N tokens is a
+ * different fraction of each. The ledger is deliberately unit-agnostic — it only
+ * compares `cost` against `budget - Σ outstanding` for one key — which is exactly
+ * what lets an account-scoped window meter in the shared percent while each sibling
+ * converts its own tokens at its own learned rate.
+ */
+export interface AdmitConstraint {
+    /** The metered allowance's identity — `(accountKey, label)` for an account-wide window, `(poolId, label)` for a model-scoped one. */
+    resourceKey: string;
+    /** Caller-computed live remaining allowance for `resourceKey`. Non-finite ⇒ optimistic (unbounded). */
+    budget: number;
+    /** This dispatch's draw against `resourceKey`, in the same unit as `budget`. */
+    cost: number;
+}
+/** How one constraint evaluated during an admission attempt. */
+export interface ConstraintOutcome {
+    resourceKey: string;
+    /** Live budget minus `outstandingBefore` — so it carries that field's carve-out too. */
+    headroomBefore: number;
+    /**
+     * Outstanding (non-expired) leases counted against this key when it was
+     * evaluated. This is everyone else's in-flight total — PLUS any draw an earlier
+     * constraint in this same attempt already made on the same key (see the
+     * duplicate-key note on {@link ReservationLedger.admit}), so it is what this
+     * constraint was actually measured against rather than a pure "before" reading.
+     */
+    outstandingBefore: number;
+    /** The cost this attempt tried to reserve against this key (clamped to >= 0). */
+    cost: number;
+    /** Whether this constraint alone had room. Admission requires ALL to be true. */
+    cleared: boolean;
+}
+/** Outcome of an admission attempt against every constraint that applies. */
 export interface AdmitDecision {
     admitted: boolean;
     /** Minted only when `admitted`; pass back to `reconcile` on completion. */
     leaseId: string | null;
-    /** Live budget minus everyone's outstanding leases, BEFORE this attempt. */
-    headroomBefore: number;
-    /** Sum of everyone's outstanding (non-expired) leases, BEFORE this attempt. */
-    outstandingBefore: number;
-    /** The cost this attempt tried to reserve (echoed for the explain-artifact). */
-    cost: number;
+    /** Every constraint's evaluation, in input order — the per-admission explain record. */
+    constraints: ConstraintOutcome[];
+    /**
+     * The TIGHTEST constraint — the one closest to blocking this dispatch, by the
+     * dimensionless ratio `cost / headroomBefore`. This is the "binding window" a
+     * report should name. Null only when no constraints were supplied.
+     *
+     * ⚠ Deliberately a RATIO, not the smallest `headroomBefore`. Constraints meter in
+     * different windows' units, so raw headroom is not comparable across them — "40
+     * left of a session window" vs "80 left of a weekly one" says nothing about which
+     * binds. The ratio is dimensionless and therefore is comparable. A blocked
+     * constraint always outranks a cleared one (its ratio exceeds 1), so this is also
+     * independent of the order the caller supplied the constraints in.
+     */
+    binding: ConstraintOutcome | null;
+    /**
+     * Whether ANY constraint had outstanding leases against it.
+     *
+     * This exists because `binding.outstandingBefore` is one key's total and must
+     * never be read as "is anything in flight anywhere" — the liveness backstop in
+     * the rolling dispatcher needs exactly that aggregate to decide whether waiting
+     * could ever help. Given as a computed boolean rather than left to the consumer
+     * to derive, so the predicate cannot be reconstructed wrongly from a per-key
+     * number (it was, and a blocked model window with an idle account window would
+     * have force-dispatched into overshoot).
+     */
+    anyOutstanding: boolean;
 }
 export interface AdmitInput {
-    /** `provider#account/model` — the real metered account the budget belongs to. */
-    resourceKey: string;
-    /** Total reservation: input estimate + output envelope. */
-    cost: number;
-    /** Caller-computed live remaining tokens for `resourceKey`. Non-finite ⇒ optimistic (unbounded). */
-    budget: number;
+    /**
+     * Every allowance this dispatch draws against. Admission is ALL-OR-NOTHING: one
+     * lease id is recorded under each key, or none are. An empty array is admitted
+     * unmetered (a lease is still minted so completion reconciles symmetrically).
+     */
+    constraints: AdmitConstraint[];
     /** Pool id for diagnostics. */
     poolId: string;
     /** Lease lifetime in ms; defaults to the ledger's TTL. */
@@ -64,24 +124,36 @@ export declare class ReservationLedger {
     private readonly defaultTtlMs;
     constructor(ledgerPath: string, now?: () => number, defaultTtlMs?: number);
     /**
-     * Attempt to reserve `cost` tokens against `resourceKey`'s shared budget.
-     * Admitted iff `budget - Σ outstanding_leases(resourceKey) >= cost`, evaluated
-     * atomically under the lock so concurrent admitters serialize and each sees the
-     * others' in-flight reservations. A non-finite `budget` is treated as unbounded
-     * (optimistic start — the reactive floor still corrects). A non-positive `cost`
-     * is always admitted with a lease so completion still reconciles symmetrically.
-     * The returned `headroomBefore`/`outstandingBefore`/`cost` feed the per-admission
-     * explain record on the dispatch-quota artifact.
+     * Attempt to reserve against EVERY constraint that applies to this dispatch.
+     * Each is admitted iff `budget - Σ outstanding_leases(resourceKey) >= cost`, and
+     * the dispatch is admitted iff every one clears — **all-or-nothing**: either one
+     * lease id is recorded under each key, or nothing is written. A partial
+     * reservation (fits the account window, overruns its model window) is therefore
+     * unrepresentable, which is what makes `reconcile` by lease id total.
+     *
+     * The whole evaluation runs atomically under the lock, so concurrent admitters
+     * serialize and each sees the others' in-flight reservations across every key.
+     * A non-finite `budget` is unbounded (optimistic start — the reactive floor still
+     * corrects); a non-positive `cost` always clears its own constraint so completion
+     * still reconciles symmetrically. Every constraint is evaluated even after one
+     * blocks, so the explain record shows the full picture rather than the first
+     * failure.
+     *
+     * Two constraints on the same `resourceKey` accumulate within the attempt — the
+     * second sees the first's draw as outstanding — so a caller that supplies a key
+     * twice cannot double-spend one allowance.
      */
     admit(input: AdmitInput): Promise<AdmitDecision>;
     /**
      * Free a reservation on completion (success OR failure — the request is no longer
-     * in flight either way). Token-checked by `leaseId`: a no-op if the lease is
-     * already gone (expired / reconciled). Returns whether a lease was removed. The
-     * lease's real cost surfaces in the provider's next quota snapshot; the ledger's
-     * job is only to stop reserving it.
+     * in flight either way). Token-checked by `leaseId` and swept across EVERY key, so
+     * a multi-constraint reservation is released in full or not at all — the caller
+     * cannot leak one window's reservation by forgetting which keys it took. A no-op
+     * if the lease is already gone (expired / reconciled). Returns whether anything was
+     * removed. The lease's real cost surfaces in the provider's next quota snapshot;
+     * the ledger's job is only to stop reserving it.
      */
-    reconcile(resourceKey: string, leaseId: string): Promise<boolean>;
+    reconcile(leaseId: string): Promise<boolean>;
     /** Sum of outstanding (non-expired) reservations for `resourceKey`. Read under the lock. */
     outstanding(resourceKey: string): Promise<number>;
     /**

package/dist/shared/quota/reservationLedger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reservationLedger.d.ts","sourceRoot":"","sources":["../../../src/shared/quota/reservationLedger.ts"],"names":[],"mappings":"AAqCA;;;;;;;;;GASG;AACH,eAAO,MAAM,qBAAqB,QAAc,CAAC;AAEjD,MAAM,WAAW,gBAAgB;IAC/B,kFAAkF;IAClF,OAAO,EAAE,MAAM,CAAC;IAChB,0DAA0D;IAC1D,IAAI,EAAE,MAAM,CAAC;IACb,kFAAkF;IAClF,MAAM,EAAE,MAAM,CAAC;IACf,0EAA0E;IAC1E,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,+EAA+E;AAC/E,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,OAAO,CAAC;IAClB,2EAA2E;IAC3E,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,4EAA4E;IAC5E,cAAc,EAAE,MAAM,CAAC;IACvB,+EAA+E;IAC/E,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gFAAgF;IAChF,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,UAAU;IACzB,iFAAiF;IACjF,WAAW,EAAE,MAAM,CAAC;IACpB,2DAA2D;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,oGAAoG;IACpG,MAAM,EAAE,MAAM,CAAC;IACf,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,KAAK,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;AA+EpD;;;;;;;;;;;;GAYG;AACH,qBAAa,iBAAiB;IAK1B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,GAAG;IALtB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;gBAGnB,UAAU,EAAE,MAAM,EAClB,GAAG,GAAE,MAAM,MAAyB,EACrD,YAAY,GAAE,MAAsB;IAMtC;;;;;;;;;OASG;IACG,KAAK,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC;IA6BtD;;;;;;OAMG;IACG,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAkBvE,4FAA4F;IACtF,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAQvD;;;;OAIG;IACG,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IASvC;;;;OAIG;IACG,QAAQ,IAAI,OAAO,CAAC,SAAS,CAAC;CAOrC;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,CAUjD;AAED,kEAAkE;AAClE,wBAAgB,uBAAuB,IAAI,iBAAiB,CAE3D"}
+{"version":3,"file":"reservationLedger.d.ts","sourceRoot":"","sources":["../../../src/shared/quota/reservationLedger.ts"],"names":[],"mappings":"AAqCA;;;;;;;;;GASG;AACH,eAAO,MAAM,qBAAqB,QAAc,CAAC;AAEjD,MAAM,WAAW,gBAAgB;IAC/B,kFAAkF;IAClF,OAAO,EAAE,MAAM,CAAC;IAChB,0DAA0D;IAC1D,IAAI,EAAE,MAAM,CAAC;IACb,kFAAkF;IAClF,MAAM,EAAE,MAAM,CAAC;IACf,0EAA0E;IAC1E,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,eAAe;IAC9B,qIAAqI;IACrI,WAAW,EAAE,MAAM,CAAC;IACpB,uGAAuG;IACvG,MAAM,EAAE,MAAM,CAAC;IACf,gFAAgF;IAChF,IAAI,EAAE,MAAM,CAAC;CACd;AAED,gEAAgE;AAChE,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,wFAAwF;IACxF,cAAc,EAAE,MAAM,CAAC;IACvB;;;;;;OAMG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iFAAiF;IACjF,IAAI,EAAE,MAAM,CAAC;IACb,iFAAiF;IACjF,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,6EAA6E;AAC7E,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,OAAO,CAAC;IAClB,2EAA2E;IAC3E,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,wFAAwF;IACxF,WAAW,EAAE,iBAAiB,EAAE,CAAC;IACjC;;;;;;;;;;;OAWG;IACH,OAAO,EAAE,iBAAiB,GAAG,IAAI,CAAC;IAClC;;;;;;;;;;OAUG;IACH,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,UAAU;IACzB;;;;OAIG;IACH,WAAW,EAAE,eAAe,EAAE,CAAC;IAC/B,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,KAAK,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;AAmHpD;;;;;;;;;;;;GAYG;AACH,qBAAa,iBAAiB;IAK1B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,GAAG;IALtB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;gBAGnB,UAAU,EAAE,MAAM,EAClB,GAAG,GAAE,MAAM,MAAyB,EACrD,YAAY,GAAE,MAAsB;IAMtC;;;;;;;;;;;;;;;;;;;OAmBG;IACG,KAAK,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC;IAqDtD;;;;;;;;OAQG;IACG,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAiBlD,4FAA4F;IACtF,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAQvD;;;;OAIG;IACG,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IASvC;;;;OAIG;IACG,QAAQ,IAAI,OAAO,CAAC,SAAS,CAAC;CAOrC;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,CAUjD;AAED,kEAAkE;AAClE,wBAAgB,uBAAuB,IAAI,iBAAiB,CAE3D"}

package/dist/shared/quota/reservationLedger.js

@@ -110,6 +110,44 @@ function sumOutstanding(leases, now) {
     }
     return total;
 }
+/**
+ * How close a constraint came to blocking, as a dimensionless ratio of the draw to
+ * the room available for it. Comparable ACROSS windows that meter in different
+ * units, which raw headroom is not. Higher = tighter; > 1 means it blocked.
+ */
+function tightness(outcome) {
+    // Order matters. A zero-cost constraint ALWAYS clears — including on an exhausted
+    // window — so it must rank loosest, not tightest. Testing headroom first returned
+    // +Infinity for `cost 0, headroom 0` and let a constraint that cleared outrank one
+    // that actually blocked. With this order the invariant below is exact: cleared
+    // ⇒ tightness <= 1 (cost <= 0 ⇒ 0, else headroom >= cost ⇒ ratio <= 1), and
+    // blocked ⇒ > 1 or +Infinity.
+    if (outcome.cost <= 0)
+        return 0;
+    if (outcome.headroomBefore <= 0)
+        return Number.POSITIVE_INFINITY;
+    return outcome.cost / outcome.headroomBefore;
+}
+/**
+ * The constraint closest to blocking — what a report should name as the binding
+ * window. Replaces the MIN-collapse that used to happen before the ledger was
+ * reached. Ranked by {@link tightness}, so the result does not depend on the order
+ * the caller listed the constraints in, and a blocked constraint always wins.
+ */
+function pickBinding(outcomes) {
+    if (outcomes.length === 0)
+        return null;
+    return outcomes.reduce((tightest, o) => {
+        const a = tightness(o);
+        const b = tightness(tightest);
+        if (a !== b)
+            return a > b ? o : tightest;
+        // Ties are reachable (two exhausted windows both score +Infinity; equal ratios).
+        // Break them on the key so the answer is a property of the ledger state, not of
+        // the order the caller happened to list the constraints in.
+        return o.resourceKey < tightest.resourceKey ? o : tightest;
+    });
+}
 /** Drop expired leases from every key, returning the trimmed map and how many were dropped. */
 function pruneExpired(ledger, now) {
     let dropped = 0;
@@ -147,65 +185,99 @@ export class ReservationLedger {
         this.defaultTtlMs = defaultTtlMs;
     }
     /**
-     * Attempt to reserve `cost` tokens against `resourceKey`'s shared budget.
-     * Admitted iff `budget - Σ outstanding_leases(resourceKey) >= cost`, evaluated
-     * atomically under the lock so concurrent admitters serialize and each sees the
-     * others' in-flight reservations. A non-finite `budget` is treated as unbounded
-     * (optimistic start — the reactive floor still corrects). A non-positive `cost`
-     * is always admitted with a lease so completion still reconciles symmetrically.
-     * The returned `headroomBefore`/`outstandingBefore`/`cost` feed the per-admission
-     * explain record on the dispatch-quota artifact.
+     * Attempt to reserve against EVERY constraint that applies to this dispatch.
+     * Each is admitted iff `budget - Σ outstanding_leases(resourceKey) >= cost`, and
+     * the dispatch is admitted iff every one clears — **all-or-nothing**: either one
+     * lease id is recorded under each key, or nothing is written. A partial
+     * reservation (fits the account window, overruns its model window) is therefore
+     * unrepresentable, which is what makes `reconcile` by lease id total.
+     *
+     * The whole evaluation runs atomically under the lock, so concurrent admitters
+     * serialize and each sees the others' in-flight reservations across every key.
+     * A non-finite `budget` is unbounded (optimistic start — the reactive floor still
+     * corrects); a non-positive `cost` always clears its own constraint so completion
+     * still reconciles symmetrically. Every constraint is evaluated even after one
+     * blocks, so the explain record shows the full picture rather than the first
+     * failure.
+     *
+     * Two constraints on the same `resourceKey` accumulate within the attempt — the
+     * second sees the first's draw as outstanding — so a caller that supplies a key
+     * twice cannot double-spend one allowance.
      */
     async admit(input) {
         const ttl = input.leaseTtlMs ?? this.defaultTtlMs;
         return withFileLock(this.lockPath, async () => {
             const now = this.now();
             const { ledger } = pruneExpired(await readLedger(this.ledgerPath), now);
-            const outstandingBefore = sumOutstanding(ledger[input.resourceKey], now);
-            const budget = Number.isFinite(input.budget) ? input.budget : Number.POSITIVE_INFINITY;
-            const headroomBefore = budget - outstandingBefore;
-            const cost = Number.isFinite(input.cost) ? input.cost : 0;
-            const admitted = cost <= 0 || headroomBefore >= cost;
+            // Draws already committed by EARLIER constraints in this same attempt, so a
+            // repeated resourceKey is metered once against its real allowance.
+            const pendingByKey = new Map();
+            const outcomes = [];
+            let anyOutstanding = false;
+            for (const constraint of input.constraints) {
+                const pending = pendingByKey.get(constraint.resourceKey) ?? 0;
+                const priorOutstanding = sumOutstanding(ledger[constraint.resourceKey], now);
+                if (priorOutstanding > 0)
+                    anyOutstanding = true;
+                const outstandingBefore = priorOutstanding + pending;
+                const budget = Number.isFinite(constraint.budget) ? constraint.budget : Number.POSITIVE_INFINITY;
+                const headroomBefore = budget - outstandingBefore;
+                // Normalize ONCE: the value validated against headroom, accumulated for a
+                // repeated key, and persisted on the lease must be the same number. A
+                // negative cost reaching the lease would subtract from the key's outstanding
+                // total and manufacture headroom that does not exist for every peer.
+                const cost = Number.isFinite(constraint.cost) ? Math.max(0, constraint.cost) : 0;
+                outcomes.push({
+                    resourceKey: constraint.resourceKey,
+                    headroomBefore,
+                    outstandingBefore,
+                    cost,
+                    cleared: cost <= 0 || headroomBefore >= cost,
+                });
+                pendingByKey.set(constraint.resourceKey, pending + cost);
+            }
+            const admitted = outcomes.every((o) => o.cleared);
+            const binding = pickBinding(outcomes);
             if (!admitted) {
                 // Persist the prune even on a blocked admission so expired leases don't
                 // linger and depress headroom for the next attempt.
                 await writeLedger(this.ledgerPath, ledger);
-                return { admitted: false, leaseId: null, headroomBefore, outstandingBefore, cost };
+                return { admitted: false, leaseId: null, constraints: outcomes, binding, anyOutstanding };
             }
             const leaseId = mintLeaseId();
-            const lease = {
-                leaseId,
-                cost,
-                poolId: input.poolId,
-                expiresAt: now + ttl,
-            };
-            ledger[input.resourceKey] = [...(ledger[input.resourceKey] ?? []), lease];
+            const expiresAt = now + ttl;
+            for (const outcome of outcomes) {
+                const lease = { leaseId, cost: outcome.cost, poolId: input.poolId, expiresAt };
+                ledger[outcome.resourceKey] = [...(ledger[outcome.resourceKey] ?? []), lease];
+            }
             await writeLedger(this.ledgerPath, ledger);
-            return { admitted: true, leaseId, headroomBefore, outstandingBefore, cost };
+            return { admitted: true, leaseId, constraints: outcomes, binding, anyOutstanding };
         });
     }
     /**
      * Free a reservation on completion (success OR failure — the request is no longer
-     * in flight either way). Token-checked by `leaseId`: a no-op if the lease is
-     * already gone (expired / reconciled). Returns whether a lease was removed. The
-     * lease's real cost surfaces in the provider's next quota snapshot; the ledger's
-     * job is only to stop reserving it.
+     * in flight either way). Token-checked by `leaseId` and swept across EVERY key, so
+     * a multi-constraint reservation is released in full or not at all — the caller
+     * cannot leak one window's reservation by forgetting which keys it took. A no-op
+     * if the lease is already gone (expired / reconciled). Returns whether anything was
+     * removed. The lease's real cost surfaces in the provider's next quota snapshot;
+     * the ledger's job is only to stop reserving it.
      */
-    async reconcile(resourceKey, leaseId) {
+    async reconcile(leaseId) {
         return withFileLock(this.lockPath, async () => {
             const now = this.now();
             const { ledger } = pruneExpired(await readLedger(this.ledgerPath), now);
-            const leases = ledger[resourceKey];
-            if (!leases) {
-                await writeLedger(this.ledgerPath, ledger);
-                return false;
+            let removed = false;
+            for (const [resourceKey, leases] of Object.entries(ledger)) {
+                const remaining = leases.filter((l) => l.leaseId !== leaseId);
+                if (remaining.length === leases.length)
+                    continue;
+                removed = true;
+                if (remaining.length > 0)
+                    ledger[resourceKey] = remaining;
+                else
+                    delete ledger[resourceKey];
             }
-            const remaining = leases.filter((l) => l.leaseId !== leaseId);
-            const removed = remaining.length !== leases.length;
-            if (remaining.length > 0)
-                ledger[resourceKey] = remaining;
-            else
-                delete ledger[resourceKey];
             await writeLedger(this.ledgerPath, ledger);
             return removed;
         });

package/dist/shared/quota/reservationLedger.js.map

@@ -1 +1 @@
-{"version":3,"file":"reservationLedger.js","sourceRoot":"","sources":["../../../src/shared/quota/reservationLedger.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reservationLedger.js","sourceRoot":"","sources":["../../../src/shared/quota/reservationLedger.ts"],"names":[],"mappings":"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"}