stitchkit 0.70.6 → 0.72.0

package/dist/application.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../src/application.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,UAAU,EACf,gBAAgB,EAChB,KAAK,iBAAiB,EACtB,uBAAuB,EACvB,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,iCAAiC,EACtC,KAAK,gBAAgB,EACrB,sBAAsB,EACtB,KAAK,eAAe,EACpB,qBAAqB,EACrB,KAAK,qBAAqB,EAC1B,2BAA2B,EAC3B,KAAK,aAAa,EAClB,kBAAkB,EAClB,KAAK,kBAAkB,EACvB,wBAAwB,GACzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,KAAK,4BAA4B,EACjC,KAAK,2BAA2B,EAChC,KAAK,2BAA2B,EAChC,KAAK,2BAA2B,EAChC,KAAK,sBAAsB,EAC3B,4BAA4B,EAC5B,4BAA4B,EAC5B,KAAK,6BAA6B,EAClC,mCAAmC,EACnC,KAAK,6BAA6B,EAClC,KAAK,sBAAsB,EAC3B,KAAK,wBAAwB,EAC7B,8BAA8B,EAC9B,KAAK,qBAAqB,EAC1B,2BAA2B,EAC3B,KAAK,qBAAqB,EAC1B,KAAK,0BAA0B,EAC/B,KAAK,0BAA0B,EAC/B,yBAAyB,EACzB,KAAK,iBAAiB,EACtB,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,0BAA0B,EAC/B,KAAK,oBAAoB,EACzB,KAAK,yBAAyB,EAC9B,KAAK,oBAAoB,EACzB,0BAA0B,EAC1B,yBAAyB,EACzB,KAAK,sBAAsB,EAC3B,4BAA4B,EAC5B,KAAK,mBAAmB,EACxB,yBAAyB,EACzB,KAAK,mBAAmB,EACxB,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,oBAAoB,EACzB,0BAA0B,EAC1B,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,4BAA4B,EACjC,kCAAkC,EAClC,KAAK,uBAAuB,EAC5B,KAAK,wBAAwB,EAC7B,KAAK,6BAA6B,EAClC,mCAAmC,EACnC,KAAK,sBAAsB,EAC3B,4BAA4B,EAC5B,KAAK,uBAAuB,EAC5B,6BAA6B,EAC7B,KAAK,8BAA8B,EACnC,oCAAoC,EACpC,KAAK,sBAAsB,EAC3B,4BAA4B,EAC5B,KAAK,uBAAuB,EAC5B,6BAA6B,EAC7B,KAAK,6BAA6B,EAClC,mCAAmC,EACnC,KAAK,4BAA4B,EACjC,KAAK,2BAA2B,EAChC,iCAAiC,GAClC,MAAM,2CAA2C,CAAC;AACnD,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,0BAA0B,EAC/B,KAAK,yBAAyB,EAC9B,+BAA+B,EAC/B,yBAAyB,EACzB,0BAA0B,GAC3B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,KAAK,+BAA+B,EACpC,qCAAqC,EACrC,KAAK,8BAA8B,EACnC,KAAK,qCAAqC,EAC1C,2CAA2C,EAC3C,8BAA8B,EAC9B,oCAAoC,GACrC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,KAAK,oBAAoB,EACzB,yBAAyB,EACzB,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,KAAK,yBAAyB,EAC9B,KAAK,0BAA0B,EAC/B,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,EAC9B,+BAA+B,EAC/B,KAAK,0BAA0B,EAC/B,gCAAgC,EAChC,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,6BAA6B,EAClC,KAAK,4BAA4B,EACjC,KAAK,6BAA6B,EAClC,mCAAmC,EACnC,6BAA6B,EAC7B,KAAK,6BAA6B,GACnC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,qBAAqB,EACrB,KAAK,eAAe,EACpB,KAAK,sBAAsB,EAC3B,KAAK,yBAAyB,EAC9B,KAAK,wBAAwB,EAC7B,KAAK,+BAA+B,EACpC,KAAK,0BAA0B,EAC/B,2BAA2B,GAC5B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,qBAAqB,EACrB,KAAK,eAAe,EACpB,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,EAC1B,KAAK,yBAAyB,EAC9B,+BAA+B,EAC/B,KAAK,0BAA0B,EAC/B,gCAAgC,EAChC,KAAK,sBAAsB,EAC3B,4BAA4B,EAC5B,KAAK,yBAAyB,EAC9B,KAAK,qBAAqB,EAC1B,2BAA2B,EAC3B,KAAK,oBAAoB,GAC1B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,KAAK,4BAA4B,EACjC,kCAAkC,EAClC,KAAK,iBAAiB,EACtB,uBAAuB,EACvB,KAAK,aAAa,EAClB,mBAAmB,EACnB,KAAK,oBAAoB,EACzB,0BAA0B,EAC1B,KAAK,2BAA2B,EAChC,iCAAiC,EACjC,KAAK,yBAAyB,EAC9B,+BAA+B,EAC/B,KAAK,mBAAmB,EACxB,yBAAyB,EACzB,KAAK,2BAA2B,EAChC,iCAAiC,EACjC,KAAK,uBAAuB,EAC5B,6BAA6B,EAC7B,KAAK,oBAAoB,EACzB,0BAA0B,EAC1B,wBAAwB,GACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,2BAA2B,EAChC,qBAAqB,GACtB,MAAM,+BAA+B,CAAC"}
+{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../src/application.ts"],"names":[],"mappings":"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"}

package/dist/application.js

@@ -20,7 +20,7 @@ import {
   createBoundedChannel,
   createCreditWindow,
   createManagedSchedule
-} from "./index-zpyj7hsv.js";
+} from "./index-3cwck0rm.js";
 import {
   createBoundedSinkManager
 } from "./index-a59da114.js";
@@ -59,16 +59,27 @@ var BoundedRateBudgetSchema = z.object({
   limit: PositiveSafeIntegerSchema,
   intervalMs: PositiveSafeIntegerSchema
 }).strict().readonly();
+var BoundedAdmissionPerKeyLimitsSchema = z.object({
+  maxConcurrent: PositiveSafeIntegerSchema,
+  rate: BoundedRateBudgetSchema.optional()
+}).strict().readonly();
+var PerKeyLimitResolverSchema = z.custom((value) => typeof value === "function", { message: "perKey.limits must be a function of the key" });
 var BoundedAdmissionPolicySchema = z.object({
   global: z.object({
     maxConcurrent: PositiveSafeIntegerSchema,
     rate: BoundedRateBudgetSchema.optional()
   }).strict(),
-  perKey: z.object({
-    maxConcurrent: PositiveSafeIntegerSchema,
-    maxKeys: PositiveSafeIntegerSchema,
-    rate: BoundedRateBudgetSchema.optional()
-  }).strict().optional()
+  perKey: z.union([
+    z.object({
+      maxConcurrent: PositiveSafeIntegerSchema,
+      maxKeys: PositiveSafeIntegerSchema,
+      rate: BoundedRateBudgetSchema.optional()
+    }).strict(),
+    z.object({
+      maxKeys: PositiveSafeIntegerSchema,
+      limits: PerKeyLimitResolverSchema
+    }).strict()
+  ]).optional()
 }).strict().readonly();
 var BoundedAdmissionStateSchema = z.enum(["accepting", "draining", "closed"]);
 var BoundedAdmissionRefusalReasonSchema = z.enum([
@@ -153,6 +164,18 @@ function createBoundedAdmission(config) {
     lastNow = value;
     return value;
   };
+  const resolveKeyLimits = (key) => {
+    const perKey = policy.perKey;
+    if (!perKey)
+      return;
+    if ("limits" in perKey) {
+      return BoundedAdmissionPerKeyLimitsSchema.parse(perKey.limits(key));
+    }
+    return BoundedAdmissionPerKeyLimitsSchema.parse({
+      maxConcurrent: perKey.maxConcurrent,
+      ...perKey.rate && { rate: perKey.rate }
+    });
+  };
   const pruneRate = (samples, intervalMs, at) => {
     let expired = 0;
     while (expired < samples.length && at - (samples[expired]?.at ?? at) >= intervalMs) {
@@ -165,8 +188,8 @@ function createBoundedAdmission(config) {
     if (policy.global.rate)
       pruneRate(globalRate, policy.global.rate.intervalMs, at);
     for (const [key, record] of keys) {
-      if (policy.perKey?.rate) {
-        pruneRate(record.rate, policy.perKey.rate.intervalMs, at);
+      if (record.limits?.rate) {
+        pruneRate(record.rate, record.limits.rate.intervalMs, at);
       }
       if (record.active === 0 && record.rate.length === 0)
         keys.delete(key);
@@ -221,22 +244,23 @@ function createBoundedAdmission(config) {
     if (policy.perKey && key !== undefined) {
       if (!keyRecord && keys.size >= policy.perKey.maxKeys)
         return refuse("key-capacity");
-      if (keyRecord && keyRecord.active >= policy.perKey.maxConcurrent) {
+      if (keyRecord?.limits && keyRecord.active >= keyRecord.limits.maxConcurrent) {
         return refuse("key-concurrency");
       }
     }
     if (policy.global.rate && globalRate.length >= policy.global.rate.limit) {
       return refuse("global-rate", retryAfter(globalRate, policy.global.rate, at));
     }
-    if (policy.perKey?.rate && keyRecord && keyRecord.rate.length >= policy.perKey.rate.limit) {
-      return refuse("key-rate", retryAfter(keyRecord.rate, policy.perKey.rate, at));
+    const keyRate = keyRecord?.limits?.rate;
+    if (keyRate && keyRecord && keyRecord.rate.length >= keyRate.limit) {
+      return refuse("key-rate", retryAfter(keyRecord.rate, keyRate, at));
     }
     if (key !== undefined && !keyRecord) {
-      keyRecord = { active: 0, rate: [] };
+      keyRecord = { active: 0, rate: [], limits: resolveKeyLimits(key) };
       keys.set(key, keyRecord);
     }
     const globalSample = policy.global.rate ? { at } : undefined;
-    const keySample = policy.perKey?.rate && keyRecord ? { at } : undefined;
+    const keySample = keyRecord?.limits?.rate ? { at } : undefined;
     active += 1;
     if (keyRecord)
       keyRecord.active += 1;
@@ -413,6 +437,7 @@ var DiagnosticJournalLimitsSchema = z2.object({
   maxFileBytes: PositiveSafeIntegerSchema2,
   maxFiles: PositiveSafeIntegerSchema2
 }).strict().readonly();
+var DiagnosticJournalLockPolicySchema = z2.enum(["refuse", "reclaim-stale"]);
 var DiagnosticJournalStateSchema = z2.enum(["open", "draining", "closed", "failed"]);
 var DiagnosticJournalRefusalReasonSchema = z2.enum([
   "closed",
@@ -435,6 +460,10 @@ var DiagnosticJournalStatusSchema = z2.object({
   state: DiagnosticJournalStateSchema,
   epoch: z2.uuid(),
   limits: DiagnosticJournalLimitsSchema,
+  lock: z2.object({
+    policy: DiagnosticJournalLockPolicySchema,
+    reclaimedStale: z2.boolean()
+  }).strict().readonly(),
   received: z2.number().int().nonnegative(),
   accepted: z2.number().int().nonnegative(),
   refused: z2.number().int().nonnegative(),
@@ -493,9 +522,86 @@ function parseDiagnosticJournalMode(mode) {
 import { z as z3 } from "zod";
 
 // src/application/diagnostic-journal-storage.ts
-import { constants } from "node:fs";
-import { lstat, open, readdir, realpath, rename, unlink } from "node:fs/promises";
+import { constants as constants2 } from "node:fs";
+import { lstat, open as open2, readdir, realpath, rename, unlink as unlink2 } from "node:fs/promises";
 import { basename, dirname, isAbsolute, resolve } from "node:path";
+
+// src/application/diagnostic-journal-lock.ts
+import { constants } from "node:fs";
+import { open, unlink } from "node:fs/promises";
+import { hostname } from "node:os";
+function isExisting(error) {
+  return isRecord(error) && error.code === "EEXIST";
+}
+function readOwner(text) {
+  let parsed;
+  try {
+    parsed = JSON.parse(text);
+  } catch {
+    return;
+  }
+  if (!isRecord(parsed))
+    return;
+  const { pid, host, acquiredAt } = parsed;
+  if (typeof pid !== "number" || !Number.isSafeInteger(pid) || pid <= 0)
+    return;
+  if (typeof host !== "string" || host.length === 0)
+    return;
+  if (typeof acquiredAt !== "string")
+    return;
+  return { pid, host, acquiredAt };
+}
+function isGone(owner) {
+  if (owner.host !== hostname())
+    return false;
+  try {
+    process.kill(owner.pid, 0);
+    return false;
+  } catch (error) {
+    return isRecord(error) && error.code === "ESRCH";
+  }
+}
+async function readLockOwner(lockPath) {
+  let handle;
+  try {
+    handle = await open(lockPath, constants.O_RDONLY | constants.O_NOFOLLOW);
+    return readOwner(await handle.readFile("utf8"));
+  } catch {
+    return;
+  } finally {
+    await handle?.close().catch(() => {
+      return;
+    });
+  }
+}
+async function createExclusive(lockPath, mode) {
+  const handle = await open(lockPath, "wx", mode);
+  const owner = {
+    pid: process.pid,
+    host: hostname(),
+    acquiredAt: new Date().toISOString()
+  };
+  await handle.writeFile(`${JSON.stringify(owner)}
+`, "utf8");
+  return handle;
+}
+async function acquireDiagnosticJournalLock(lockPath, mode, policy) {
+  try {
+    return { handle: await createExclusive(lockPath, mode), reclaimedStale: false };
+  } catch (error) {
+    if (policy !== "reclaim-stale" || !isExisting(error))
+      throw error;
+    const owner = await readLockOwner(lockPath);
+    if (!owner || !isGone(owner))
+      throw error;
+    await unlink(lockPath).catch(() => {
+      return;
+    });
+    return { handle: await createExclusive(lockPath, mode), reclaimedStale: true };
+  }
+}
+
+// src/application/diagnostic-journal-storage.ts
 class DiagnosticJournalStorageError extends Error {
   phase;
   constructor(phase, message, options) {
@@ -513,7 +619,7 @@ async function removeIfPresent(path) {
     if (info.isSymbolicLink() || !info.isFile()) {
       throw new Error("Diagnostic journal generations must be regular files");
     }
-    await unlink(path);
+    await unlink2(path);
   } catch (error) {
     if (!isMissing(error))
       throw error;
@@ -552,7 +658,7 @@ async function createRotatingDiagnosticJournalStorage(config) {
   const parent = await realpath(dirname(config.path));
   const journalPath = resolve(parent, basename(config.path));
   const lockPath = `${journalPath}.lock`;
-  const lock = await open(lockPath, "wx", config.mode);
+  const { handle: lock, reclaimedStale } = await acquireDiagnosticJournalLock(lockPath, config.mode, config.lock);
   let handle;
   let currentFileBytes = 0;
   let retainedFiles = 1;
@@ -560,7 +666,7 @@ async function createRotatingDiagnosticJournalStorage(config) {
   let partialTails = 0;
   let closed = false;
   const openCurrent = async () => {
-    handle = await open(journalPath, constants.O_APPEND | constants.O_CREAT | constants.O_RDWR | constants.O_NOFOLLOW, config.mode);
+    handle = await open2(journalPath, constants2.O_APPEND | constants2.O_CREAT | constants2.O_RDWR | constants2.O_NOFOLLOW, config.mode);
     const info = await handle.stat();
     if (!info.isFile()) {
       await handle.close();
@@ -624,7 +730,7 @@ async function createRotatingDiagnosticJournalStorage(config) {
     await lock.close().catch(() => {
       return;
     });
-    await unlink(lockPath).catch(() => {
+    await unlink2(lockPath).catch(() => {
       return;
     });
     throw error;
@@ -636,6 +742,7 @@ async function createRotatingDiagnosticJournalStorage(config) {
     partialTails
   });
   return {
+    reclaimedStale,
     async append(bytes) {
       if (closed || !handle) {
         throw new DiagnosticJournalStorageError("write", "Diagnostic journal storage is closed");
@@ -668,7 +775,7 @@ async function createRotatingDiagnosticJournalStorage(config) {
       }
       try {
         await lock.close();
-        await unlink(lockPath);
+        await unlink2(lockPath);
       } catch (error) {
         failure ??= error;
       }
@@ -822,6 +929,7 @@ function createDiagnosticJournalManager(config, storage) {
       state,
       epoch: config.epoch,
       limits,
+      lock: config.lock,
       received,
       accepted,
       refused,
@@ -917,16 +1025,19 @@ function createDiagnosticJournalManager(config, storage) {
 // src/application/diagnostic-journal.ts
 async function createDiagnosticJournal(config) {
   const limits = DiagnosticJournalLimitsSchema.parse(config.limits);
+  const lock = DiagnosticJournalLockPolicySchema.parse(config.lock ?? "refuse");
   const storage = await createRotatingDiagnosticJournalStorage({
     path: config.path,
     maxFileBytes: limits.maxFileBytes,
     maxFiles: limits.maxFiles,
-    mode: parseDiagnosticJournalMode(config.mode)
+    mode: parseDiagnosticJournalMode(config.mode),
+    lock
   });
   return createDiagnosticJournalManager({
     eventSchema: config.eventSchema,
     epoch: randomUUID(),
     limits,
+    lock: { policy: lock, reclaimedStale: storage.reclaimedStale },
     ...config.onFailure && { onFailure: config.onFailure }
   }, storage);
 }
@@ -1092,6 +1203,7 @@ export {
   DiagnosticJournalStatusSchema,
   DiagnosticJournalStateSchema,
   DiagnosticJournalRefusalReasonSchema,
+  DiagnosticJournalLockPolicySchema,
   DiagnosticJournalLimitsSchema,
   DiagnosticJournalFrameSchema,
   DiagnosticJournalFailurePhaseSchema,
@@ -1108,6 +1220,7 @@ export {
   BoundedAdmissionRefusalReasonSchema,
   BoundedAdmissionRefusalError,
   BoundedAdmissionPolicySchema,
+  BoundedAdmissionPerKeyLimitsSchema,
   ApplicationStatusProjectionSchema,
   ApplicationSnapshotSinkStatusSchema,
   ApplicationSnapshotSchema,

package/dist/browser/resumable.d.ts

@@ -0,0 +1,56 @@
+import { z } from 'zod';
+export declare const BackoffPolicySchema: z.ZodReadonly<z.ZodObject<{
+    minDelayMs: z.ZodNumber;
+    maxDelayMs: z.ZodNumber;
+    jitter: z.ZodNumber;
+}, z.core.$strict>>;
+export type BackoffPolicy = z.infer<typeof BackoffPolicySchema>;
+export interface Backoff {
+    /** The next delay in milliseconds, doubling from `minDelayMs` and jittered. */
+    next(): number;
+    reset(): void;
+}
+/**
+ * Exponential backoff with jitter, as a value.
+ *
+ * Jitter is the part that is easy to leave out and expensive to leave out: without it every
+ * consumer that lost the same server retries at the same instant, and the recovering server is
+ * hit by the whole fleet at once instead of a spread. The randomisation is subtractive — a delay
+ * is never longer than the ceiling the caller declared, only shorter — so `maxDelayMs` remains a
+ * real bound rather than an average.
+ */
+export declare function createBackoff(policy: BackoffPolicy, random?: () => number): Backoff;
+export interface ResumableAttempt {
+    /** 1 for the first re-open after a failure, growing until a delivery resets it. */
+    readonly number: number;
+    readonly delayMs: number;
+    readonly error: unknown;
+}
+export interface ResumableIteratorConfig<T, CURSOR> {
+    /** Open the stream, from the last cursor a delivered item advanced to. */
+    open(cursor: CURSOR | undefined): AsyncIterable<T> | Promise<AsyncIterable<T>>;
+    /** The cursor that would resume after this item. The framework never reads inside it. */
+    advance(item: T, cursor: CURSOR | undefined): CURSOR;
+    /** An item that ends the stream for good instead of triggering a re-open. */
+    isTerminal?(item: T): boolean;
+    retry?: BackoffPolicy;
+    signal?: AbortSignal;
+    /** Called before each wait. A reconnect loop nobody can see is the shape of this defect. */
+    onAttempt?(attempt: ResumableAttempt): void;
+    /** Deterministic jitter for tests; defaults to `Math.random`. */
+    random?(): number;
+}
+/**
+ * Re-open a long-lived stream from the last delivered position.
+ *
+ * The caller owns every domain decision: `open` knows the transport, `advance` knows what a
+ * cursor means and `isTerminal` knows which item ends the stream. What this owns is the part
+ * that is the same everywhere and wrong in most hand-written copies — retrying with a bounded,
+ * jittered delay, resuming rather than restarting, resetting the backoff once the stream
+ * delivers again, and stopping promptly when the caller aborts.
+ *
+ * A failure while opening and a failure mid-stream are one case: both re-open from the cursor
+ * the last delivered item produced.
+ */
+export declare function resumableIterator<T, CURSOR>(config: ResumableIteratorConfig<T, CURSOR>): AsyncGenerator<T, void, undefined>;
+//# sourceMappingURL=resumable.d.ts.map

package/dist/browser/resumable.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resumable.d.ts","sourceRoot":"","sources":["../../src/browser/resumable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,mBAAmB;;;;mBAW5B,CAAC;AACL,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE,MAAM,WAAW,OAAO;IACtB,+EAA+E;IAC/E,IAAI,IAAI,MAAM,CAAC;IACf,KAAK,IAAI,IAAI,CAAC;CACf;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,aAAa,EACrB,MAAM,GAAE,MAAM,MAAoB,GACjC,OAAO,CAcT;AAED,MAAM,WAAW,gBAAgB;IAC/B,mFAAmF;IACnF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,uBAAuB,CAAC,CAAC,EAAE,MAAM;IAChD,0EAA0E;IAC1E,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/E,yFAAyF;IACzF,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC;IACrD,6EAA6E;IAC7E,UAAU,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC;IAC9B,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,4FAA4F;IAC5F,SAAS,CAAC,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC5C,iEAAiE;IACjE,MAAM,CAAC,IAAI,MAAM,CAAC;CACnB;AA8BD;;;;;;;;;;;GAWG;AACH,wBAAuB,iBAAiB,CAAC,CAAC,EAAE,MAAM,EAChD,MAAM,EAAE,uBAAuB,CAAC,CAAC,EAAE,MAAM,CAAC,GACzC,cAAc,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,CAiCpC"}

package/dist/cli.js

@@ -5,12 +5,12 @@ import {
   emitResult,
   parseCliArgs,
   pollUntilDone
-} from "./index-tnazr5tc.js";
-import"./index-hxtm2xr2.js";
+} from "./index-pz7ytdga.js";
+import"./index-k2zczx1g.js";
 import"./index-wwst0td5.js";
-import"./index-ejv31h14.js";
-import"./index-qm87g51s.js";
-import"./index-w9m1wznn.js";
+import"./index-7qy2ex0m.js";
+import"./index-s4c8wy8m.js";
+import"./index-nemjkxjp.js";
 import"./index-sbdmyz75.js";
 import"./index-22by16v6.js";
 import"./index-cby4ar3v.js";

package/dist/{index-cx84zg25.js → index-118v0z41.js}

@@ -18,7 +18,7 @@ import {
   runWithRequestContext,
   setRequestEndpoint,
   setRequestError
-} from "./index-w9m1wznn.js";
+} from "./index-nemjkxjp.js";
 import {
   ShutdownOptionsSchema,
   isStreamCancellation,

package/dist/{index-zpyj7hsv.js → index-3cwck0rm.js}

@@ -200,7 +200,8 @@ var CreditWindowSnapshotSchema = z.object({
   leasedBytes: z.number().int().nonnegative(),
   acquired: z.number().int().nonnegative(),
   refused: z.number().int().nonnegative(),
-  replenishedBytes: z.number().int().nonnegative()
+  replenishedBytes: z.number().int().nonnegative(),
+  waiting: z.number().int().nonnegative()
 }).strict().readonly();
 function createCreditWindow(config) {
   const capacityBytes = PositiveSafeIntegerSchema.parse(config.capacityBytes);
@@ -209,6 +210,7 @@ function createCreditWindow(config) {
   let acquired = 0;
   let refused = 0;
   let replenishedBytes = 0;
+  const waiters = new Set;
   const snapshot = () => CreditWindowSnapshotSchema.parse({
     state,
     capacityBytes,
@@ -216,46 +218,109 @@ function createCreditWindow(config) {
     leasedBytes: capacityBytes - availableBytes,
     acquired,
     refused,
-    replenishedBytes
+    replenishedBytes,
+    waiting: waiters.size
   });
-  return {
-    acquire(bytes) {
-      const requested = PositiveSafeIntegerSchema.parse(bytes);
-      if (state === "closed") {
-        refused += 1;
-        return { outcome: "refused", reason: "closed" };
-      }
-      if (requested > capacityBytes) {
-        refused += 1;
-        return { outcome: "refused", reason: "larger-than-window" };
-      }
-      if (requested > availableBytes) {
-        refused += 1;
-        return { outcome: "refused", reason: "insufficient-credit" };
+  const serveWaiters = () => {
+    for (const waiter of waiters) {
+      if (waiter.bytes > availableBytes)
+        return;
+      waiter.settle({ outcome: "leased", lease: lease(waiter.bytes) });
+    }
+  };
+  const lease = (requested) => {
+    availableBytes -= requested;
+    acquired += 1;
+    let leaseReleased = false;
+    return {
+      bytes: requested,
+      get released() {
+        return leaseReleased;
+      },
+      release() {
+        if (leaseReleased)
+          return;
+        leaseReleased = true;
+        availableBytes += requested;
+        replenishedBytes += requested;
+        if (availableBytes > capacityBytes) {
+          throw new Error("Credit window accounting exceeded its capacity");
+        }
+        serveWaiters();
       }
-      availableBytes -= requested;
-      acquired += 1;
-      let leaseReleased = false;
-      const lease = {
+    };
+  };
+  const tryLease = (requested) => {
+    if (state === "closed")
+      return { outcome: "refused", reason: "closed" };
+    if (requested > capacityBytes) {
+      return { outcome: "refused", reason: "larger-than-window" };
+    }
+    if (requested > availableBytes) {
+      return { outcome: "refused", reason: "insufficient-credit" };
+    }
+    return { outcome: "leased", lease: lease(requested) };
+  };
+  const acquireNow = (requested) => {
+    const result = tryLease(requested);
+    if (result.outcome === "refused")
+      refused += 1;
+    return result;
+  };
+  const acquireWaiting = (requested, options) => {
+    const timeoutMs = options.timeoutMs === undefined ? undefined : PositiveSafeIntegerSchema.parse(options.timeoutMs);
+    const immediate = tryLease(requested);
+    if (immediate.outcome === "leased")
+      return Promise.resolve(immediate);
+    if (immediate.reason !== "insufficient-credit") {
+      refused += 1;
+      return Promise.resolve({ outcome: "refused", reason: immediate.reason });
+    }
+    if (options.signal?.aborted) {
+      refused += 1;
+      return Promise.resolve({ outcome: "refused", reason: "aborted" });
+    }
+    return new Promise((resolve) => {
+      let settled = false;
+      let timer;
+      const waiter = {
         bytes: requested,
-        get released() {
-          return leaseReleased;
-        },
-        release() {
-          if (leaseReleased)
+        settle(result) {
+          if (settled)
             return;
-          leaseReleased = true;
-          availableBytes += requested;
-          replenishedBytes += requested;
-          if (availableBytes > capacityBytes) {
-            throw new Error("Credit window accounting exceeded its capacity");
-          }
+          settled = true;
+          if (timer !== undefined)
+            clearTimeout(timer);
+          options.signal?.removeEventListener("abort", onAbort);
+          waiters.delete(waiter);
+          if (result.outcome === "refused")
+            refused += 1;
+          resolve(result);
         }
       };
-      return { outcome: "leased", lease };
-    },
+      function onAbort() {
+        waiter.settle({ outcome: "refused", reason: "aborted" });
+      }
+      waiters.add(waiter);
+      options.signal?.addEventListener("abort", onAbort, { once: true });
+      if (timeoutMs !== undefined) {
+        timer = setTimeout(() => {
+          waiter.settle({ outcome: "refused", reason: "timed-out" });
+        }, timeoutMs);
+      }
+    });
+  };
+  function acquire(bytes, options) {
+    const requested = PositiveSafeIntegerSchema.parse(bytes);
+    return options === undefined ? acquireNow(requested) : acquireWaiting(requested, options);
+  }
+  return {
+    acquire,
     close() {
       state = "closed";
+      for (const waiter of [...waiters]) {
+        waiter.settle({ outcome: "refused", reason: "closed" });
+      }
       return snapshot();
     },
     getSnapshot: snapshot

package/dist/{index-ejv31h14.js → index-7qy2ex0m.js}

@@ -1,6 +1,6 @@
 import {
   executeToolMethod
-} from "./index-qm87g51s.js";
+} from "./index-s4c8wy8m.js";
 import {
   assertToolExtensionCompatible,
   mergeSchemas,

package/dist/{index-trrf7nch.js → index-ezmn6ac6.js}

@@ -3,15 +3,15 @@ import {
 } from "./index-3xnq72rz.js";
 import {
   collectToolSurface
-} from "./index-hxtm2xr2.js";
+} from "./index-k2zczx1g.js";
 import {
   createToolRunner,
   formatToolError
-} from "./index-ejv31h14.js";
+} from "./index-7qy2ex0m.js";
 import {
   isToolExecutionControlError,
   toolResultFromError
-} from "./index-qm87g51s.js";
+} from "./index-s4c8wy8m.js";
 import {
   isRecord
 } from "./index-qyrqwr4c.js";

package/dist/{index-ekkt4gy9.js → index-jqtsc9mj.js}

@@ -1,10 +1,10 @@
 import {
   collectTools,
   createToolRunner
-} from "./index-ejv31h14.js";
+} from "./index-7qy2ex0m.js";
 import {
   toolErrorFromResult
-} from "./index-qm87g51s.js";
+} from "./index-s4c8wy8m.js";
 import {
   assertUniqueToolName
 } from "./index-22by16v6.js";

package/dist/{index-hxtm2xr2.js → index-k2zczx1g.js}

@@ -3,7 +3,7 @@ import {
 } from "./index-wwst0td5.js";
 import {
   contractToolMountable
-} from "./index-ejv31h14.js";
+} from "./index-7qy2ex0m.js";
 import {
   projectToolSurface
 } from "./index-22by16v6.js";

package/dist/{index-by57nwhc.js → index-m668wzyc.js}

@@ -15,7 +15,7 @@ import {
 import {
   ToolExecutionControlError,
   isToolExecutionControlError
-} from "./index-qm87g51s.js";
+} from "./index-s4c8wy8m.js";
 import {
   AgentAssistantPlaceholderSchema,
   AgentJsonObjectSchema,
@@ -1418,11 +1418,18 @@ function createRunExecutor(dependencies) {
           ...run.fencingToken !== undefined && { fencingToken: run.fencingToken }
         })
       });
+      let lastPromptTokens = { provenance: "unavailable" };
       const runtimeContext = {
         context: input.context,
         run,
         signal: executionSignal,
-        toolFenceLifecycle
+        toolFenceLifecycle,
+        get contextUsage() {
+          const descriptor = selectedModel?.descriptor;
+          if (!descriptor)
+            return;
+          return { usedTokens: lastPromptTokens, contextWindow: descriptor.contextWindow };
+        }
       };
       selectedModel = await config.models.resolve({
         context: input.context,
@@ -1783,6 +1790,7 @@ function createRunExecutor(dependencies) {
             usage: part.usage,
             providerMetadata: part.providerMetadata
           }) ?? normalizeSdkUsage(part.usage);
+          lastPromptTokens = stepUsage.inputTokens;
           modelUsage = addUsage(modelUsage, stepUsage);
           usage = nonModelUsage ? addUsage(nonModelUsage, modelUsage) : modelUsage;
           config.observe?.emit({