@askalf/dario 6.16.0 → 6.17.0

package/dist/donuts.js

@@ -1,3 +1,16 @@
+/**
+ * Spend donuts — where the API-equivalent number comes from, as shares.
+ *
+ * Three rings from the ledger, no new data: by model, by consumer (named
+ * key / `x-dario-consumer`), and covered-vs-metered. Rendered as one SVG
+ * (`dario usage --donut`, `GET /analytics/donuts.svg`) and inside the
+ * server-rendered `/analytics/view` fragment that the `/analytics/ui` page
+ * loaded before 6.17 (still served). Same palette and frame as the share card in ledger.ts.
+ *
+ * Pure over a LedgerSummary / AnalyticsSummary so the geometry is testable
+ * without a proxy.
+ */
+import { readFileSync } from 'node:fs';
 import { formatUsd } from './ledger.js';
 const PALETTE = ['#7c3aed', '#db2777', '#2563eb', '#059669', '#d97706', '#0891b2'];
 const OTHER = '#6b7280';
@@ -90,7 +103,7 @@ export function renderSpendDonuts(s) {
 /**
  * The server-rendered fragment behind `/analytics/ui`: headline, the three
  * rings, the rolling window, and a per-model table. Same gate as
- * `/analytics`; the shell page fetches it with the token the viewer typed.
+ * `/analytics`; the page before 6.17 fetched it with the token the viewer typed; it is still served.
  */
 export function renderAnalyticsView(summary, lifetime, version) {
     const w = summary.window;
@@ -119,58 +132,37 @@ ${table}
 ${accounts ? `<table><thead><tr><th>seat</th><th>requests</th><th>5h</th><th>7d</th><th>last claim</th></tr></thead><tbody>${accounts}</tbody></table>` : ''}
 <div class="foot">dario ${escapeHtml(version)} · rendered ${escapeHtml(new Date().toISOString().slice(0, 19).replace('T', ' '))} UTC</div>`;
 }
+/** The page served when the build ran tsc without the copy step: say so instead of a 500. */
+const ANALYTICS_UI_MISSING = '<!doctype html><html lang="en"><head><meta charset="utf-8"><title>dario</title></head><body><p>This build is missing <code>analytics-ui.html</code> next to <code>donuts.js</code>; run <code>npm run build</code>.</p></body></html>';
 /**
- * The static shell for `/analytics/ui`. Carries NO data — it is safe to
- * serve without auth — and asks the viewer for the token once (kept in
- * sessionStorage), then fetches `/analytics/view` every 60 s with it.
+ * A reader of the dashboard page that reads it once: the first read that succeeds is kept for
+ * every call after it. A failed read answers with the missing-file page and keeps nothing, so
+ * copying the file in takes effect on the next request without a restart. The reader is a
+ * parameter so the test can count the reads.
  */
-export const ANALYTICS_UI_SHELL = `<!doctype html>
-<html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">
-<title>dario analytics</title>
-<style>
-  :root{color-scheme:dark}
-  body{margin:0;background:#0a0a0f;color:#e5e7eb;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,"Liberation Mono",monospace;font-size:14px}
-  header{display:flex;gap:12px;align-items:center;padding:14px 20px;border-bottom:1px solid #1f2937;background:linear-gradient(90deg,#7c3aed,#db2777) top/100% 4px no-repeat,#0a0a0f}
-  header h1{font-size:14px;letter-spacing:2px;margin:0;color:#9ca3af;font-weight:600}
-  header input{background:#111827;color:#e5e7eb;border:1px solid #374151;border-radius:6px;padding:6px 10px;font:inherit;width:22em}
-  header button{background:#7c3aed;color:#fff;border:0;border-radius:6px;padding:6px 12px;font:inherit;cursor:pointer}
-  #status{color:#9ca3af;margin-left:auto}
-  main{padding:20px;max-width:1100px;margin:0 auto}
-  .headline{font-size:34px;font-weight:700;color:#fff;margin:6px 0 16px}
-  .headline span{display:block;font-size:13px;font-weight:400;color:#9ca3af;margin-top:4px}
-  .headline.muted{color:#6b7280}
-  .stats{display:grid;grid-template-columns:repeat(auto-fit,minmax(150px,1fr));gap:12px;margin-bottom:18px}
-  .stat{background:#111827;border:1px solid #1f2937;border-radius:12px;padding:12px 14px}
-  .stat .v{font-size:20px;font-weight:700;color:#fff}.stat .l{font-size:11px;color:#9ca3af;margin-top:2px}
-  .rings svg{width:100%;max-width:640px;height:auto;display:block;margin:0 auto 18px}
-  table{width:100%;border-collapse:collapse;margin:0 0 18px;font-size:12px}
-  th,td{text-align:right;padding:6px 8px;border-bottom:1px solid #1f2937}th:first-child,td:first-child{text-align:left}
-  th{color:#9ca3af;font-weight:500}
-  .foot{color:#6b7280;font-size:11px}
-  .err{color:#fca5a5;padding:20px;background:#1f1115;border:1px solid #7f1d1d;border-radius:12px}
-</style></head>
-<body>
-<header><h1>DARIO ANALYTICS</h1>
-  <input id="tok" type="password" placeholder="analytics token or API key (blank on an unkeyed proxy)" autocomplete="off">
-  <button id="go">connect</button><span id="status"></span></header>
-<main id="view"></main>
-<script>
-(function(){
-  var tok=document.getElementById('tok'),view=document.getElementById('view'),status=document.getElementById('status'),timer=null;
-  try{tok.value=sessionStorage.getItem('dario.analytics.token')||''}catch(e){}
-  function headers(){var h={};if(tok.value)h['Authorization']='Bearer '+tok.value;return h}
-  function load(){
-    fetch('/analytics/view',{headers:headers(),cache:'no-store'}).then(function(r){
-      if(r.status===401){view.innerHTML='<div class="err">401 — this proxy is keyed. Paste its analytics token (DARIO_ANALYTICS_TOKEN) or API key above.</div>';status.textContent='';return}
-      if(!r.ok){view.innerHTML='<div class="err">'+r.status+' from /analytics/view</div>';return}
-      return r.text().then(function(html){view.innerHTML=html;status.textContent='live · refreshes every 60 s';try{sessionStorage.setItem('dario.analytics.token',tok.value)}catch(e){}})
-    }).catch(function(e){view.innerHTML='<div class="err">'+String(e)+'</div>'});
-  }
-  function start(){if(timer)clearInterval(timer);load();timer=setInterval(load,60000)}
-  document.getElementById('go').addEventListener('click',start);
-  tok.addEventListener('keydown',function(e){if(e.key==='Enter')start()});
-  start();
-})();
-</script>
-</body></html>
-`;
+export function analyticsUiLoader(read) {
+    let page = null;
+    return () => {
+        if (page !== null)
+            return page;
+        try {
+            page = read();
+            return page;
+        }
+        catch {
+            return ANALYTICS_UI_MISSING;
+        }
+    };
+}
+/**
+ * The dashboard behind `/analytics/ui`: `dist/analytics-ui.html`, copied from `src/` by the
+ * build and read once, on the first request. It carries no data and no credential. It asks for
+ * the analytics token or an API key once (kept in sessionStorage) and reads `/analytics`,
+ * `/accounts`, `/codex`, `/health`, `/analytics/ledger` and `/admin/keys` with it, and tails
+ * `/analytics/stream`; it loads nothing from outside the proxy. The
+ * `window.DARIO_COCKPIT = "served"` line in its head tells the page a proxy is serving it, so it
+ * goes live at once; the same file opened from disk runs on sample data, because the page checks
+ * the protocol before the marker. `/analytics/view` and the rings above are unchanged for the CLI
+ * and for anything that embedded them.
+ */
+export const analyticsUiPage = analyticsUiLoader(() => readFileSync(new URL('./analytics-ui.html', import.meta.url), 'utf8'));

package/dist/ledger.d.ts

@@ -142,6 +142,11 @@ export declare function dayKey(atMs: number): string;
  * claim, and an absent claim on a 2xx (stream aborts, api-key mode without
  * the header) are covered — the request was served, and nothing says it was
  * billed per token.
+ *
+ * `credits` is metered too: the credits rung spends the monthly API credits
+ * a Max plan includes, at API rates, from a balance with an end. That is
+ * money the plan handed over and the request used up, not a bill that never
+ * arrived, so it is reported as spent and never counted as saved.
  */
 export declare function ledgerBucketFor(record: Pick<RequestRecord, 'status' | 'claim'>): LedgerBucket | null;
 /**
@@ -169,6 +174,19 @@ export declare function consumerDayUsage(file: LedgerFile, consumer: string, now
 /** `1234` → `1.2k`, `1234567` → `1.2M`; below a thousand, the number itself. */
 export declare function formatTokenCount(n: number): string;
 export declare function summarizeLedger(file: LedgerFile, path: string, now?: number): LedgerSummary;
+/** One row of the table as money: the bucket's USD at that day's rate, present where the bucket is. */
+export type PricedLedgerRow = Partial<Record<LedgerBucket, number>>;
+/**
+ * The table priced row for row, the way summarizeLedger prices it: what
+ * /analytics/ledger sends next to the raw cells, so a reader charting them
+ * (the dashboard, a script) needs no price list of its own and a pricing
+ * correction here reaches every reader at once.
+ */
+export interface PricedLedger {
+    days: Record<string, Record<string, PricedLedgerRow>>;
+    consumers: Record<string, Record<string, Record<string, PricedLedgerRow>>>;
+}
+export declare function priceLedger(file: LedgerFile): PricedLedger;
 /**
  * Read a ledger file for display without a running proxy (`dario usage`
  * when the proxy is down). Missing file → null; unreadable → null with the
@@ -204,6 +222,8 @@ export declare class Ledger {
     };
     /** The raw per-day table, for /analytics/ledger. */
     snapshot(): LedgerFile;
+    /** The same table as money, sent next to it on /analytics/ledger. */
+    priced(): PricedLedger;
     private scheduleFlush;
     /** Write now if anything changed. Serialized; a failure is logged, not thrown. */
     flush(): Promise<void>;

package/dist/ledger.js

@@ -71,12 +71,17 @@ function dayMs(day) {
  * claim, and an absent claim on a 2xx (stream aborts, api-key mode without
  * the header) are covered — the request was served, and nothing says it was
  * billed per token.
+ *
+ * `credits` is metered too: the credits rung spends the monthly API credits
+ * a Max plan includes, at API rates, from a balance with an end. That is
+ * money the plan handed over and the request used up, not a bill that never
+ * arrived, so it is reported as spent and never counted as saved.
  */
 export function ledgerBucketFor(record) {
     if (record.status < 200 || record.status >= 300)
         return null;
     const bucket = billingBucketFromClaim(record.claim);
-    return bucket === 'api' || bucket === 'extra_usage' ? 'metered' : 'covered';
+    return bucket === 'api' || bucket === 'extra_usage' || bucket === 'credits' ? 'metered' : 'covered';
 }
 function isCell(v) {
     if (!v || typeof v !== 'object')
@@ -365,6 +370,36 @@ export function summarizeLedger(file, path, now = Date.now()) {
         perConsumer: summarizeLedgerConsumers(file, now),
     };
 }
+export function priceLedger(file) {
+    const priceRow = (day, model, row) => {
+        const at = dayMs(day);
+        const out = {};
+        if (row.covered)
+            out.covered = round(costOfTokens(model, at, row.covered));
+        if (row.metered)
+            out.metered = round(costOfTokens(model, at, row.metered));
+        return out;
+    };
+    const days = {};
+    for (const [day, models] of Object.entries(file.days)) {
+        const priced = {};
+        for (const [model, row] of Object.entries(models))
+            priced[model] = priceRow(day, model, row);
+        days[day] = priced;
+    }
+    const consumers = {};
+    for (const [day, byConsumer] of Object.entries(file.consumers ?? {})) {
+        const priced = {};
+        for (const [consumer, models] of Object.entries(byConsumer)) {
+            const rows = {};
+            for (const [model, row] of Object.entries(models))
+                rows[model] = priceRow(day, model, row);
+            priced[consumer] = rows;
+        }
+        consumers[day] = priced;
+    }
+    return { days, consumers };
+}
 /**
  * Read a ledger file for display without a running proxy (`dario usage`
  * when the proxy is down). Missing file → null; unreadable → null with the
@@ -438,6 +473,10 @@ export class Ledger {
     snapshot() {
         return JSON.parse(JSON.stringify(this.file));
     }
+    /** The same table as money, sent next to it on /analytics/ledger. */
+    priced() {
+        return priceLedger(this.file);
+    }
     scheduleFlush() {
         this.dirty = true;
         if (this.timer)

package/dist/metrics.js

@@ -130,7 +130,8 @@ export function renderPrometheus(input) {
     if (p.estimatedExhaustionMinutes !== null) {
         metric('dario_predicted_exhaustion_minutes', 'Minutes until the current seat window is predicted to exhaust at the present burn rate.', [[{}, p.estimatedExhaustionMinutes]]);
     }
-    metric('dario_burn_tokens_per_minute', 'Token burn rate over the rolling window.', [[{}, p.tokenBurnRate]]);
+    metric('dario_burn_tokens_per_minute', 'Input and output token burn rate over the rolling window; cache reads and writes are not in it.', [[{}, p.tokenBurnRate]]);
+    metric('dario_burn_total_tokens_per_minute', 'Token burn rate over the rolling window, every kind: input, output, cache reads and cache writes.', [[{}, p.totalTokenBurnRate]]);
     metric('dario_burn_cost_usd_per_minute', 'API-equivalent cost burn rate over the rolling window, USD/min.', [[{}, p.costBurnRate]]);
     // ---- ledger (survives restarts) ----------------------------------------
     if (lifetime) {

package/dist/proxy.d.ts

@@ -671,6 +671,16 @@ interface ProxyOptions {
      * a CLI flag, so the key never lands in `ps`/argv).
      */
     upstreamApiKey?: string;
+    /**
+     * The key behind a `credits:<model>` entry of `--pool-fallback`
+     * (credits-rung.ts): a Console API key of the organization a Max plan is
+     * linked to, spending the monthly API credits that plan includes. Used
+     * only when every seat is drained or cooling and no subscription rung can
+     * serve; the pool stays the first choice. Sourced from
+     * DARIO_CREDITS_API_KEY (env-only, like `upstreamApiKey`, so it never lands
+     * in argv). A chain entry without the key is inert and said so at startup.
+     */
+    creditsApiKey?: string;
     /**
      * Overage-guard — halt the proxy on the first response that bills to
      * anything other than the subscription pool (`overage`, `api`, or a new