@askalf/dario 6.0.35 → 6.0.37

package/dist/cli.d.ts

@@ -105,6 +105,42 @@ export declare function parseBooleanEnv(value: string | undefined): boolean | un
  *   Set(['thinking','env']) — value "thinking,env"        → preserve listed
  */
 export declare function resolvePreserveOrchestrationTags(args: string[], env: string | undefined): Set<string> | undefined;
+/**
+ * The seat shape a running proxy returns from `/accounts`.
+ *
+ * Everything past `alias` is optional on purpose. A freshly installed CLI
+ * routinely queries a proxy still running the PREVIOUS release, whose seats
+ * predate whichever field the newest feature added — `sharesWindowWith`,
+ * `organizationId` and `grantedAt` all arrived that way (dario#1248 review).
+ * The payload is accepted on `mode` + `accounts` alone, so the renderer, not
+ * the fetch, is where a missing field would throw. Defaulting each one here
+ * keeps `accounts list --live` degrading to a thinner line instead of dying
+ * with a TypeError and skipping the on-disk fallback it advertises.
+ */
+export interface LiveSeat {
+    alias?: string;
+    status?: string;
+    action?: 'none' | 'wait' | 'regrant';
+    util5h?: number;
+    util7d?: number;
+    utilAgeMs?: number | null;
+    resetInMs?: number | null;
+    requestCount?: number;
+    rejectedCount?: number;
+    organizationId?: string | null;
+    sharesWindowWith?: string[];
+    grantedAt?: number | null;
+}
+export interface LivePayload {
+    mode?: string;
+    accounts?: LiveSeat[];
+    distinctWindows?: number;
+}
+/**
+ * Render the live pool listing. Pure — returns the lines rather than printing
+ * them, so a legacy payload can be driven straight through it in a test.
+ */
+export declare function formatLiveAccountsListing(payload: LivePayload, port: number, now: number): string[];
 /**
  * Decide whether this module is being invoked as the CLI entry point or
  * imported as a library. Pure, exported for tests; the file-bottom uses

package/dist/cli.js

@@ -894,6 +894,52 @@ function parsePositiveIntFlag(prefix) {
     }
     return n;
 }
+/**
+ * Render the live pool listing. Pure — returns the lines rather than printing
+ * them, so a legacy payload can be driven straight through it in a test.
+ */
+export function formatLiveAccountsListing(payload, port, now) {
+    const seats = Array.isArray(payload.accounts) ? payload.accounts : [];
+    const num = (v) => (typeof v === 'number' && Number.isFinite(v) ? v : 0);
+    const pct = (n) => `${Math.round(num(n) * 100)}%`;
+    const mins = (ms) => {
+        const m = Math.max(1, Math.round(ms / 60_000));
+        return m >= 60 ? `${Math.floor(m / 60)}h ${m % 60}m` : `${m}m`;
+    };
+    const age = (ms) => typeof ms !== 'number' || !Number.isFinite(ms)
+        ? 'never measured'
+        : ms < 60_000 ? `read ${Math.round(ms / 1000)}s ago` : `read ${mins(ms)} ago`;
+    const lines = [];
+    lines.push('');
+    lines.push(`  dario — Accounts (live, from http://127.0.0.1:${port})`);
+    lines.push('  ────────────────');
+    lines.push('');
+    const windows = typeof payload.distinctWindows === 'number' ? payload.distinctWindows : seats.length;
+    lines.push(`  Pool of ${seats.length} (${seats.length === 1 ? '1 seat' : seats.length + ' seats'} on ${windows} distinct window${windows === 1 ? '' : 's'})`);
+    lines.push('');
+    for (const s of seats) {
+        const alias = typeof s.alias === 'string' ? s.alias : '(unnamed)';
+        const rawStatus = typeof s.status === 'string' ? s.status : 'unknown';
+        const status = rawStatus === 'rejected' && typeof s.resetInMs === 'number' ? `rejected, back in ${mins(s.resetInMs)}` : rawStatus;
+        lines.push(`    ${alias.padEnd(20)} ${status.padEnd(26)} 5h ${pct(s.util5h).padEnd(6)} 7d ${pct(s.util7d).padEnd(6)} ${age(s.utilAgeMs)}`);
+        // The one-word next step (dario#1244): a parked seat wants nothing from
+        // the operator; an auth-failure streak wants a re-grant.
+        const next = s.action === 'regrant' ? 'next: re-grant this seat (dario accounts remove + add)'
+            : s.action === 'wait' ? 'next: nothing, it comes back on its own'
+                : null;
+        const facts = [
+            `served ${num(s.requestCount)}`,
+            `429s ${num(s.rejectedCount)}`,
+            ...(next ? [next] : []),
+            typeof s.organizationId === 'string' && s.organizationId ? `org ${s.organizationId.slice(0, 8)}…` : 'org not yet observed',
+            ...(Array.isArray(s.sharesWindowWith) && s.sharesWindowWith.length > 0 ? [`shares its window with ${s.sharesWindowWith.join(', ')}`] : []),
+        ];
+        lines.push(`    ${''.padEnd(20)} ${facts.join('  ·  ')}`);
+        lines.push(`    ${''.padEnd(20)} ${describeGrantAge(grantAge(typeof s.grantedAt === 'number' ? s.grantedAt : undefined, now))}`);
+    }
+    lines.push('');
+    return lines;
+}
 /**
  * `dario accounts list --live` — the running proxy's view of the pool
  * (dario#1244): status with its countdown, the reading and its age, 429s
@@ -924,40 +970,8 @@ async function accountsListLive() {
     }
     if (!payload || payload.mode !== 'pool' || !Array.isArray(payload.accounts))
         return false;
-    const seats = payload.accounts;
-    const now = Date.now();
-    const pct = (n) => `${Math.round(n * 100)}%`;
-    const mins = (ms) => {
-        const m = Math.max(1, Math.round(ms / 60_000));
-        return m >= 60 ? `${Math.floor(m / 60)}h ${m % 60}m` : `${m}m`;
-    };
-    const age = (ms) => ms === null ? 'never measured' : ms < 60_000 ? `read ${Math.round(ms / 1000)}s ago` : `read ${mins(ms)} ago`;
-    console.log('');
-    console.log(`  dario — Accounts (live, from http://127.0.0.1:${port})`);
-    console.log('  ────────────────');
-    console.log('');
-    const windows = payload.distinctWindows ?? seats.length;
-    console.log(`  Pool of ${seats.length} (${seats.length === 1 ? '1 seat' : seats.length + ' seats'} on ${windows} distinct window${windows === 1 ? '' : 's'})`);
-    console.log('');
-    for (const s of seats) {
-        const status = s.status === 'rejected' && typeof s.resetInMs === 'number' ? `rejected, back in ${mins(s.resetInMs)}` : s.status;
-        console.log(`    ${s.alias.padEnd(20)} ${status.padEnd(26)} 5h ${pct(s.util5h).padEnd(6)} 7d ${pct(s.util7d).padEnd(6)} ${age(s.utilAgeMs)}`);
-        // The one-word next step (dario#1244): a parked seat wants nothing from
-        // the operator; an auth-failure streak wants a re-grant.
-        const next = s.action === 'regrant' ? 'next: re-grant this seat (dario accounts remove + add)'
-            : s.action === 'wait' ? 'next: nothing, it comes back on its own'
-                : null;
-        const facts = [
-            `served ${s.requestCount}`,
-            `429s ${s.rejectedCount}`,
-            ...(next ? [next] : []),
-            s.organizationId ? `org ${s.organizationId.slice(0, 8)}…` : 'org not yet observed',
-            ...(s.sharesWindowWith.length > 0 ? [`shares its window with ${s.sharesWindowWith.join(', ')}`] : []),
-        ];
-        console.log(`    ${''.padEnd(20)} ${facts.join('  ·  ')}`);
-        console.log(`    ${''.padEnd(20)} ${describeGrantAge(grantAge(s.grantedAt ?? undefined, now))}`);
-    }
-    console.log('');
+    for (const line of formatLiveAccountsListing(payload, port, Date.now()))
+        console.log(line);
     return true;
 }
 async function accounts() {

package/dist/version.js

@@ -1,28 +1,42 @@
 /**
- * dario's own package version, read once from the bundled package.json.
+ * dario's own package version, bound at module load.
  *
  * Surfaced on `/status` and `/health` (#640) so a headless operator can confirm
  * an auto-update actually rolled the running proxy — `curl /health | jq .version`
  * beats exec-ing into the container to read package.json.
+ *
+ * WHY AT MODULE LOAD, NOT ON FIRST CALL. This used to read package.json lazily
+ * the first time someone asked, and cache that. `npm i -g` rewrites
+ * package.json under the running install without touching the process, so a
+ * proxy that had not served `/status` before an upgrade answered its first one
+ * with the NEW version while still executing the OLD code — precisely the
+ * opposite of what the field exists to report. It cost the reporter on #1244 a
+ * round trip: `/status` read 6.0.34 while `GET /admin/accounts` was still
+ * emitting the 6.0.33 field set, so the advice he had been given ("upgrade,
+ * then read `organization_id`") looked already done.
+ *
+ * Reading at import binds the value to the process. proxy.ts imports this at
+ * startup, so `/status` reports the build that is actually answering until it
+ * restarts — the only claim the field can honestly make.
  */
 import { readFileSync } from 'node:fs';
 import { join, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
-let cached = null;
-export function darioVersion() {
-    if (cached !== null)
-        return cached;
-    let v = 'unknown';
+function readVersion() {
     try {
         // dist/version.js → ../package.json (same layout the MCP server + CLI use).
         const here = dirname(fileURLToPath(import.meta.url));
         const pkg = JSON.parse(readFileSync(join(here, '..', 'package.json'), 'utf-8'));
         if (typeof pkg.version === 'string')
-            v = pkg.version;
+            return pkg.version;
     }
     catch {
-        // package.json missing/malformed — keep 'unknown', never throw.
+        // package.json missing/malformed — report 'unknown', never throw.
     }
-    cached = v;
-    return v;
+    return 'unknown';
+}
+/** Read once, at import. See the note above for why not on first call. */
+const VERSION = readVersion();
+export function darioVersion() {
+    return VERSION;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@askalf/dario",
-  "version": "6.0.35",
+  "version": "6.0.37",
   "description": "Use your Claude and ChatGPT subscriptions in Cursor, Cline, Aider, Claude Code and the Agent SDK — at subscription pricing, not per-token API bills. One local Anthropic + OpenAI-compatible endpoint: either plan answers either wire shape, with automatic failover when one hits its limit.",
   "type": "module",
   "bin": {