@ashlr/hub 3.13.0 → 3.14.0

package/dist/core/usage/frontier-usage.d.ts

@@ -26,7 +26,7 @@
  *  - No writes, no mutations, no child-process spawns.
  *  - Bounded: reads ledger + session files only; no git, no network.
  */
-import type { AshlrConfig, EngineId } from '../types.js';
+import type { ActivityRollup, AshlrConfig, EngineId } from '../types.js';
 /** The subscription-window state for a single engine. */
 export interface FrontierEngineWindowState {
     /** 'active' = within normal budget; 'near' = ≥80%; 'exhausted' = ≥configured max% */
@@ -79,7 +79,25 @@ export interface FrontierUsage {
  *  - ~/.config/codex/sessions/*.jsonl      (subscription rate-limits, synchronous)
  *  - ~/.claude/projects/{project}/*.jsonl + runs  (observability rollup, synchronous)
  */
-export declare function getFrontierUsage(cfg: AshlrConfig): Promise<FrontierUsage>;
+export declare function getFrontierUsage(cfg: AshlrConfig, opts?: FrontierUsageAsyncOptions): Promise<FrontierUsage>;
+export interface FrontierUsageAsyncOptions {
+    /**
+     * Computes the 1d rollup when the shared cache (observability/rollup.ts
+     * getCachedRollup) needs a refresh. A server passes its read-projection
+     * worker here (`reader.read('pulse', { window: '1d' })`) so the rollup's
+     * per-repo git reads never run on the request thread. Default:
+     * buildRollupAsync on the calling thread.
+     */
+    rollup?: () => Promise<ActivityRollup>;
+    /**
+     * False: never wait for the rollup — use whatever the shared cache holds
+     * (peekCachedRollup) and let `rollup`, when given, refresh it in the
+     * background; with no cached value the token/cost fields are omitted, as
+     * when the rollup is unreadable. For request paths polled by a UI (the
+     * Verse cockpit), which must never compute or wait on it. Default true.
+     */
+    waitForRollup?: boolean;
+}
 /**
  * Synchronous wrapper that returns a promise — allows buildSnapshot (which is
  * async) to await frontier usage without blocking the event loop for I/O.

package/dist/core/usage/frontier-usage.js

@@ -122,17 +122,7 @@ function readRollupTotals(engine, cfg) {
     try {
         // eslint-disable-next-line @typescript-eslint/no-require-imports -- lazy sync require avoids a load-time cycle
         const { buildRollup } = require('../observability/rollup.js');
-        const rollup = buildRollup('1d', cfg);
-        const prefix = engineToModelPrefix(engine).toLowerCase();
-        let tokensToday = 0;
-        let costToday = 0;
-        for (const m of rollup.byModel) {
-            if (m.model.toLowerCase().startsWith(prefix)) {
-                tokensToday += m.tokensIn + m.tokensOut;
-                costToday += m.estCostUsd;
-            }
-        }
-        return { tokensToday, costToday };
+        return totalsFor(engine, buildRollup('1d', cfg).byModel);
     }
     catch {
         return { tokensToday: 0, costToday: 0 };
@@ -143,18 +133,25 @@ function readRollupTotals(engine, cfg) {
 // ---------------------------------------------------------------------------
 /** Default throttle threshold — matches subscription-usage.ts DEFAULT_MAX_PERCENT. */
 const DEFAULT_MAX_PERCENT = 90;
-function buildEngineUsage(engine, cfg) {
+function syncSources(cfg) {
+    return {
+        quotaCalls: readQuotaCalls,
+        rollupTotals: (engine) => readRollupTotals(engine, cfg),
+        subscriptionWindow: (engine) => readSubscriptionWindow(engine, cfg),
+    };
+}
+function buildEngineUsage(engine, cfg, sources = syncSources(cfg)) {
     // ── Limit config ──────────────────────────────────────────────────────────
     const limitCfg = cfg.foundry?.limits?.[engine];
     const limitMax = limitCfg?.max;
     const limitWindow = limitCfg?.window ?? '1d';
     const windowMs = windowToMs(limitWindow);
     // ── Quota ledger — calls in the accounting window ────────────────────────
-    const callsToday = readQuotaCalls(engine, windowMs);
+    const callsToday = sources.quotaCalls(engine, windowMs);
     // ── Observability rollup — tokens + cost today ───────────────────────────
-    const { tokensToday, costToday } = readRollupTotals(engine, cfg);
+    const { tokensToday, costToday } = sources.rollupTotals(engine);
     // ── Subscription tracker — real window utilization ───────────────────────
-    const subWindow = readSubscriptionWindow(engine, cfg);
+    const subWindow = sources.subscriptionWindow(engine);
     // ── Subscription window state ─────────────────────────────────────────────
     let windowState;
     if (subWindow !== null) {
@@ -216,13 +213,14 @@ function buildEngineUsage(engine, cfg) {
  *  - ~/.config/codex/sessions/*.jsonl      (subscription rate-limits, synchronous)
  *  - ~/.claude/projects/{project}/*.jsonl + runs  (observability rollup, synchronous)
  */
-export async function getFrontierUsage(cfg) {
+export async function getFrontierUsage(cfg, opts = {}) {
     const generatedAt = new Date().toISOString();
     const engines = [];
     const engineIds = frontierEngines(cfg);
+    const sources = await asyncSources(cfg, opts);
     for (const engine of engineIds) {
         try {
-            engines.push(buildEngineUsage(engine, cfg));
+            engines.push(buildEngineUsage(engine, cfg, sources));
         }
         catch {
             // Degrade to a zero record — never block the whole snapshot.
@@ -235,6 +233,66 @@ export async function getFrontierUsage(cfg) {
     }
     return { generatedAt, engines };
 }
+/**
+ * The async path's sources. Modules load through `await import()`, which
+ * behaves the same under Node, vitest and the Bun-compiled sidecar — unlike
+ * the sync path's bare `require`, which exists only under Bun (under Node ESM
+ * it throws and every reading silently degrades to zero, so tests never ran
+ * the code production runs). The rollup is read ONCE for all engines, from
+ * the stale-while-revalidate cache: a request never recomputes it inline
+ * when a value under ROLLUP_CACHE_MAX_STALE_MS exists. Each source degrades
+ * independently, as the sync readers do.
+ */
+async function asyncSources(cfg, opts) {
+    const [quota, subscription, rollupModule] = await Promise.all([
+        import('../fleet/quota.js').catch(() => null),
+        import('../fleet/subscription-usage.js').catch(() => null),
+        import('../observability/rollup.js').catch(() => null),
+    ]);
+    let byModel = null;
+    if (rollupModule) {
+        try {
+            const compute = opts.rollup ? { compute: opts.rollup } : {};
+            byModel = opts.waitForRollup === false
+                ? rollupModule.peekCachedRollup('1d', cfg, compute)?.rollup.byModel ?? null
+                : (await rollupModule.getCachedRollup('1d', cfg, compute)).rollup.byModel;
+        }
+        catch {
+            byModel = null;
+        }
+    }
+    return {
+        quotaCalls: (engine, windowMs) => {
+            try {
+                return quota ? quota.usesInWindow(engine, windowMs) : 0;
+            }
+            catch {
+                return 0;
+            }
+        },
+        rollupTotals: (engine) => (byModel ? totalsFor(engine, byModel) : { tokensToday: 0, costToday: 0 }),
+        subscriptionWindow: (engine) => {
+            try {
+                return subscription ? subscription.subscriptionUsage(engine, { cfg }) : null;
+            }
+            catch {
+                return null;
+            }
+        },
+    };
+}
+function totalsFor(engine, byModel) {
+    const prefix = engineToModelPrefix(engine).toLowerCase();
+    let tokensToday = 0;
+    let costToday = 0;
+    for (const m of byModel) {
+        if (m.model.toLowerCase().startsWith(prefix)) {
+            tokensToday += m.tokensIn + m.tokensOut;
+            costToday += m.estCostUsd;
+        }
+    }
+    return { tokensToday, costToday };
+}
 // ---------------------------------------------------------------------------
 // Snapshot-compatible helper (used by buildSnapshot + dashboard API)
 // ---------------------------------------------------------------------------

package/dist/core/usage/frontier-usage.js.map

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

package/dist/core/verse/accounts.d.ts

@@ -174,6 +174,13 @@ export interface VerseAccountRecord {
     } | null;
     /** Plain-language facts the UI must show instead of implying a fault. */
     notes: string[];
+    /**
+     * When THIS server last held a verified reading for the account, present
+     * only while `observedAt` is null (the reading expired, or polling paused).
+     * History for an honest "last reading at …" line — never current evidence:
+     * no window, percentage or usability is derived from it.
+     */
+    lastReadingAt?: string;
 }
 export type VerseAccountsCollectorMode = 'owned' | 'read-only' | 'unconfigured';
 export interface VerseAccountsCollectorStatus {
@@ -181,6 +188,11 @@ export interface VerseAccountsCollectorStatus {
     state: 'running' | 'suspended' | 'blocked' | 'stopped';
     /** Who owns the exclusive per-root native metadata lease. */
     owner: 'this-server' | 'another-collector' | 'none';
+    /**
+     * The process id recorded on the lease while ANOTHER process holds it (so
+     * the operator can see which one), or absent. Never the lock's token.
+     */
+    holderPid?: number;
     /** Lease refusal code (`collector-owned`, …) or a config reason. Null when fine. */
     reasonCode: string | null;
     pollIntervalMs: number;
@@ -229,6 +241,21 @@ export interface VerseAccountEvidence {
 }
 /** The private ledger root: where the lease, activity and evidence files live. */
 export declare function accountsLedgerRoot(accountsRoot: string): string;
+/**
+ * The pid recorded on the native-metadata lease lock, or null. Reads ONLY the
+ * `pid` field: the lock also carries the holder's ownership token, which never
+ * leaves this function. Diagnostics only — ownership is decided by the lease
+ * itself, never by this read.
+ */
+export declare function readLeaseHolderPid(ledgerRoot: string): number | null;
+/**
+ * One sentence naming who holds the lease. The old wording always blamed
+ * `ashlr resource-console`, but on Mason's machine the holder is almost
+ * always another Verse (the desktop sidecar) or the fleet daemon's 5-minute
+ * capacity sample — and a wrong name sends the operator hunting for a process
+ * that is not running.
+ */
+export declare function leaseHolderSentence(pid: number | null): string;
 export interface VerseAccountIdentity {
     id: string;
     label: string;
@@ -348,6 +375,8 @@ export interface VerseAccountCollectorOptions {
     pollIntervalMs?: number;
     /** Suspend polling after this long with no client interest. Default 5 min. */
     idleSuspendMs?: number;
+    /** Idle watchdog cadence. Default 15 s; tests shorten it. */
+    idleCheckMs?: number;
     signal?: AbortSignal;
     /** Diagnostics sink. Receives plain sentences only — never a command or token. */
     log?: (message: string) => void;
@@ -365,8 +394,18 @@ export interface VerseAccountCollector {
     unavailableWorkerIds(): string[];
     /** Codex credits by account id, best effort. */
     credits(accountId: string): VerseCodexCredits | null;
+    /** When this server last held a verified reading for `accountId` (history, never evidence). */
+    lastReadingAt?(accountId: string): string | null;
     close(): Promise<void>;
 }
+/**
+ * True only while this server OWNS native collection and it is actually
+ * running — the one state in which its readings are current. Suspended,
+ * read-only, degraded and unconfigured collectors all answer false, and so
+ * does "no collector". Publishers use it to decide whether to write the
+ * fleet's capacity snapshot at all (budget-api.ts `startBudgetCapacityPublisher`).
+ */
+export declare function verseCollectorLive(collector: VerseAccountCollector | null | undefined): boolean;
 /**
  * Acquire the exclusive per-root native-metadata lease and run both collectors.
  * On `collector-owned` (or any other clean refusal) the returned collector runs
@@ -376,6 +415,12 @@ export interface VerseAccountCollector {
 export declare function startVerseAccountCollector(options: VerseAccountCollectorOptions): Promise<VerseAccountCollector>;
 export declare function setVerseAccountCollector(collector: VerseAccountCollector | null): void;
 export declare function getVerseAccountCollector(): VerseAccountCollector | null;
+/**
+ * Connection-row reasons that mean "no check has landed in this window" — a
+ * GAP between probes — rather than "a check ran and failed". Only these may be
+ * bridged by the quota refresher's own reading (see `codexGapReading`).
+ */
+export declare const VERSE_CODEX_GAP_REASONS: ReadonlySet<string>;
 /**
  * The `GET /api/verse/accounts` body. Live records when this server owns the
  * collectors, evidence-derived records otherwise, and an explicit collector