@vanillagreen/pi-claude-bridge 1.9.0 → 3.2.2

package/src/rate-limit.ts

@@ -1,15 +1,28 @@
+import { USAGE_LIMIT_ERROR_PREFIXES } from "@anthropic-ai/claude-agent-sdk";
+
 export const RATE_LIMIT_AUTO_RESUME_EVENT = "vstack:rate-limit";
 export const RATE_LIMIT_TOKEN = "\x1b[31m[rate-limit]\x1b[39m";
 
-export function isExtraUsageRequiredMessage(value: unknown): boolean {
-	let text: string;
-	if (typeof value === "string") text = value;
-	else if (value instanceof Error) text = value.message;
-	else {
-		try { text = JSON.stringify(value ?? ""); }
-		catch { text = String(value); }
-	}
-	return /extra[-\s]?usage|overage|extra usage billing|extra usage credits|1M context/i.test(text);
+// The SDK export is @alpha — degrade to "no match" (pre-0.3.220 behavior) if a
+// future release drops it, instead of crashing message classification.
+const USAGE_LIMIT_PREFIXES: readonly string[] = Array.isArray(USAGE_LIMIT_ERROR_PREFIXES as unknown)
+	? USAGE_LIMIT_ERROR_PREFIXES
+	: [];
+
+function coerceMessageText(value: unknown): string {
+	if (typeof value === "string") return value;
+	if (value instanceof Error) return value.message;
+	try { return JSON.stringify(value ?? ""); }
+	catch { return String(value); }
+}
+
+/** Broad test: any "a usage limit was genuinely reached" message, matched
+ *  against the CLI's own copy (SDK `USAGE_LIMIT_ERROR_PREFIXES`, e.g. "You've
+ *  hit your weekly limit…"). Substring rather than prefix match because the
+ *  text usually arrives embedded in a result payload's errors array. */
+export function isUsageLimitMessage(value: unknown): boolean {
+	const text = coerceMessageText(value);
+	return USAGE_LIMIT_PREFIXES.some((prefix) => text.includes(prefix));
 }
 
 export function uniqueNonEmptyLines(values: unknown[]): string[] {
@@ -24,9 +37,27 @@ export function uniqueNonEmptyLines(values: unknown[]): string[] {
 	return out;
 }
 
+/** Epoch milliseconds from an SDK reset timestamp, or undefined.
+ *  `SDKRateLimitInfo.resetsAt` is a bare number in epoch SECONDS (measured:
+ *  treating it as ms rendered "resets Jan 21, 1970" for a Jul 2026 reset).
+ *  The unit is undocumented, so detect by magnitude — epoch seconds stay below
+ *  1e12 until the year 33658, epoch ms passed 1e12 in 2001. A numeric STRING
+ *  gets the same magnitude treatment (rate_limit_event payloads have carried
+ *  both), and anything else falls back to Date.parse for ISO strings. */
+export function resetTimestampMs(value: unknown): number | undefined {
+	if (typeof value === "number" && Number.isFinite(value)) {
+		return Math.abs(value) < 1e12 ? value * 1000 : value;
+	}
+	if (typeof value !== "string" || !value.trim()) return undefined;
+	const numeric = Number(value);
+	if (Number.isFinite(numeric)) return Math.abs(numeric) < 1e12 ? numeric * 1000 : numeric;
+	const parsed = Date.parse(value);
+	return Number.isFinite(parsed) ? parsed : undefined;
+}
+
 export function formatResetTimestamp(value: unknown): string {
-	const parsed = typeof value === "number" ? value : typeof value === "string" ? Date.parse(value) : Number.NaN;
-	if (!Number.isFinite(parsed)) return "unknown";
+	const parsed = resetTimestampMs(value);
+	if (parsed === undefined) return "unknown";
 	return new Date(parsed).toLocaleString(undefined, {
 		day: "numeric",
 		hour: "numeric",
@@ -44,8 +75,12 @@ export function normalizeRateLimitUtilization(value: unknown): number | undefine
 	if (typeof value !== "number" || !Number.isFinite(value) || value < 0) return undefined;
 	if (value === 0) return 0;
 	// Claude SDK payloads have appeared as both fractions and percentages.
-	// Exact 1 is unit-ambiguous (1% vs 100%), so do not use it for allowed-warning copy.
-	if (value > 0 && value < 1) return value * 100;
+	// Exact 1 is unit-ambiguous (1% vs 100%); read it as the fractional form
+	// (100%) because that is the fail-closed direction — under the fraction
+	// convention 1 is the fully-consumed case the warning exists to surface,
+	// while under the percent convention 1% sits below the threshold anyway,
+	// so nothing is lost by warning (VST-16).
+	if (value > 0 && value <= 1) return value * 100;
 	if (value > 1 && value <= 100) return value;
 	return undefined;
 }

package/src/request-lane.ts

@@ -0,0 +1,36 @@
+import { AsyncLocalStorage } from "node:async_hooks";
+
+/**
+ * Selects the Pi agent session whose provider request is currently executing.
+ *
+ * Pi forwards a stable `SimpleStreamOptions.sessionId` on every model request,
+ * including tool-result continuations.  The bridge may serve the parent agent
+ * and several in-process subagents concurrently, so process-global query state
+ * cannot identify the request that a callback belongs to.  AsyncLocalStorage
+ * keeps that identity attached to every promise, SDK iterator, and timer born
+ * during the provider call without threading the id through every helper.
+ */
+const REQUEST_LANE_SYMBOL = Symbol.for("vstack.pi.claude-bridge.request-lane.v1");
+
+function requestLaneStorage(): AsyncLocalStorage<string> {
+	const host = globalThis as Record<symbol, unknown>;
+	let storage = host[REQUEST_LANE_SYMBOL] as AsyncLocalStorage<string> | undefined;
+	if (!storage) {
+		storage = new AsyncLocalStorage<string>();
+		host[REQUEST_LANE_SYMBOL] = storage;
+	}
+	return storage;
+}
+
+/** Run `callback` in the lane for `sessionId`. `undefined` selects the default
+ *  (direct-host) lane even when a named lane is active — a listener that fires
+ *  inside another request's context must not inherit that request's lane. */
+export function runInRequestLane<T>(sessionId: string | undefined, callback: () => T): T {
+	const storage = requestLaneStorage();
+	if (sessionId !== undefined) return storage.run(sessionId, callback);
+	return storage.getStore() === undefined ? callback() : storage.exit(callback);
+}
+
+export function currentRequestLaneId(): string | undefined {
+	return requestLaneStorage().getStore();
+}

package/src/sdk-query.ts

@@ -0,0 +1,16 @@
+// Shared mutable SDK query factory + its test seam. In its own module so both
+// the provider entry (index.ts) and the account host spawn children through
+// the same seam — tests swap the factory once and every spawn path honors it.
+
+import { query } from "@anthropic-ai/claude-agent-sdk";
+
+export type SdkQueryFactory = typeof query;
+
+// ESM live binding: importers read the CURRENT factory at call time.
+export let sdkQueryFactory: SdkQueryFactory = query;
+
+/** Test seam for exercising the real bridge retry/session orchestration without
+ *  spending Claude usage. Production never calls this. */
+export function __testSetSdkQueryFactory(factory?: SdkQueryFactory): void {
+	sdkQueryFactory = factory ?? query;
+}