@songsid/agend 2.3.2-beta.1 → 2.3.2-beta.11

package/dist/backend-signin-pending.js

@@ -0,0 +1,44 @@
+/** Non-secret onboarding hints. Never used as proof that credentials work. */
+import { closeSync, constants, fstatSync, openSync, readSync } from "node:fs";
+import { join } from "node:path";
+import { atomicWriteFileSync } from "./atomic-write.js";
+export const ONBOARDING_BACKENDS = ["kiro-cli", "claude-code", "codex", "antigravity"];
+export function onboardingBackends(value) {
+    if (!Array.isArray(value) || value.length > 4 || value.some(v => typeof v !== "string"
+        || !ONBOARDING_BACKENDS.includes(v)))
+        return null;
+    return [...new Set(value)];
+}
+export function readPendingBackendSignIns(dataDir) {
+    const empty = { version: 1, selected: [], pending: [] };
+    let fd;
+    try {
+        fd = openSync(join(dataDir, "backend-signin-pending.json"), constants.O_RDONLY | (constants.O_NOFOLLOW ?? 0) | (constants.O_NONBLOCK ?? 0));
+        const stat = fstatSync(fd);
+        if (!stat.isFile() || stat.size > 4096 || (process.getuid && stat.uid !== process.getuid()) || (stat.mode & 0o077))
+            return empty;
+        const buffer = Buffer.alloc(4097);
+        const size = readSync(fd, buffer, 0, buffer.length, 0);
+        if (size > 4096)
+            return empty;
+        const parsed = JSON.parse(buffer.subarray(0, size).toString("utf8"));
+        const selected = onboardingBackends(parsed.selected), pending = onboardingBackends(parsed.pending);
+        if (parsed.version !== 1 || !selected || !pending || pending.some(v => !selected.includes(v)))
+            return empty;
+        return { version: 1, selected, pending };
+    }
+    catch {
+        return empty;
+    }
+    finally {
+        if (fd !== undefined)
+            closeSync(fd);
+    }
+}
+export function writePendingBackendSignIns(dataDir, value) {
+    const selected = onboardingBackends(value.selected), pending = onboardingBackends(value.pending);
+    if (!selected || !pending || pending.some(v => !selected.includes(v)))
+        throw new Error("invalid_signin_checklist");
+    atomicWriteFileSync(join(dataDir, "backend-signin-pending.json"), JSON.stringify({ version: 1, selected, pending }) + "\n", { mode: 0o600 });
+}
+//# sourceMappingURL=backend-signin-pending.js.map

package/dist/backend-signin-pending.js.map

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

package/dist/browser-backend-signins.d.ts

@@ -0,0 +1,56 @@
+/** Shared pre-fleet/dashboard orchestration. Contains no fleet or HTTP authority. */
+import { type StructuredBackend, type SignInAction, type StructuredSignInTransport, type StructuredSignInView } from "./structured-signin.js";
+import { LoginWindowLock } from "./login-window-lock.js";
+import type { AuthCheckResult } from "./login-flows.js";
+import { type OnboardingBackend } from "./backend-signin-pending.js";
+export interface BrowserBackendSignInDeps {
+    dataDir: string;
+    selected?: readonly OnboardingBackend[];
+    current(owner: object): boolean;
+    installed(): Promise<readonly string[]>;
+    checkAuth(backend: StructuredBackend): Promise<AuthCheckResult>;
+    checkConsoleAuth?(): Promise<AuthCheckResult>;
+    transport(backend: StructuredBackend): StructuredSignInTransport;
+    lock?: LoginWindowLock;
+    changed?(event: {
+        backend: StructuredBackend;
+        phase: string;
+        reason?: string;
+    }, owner: object, launched: boolean): void;
+}
+export interface BrowserBackendSignInSnapshot {
+    selected: OnboardingBackend[];
+    pending: OnboardingBackend[];
+    skipped: OnboardingBackend[];
+    states: Partial<Record<OnboardingBackend, AuthCheckResult | "console_only" | "not_installed">>;
+    login: StructuredSignInView | null;
+    ready: boolean;
+}
+export declare class BrowserBackendSignIns {
+    private readonly deps;
+    private record;
+    private readonly skipped;
+    private readonly states;
+    private readonly lock;
+    private run;
+    private closed;
+    private refreshInFlight;
+    private refreshed;
+    private checklistRevision;
+    constructor(deps: BrowserBackendSignInDeps);
+    private current;
+    private terminal;
+    get activeBackend(): StructuredBackend | null;
+    private loginMayWrite;
+    get ready(): boolean;
+    private persist;
+    snapshot(owner: object): BrowserBackendSignInSnapshot;
+    refresh(owner: object, force?: boolean): Promise<BrowserBackendSignInSnapshot>;
+    select(owner: object, values: unknown): Promise<BrowserBackendSignInSnapshot>;
+    begin(owner: object, backend: string, relogin?: boolean): Promise<BrowserBackendSignInSnapshot>;
+    input(owner: object, id: string, revision: number, action: SignInAction): Promise<BrowserBackendSignInSnapshot>;
+    cancel(owner: object): Promise<BrowserBackendSignInSnapshot>;
+    skip(owner: object, backend: string): Promise<BrowserBackendSignInSnapshot>;
+    /** False means a credential writer may still exist: the caller must not hand over. */
+    close(): Promise<boolean>;
+}

package/dist/browser-backend-signins.js

@@ -0,0 +1,189 @@
+/** Shared pre-fleet/dashboard orchestration. Contains no fleet or HTTP authority. */
+import { StructuredSignIn, structuredSignInSupported } from "./structured-signin.js";
+import { LoginWindowLock } from "./login-window-lock.js";
+import { onboardingBackends, readPendingBackendSignIns, writePendingBackendSignIns } from "./backend-signin-pending.js";
+export class BrowserBackendSignIns {
+    deps;
+    record;
+    skipped = new Set();
+    states = {};
+    lock;
+    run = null;
+    closed = false;
+    refreshInFlight = null;
+    refreshed = false;
+    checklistRevision = 0;
+    constructor(deps) {
+        this.deps = deps;
+        const old = readPendingBackendSignIns(deps.dataDir);
+        const selected = onboardingBackends(deps.selected ? [...deps.selected] : old.selected);
+        if (!selected)
+            throw new Error("invalid_signin_checklist");
+        // Probes, not an old record, decide which credentials can be reused.
+        this.record = { version: 1, selected, pending: [...selected] };
+        this.lock = deps.lock ?? new LoginWindowLock();
+    }
+    current(owner) { return !this.closed && this.deps.current(owner); }
+    terminal(run) {
+        if (!run)
+            return true;
+        const view = run.session.view(run.owner);
+        // A parser may report failed before its async cleanup finishes. Only the
+        // final safe reason (or done) proves that finish has settled the writer.
+        return view.phase === "done" || (view.phase === "failed" && !!view.reason);
+    }
+    get activeBackend() { return this.run && !this.terminal(this.run) ? this.run.backend : null; }
+    loginMayWrite(backend) {
+        return this.lock.current?.backend === backend || (this.run?.backend === backend
+            && (!this.terminal(this.run) || this.run.session.view(this.run.owner).reason === "cleanup_failed"));
+    }
+    get ready() {
+        return this.terminal(this.run) && this.run?.session.view(this.run.owner).reason !== "cleanup_failed"
+            && this.record.pending.every(backend => this.skipped.has(backend));
+    }
+    persist() { writePendingBackendSignIns(this.deps.dataDir, this.record); }
+    snapshot(owner) {
+        if (!this.current(owner))
+            throw new Error("signin_session_expired");
+        return { selected: [...this.record.selected], pending: [...this.record.pending], skipped: [...this.skipped],
+            states: { ...this.states }, login: this.run?.session.view(owner) ?? null, ready: this.ready };
+    }
+    async refresh(owner, force = false) {
+        if (!this.current(owner))
+            throw new Error("signin_session_expired");
+        do {
+            if ((!this.refreshed || force) && !this.refreshInFlight) {
+                const revision = this.checklistRevision, selected = [...this.record.selected];
+                const current = () => this.current(owner) && revision === this.checklistRevision;
+                this.refreshInFlight = (async () => {
+                    const installed = await this.deps.installed();
+                    if (!current())
+                        return;
+                    const checked = {};
+                    for (const backend of selected) {
+                        const status = !installed.includes(backend) ? "not_installed" : this.loginMayWrite(backend) ? "unknown"
+                            : structuredSignInSupported(backend) ? await this.deps.checkAuth(backend)
+                                : await this.deps.checkConsoleAuth?.() === "valid" ? "valid" : "console_only";
+                        if (!current())
+                            return;
+                        checked[backend] = status;
+                    }
+                    // Publish the whole scan only while it still owns this checklist.
+                    Object.assign(this.states, checked);
+                    this.record.pending = selected.filter(backend => checked[backend] !== "valid");
+                    this.persist();
+                    this.refreshed = true;
+                })().finally(() => { this.refreshInFlight = null; });
+            }
+            force = false;
+            await this.refreshInFlight;
+            if (!this.current(owner))
+                throw new Error("signin_session_expired");
+            // A select or completed login superseded the scan: join one fresh scan.
+        } while (!this.refreshed);
+        return this.snapshot(owner);
+    }
+    async select(owner, values) {
+        if (!this.current(owner))
+            throw new Error("signin_session_expired");
+        const selected = onboardingBackends(values);
+        if (!selected)
+            throw new Error("invalid_signin_checklist");
+        if (this.run && !selected.includes(this.run.backend))
+            await this.cancel(owner);
+        if (!this.current(owner))
+            throw new Error("signin_session_expired");
+        this.checklistRevision++;
+        for (const backend of this.record.selected)
+            if (!selected.includes(backend))
+                delete this.states[backend];
+        const prior = this.record.selected;
+        this.record = { version: 1, selected, pending: selected.filter(backend => !prior.includes(backend) || this.record.pending.includes(backend)) };
+        this.persist();
+        this.refreshed = false;
+        return this.refresh(owner);
+    }
+    async begin(owner, backend, relogin = false) {
+        if (!this.current(owner))
+            throw new Error("signin_session_expired");
+        if (!structuredSignInSupported(backend) || !this.record.selected.includes(backend))
+            throw new Error("signin_console_only");
+        if (this.run?.session.view(this.run.owner).reason === "cleanup_failed")
+            throw new Error("signin_cleanup_failed");
+        if (this.run && !this.terminal(this.run))
+            return this.snapshot(owner); // refresh/double click joins
+        const session = new StructuredSignIn(backend, owner, {
+            lock: this.lock, current: () => this.current(owner), transport: this.deps.transport(backend),
+            checkAuth: () => this.deps.checkAuth(backend),
+            changed: event => {
+                if ((event.phase === "done" || (event.phase === "failed" && event.reason))
+                    && this.current(owner) && this.run?.session === session) {
+                    this.checklistRevision++;
+                    this.refreshed = false;
+                    this.states[backend] = event.phase === "done" ? "valid" : "unknown";
+                    this.record.pending = event.phase === "done" ? this.record.pending.filter(value => value !== backend)
+                        : [...new Set([...this.record.pending, backend])];
+                    this.persist();
+                }
+                this.deps.changed?.(event, owner, session.launched);
+            },
+        });
+        const run = { session, owner, backend };
+        this.run = run; // reserve before the installed await
+        this.checklistRevision++;
+        this.refreshed = false;
+        this.record.pending = [...new Set([...this.record.pending, backend])];
+        this.skipped.delete(backend);
+        this.persist();
+        const installed = await this.deps.installed();
+        if (!this.current(owner) || this.run !== run) {
+            await session.cancel();
+            throw new Error("signin_session_expired");
+        }
+        if (!installed.includes(backend)) {
+            await session.cancel();
+            this.states[backend] = "not_installed";
+            return this.snapshot(owner);
+        }
+        await session.start(relogin);
+        return this.snapshot(owner);
+    }
+    async input(owner, id, revision, action) {
+        if (!this.current(owner) || !this.run || this.run.owner !== owner)
+            throw new Error("signin_session_expired");
+        const result = await this.run.session.action(owner, id, revision, action);
+        if (result !== "accepted")
+            throw new Error(`signin_action_${result}`);
+        return this.snapshot(owner);
+    }
+    async cancel(owner) {
+        if (!this.current(owner))
+            throw new Error("signin_session_expired");
+        const run = this.run;
+        if (run)
+            await run.session.cancel();
+        if (run?.session.view(owner).reason === "cleanup_failed")
+            throw new Error("signin_cleanup_failed");
+        return this.snapshot(owner);
+    }
+    async skip(owner, backend) {
+        if (!this.current(owner) || !this.record.selected.includes(backend))
+            throw new Error("invalid_signin_checklist");
+        if (this.run?.backend === backend)
+            await this.cancel(owner);
+        if (!this.current(owner))
+            throw new Error("signin_session_expired");
+        this.skipped.add(backend);
+        this.persist();
+        return this.snapshot(owner);
+    }
+    /** False means a credential writer may still exist: the caller must not hand over. */
+    async close() {
+        this.closed = true;
+        const run = this.run;
+        if (run)
+            await run.session.cancel();
+        return run?.session.view(run.owner).reason !== "cleanup_failed";
+    }
+}
+//# sourceMappingURL=browser-backend-signins.js.map

package/dist/browser-backend-signins.js.map

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

package/dist/cache-ledger.d.ts

@@ -13,12 +13,13 @@
  *   cache_creation: { ephemeral_5m_input_tokens, ephemeral_1h_input_tokens }, output_tokens }. A message spans several
  *   lines (one per content block) carrying the same id and usage: counted once.
  * - Codex (0.160): `event_msg` `token_count` with `info.last_token_usage` { input_tokens (cached included),
- *   cached_input_tokens, cache_write_input_tokens, output_tokens }. The write field exists but was 0 in every one of
+ *   cached_input_tokens, cache_write_input_tokens, output_tokens, reasoning_output_tokens (a part of output_tokens) }. The write field exists but was 0 in every one of
  *   38,551 real events on GPT-5.6+ models — so a write is estimated as the request's uncached input unless a real
  *   write count shows up. The model comes from the preceding `turn_context`.
  */
 import { type ScanLine } from "./cache-scan.js";
-export type TranscriptKind = "claude" | "codex";
+/** The reader: Claude Code, Codex, Grok, Muse, OpenCode and Antigravity are measured; Kiro is estimated (#2122 §10). */
+export type TranscriptKind = "claude" | "codex" | "kiro" | "grok" | "muse" | "opencode" | "antigravity";
 /** One model request, as the transcript records it. */
 export interface Turn {
     t: number;
@@ -32,6 +33,12 @@ export interface Turn {
     /** An OpenAI cache write as recorded (null: not recorded, 0 included when the field is absent). */
     write: number | null;
     output: number;
+    /** The part of `output` the CLI reports as reasoning (Codex `reasoning_output_tokens`); absent or 0 where none is. */
+    reasoning?: number;
+    /** The model requests this record covers (a Kiro turn's `total_request_count`, Grok's `modelCalls`); absent: one. */
+    requests?: number;
+    /** What the CLI itself reported the request cost, USD (Grok's `costUsdTicks` × 1e-10); absent: not reported. */
+    cost?: number;
 }
 /** Gap histogram edges, seconds: ≤5 min, ≤30 min, ≤1 h, ≤2 h, ≤6 h, ≤24 h, longer. */
 export declare const GAP_EDGES: readonly [300, 1800, 3600, 7200, 21600, 86400];
@@ -52,6 +59,14 @@ export interface HourAgg {
     m: Record<string, HourTotals>;
     g: number[];
     src?: Record<string, Record<string, HourTotals>>;
+    /**
+     * #2122 §10.3: reasoning tokens, by source and model key — the part of `output` a CLI reports as reasoning (Codex). Kept
+     * beside the totals, never as an 8th entry: a published reader keeps only 7-entry totals and would drop the hour (Fable
+     * #2604 P1); an older version that rewrites the ledger drops only this.
+     */
+    rs?: Record<string, Record<string, number>>;
+    /** #2122 §10.2: the cost a CLI reported (USD), by source and model key — beside the totals, as `rs`. */
+    cs?: Record<string, Record<string, number>>;
 }
 /** A source of an hour's totals: the reader that read them and the profile it read them under. */
 export declare const sourceKey: (reader: TranscriptKind, profile: string) => string;
@@ -85,6 +100,9 @@ export interface FileCursor {
     total?: number;
     /** Claude: ids of the last messages counted (one message spans several lines). */
     ids?: string[];
+    /** Kiro (kiro-usage-scan.ts): what the source looked like when read, and the time of the last turn counted. */
+    sig?: string;
+    after?: number;
 }
 export interface Ledger {
     v: 2;
@@ -119,3 +137,21 @@ export declare function pruneLedger(ledger: Ledger, cutoff: number, foldedThroug
 export declare function claudeLine(line: ScanLine, file: FileCursor): Turn | null;
 /** The turn a Codex rollout line records, or null. A `turn_context` line updates the file's model. */
 export declare function codexLine(line: ScanLine, file: FileCursor): Turn | null;
+/**
+ * #2122 §10 step 3: the turns a Grok `updates.jsonl` line records — a `turn_completed` update's `usage`, one turn per
+ * model in its `modelUsage` (else the whole usage under `_meta.modelId`). Real counts, per turn (not cumulative):
+ * `inputTokens` includes the cache reads and writes, `reasoningTokens` is a part of `outputTokens` (totalTokens = input +
+ * output, checked on the host's 1.0.x sessions), `modelCalls` the requests, `costUsdTicks` × 1e-10 the cost grok
+ * reported. A turn already counted (its `prompt_id`, kept in `file.ids`) is not counted again.
+ */
+export declare function grokLine(line: ScanLine, file: FileCursor): Turn[];
+/**
+ * #2122 §10 step 4: the turn a Muse `session.jsonl` line records — a `runtime.session` event `model_completed` with its
+ * `usage`. Real counts, one per model call, read as tokscale reads them (sessions/muse.rs at 669fdaee):
+ * - `input_tokens` includes the cache reads — `cache_read_tokens`, else (absent, not 0) the older `cached_tokens` — and
+ *   `cache_write_tokens` is apart; `reasoning_tokens` is a part of `output_tokens`;
+ * - the call's time is its start: `recorded_at` (when it completed; µs, ms or s) less a positive `duration_ms`;
+ * - a call replayed into the file (the same stream, sequence, model and counts) is counted once (`file.ids`).
+ * Only `model_completed` counts: a workflow's aggregate events would count a child's calls twice.
+ */
+export declare function museLine(line: ScanLine, file: FileCursor): Turn | null;

package/dist/cache-ledger.js

@@ -13,7 +13,7 @@
  *   cache_creation: { ephemeral_5m_input_tokens, ephemeral_1h_input_tokens }, output_tokens }. A message spans several
  *   lines (one per content block) carrying the same id and usage: counted once.
  * - Codex (0.160): `event_msg` `token_count` with `info.last_token_usage` { input_tokens (cached included),
- *   cached_input_tokens, cache_write_input_tokens, output_tokens }. The write field exists but was 0 in every one of
+ *   cached_input_tokens, cache_write_input_tokens, output_tokens, reasoning_output_tokens (a part of output_tokens) }. The write field exists but was 0 in every one of
  *   38,551 real events on GPT-5.6+ models — so a write is estimated as the request's uncached input unless a real
  *   write count shows up. The model comes from the preceding `turn_context`.
  */
@@ -48,7 +48,7 @@ export function reviveLedger(raw) {
                 m[mk] = tot;
         const src = dict();
         for (const [sk, sm] of Object.entries(v.src ?? {})) {
-            if (!/^(?:claude|codex):.{1,120}$/s.test(sk) || !sm || typeof sm !== "object")
+            if (!/^(?:claude|codex|kiro|grok|muse|opencode|antigravity):.{1,120}$/s.test(sk) || !sm || typeof sm !== "object")
                 continue;
             const into = dict();
             for (const [mk, tot] of Object.entries(sm))
@@ -56,7 +56,23 @@ export function reviveLedger(raw) {
                     into[mk] = tot;
             src[sk] = into;
         }
-        l.hours[k] = { m, g: v.g, ...(Object.keys(src).length ? { src } : {}) };
+        // Beside the totals, by source and model key: only for a total that exists, only positive and finite.
+        const beside = (raw) => {
+            const out = dict();
+            for (const [sk, sm] of Object.entries((raw && typeof raw === "object" ? raw : {}))) {
+                if (!src[sk] || !sm || typeof sm !== "object")
+                    continue;
+                const into = dict();
+                for (const [mk, n] of Object.entries(sm))
+                    if (typeof n === "number" && Number.isFinite(n) && n > 0 && src[sk][mk])
+                        into[mk] = n;
+                if (Object.keys(into).length)
+                    out[sk] = into;
+            }
+            return out;
+        };
+        const rs = beside(v.rs), cs = beside(v.cs);
+        l.hours[k] = { m, g: v.g, ...(Object.keys(src).length ? { src } : {}), ...(Object.keys(rs).length ? { rs } : {}), ...(Object.keys(cs).length ? { cs } : {}) };
     }
     if (Array.isArray(r.gaps))
         l.gaps = r.gaps.filter((g) => Array.isArray(g) && g.length === 9);
@@ -98,7 +114,7 @@ export function addTurn(ledger, file, turn, cutoff, profile) {
     const hour = ledger.hours[hk] ??= { m: dict(), g: new Array(GAP_BUCKETS).fill(0) };
     const mk = modelKey(turn.model, turn.prompt);
     const bump = (tot) => {
-        tot[0] += 1;
+        tot[0] += turn.requests ?? 1;
         tot[1] += turn.uncached;
         tot[2] += turn.read;
         tot[3] += turn.write5m;
@@ -108,9 +124,19 @@ export function addTurn(ledger, file, turn, cutoff, profile) {
     };
     bump(hour.m[mk] ??= [0, 0, 0, 0, 0, 0, 0]);
     // #2122: and under its source — the reader that read it (this file's kind) and the profile it was read under.
-    const src = (hour.src ??= dict())[sourceKey(file.kind, profile ?? "unknown")] ??= dict();
+    const sk = sourceKey(file.kind, profile ?? "unknown");
+    const src = (hour.src ??= dict())[sk] ??= dict();
     bump(src[mk] ??= [0, 0, 0, 0, 0, 0, 0]);
-    if (!prev)
+    if (turn.reasoning) {
+        const rs = (hour.rs ??= dict())[sk] ??= dict();
+        rs[mk] = (rs[mk] ?? 0) + turn.reasoning;
+    }
+    if (turn.cost) {
+        const cs = (hour.cs ??= dict())[sk] ??= dict();
+        cs[mk] = (cs[mk] ?? 0) + turn.cost;
+    }
+    // Only Claude and Codex are in the cache analysis (Kiro's turns are estimates; the others' analysis is not built).
+    if (!prev || (file.kind !== "claude" && file.kind !== "codex"))
         return;
     const gap = (turn.t - prev.t) / 1000;
     if (!(gap >= 0))
@@ -243,8 +269,107 @@ export function codexLine(line, file) {
     const t = Date.parse(d.timestamp);
     if (!Number.isFinite(t))
         return null;
-    const input = num(u.input_tokens), read = Math.min(num(u.cached_input_tokens), input);
+    const input = num(u.input_tokens), read = Math.min(num(u.cached_input_tokens), input), output = num(u.output_tokens);
     const write = typeof u.cache_write_input_tokens === "number" ? Math.min(num(u.cache_write_input_tokens), input - read) : null;
-    return { t, model: file.model ?? "unknown", prompt: input, uncached: input - read - (write ?? 0), read, write5m: 0, write1h: 0, write, output: num(u.output_tokens) };
+    // Reasoning is counted inside output_tokens (total_tokens = input + output): kept as its part, capped at output.
+    return { t, model: file.model ?? "unknown", prompt: input, uncached: input - read - (write ?? 0), read, write5m: 0, write1h: 0, write, output, reasoning: Math.min(num(u.reasoning_output_tokens), output) };
+}
+/**
+ * #2122 §10 step 3: the turns a Grok `updates.jsonl` line records — a `turn_completed` update's `usage`, one turn per
+ * model in its `modelUsage` (else the whole usage under `_meta.modelId`). Real counts, per turn (not cumulative):
+ * `inputTokens` includes the cache reads and writes, `reasoningTokens` is a part of `outputTokens` (totalTokens = input +
+ * output, checked on the host's 1.0.x sessions), `modelCalls` the requests, `costUsdTicks` × 1e-10 the cost grok
+ * reported. A turn already counted (its `prompt_id`, kept in `file.ids`) is not counted again.
+ */
+export function grokLine(line, file) {
+    if (!("whole" in line) || line.whole.indexOf("\"turn_completed\"") === -1)
+        return [];
+    let d;
+    try {
+        d = JSON.parse(line.whole.toString("utf8"));
+    }
+    catch {
+        return [];
+    }
+    const u = d.params?.update, meta = d.params?._meta;
+    if (!u || u.sessionUpdate !== "turn_completed" || !u.usage || typeof u.usage !== "object")
+        return [];
+    const id = typeof u.prompt_id === "string" ? u.prompt_id : typeof meta?.eventId === "string" ? meta.eventId : undefined;
+    if (id && file.ids?.includes(id))
+        return [];
+    const ms = typeof meta?.agentTimestampMs === "number" ? meta.agentTimestampMs : typeof d.timestamp === "number" ? d.timestamp * 1000 : NaN;
+    if (!Number.isFinite(ms))
+        return [];
+    const usage = u.usage;
+    const perModel = usage.modelUsage && typeof usage.modelUsage === "object" && Object.keys(usage.modelUsage).length
+        ? Object.entries(usage.modelUsage)
+        : [[typeof meta?.modelId === "string" ? meta.modelId : "unknown", usage]];
+    const out = [];
+    for (const [model, mu] of perModel) {
+        if (!mu || typeof mu !== "object")
+            continue;
+        const input = num(mu.inputTokens), read = Math.min(num(mu.cachedReadTokens), input), write = Math.min(num(mu.cacheCreationTokens), input - read);
+        const output = num(mu.outputTokens), ticks = num(mu.costUsdTicks);
+        if (!input && !output)
+            continue;
+        out.push({ t: ms, model, prompt: input, uncached: input - read - write, read, write5m: 0, write1h: 0, write, output,
+            reasoning: Math.min(num(mu.reasoningTokens), output), requests: Math.max(1, Math.round(num(mu.modelCalls))), ...(ticks ? { cost: ticks * 1e-10 } : {}) });
+    }
+    if (id && out.length)
+        file.ids = [...(file.ids ?? []).slice(-15), id];
+    return out;
+}
+/**
+ * #2122 §10 step 4: the turn a Muse `session.jsonl` line records — a `runtime.session` event `model_completed` with its
+ * `usage`. Real counts, one per model call, read as tokscale reads them (sessions/muse.rs at 669fdaee):
+ * - `input_tokens` includes the cache reads — `cache_read_tokens`, else (absent, not 0) the older `cached_tokens` — and
+ *   `cache_write_tokens` is apart; `reasoning_tokens` is a part of `output_tokens`;
+ * - the call's time is its start: `recorded_at` (when it completed; µs, ms or s) less a positive `duration_ms`;
+ * - a call replayed into the file (the same stream, sequence, model and counts) is counted once (`file.ids`).
+ * Only `model_completed` counts: a workflow's aggregate events would count a child's calls twice.
+ */
+export function museLine(line, file) {
+    if (!("whole" in line) || line.whole.indexOf("\"model_completed\"") === -1)
+        return null;
+    let d;
+    try {
+        d = JSON.parse(line.whole.toString("utf8"));
+    }
+    catch {
+        return null;
+    }
+    const e = d.payload?.event;
+    if (d.payload_type !== "runtime.session" || !e || e.kind !== "model_completed" || !e.usage || typeof e.usage !== "object")
+        return null;
+    const ended = museMs(d.recorded_at);
+    if (ended === null)
+        return null;
+    const u = e.usage;
+    const present = (v) => typeof v === "number" && Number.isFinite(v);
+    const input = num(u.input_tokens), read = Math.min(num(present(u.cache_read_tokens) ? u.cache_read_tokens : u.cached_tokens), input);
+    const write = present(u.cache_write_tokens) ? num(u.cache_write_tokens) : null;
+    const output = num(u.output_tokens), reasoning = Math.min(num(u.reasoning_tokens), output);
+    if (!input && !output && !write)
+        return null;
+    const model = typeof e.model === "string" && e.model ? e.model : "unknown";
+    const id = `${typeof d.stream?.id === "string" ? d.stream.id : ""}:${present(d.sequence) ? d.sequence : ""}:${model}:${input}:${output}:${read}:${write ?? 0}:${reasoning}`;
+    if (file.ids?.includes(id))
+        return null;
+    file.ids = [...(file.ids ?? []).slice(-63), id];
+    const duration = num(e.duration_ms);
+    return { t: duration && ended - duration > 0 ? ended - duration : ended, model, prompt: input + (write ?? 0), uncached: input - read, read,
+        write5m: 0, write1h: 0, write, output, reasoning };
+}
+/** Muse's `recorded_at` as milliseconds: it writes microseconds; milliseconds and seconds are read too (as tokscale does). */
+function museMs(raw) {
+    if (typeof raw !== "number" || !Number.isFinite(raw))
+        return null;
+    if (raw >= 1e15)
+        return Math.floor(raw / 1000);
+    if (raw >= 1e12)
+        return raw;
+    if (raw >= 1e9)
+        return raw * 1000;
+    return null;
 }
 //# sourceMappingURL=cache-ledger.js.map