@openrig/cli 0.6.11 → 0.6.13

package/daemon/dist/domain/provider/codex-auth-reader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-auth-reader.d.ts","sourceRoot":"","sources":["../../../src/domain/provider/codex-auth-reader.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,wFAAwF;IACxF,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,qEAAqE;IACrE,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,EAAE,YAAY,EAAE,CAAC;CACvB;AAgDD;0EAC0E;AAC1E,wBAAgB,qBAAqB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,iBAAiB,CAM7F"}
+{"version":3,"file":"codex-auth-reader.d.ts","sourceRoot":"","sources":["../../../src/domain/provider/codex-auth-reader.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,wFAAwF;IACxF,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,mHAAmH;AACnH,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,QAAQ,GAAG,MAAM,GAAG,YAAY,CAAC;IACzC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,4DAA4D;IAC5D,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,iBAAiB;IAChC,qEAAqE;IACrE,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,iGAAiG;IACjG,QAAQ,CAAC,EAAE,qBAAqB,CAAC;IACjC,yGAAyG;IACzG,YAAY,CAAC,EAAE;QAAE,MAAM,EAAE,QAAQ,GAAG,MAAM,GAAG,YAAY,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC5E;AAqED;0EAC0E;AAC1E,wBAAgB,qBAAqB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,iBAAiB,CAU7F"}

package/daemon/dist/domain/provider/codex-auth-reader.js

@@ -6,27 +6,46 @@
 // token-class material (BR-6: no secret ever surfaces).
 import fs from "node:fs";
 import path from "node:path";
+import { userInfo } from "node:os";
 const SEAT_COLUMN_COUNT = 6;
+/** The account's home from the OS account database. Unlike os.homedir() this does not echo an
+ *  empty $HOME back, so a HOME="" process still lands under the real home. Empty string when the
+ *  OS reports no home at all: resolution then keeps the historical cwd-relative ".codex" rather
+ *  than erroring. Mirrors the CLI's resolveCodexHome fallback (the daemon cannot import the CLI). */
+function accountHome() {
+    try {
+        return userInfo().homedir ?? "";
+    }
+    catch {
+        return "";
+    }
+}
 function resolveCodexHome(env) {
+    const home = typeof env.HOME === "string" && env.HOME.length > 0 ? env.HOME : accountHome();
     const codexHome = typeof env.CODEX_HOME === "string" && env.CODEX_HOME.length > 0
         ? env.CODEX_HOME
-        : path.join(env.HOME ?? "", ".codex");
+        : path.join(home, ".codex");
     return {
         profileDir: path.join(codexHome, "auth-profiles"),
         registryPath: path.join(codexHome, "auth-seat-registry.tsv"),
     };
 }
-// Profile NAMES only — the *.json file contents (token-class) are never opened.
+// Profile NAMES only — the *.json file contents (token-class) are never opened. Mirrors readSeats: a missing
+// folder means none saved; any other error is unreadable (the code only), with `profiles` still [].
 function listProfiles(profileDir) {
     try {
-        return fs
+        const profiles = fs
             .readdirSync(profileDir)
             .filter((n) => n.endsWith(".json"))
             .map((n) => n.slice(0, -".json".length))
             .sort();
+        return { profiles, profilesRead: { status: "read" } };
     }
-    catch {
-        return [];
+    catch (error) {
+        const code = error.code;
+        return code === "ENOENT"
+            ? { profiles: [], profilesRead: { status: "absent" } }
+            : { profiles: [], profilesRead: { status: "unreadable", code: code ?? "unknown" } };
     }
 }
 function readSeats(registryPath) {
@@ -34,31 +53,41 @@ function readSeats(registryPath) {
     try {
         raw = fs.readFileSync(registryPath, "utf8");
     }
-    catch {
-        return [];
+    catch (error) {
+        const code = error.code;
+        return code === "ENOENT"
+            ? { seats: [], registry: { status: "absent", malformedRows: 0 } }
+            : { seats: [], registry: { status: "unreadable", code: code ?? "unknown", malformedRows: 0 } };
     }
     const rows = [];
+    let malformedRows = 0;
     for (const line of raw.split("\n")) {
         if (line.length === 0)
             continue;
         const cols = line.split("\t");
-        if (cols.length !== SEAT_COLUMN_COUNT)
-            continue; // skip malformed rows — never fabricate fields
+        if (cols.length !== SEAT_COLUMN_COUNT) { // skip malformed rows — never fabricate fields
+            malformedRows += 1;
+            continue;
+        }
         // Length is exactly 6 above, so the tuple destructure is total (satisfies noUncheckedIndexedAccess).
         const [seat, rig, runtime, cwd, authProfile, updatedTs] = cols;
         if (seat === "seat")
             continue; // the header row
         rows.push({ seat, rig, runtime, cwd, authProfile, updatedTs });
     }
-    return rows;
+    return { seats: rows, registry: { status: "read", malformedRows } };
 }
 /** Read the codex-auth on-disk METADATA (profile names + seat registry). Never throws; never
  *  surfaces token-class content. Absent home/files yield empty arrays. */
 export function readCodexAuthMetadata(env = process.env) {
     const { profileDir, registryPath } = resolveCodexHome(env);
+    const { seats, registry } = readSeats(registryPath);
+    const { profiles, profilesRead } = listProfiles(profileDir);
     return {
-        profiles: listProfiles(profileDir),
-        seats: readSeats(registryPath),
+        profiles,
+        seats,
+        registry,
+        profilesRead,
     };
 }
 //# sourceMappingURL=codex-auth-reader.js.map

package/daemon/dist/domain/provider/codex-auth-reader.js.map

@@ -1 +1 @@
-{"version":3,"file":"codex-auth-reader.js","sourceRoot":"","sources":["../../../src/domain/provider/codex-auth-reader.ts"],"names":[],"mappings":"AAAA,gGAAgG;AAChG,gGAAgG;AAChG,yFAAyF;AACzF,iGAAiG;AACjG,mGAAmG;AACnG,wDAAwD;AAExD,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAkB7B,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAE5B,SAAS,gBAAgB,CAAC,GAAsB;IAC9C,MAAM,SAAS,GACb,OAAO,GAAG,CAAC,UAAU,KAAK,QAAQ,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;QAC7D,CAAC,CAAC,GAAG,CAAC,UAAU;QAChB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC;IAC1C,OAAO;QACL,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC;QACjD,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,wBAAwB,CAAC;KAC7D,CAAC;AACJ,CAAC;AAED,gFAAgF;AAChF,SAAS,YAAY,CAAC,UAAkB;IACtC,IAAI,CAAC;QACH,OAAO,EAAE;aACN,WAAW,CAAC,UAAU,CAAC;aACvB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;aAClC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;aACvC,IAAI,EAAE,CAAC;IACZ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAAC,YAAoB;IACrC,IAAI,GAAW,CAAC;IAChB,IAAI,CAAC;QACH,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IAC9C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,IAAI,GAAmB,EAAE,CAAC;IAChC,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACnC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAChC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,IAAI,CAAC,MAAM,KAAK,iBAAiB;YAAE,SAAS,CAAC,+CAA+C;QAChG,qGAAqG;QACrG,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,SAAS,CAAC,GAAG,IAAwD,CAAC;QACnH,IAAI,IAAI,KAAK,MAAM;YAAE,SAAS,CAAC,iBAAiB;QAChD,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC;IACjE,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;0EAC0E;AAC1E,MAAM,UAAU,qBAAqB,CAAC,MAAyB,OAAO,CAAC,GAAG;IACxE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAC3D,OAAO;QACL,QAAQ,EAAE,YAAY,CAAC,UAAU,CAAC;QAClC,KAAK,EAAE,SAAS,CAAC,YAAY,CAAC;KAC/B,CAAC;AACJ,CAAC"}
+{"version":3,"file":"codex-auth-reader.js","sourceRoot":"","sources":["../../../src/domain/provider/codex-auth-reader.ts"],"names":[],"mappings":"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"}

package/daemon/dist/domain/provider/codex-usage-reader.d.ts

@@ -1,4 +1,7 @@
-export type CodexUsageFailureReason = "binary_not_found" | "spawn_failed" | "rpc_error" | "unrecognized_shape" | "timeout" | "child_exited" | "output_too_large";
+export type CodexUsageFailureReason = "binary_not_found"
+/** `account/read` reported no signed-in account and `account/rateLimits/read` then failed: a classification of
+ *  answers already received, not another read. */
+ | "not_signed_in" | "spawn_failed" | "rpc_error" | "unrecognized_shape" | "timeout" | "child_exited" | "output_too_large";
 /** The two raw answers, as the app-server sent them. Normalizing is the windows module's job. */
 export type CodexUsageReadOutcome = {
     ok: true;
@@ -27,5 +30,7 @@ export interface CodexUsageReaderOptions {
 export declare const CODEX_USAGE_READER_ARGS: string[];
 /** Native reads take 25–35 s (Ops' readers); the refresh is bounded by the upper end. */
 export declare const CODEX_USAGE_READ_DEADLINE_MS = 35000;
+/** How long the reader's process group gets at each stop step (and for the reap) once the read ends. */
+export declare const CODEX_USAGE_READ_GRACE_MS = 2000;
 export declare function codexUsageReader(options?: CodexUsageReaderOptions): CodexUsageReader;
 //# sourceMappingURL=codex-usage-reader.d.ts.map

package/daemon/dist/domain/provider/codex-usage-reader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-usage-reader.d.ts","sourceRoot":"","sources":["../../../src/domain/provider/codex-usage-reader.ts"],"names":[],"mappings":"AAcA,MAAM,MAAM,uBAAuB,GAC/B,kBAAkB,GAClB,cAAc,GACd,WAAW,GACX,oBAAoB,GACpB,SAAS,GACT,cAAc,GACd,kBAAkB,CAAC;AAEvB,iGAAiG;AACjG,MAAM,MAAM,qBAAqB,GAC7B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAE,GACvE;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,uBAAuB,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/E,MAAM,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,qBAAqB,CAAC,CAAC;AAEpE,MAAM,WAAW,uBAAuB;IACtC,yDAAyD;IACzD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oGAAoG;IACpG,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAED,6GAA6G;AAC7G,eAAO,MAAM,uBAAuB,UAA8E,CAAC;AAEnH,yFAAyF;AACzF,eAAO,MAAM,4BAA4B,QAAS,CAAC;AAMnD,wBAAgB,gBAAgB,CAAC,OAAO,GAAE,uBAA4B,GAAG,gBAAgB,CAwBxF"}
+{"version":3,"file":"codex-usage-reader.d.ts","sourceRoot":"","sources":["../../../src/domain/provider/codex-usage-reader.ts"],"names":[],"mappings":"AAcA,MAAM,MAAM,uBAAuB,GAC/B,kBAAkB;AACpB;kDACkD;GAChD,eAAe,GACf,cAAc,GACd,WAAW,GACX,oBAAoB,GACpB,SAAS,GACT,cAAc,GACd,kBAAkB,CAAC;AAEvB,iGAAiG;AACjG,MAAM,MAAM,qBAAqB,GAC7B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAE,GACvE;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,uBAAuB,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/E,MAAM,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,qBAAqB,CAAC,CAAC;AAEpE,MAAM,WAAW,uBAAuB;IACtC,yDAAyD;IACzD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oGAAoG;IACpG,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAED,6GAA6G;AAC7G,eAAO,MAAM,uBAAuB,UAA8E,CAAC;AAEnH,yFAAyF;AACzF,eAAO,MAAM,4BAA4B,QAAS,CAAC;AACnD,wGAAwG;AACxG,eAAO,MAAM,yBAAyB,OAAQ,CAAC;AAM/C,wBAAgB,gBAAgB,CAAC,OAAO,GAAE,uBAA4B,GAAG,gBAAgB,CAwBxF"}

package/daemon/dist/domain/provider/codex-usage-reader.js

@@ -14,11 +14,13 @@ import { stopGroup } from "../codex-network-default.js";
 export const CODEX_USAGE_READER_ARGS = ["-c", "features.plugins=false", "-c", "features.apps=false", "app-server"];
 /** Native reads take 25–35 s (Ops' readers); the refresh is bounded by the upper end. */
 export const CODEX_USAGE_READ_DEADLINE_MS = 35_000;
+/** How long the reader's process group gets at each stop step (and for the reap) once the read ends. */
+export const CODEX_USAGE_READ_GRACE_MS = 2_000;
 const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 const firstLine = (error) => String(error instanceof Error ? error.message : error).split("\n")[0];
 export function codexUsageReader(options = {}) {
     const deadlineMs = options.deadlineMs ?? CODEX_USAGE_READ_DEADLINE_MS;
-    const graceMs = options.graceMs ?? 2_000;
+    const graceMs = options.graceMs ?? CODEX_USAGE_READ_GRACE_MS;
     const maxOutputBytes = options.maxOutputBytes ?? 1024 * 1024;
     const now = options.now ?? (() => new Date().toISOString());
     return async () => {
@@ -94,6 +96,9 @@ function converse(child, deadlineMs, maxOutputBytes, now) {
                 if (message.error !== undefined) {
                     const method = message.id === 1 ? "initialize" : message.id === 2 ? "account/read" : "account/rateLimits/read";
                     const text = isRecord(message.error) && typeof message.error.message === "string" ? `: ${message.error.message.split("\n")[0]}` : "";
+                    if (message.id === 3 && isRecord(account) && account.account === null && account.requiresOpenaiAuth === true) {
+                        return fail("not_signed_in", `codex app-server's account/read reported no signed-in account; account/rateLimits/read then failed${text}`);
+                    }
                     return fail("rpc_error", `codex app-server returned an error for ${method}${text}`);
                 }
                 if (message.id === 1) {

package/daemon/dist/domain/provider/codex-usage-reader.js.map

@@ -1 +1 @@
-{"version":3,"file":"codex-usage-reader.js","sourceRoot":"","sources":["../../../src/domain/provider/codex-usage-reader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"codex-usage-reader.js","sourceRoot":"","sources":["../../../src/domain/provider/codex-usage-reader.ts"],"names":[],"mappings":"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"}

package/daemon/dist/domain/provider/codex-usage-windows.d.ts

@@ -1,21 +1,8 @@
 import type { CodexUsageReader } from "./codex-usage-reader.js";
-import type { ProviderUsageAllowance, UsageAllowanceIdentity, UsageRefreshOutcome, UsageWindowRow } from "./provider-types.js";
-/** A reading is too old to claim current capacity after this (Ops' openrig.subscription-usage.v1 rule). */
-export declare const USAGE_FRESH_FOR_MS: number;
-/** An observation up to this far in the future is clock skew within tolerance (same rule). */
-export declare const USAGE_CLOCK_TOLERANCE_MS = 60000;
-interface ReadWindow {
-    window: "primary" | "secondary";
-    durationMins: number | null;
-    usedPercent: number | null;
-    resetsAt: string | null;
-}
-interface Reading {
-    identity: UsageAllowanceIdentity;
-    windows: ReadWindow[];
-    limitEvidence: string | null;
-    observedAt: string;
-}
+import type { UsageAllowanceIdentity } from "./provider-types.js";
+import { UsageWindows, type UsageReading, type UsageReadingStore } from "./usage-windows.js";
+export { UNRESOLVED_READS_KEPT, USAGE_CLOCK_TOLERANCE_MS, USAGE_FRESH_FOR_MS, usageFreshness, usageLevel, type UsageRefreshResult, } from "./usage-windows.js";
+type Reading = UsageReading<UsageAllowanceIdentity>;
 /**
  * The workspace `account/read` reports, when it reports one: `workspaceRouting.chatgptAccountId` at the top
  * level of the result (a sibling of `account`). Path and types from Codex 0.162.1's generated schema
@@ -37,42 +24,18 @@ export declare function normalizeCodexUsage(account: unknown, rateLimits: unknow
     ok: false;
     detail: string;
 };
-/** Freshness is aged from the window's own observation, never from the time of the request. */
-export declare function usageFreshness(observedAt: string, now: string, failedAfter: {
-    at: string;
-} | null): Pick<UsageWindowRow, "freshness" | "freshnessReason">;
-/** Level of one window as of its observation. Absent data is never nearing or exhausted. */
-export declare function usageLevel(window: ReadWindow, limitEvidence: string | null, now: string): Pick<UsageWindowRow, "level" | "levelReason">;
-/** Unresolved observations can't be matched to earlier ones, so each read adds its own rows. Keep those
- *  from the most recent few reads: enough to compare the latest with the two before it, and bounded
- *  because nothing else ever removes them. */
-export declare const UNRESOLVED_READS_KEPT = 3;
+/** The replacement key of a resolved identity. Email is never part of it; an unresolved identity has none. */
+export declare const codexUsageIdentityKey: (i: UsageAllowanceIdentity) => string | null;
 export interface CodexUsageWindowsDeps {
     read: CodexUsageReader;
     now?: () => string;
+    /** Durable readings (slice 01): absent, a restart starts empty. */
+    store?: UsageReadingStore<UsageAllowanceIdentity>;
 }
-export interface UsageRefreshResult {
-    refresh: UsageRefreshOutcome & {
-        coalesced: boolean;
-    };
-}
-export declare class CodexUsageWindows {
-    private readonly deps;
-    private readonly now;
-    private readonly startedAt;
-    private readonly readings;
-    /** Unresolved observations, grouped by read, newest last; at most UNRESOLVED_READS_KEPT reads. */
-    private unresolved;
-    private unresolvedDropped;
-    private lastRefresh;
-    private inflight;
+export declare class CodexUsageWindows extends UsageWindows<UsageAllowanceIdentity, {
+    account: unknown;
+    rateLimits: unknown;
+}> {
     constructor(deps: CodexUsageWindowsDeps);
-    /** One bounded read. A refresh asked for while one runs joins it; one asked for after it ends reads again. */
-    refresh(): Promise<UsageRefreshResult>;
-    private runRead;
-    private recordFailure;
-    /** The served rows. Reads memory only: it never starts a native read. */
-    project(now: string): ProviderUsageAllowance[];
 }
-export {};
 //# sourceMappingURL=codex-usage-windows.d.ts.map

package/daemon/dist/domain/provider/codex-usage-windows.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-usage-windows.d.ts","sourceRoot":"","sources":["../../../src/domain/provider/codex-usage-windows.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAA2B,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AACzF,OAAO,KAAK,EACV,sBAAsB,EACtB,sBAAsB,EACtB,mBAAmB,EACnB,cAAc,EACf,MAAM,qBAAqB,CAAC;AAE7B,2GAA2G;AAC3G,eAAO,MAAM,kBAAkB,QAAc,CAAC;AAC9C,8FAA8F;AAC9F,eAAO,MAAM,wBAAwB,QAAS,CAAC;AAE/C,UAAU,UAAU;IAClB,MAAM,EAAE,SAAS,GAAG,WAAW,CAAC;IAChC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,UAAU,OAAO;IACf,QAAQ,EAAE,sBAAsB,CAAC;IACjC,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;CACpB;AAkBD;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAGtE;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,GAC3F;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,EAAE,OAAO,EAAE,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAwClE;AAED,+FAA+F;AAC/F,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,GAChG,IAAI,CAAC,cAAc,EAAE,WAAW,GAAG,iBAAiB,CAAC,CActD;AAED,4FAA4F;AAC5F,wBAAgB,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,EAAE,MAAM,GACtF,IAAI,CAAC,cAAc,EAAE,OAAO,GAAG,aAAa,CAAC,CAW9C;AAQD;;8CAE8C;AAC9C,eAAO,MAAM,qBAAqB,IAAI,CAAC;AAEvC,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,gBAAgB,CAAC;IACvB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,mBAAmB,GAAG;QAAE,SAAS,EAAE,OAAO,CAAA;KAAE,CAAC;CACvD;AAED,qBAAa,iBAAiB;IAUhB,OAAO,CAAC,QAAQ,CAAC,IAAI;IATjC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoD;IAC7E,kGAAkG;IAClG,OAAO,CAAC,UAAU,CAAmD;IACrE,OAAO,CAAC,iBAAiB,CAAK;IAC9B,OAAO,CAAC,WAAW,CAAoC;IACvD,OAAO,CAAC,QAAQ,CAA6C;gBAEhC,IAAI,EAAE,qBAAqB;IAKxD,8GAA8G;IACxG,OAAO,IAAI,OAAO,CAAC,kBAAkB,CAAC;YAW9B,OAAO;IA4BrB,OAAO,CAAC,aAAa;IAKrB,yEAAyE;IACzE,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,EAAE;CA2D/C"}
+{"version":3,"file":"codex-usage-windows.d.ts","sourceRoot":"","sources":["../../../src/domain/provider/codex-usage-windows.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAwB,KAAK,YAAY,EAAE,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEnH,OAAO,EACL,qBAAqB,EACrB,wBAAwB,EACxB,kBAAkB,EAClB,cAAc,EACd,UAAU,EACV,KAAK,kBAAkB,GACxB,MAAM,oBAAoB,CAAC;AAG5B,KAAK,OAAO,GAAG,YAAY,CAAC,sBAAsB,CAAC,CAAC;AAkBpD;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAGtE;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,GAC3F;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,EAAE,OAAO,EAAE,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAwClE;AAED,8GAA8G;AAC9G,eAAO,MAAM,qBAAqB,GAAI,GAAG,sBAAsB,KAAG,MAAM,GAAG,IAG/D,CAAC;AAEb,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,gBAAgB,CAAC;IACvB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,mEAAmE;IACnE,KAAK,CAAC,EAAE,iBAAiB,CAAC,sBAAsB,CAAC,CAAC;CACnD;AAED,qBAAa,iBAAkB,SAAQ,YAAY,CAAC,sBAAsB,EAAE;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAE,CAAC;gBACxG,IAAI,EAAE,qBAAqB;CAWxC"}

package/daemon/dist/domain/provider/codex-usage-windows.js

@@ -1,13 +1,8 @@
-// Slice 01 (OPR.0.7.0.1) — Codex usage windows for the provider view. Holds the last reading of
-// this daemon's Codex login in memory, refreshes it only on request (one bounded read; matching
-// overlapping requests share it), and projects rows keyed by allowance identity with freshness
-// kept separate from level. A failed refresh never replaces a reading: the reading stays, with its
-// own time, marked old beside the failure. A daemon restart starts empty.
-import { NEARING_THRESHOLD_PERCENT } from "./host-usage-rollup.js";
-/** A reading is too old to claim current capacity after this (Ops' openrig.subscription-usage.v1 rule). */
-export const USAGE_FRESH_FOR_MS = 15 * 60_000;
-/** An observation up to this far in the future is clock skew within tolerance (same rule). */
-export const USAGE_CLOCK_TOLERANCE_MS = 60_000;
+// Slice 01 (OPR.0.7.0.1) — Codex usage windows for the provider view: the Codex normalizer and
+// identity rule over the shared usage-windows core (usage-windows.ts), which holds the last reading in
+// memory, refreshes only on request (coalesced) and projects rows.
+import { UsageWindows } from "./usage-windows.js";
+export { UNRESOLVED_READS_KEPT, USAGE_CLOCK_TOLERANCE_MS, USAGE_FRESH_FOR_MS, usageFreshness, usageLevel, } from "./usage-windows.js";
 const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 const stringOrNull = (value) => (typeof value === "string" && value.length > 0 ? value : null);
 function readWindow(window, raw) {
@@ -87,173 +82,21 @@ export function normalizeCodexUsage(account, rateLimits, observedAt) {
     }
     return { ok: true, readings };
 }
-/** Freshness is aged from the window's own observation, never from the time of the request. */
-export function usageFreshness(observedAt, now, failedAfter) {
-    const observedMs = Date.parse(observedAt);
-    const nowMs = Date.parse(now);
-    if (!Number.isFinite(observedMs) || !Number.isFinite(nowMs)) {
-        return { freshness: "unavailable", freshnessReason: "observation time unreadable" };
-    }
-    if (observedMs - nowMs > USAGE_CLOCK_TOLERANCE_MS) {
-        return { freshness: "unavailable", freshnessReason: "observed in the future beyond the 60 s clock tolerance" };
-    }
-    if (failedAfter)
-        return { freshness: "stale", freshnessReason: `refresh failed at ${failedAfter.at}; this reading is older` };
-    if (nowMs - observedMs > USAGE_FRESH_FOR_MS) {
-        return { freshness: "stale", freshnessReason: `observed ${Math.round((nowMs - observedMs) / 60_000)} min ago (fresh for 15 min)` };
-    }
-    return { freshness: "fresh" };
-}
-/** Level of one window as of its observation. Absent data is never nearing or exhausted. */
-export function usageLevel(window, limitEvidence, now) {
-    if (window.usedPercent === null)
-        return { level: "unknown", levelReason: "no usage reported for this window" };
-    const resetMs = window.resetsAt === null ? NaN : Date.parse(window.resetsAt);
-    const nowMs = Date.parse(now);
-    if (Number.isFinite(resetMs) && Number.isFinite(nowMs) && nowMs >= resetMs) {
-        return { level: "unknown", levelReason: `reset passed at ${window.resetsAt}; a new reading is needed` };
-    }
-    if (window.usedPercent >= 100)
-        return { level: "exhausted", levelReason: "at the limit" };
-    if (limitEvidence !== null)
-        return { level: "exhausted", levelReason: `provider limit evidence: ${limitEvidence}` };
-    if (window.usedPercent >= NEARING_THRESHOLD_PERCENT)
-        return { level: "nearing", levelReason: `${NEARING_THRESHOLD_PERCENT}% or more used` };
-    return { level: "ok" };
-}
 /** The replacement key of a resolved identity. Email is never part of it; an unresolved identity has none. */
-const identityKey = (i) => i.accountId !== null ? `codex:account:${i.accountId}:${i.limitId}`
+export const codexUsageIdentityKey = (i) => i.accountId !== null ? `codex:account:${i.accountId}:${i.limitId}`
     : i.workspaceId !== null ? `codex:workspace:${i.workspaceId}:${i.limitId}`
         : null;
-/** Unresolved observations can't be matched to earlier ones, so each read adds its own rows. Keep those
- *  from the most recent few reads: enough to compare the latest with the two before it, and bounded
- *  because nothing else ever removes them. */
-export const UNRESOLVED_READS_KEPT = 3;
-export class CodexUsageWindows {
-    deps;
-    now;
-    startedAt;
-    readings = new Map();
-    /** Unresolved observations, grouped by read, newest last; at most UNRESOLVED_READS_KEPT reads. */
-    unresolved = [];
-    unresolvedDropped = 0;
-    lastRefresh = null;
-    inflight = null;
+export class CodexUsageWindows extends UsageWindows {
     constructor(deps) {
-        this.deps = deps;
-        this.now = deps.now ?? (() => new Date().toISOString());
-        this.startedAt = this.now();
-    }
-    /** One bounded read. A refresh asked for while one runs joins it; one asked for after it ends reads again. */
-    async refresh() {
-        if (this.inflight)
-            return { refresh: { ...(await this.inflight), coalesced: true } };
-        const run = this.runRead();
-        this.inflight = run;
-        try {
-            return { refresh: { ...(await run), coalesced: false } };
-        }
-        finally {
-            if (this.inflight === run)
-                this.inflight = null;
-        }
-    }
-    async runRead() {
-        let outcome;
-        try {
-            outcome = await this.deps.read();
-        }
-        catch (error) {
-            outcome = { ok: false, at: this.now(), reason: "spawn_failed", detail: `the reader failed: ${error instanceof Error ? error.message : String(error)}` };
-        }
-        if (!outcome.ok)
-            return this.recordFailure(outcome.at, outcome.reason, outcome.detail);
-        const normalized = normalizeCodexUsage(outcome.account, outcome.rateLimits, outcome.observedAt);
-        if (!normalized.ok)
-            return this.recordFailure(outcome.observedAt, "unrecognized_shape", normalized.detail);
-        for (const reading of [...this.readings.values(), ...this.unresolved.flat()])
-            reading.latest = false;
-        const unresolvedNow = [];
-        for (const reading of normalized.readings) {
-            const key = identityKey(reading.identity);
-            if (key === null)
-                unresolvedNow.push({ ...reading, latest: true });
-            else
-                this.readings.set(key, { ...reading, latest: true });
-        }
-        if (unresolvedNow.length > 0) {
-            this.unresolved.push(unresolvedNow);
-            while (this.unresolved.length > UNRESOLVED_READS_KEPT) {
-                this.unresolved.shift();
-                this.unresolvedDropped += 1;
-            }
-        }
-        this.lastRefresh = { at: outcome.observedAt, outcome: "ok" };
-        return this.lastRefresh;
-    }
-    recordFailure(at, reason, detail) {
-        this.lastRefresh = { at, outcome: "failed", reason, detail };
-        return this.lastRefresh;
-    }
-    /** The served rows. Reads memory only: it never starts a native read. */
-    project(now) {
-        const source = { kind: "codex_app_server", host: "local" };
-        const failure = this.lastRefresh?.outcome === "failed" ? this.lastRefresh : null;
-        if (this.readings.size === 0 && this.unresolved.length === 0) {
-            return [{
-                    provider: "codex",
-                    identity: null,
-                    source,
-                    observedAt: null,
-                    seats: "unknown",
-                    windows: [],
-                    limitEvidence: null,
-                    latestFromSource: false,
-                    lastRefresh: this.lastRefresh,
-                    currentAvailability: "unknown",
-                    unavailableReason: failure
-                        ? `refresh failed at ${failure.at}: ${failure.reason}; no earlier reading since the daemon started at ${this.startedAt}`
-                        : `no reading since the daemon started at ${this.startedAt}; refresh with rig provider status --refresh`,
-                }];
-        }
-        const rows = [];
-        const resolved = [...this.readings.entries()].sort(([a], [b]) => a.localeCompare(b)).map(([, reading]) => reading);
-        const unresolvedRows = this.unresolved.flat();
-        for (const reading of [...resolved, ...unresolvedRows]) {
-            const failedAfter = failure && Date.parse(failure.at) >= Date.parse(reading.observedAt) ? failure : null;
-            const windows = reading.windows.map((w) => ({
-                window: w.window,
-                durationMins: w.durationMins,
-                usedPercent: w.usedPercent,
-                remainingPercent: w.usedPercent === null ? null : Math.max(0, 100 - w.usedPercent),
-                resetsAt: w.resetsAt,
-                observedAt: reading.observedAt,
-                ...usageLevel(w, reading.limitEvidence, now),
-                ...usageFreshness(reading.observedAt, now, failedAfter),
-            }));
-            const known = reading.latest && failedAfter === null && windows.length > 0
-                && windows.every((w) => w.freshness === "fresh" && w.level !== "unknown");
-            rows.push({
-                provider: "codex",
-                identity: reading.identity,
-                source,
-                observedAt: reading.observedAt,
-                seats: "unknown",
-                windows,
-                limitEvidence: reading.limitEvidence,
-                latestFromSource: reading.latest,
-                lastRefresh: this.lastRefresh,
-                currentAvailability: known ? "known" : "unknown",
-                ...(reading.identity.source === "unresolved" ? {
-                    unresolved: {
-                        note: "identity unresolved: not matched to, merged with or replacing any other row",
-                        keptReads: UNRESOLVED_READS_KEPT,
-                        droppedReads: this.unresolvedDropped,
-                    },
-                } : {}),
-            });
-        }
-        return rows;
+        super({
+            provider: "codex",
+            sourceKind: "codex_app_server",
+            read: deps.read,
+            normalize: (answer) => normalizeCodexUsage(answer.account, answer.rateLimits, answer.observedAt),
+            key: codexUsageIdentityKey,
+            ...(deps.now ? { now: deps.now } : {}),
+            ...(deps.store ? { store: deps.store } : {}),
+        });
     }
 }
 //# sourceMappingURL=codex-usage-windows.js.map

package/daemon/dist/domain/provider/codex-usage-windows.js.map

@@ -1 +1 @@
-{"version":3,"file":"codex-usage-windows.js","sourceRoot":"","sources":["../../../src/domain/provider/codex-usage-windows.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"codex-usage-windows.js","sourceRoot":"","sources":["../../../src/domain/provider/codex-usage-windows.ts"],"names":[],"mappings":"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"}

package/daemon/dist/domain/provider/provider-account-readings.d.ts

@@ -0,0 +1,42 @@
+import type Database from "better-sqlite3";
+import type { UsageAllowanceIdentity } from "./provider-types.js";
+import type { UsageReading } from "./usage-windows.js";
+/** Exhaustion episodes kept per allowance key. */
+export declare const EXHAUSTION_EPISODES_KEPT = 20;
+/** One exhaustion episode: a window observed exhausted under one reset (or, with no exhausted window, the provider's
+ *  limit evidence), however many refreshes saw it. `lastObservedAt` is its most recent observation. */
+export interface ExhaustionEpisode {
+    window: string | null;
+    resetsAt: string | null;
+    evidence: string;
+    lastObservedAt: string;
+}
+export declare class ProviderAccountReadingsStore {
+    private readonly db;
+    constructor(db: Database.Database);
+    /** Store one reading of `key`. Only the identity labels, the windows' four fields, the limit evidence and the
+     *  observation time are written. The same observation (time and values) isn't written twice; a newer observation
+     *  with equal values is. Then the key's rows are pruned (other keys are untouched). */
+    record(key: string, reading: UsageReading<UsageAllowanceIdentity>): void;
+    /** Keep the key's latest reading, its latest reading per window, and the latest reading of each of its newest
+     *  EXHAUSTION_EPISODES_KEPT episodes; delete its other readable rows. An unreadable row is left as it is. */
+    private prune;
+    /** The key's readable rows with their windows, newest observation first. */
+    private readable;
+    /** The key's latest readable stored reading, or null. */
+    latest(key: string): UsageReading<UsageAllowanceIdentity> | null;
+    /** Every stored key's latest readable reading, as the projection held it. Retention bounds each key's rows. */
+    latestAll(): Array<{
+        key: string;
+        reading: UsageReading<UsageAllowanceIdentity>;
+    }>;
+    /** The key's exhaustion episodes, newest first, each with its most recent observation. */
+    exhaustionEpisodes(key: string): ExhaustionEpisode[];
+    /** The key's most recent observed exhaustion, or null. */
+    lastExhaustion(key: string): {
+        at: string;
+        window: string | null;
+        evidence: string;
+    } | null;
+}
+//# sourceMappingURL=provider-account-readings.d.ts.map

package/daemon/dist/domain/provider/provider-account-readings.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider-account-readings.d.ts","sourceRoot":"","sources":["../../../src/domain/provider/provider-account-readings.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,KAAK,EAAE,YAAY,EAAmB,MAAM,oBAAoB,CAAC;AAExE,kDAAkD;AAClD,eAAO,MAAM,wBAAwB,KAAK,CAAC;AAE3C;uGACuG;AACvG,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;CACxB;AA2DD,qBAAa,4BAA4B;IAC3B,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,QAAQ,CAAC,QAAQ;IAElD;;2FAEuF;IACvF,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,CAAC,sBAAsB,CAAC,GAAG,IAAI;IAcxE;iHAC6G;IAC7G,OAAO,CAAC,KAAK;IAsBb,4EAA4E;IAC5E,OAAO,CAAC,QAAQ;IAKhB,yDAAyD;IACzD,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAC,sBAAsB,CAAC,GAAG,IAAI;IAKhE,+GAA+G;IAC/G,SAAS,IAAI,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,YAAY,CAAC,sBAAsB,CAAC,CAAA;KAAE,CAAC;IAKlF,0FAA0F;IAC1F,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,EAAE;IAUpD,0DAA0D;IAC1D,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;CAI5F"}