@a1hvdy/cc-openclaw 0.17.0 → 0.18.1

package/dist/src/engines/heartbeat-guard.js

@@ -1,120 +0,0 @@
-/**
- * HeartbeatGuard — enforce `heartbeat.model` override at the engines layer.
- *
- * Context
- * -------
- * OpenClaw issues #9556, #13009, #14279 document a recurring bug: heartbeat-
- * triggered runs ignore the `heartbeat.model` field in the agent config and
- * fall through to the session's primary model (typically Opus), burning
- * expensive tokens on what should be a cheap Haiku ping.
- *
- * The existing `src/lib/heartbeat-workaround.ts` patches this at the SDK
- * request layer. This guard operates one level higher — at the engines /
- * agent-config layer — to:
- *
- *   1. Read `heartbeat.model` from the resolved agent config.
- *   2. If present, enforce it on any heartbeat invocation.
- *   3. If the upstream runtime ignores the override (bug still present),
- *      REFUSE the heartbeat with a clear error that names the issue numbers.
- *
- * Usage
- * -----
- * ```ts
- * const guard = new HeartbeatGuard(agentConfig);
- * const result = guard.enforce(requestedModel);
- * if (!result.ok) throw result.error;
- * // use result.model for the heartbeat call
- * ```
- */
-// ─── Errors ───────────────────────────────────────────────────────────────────
-export class HeartbeatGuardError extends Error {
-    /** The model the upstream runtime attempted to use. */
-    requestedModel;
-    /** The model the guard expected. */
-    expectedModel;
-    /** Upstream issue numbers that describe why this guard exists. */
-    issueRefs = ['#9556', '#13009', '#14279'];
-    constructor(requestedModel, expectedModel) {
-        super(`HeartbeatGuard: upstream runtime used model "${requestedModel}" for a heartbeat turn ` +
-            `but heartbeat.model is set to "${expectedModel}". ` +
-            `This is a known upstream bug — see OpenClaw issues #9556, #13009, #14279. ` +
-            `Refusing the heartbeat to prevent expensive model misrouting. ` +
-            `Disable this guard with OPENCLAW_HEARTBEAT_GUARD_DISABLE=1 once upstream ships a fix.`);
-        this.name = 'HeartbeatGuardError';
-        this.requestedModel = requestedModel;
-        this.expectedModel = expectedModel;
-    }
-}
-// ─── Guard ────────────────────────────────────────────────────────────────────
-export class HeartbeatGuard {
-    config;
-    constructor(agentConfig) {
-        this.config = agentConfig;
-    }
-    /**
-     * Enforce the heartbeat model override.
-     *
-     * @param requestedModel - The model string the upstream runtime resolved for
-     *   this heartbeat invocation (i.e. whatever it actually passed to the SDK).
-     *
-     * @returns `{ ok: true, model }` — the model the caller MUST use.
-     *          `{ ok: false, error }` — the upstream ignored the override; refuse.
-     *
-     * When no `heartbeat.model` is configured this is a pass-through:
-     * returns `{ ok: true, model: requestedModel }` unconditionally.
-     */
-    enforce(requestedModel) {
-        if (isHeartbeatGuardDisabled()) {
-            return { ok: true, model: requestedModel };
-        }
-        const expected = this.config.heartbeat?.model;
-        if (!expected) {
-            // No override configured — pass through.
-            return { ok: true, model: requestedModel };
-        }
-        // Normalise: strip optional provider prefix (e.g. "cc-openclaw/claude-haiku-4-5").
-        const normaliseModel = (m) => (m.includes('/') ? m.split('/').pop() : m);
-        const normRequested = normaliseModel(requestedModel);
-        const normExpected = normaliseModel(expected);
-        if (normRequested === normExpected) {
-            // Runtime honoured the override.
-            return { ok: true, model: requestedModel };
-        }
-        // Override was ignored. Refuse.
-        return {
-            ok: false,
-            error: new HeartbeatGuardError(requestedModel, expected),
-        };
-    }
-    /**
-     * Convenience: enforce and throw on refusal. Equivalent to:
-     *   const r = guard.enforce(model); if (!r.ok) throw r.error; return r.model;
-     */
-    enforceOrThrow(requestedModel) {
-        const result = this.enforce(requestedModel);
-        if (!result.ok)
-            throw result.error;
-        return result.model;
-    }
-    /**
-     * Returns the configured heartbeat.model, or undefined if none is set.
-     */
-    get configuredModel() {
-        return this.config.heartbeat?.model;
-    }
-    /**
-     * True if heartbeats are explicitly disabled in the agent config.
-     */
-    get heartbeatsDisabled() {
-        return this.config.heartbeat?.enabled === false;
-    }
-}
-// ─── Env gate ─────────────────────────────────────────────────────────────────
-/**
- * Set OPENCLAW_HEARTBEAT_GUARD_DISABLE=1 to skip the guard entirely.
- * Use this ONLY after upstream ships a fix for #9556/#13009/#14279.
- */
-export function isHeartbeatGuardDisabled() {
-    return process.env.OPENCLAW_HEARTBEAT_GUARD_DISABLE === '1';
-}
-//# sourceMappingURL=heartbeat-guard.js.map

package/dist/src/engines/heartbeat-guard.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"heartbeat-guard.js","sourceRoot":"","sources":["../../../src/engines/heartbeat-guard.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAqBH,iFAAiF;AAEjF,MAAM,OAAO,mBAAoB,SAAQ,KAAK;IAC5C,uDAAuD;IAC9C,cAAc,CAAS;IAChC,oCAAoC;IAC3B,aAAa,CAAS;IAC/B,kEAAkE;IACzD,SAAS,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAU,CAAC;IAE5D,YAAY,cAAsB,EAAE,aAAqB;QACvD,KAAK,CACH,gDAAgD,cAAc,yBAAyB;YACrF,kCAAkC,aAAa,KAAK;YACpD,4EAA4E;YAC5E,gEAAgE;YAChE,uFAAuF,CAC1F,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAC;QAClC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;CACF;AAED,iFAAiF;AAEjF,MAAM,OAAO,cAAc;IACR,MAAM,CAAuB;IAE9C,YAAY,WAAiC;QAC3C,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC;IAC5B,CAAC;IAED;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,cAAsB;QAC5B,IAAI,wBAAwB,EAAE,EAAE,CAAC;YAC/B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC;QAC7C,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC;QAC9C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,yCAAyC;YACzC,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC;QAC7C,CAAC;QAED,mFAAmF;QACnF,MAAM,cAAc,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAClF,MAAM,aAAa,GAAG,cAAc,CAAC,cAAc,CAAC,CAAC;QACrD,MAAM,YAAY,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;QAE9C,IAAI,aAAa,KAAK,YAAY,EAAE,CAAC;YACnC,iCAAiC;YACjC,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC;QAC7C,CAAC;QAED,gCAAgC;QAChC,OAAO;YACL,EAAE,EAAE,KAAK;YACT,KAAK,EAAE,IAAI,mBAAmB,CAAC,cAAc,EAAE,QAAQ,CAAC;SACzD,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,cAAc,CAAC,cAAsB;QACnC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,CAAC,EAAE;YAAE,MAAM,MAAM,CAAC,KAAK,CAAC;QACnC,OAAO,MAAM,CAAC,KAAK,CAAC;IACtB,CAAC;IAED;;OAEG;IACH,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC;IACtC,CAAC;IAED;;OAEG;IACH,IAAI,kBAAkB;QACpB,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,KAAK,KAAK,CAAC;IAClD,CAAC;CACF;AAED,iFAAiF;AAEjF;;;GAGG;AACH,MAAM,UAAU,wBAAwB;IACtC,OAAO,OAAO,CAAC,GAAG,CAAC,gCAAgC,KAAK,GAAG,CAAC;AAC9D,CAAC"}

package/dist/src/engines/subprocess-pool.d.ts

@@ -1,78 +0,0 @@
-/**
- * SubprocessPool — warm claude CLI subprocess pool for conversation-boundary recycle.
- *
- * DARK-FLAGGED: only consulted when OPENCLAW_SUBPROCESS_POOL=1.
- * When the flag is off, this module is a no-op and all behaviour is
- * byte-identical to the pre-v0.16 code path.
- *
- * Goal: cut Telegram cold-turn wall-clock toward direct CLI baseline
- * (currently ~3× direct CLI) by keeping a pool of warm `claude` CLI
- * subprocesses ready to accept the first message of a new conversation,
- * amortising the ~800-1200ms spawn + init cost.
- *
- * Pool policy:
- *   - Maintains `minIdle` warm sessions (default 1).
- *   - On conversation start: borrow the head idle session; the pool
- *     immediately spawns a replacement to maintain the idle floor.
- *   - On conversation boundary (session.stop() / recycle()): return the
- *     session to the pool — the session's subprocess is killed, a fresh
- *     one is spawned and warmed, then placed back into the idle queue.
- *   - Hard cap: `maxSize` total (idle + borrowed) sessions (default 4).
- *   - Idle sessions are reaped after `idleTtlMs` (default 5 min) to
- *     avoid orphaning warm processes during quiet periods.
- */
-import { EventEmitter } from 'node:events';
-import { PersistentClaudeSession } from './persistent-session.js';
-import type { SessionConfig } from '../types.js';
-export interface SubprocessPoolOptions {
-    /** Minimum idle (pre-warmed) sessions to keep ready. Default 1. */
-    minIdle?: number;
-    /** Hard cap on total sessions (idle + borrowed). Default 4. */
-    maxSize?: number;
-    /** Idle TTL before a warm session is reaped (ms). Default 300_000 (5 min). */
-    idleTtlMs?: number;
-    /** Base config applied to every pool-spawned session. */
-    baseConfig: SessionConfig;
-    /** Override the claude binary path (test injection). */
-    claudeBin?: string;
-}
-/**
- * Returns true only when the pool feature flag is explicitly enabled.
- * Default off — behaviour is byte-identical to pre-v0.16 when off.
- */
-export declare function isSubprocessPoolEnabled(): boolean;
-export declare class SubprocessPool extends EventEmitter {
-    private readonly opts;
-    private idle;
-    private borrowed;
-    private reaperTimer;
-    private _destroyed;
-    constructor(options: SubprocessPoolOptions);
-    /**
-     * Start the pool: pre-warm `minIdle` sessions and schedule the idle reaper.
-     */
-    start(): Promise<void>;
-    /**
-     * Borrow a warm session for a new conversation.
-     * Returns null if pool is disabled or at capacity and no idle sessions exist.
-     * Callers MUST call recycle(session) when the conversation ends.
-     */
-    borrow(): Promise<PersistentClaudeSession | null>;
-    /**
-     * Recycle a borrowed session back into the pool.
-     * The session's subprocess is terminated; a fresh warmed session replaces it.
-     */
-    recycle(session: PersistentClaudeSession): Promise<void>;
-    /**
-     * Destroy the pool: kill all idle sessions and stop the reaper.
-     */
-    destroy(): void;
-    get stats(): {
-        idle: number;
-        borrowed: number;
-        maxSize: number;
-    };
-    private _fillIdle;
-    private _spawnWarm;
-    private _reapStale;
-}

package/dist/src/engines/subprocess-pool.js

@@ -1,200 +0,0 @@
-/**
- * SubprocessPool — warm claude CLI subprocess pool for conversation-boundary recycle.
- *
- * DARK-FLAGGED: only consulted when OPENCLAW_SUBPROCESS_POOL=1.
- * When the flag is off, this module is a no-op and all behaviour is
- * byte-identical to the pre-v0.16 code path.
- *
- * Goal: cut Telegram cold-turn wall-clock toward direct CLI baseline
- * (currently ~3× direct CLI) by keeping a pool of warm `claude` CLI
- * subprocesses ready to accept the first message of a new conversation,
- * amortising the ~800-1200ms spawn + init cost.
- *
- * Pool policy:
- *   - Maintains `minIdle` warm sessions (default 1).
- *   - On conversation start: borrow the head idle session; the pool
- *     immediately spawns a replacement to maintain the idle floor.
- *   - On conversation boundary (session.stop() / recycle()): return the
- *     session to the pool — the session's subprocess is killed, a fresh
- *     one is spawned and warmed, then placed back into the idle queue.
- *   - Hard cap: `maxSize` total (idle + borrowed) sessions (default 4).
- *   - Idle sessions are reaped after `idleTtlMs` (default 5 min) to
- *     avoid orphaning warm processes during quiet periods.
- */
-import { EventEmitter } from 'node:events';
-import { PersistentClaudeSession } from './persistent-session.js';
-import { getClaudeBin } from '../lib/config.js';
-// ─── Env gate ────────────────────────────────────────────────────────────────
-/**
- * Returns true only when the pool feature flag is explicitly enabled.
- * Default off — behaviour is byte-identical to pre-v0.16 when off.
- */
-export function isSubprocessPoolEnabled() {
-    return process.env.OPENCLAW_SUBPROCESS_POOL === '1';
-}
-// ─── SubprocessPool ──────────────────────────────────────────────────────────
-export class SubprocessPool extends EventEmitter {
-    opts;
-    idle = [];
-    borrowed = 0;
-    reaperTimer = null;
-    _destroyed = false;
-    constructor(options) {
-        super();
-        this.opts = {
-            minIdle: options.minIdle ?? 1,
-            maxSize: options.maxSize ?? 4,
-            idleTtlMs: options.idleTtlMs ?? 300_000,
-            baseConfig: options.baseConfig,
-            claudeBin: options.claudeBin ?? getClaudeBin() ?? 'claude',
-        };
-    }
-    // ─── Lifecycle ─────────────────────────────────────────────────────────────
-    /**
-     * Start the pool: pre-warm `minIdle` sessions and schedule the idle reaper.
-     */
-    async start() {
-        if (this._destroyed)
-            throw new Error('SubprocessPool: already destroyed');
-        await this._fillIdle();
-        this.reaperTimer = setInterval(() => this._reapStale(), 60_000);
-        // Allow the Node process to exit even if the reaper is still pending.
-        if (this.reaperTimer.unref)
-            this.reaperTimer.unref();
-    }
-    /**
-     * Borrow a warm session for a new conversation.
-     * Returns null if pool is disabled or at capacity and no idle sessions exist.
-     * Callers MUST call recycle(session) when the conversation ends.
-     */
-    async borrow() {
-        if (this._destroyed)
-            return null;
-        if (!isSubprocessPoolEnabled())
-            return null;
-        if (this.idle.length > 0) {
-            const entry = this.idle.shift();
-            this.borrowed++;
-            this.emit('borrow', { remaining: this.idle.length, borrowed: this.borrowed });
-            // Spawn a replacement asynchronously to restore the idle floor.
-            this._fillIdle().catch((err) => this.emit('error', err));
-            return entry.session;
-        }
-        // No idle sessions: try to spawn one on-demand if under cap.
-        const total = this.idle.length + this.borrowed;
-        if (total < this.opts.maxSize) {
-            const session = await this._spawnWarm();
-            if (session) {
-                this.borrowed++;
-                this.emit('borrow', { remaining: 0, borrowed: this.borrowed });
-                return session;
-            }
-        }
-        this.emit('pool_exhausted', { borrowed: this.borrowed, maxSize: this.opts.maxSize });
-        return null;
-    }
-    /**
-     * Recycle a borrowed session back into the pool.
-     * The session's subprocess is terminated; a fresh warmed session replaces it.
-     */
-    async recycle(session) {
-        this.borrowed = Math.max(0, this.borrowed - 1);
-        // Kill the in-use session — it has conversation state we do not want to
-        // bleed into the next borrower.
-        try {
-            session.stop();
-        }
-        catch {
-            // Ignore stop errors — process may already be gone.
-        }
-        this.emit('recycle', { idle: this.idle.length, borrowed: this.borrowed });
-        // Restore idle floor without blocking the caller.
-        this._fillIdle().catch((err) => this.emit('error', err));
-    }
-    /**
-     * Destroy the pool: kill all idle sessions and stop the reaper.
-     */
-    destroy() {
-        if (this._destroyed)
-            return;
-        this._destroyed = true;
-        if (this.reaperTimer) {
-            clearInterval(this.reaperTimer);
-            this.reaperTimer = null;
-        }
-        for (const entry of this.idle) {
-            try {
-                entry.session.stop();
-            }
-            catch {
-                /* ignore */
-            }
-        }
-        this.idle = [];
-        this.emit('destroyed');
-    }
-    // ─── Diagnostics ──────────────────────────────────────────────────────────
-    get stats() {
-        return { idle: this.idle.length, borrowed: this.borrowed, maxSize: this.opts.maxSize };
-    }
-    // ─── Private ──────────────────────────────────────────────────────────────
-    async _fillIdle() {
-        const needed = this.opts.minIdle - this.idle.length;
-        const capacity = this.opts.maxSize - this.idle.length - this.borrowed;
-        const toSpawn = Math.min(needed, capacity);
-        if (toSpawn <= 0)
-            return;
-        await Promise.allSettled(Array.from({ length: toSpawn }, async () => {
-            const session = await this._spawnWarm();
-            if (session && !this._destroyed) {
-                this.idle.push({ session, warmAt: Date.now() });
-                this.emit('idle_ready', { idle: this.idle.length });
-            }
-        }));
-    }
-    async _spawnWarm() {
-        try {
-            const session = new PersistentClaudeSession({
-                ...this.opts.baseConfig,
-                // Pool sessions are pre-spawned without a specific task — keep
-                // them lean: no custom session ID, no resume.
-                claudeResumeId: undefined,
-                resumeSessionId: undefined,
-                customSessionId: undefined,
-            }, this.opts.claudeBin);
-            await session.start();
-            return session;
-        }
-        catch (err) {
-            this.emit('spawn_error', { error: err });
-            return null;
-        }
-    }
-    _reapStale() {
-        if (this._destroyed)
-            return;
-        const now = Date.now();
-        const stale = [];
-        this.idle = this.idle.filter((entry) => {
-            if (now - entry.warmAt > this.opts.idleTtlMs) {
-                stale.push(entry);
-                return false;
-            }
-            return true;
-        });
-        for (const entry of stale) {
-            try {
-                entry.session.stop();
-            }
-            catch {
-                /* ignore */
-            }
-        }
-        if (stale.length > 0) {
-            this.emit('idle_reaped', { reaped: stale.length, remaining: this.idle.length });
-            // Restore floor if reaping dropped below minIdle.
-            this._fillIdle().catch((err) => this.emit('error', err));
-        }
-    }
-}
-//# sourceMappingURL=subprocess-pool.js.map

package/dist/src/engines/subprocess-pool.js.map

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

package/dist/src/lib/cost-rollup.d.ts

@@ -1,36 +0,0 @@
-/**
- * v0.16 task-012 — cost rollup.
- *
- * Aggregates per-turn entries from `cc-openclaw-cost.jsonl` (emitted by the
- * openai-compat handlers) into daily and ISO-week buckets, with per-model
- * pricing applied to compute USD cost. Pure function — accepts a file path
- * and returns a structured aggregate. Consumer is the `/status` command +
- * the workspace `metrics` skill.
- *
- * JSONL line shape (from streaming-handler.ts + non-streaming-handler.ts):
- *   { ts, sessionId, turn, model, inputTokens, outputTokens, durationMs }
- *
- * `costUsd` is NOT in the JSONL — it's computed here from the `model` field
- * via the pricing table. Model values can be either full IDs
- * (`claude-opus-4-7`) or shorthand (`opus`, `sonnet`, `haiku`). Pricing per
- * 1M tokens, Anthropic public list pricing as of 2026-Q2. Unknown models
- * fall back to sonnet-rate so the aggregate is never NaN.
- */
-interface BucketAggregate {
-    tokensIn: number;
-    tokensOut: number;
-    turns: number;
-    costUsd: number;
-    durationMsTotal: number;
-}
-export interface CostRollupResult {
-    daily: Record<string, BucketAggregate>;
-    weekly: Record<string, BucketAggregate>;
-    totals: BucketAggregate;
-    rowCount: number;
-    skippedCount: number;
-}
-export declare function rollupCosts(jsonlPath: string): CostRollupResult;
-/** Compact one-line summary for /status output. */
-export declare function formatRollupLine(rollup: CostRollupResult, today: string): string;
-export {};

package/dist/src/lib/cost-rollup.js

@@ -1,125 +0,0 @@
-/**
- * v0.16 task-012 — cost rollup.
- *
- * Aggregates per-turn entries from `cc-openclaw-cost.jsonl` (emitted by the
- * openai-compat handlers) into daily and ISO-week buckets, with per-model
- * pricing applied to compute USD cost. Pure function — accepts a file path
- * and returns a structured aggregate. Consumer is the `/status` command +
- * the workspace `metrics` skill.
- *
- * JSONL line shape (from streaming-handler.ts + non-streaming-handler.ts):
- *   { ts, sessionId, turn, model, inputTokens, outputTokens, durationMs }
- *
- * `costUsd` is NOT in the JSONL — it's computed here from the `model` field
- * via the pricing table. Model values can be either full IDs
- * (`claude-opus-4-7`) or shorthand (`opus`, `sonnet`, `haiku`). Pricing per
- * 1M tokens, Anthropic public list pricing as of 2026-Q2. Unknown models
- * fall back to sonnet-rate so the aggregate is never NaN.
- */
-import * as fs from 'node:fs';
-const PRICING = {
-    'claude-opus-4-7': { inputPerM: 15, outputPerM: 75 },
-    'claude-opus-4-6': { inputPerM: 15, outputPerM: 75 },
-    opus: { inputPerM: 15, outputPerM: 75 },
-    'claude-sonnet-4-6': { inputPerM: 3, outputPerM: 15 },
-    'claude-sonnet-4-5': { inputPerM: 3, outputPerM: 15 },
-    sonnet: { inputPerM: 3, outputPerM: 15 },
-    'claude-haiku-4-5': { inputPerM: 0.8, outputPerM: 4 },
-    'claude-haiku-4-5-20251001': { inputPerM: 0.8, outputPerM: 4 },
-    haiku: { inputPerM: 0.8, outputPerM: 4 },
-};
-const DEFAULT_PRICING = PRICING.sonnet;
-function resolvePricing(model) {
-    if (PRICING[model])
-        return PRICING[model];
-    const lower = model.toLowerCase();
-    for (const key of Object.keys(PRICING)) {
-        if (lower.includes(key))
-            return PRICING[key];
-    }
-    return DEFAULT_PRICING;
-}
-function computeCostUsd(row) {
-    const p = resolvePricing(row.model);
-    return (row.inputTokens / 1_000_000) * p.inputPerM + (row.outputTokens / 1_000_000) * p.outputPerM;
-}
-function isoDateKey(ts) {
-    return ts.slice(0, 10);
-}
-/** ISO-8601 week key: `<YYYY>-W<WW>`. Week 1 contains the first Thursday. */
-function isoWeekKey(ts) {
-    const d = new Date(ts);
-    if (Number.isNaN(d.getTime()))
-        return 'invalid';
-    const target = new Date(Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate()));
-    const day = target.getUTCDay() || 7;
-    target.setUTCDate(target.getUTCDate() + 4 - day);
-    const yearStart = new Date(Date.UTC(target.getUTCFullYear(), 0, 1));
-    const weekNum = Math.ceil(((target.getTime() - yearStart.getTime()) / 86_400_000 + 1) / 7);
-    return `${target.getUTCFullYear()}-W${String(weekNum).padStart(2, '0')}`;
-}
-function emptyBucket() {
-    return { tokensIn: 0, tokensOut: 0, turns: 0, costUsd: 0, durationMsTotal: 0 };
-}
-function addToBucket(bucket, row, cost) {
-    bucket.tokensIn += row.inputTokens;
-    bucket.tokensOut += row.outputTokens;
-    bucket.turns += 1;
-    bucket.costUsd += cost;
-    bucket.durationMsTotal += row.durationMs ?? 0;
-}
-export function rollupCosts(jsonlPath) {
-    const result = {
-        daily: {},
-        weekly: {},
-        totals: emptyBucket(),
-        rowCount: 0,
-        skippedCount: 0,
-    };
-    let raw;
-    try {
-        raw = fs.readFileSync(jsonlPath, 'utf8');
-    }
-    catch {
-        return result;
-    }
-    for (const line of raw.split('\n')) {
-        if (!line.trim())
-            continue;
-        let row;
-        try {
-            row = JSON.parse(line);
-        }
-        catch {
-            result.skippedCount += 1;
-            continue;
-        }
-        if (!row.ts || typeof row.inputTokens !== 'number' || typeof row.outputTokens !== 'number') {
-            result.skippedCount += 1;
-            continue;
-        }
-        const dayKey = isoDateKey(row.ts);
-        const weekKey = isoWeekKey(row.ts);
-        const cost = computeCostUsd(row);
-        if (!result.daily[dayKey])
-            result.daily[dayKey] = emptyBucket();
-        if (!result.weekly[weekKey])
-            result.weekly[weekKey] = emptyBucket();
-        addToBucket(result.daily[dayKey], row, cost);
-        addToBucket(result.weekly[weekKey], row, cost);
-        addToBucket(result.totals, row, cost);
-        result.rowCount += 1;
-    }
-    return result;
-}
-/** Compact one-line summary for /status output. */
-export function formatRollupLine(rollup, today) {
-    const day = rollup.daily[today] ?? emptyBucket();
-    const yearWeek = isoWeekKey(`${today}T00:00:00Z`);
-    const week = rollup.weekly[yearWeek] ?? emptyBucket();
-    return [
-        `today $${day.costUsd.toFixed(4)} (${day.turns} turns, ${day.tokensIn + day.tokensOut} tok)`,
-        `week $${week.costUsd.toFixed(4)} (${week.turns} turns, ${week.tokensIn + week.tokensOut} tok)`,
-    ].join(' | ');
-}
-//# sourceMappingURL=cost-rollup.js.map

package/dist/src/lib/cost-rollup.js.map

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