@askalf/dario 6.12.10 → 6.12.11

package/dist/cli.js

@@ -52,7 +52,7 @@ function readBudgetFlags(args) {
     return budget;
 }
 import { loadAllAccounts as loadAllAccountsForIdentity, regenerateClientIdentity } from './accounts.js';
-import { maskEmail, parsePoolHeadroomFloor, configuredPoolRouting, describePoolStrategy } from './pool.js';
+import { maskEmail, parsePoolHeadroomFloor, headroomFloorProblem, headroomFloorFlagProblem, configuredPoolRouting, describePoolStrategy } from './pool.js';
 import { realpathSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { homedir } from 'node:os';
@@ -541,12 +541,20 @@ async function proxy() {
     // used rather than ride it into the 429.
     const poolHeadroomFloorFromFlag = args.find((a) => a.startsWith('--pool-headroom-floor='))?.split('=')[1];
     if (poolHeadroomFloorFromFlag !== undefined && parsePoolHeadroomFloor(poolHeadroomFloorFromFlag) === null) {
-        console.error(`[dario] Invalid --pool-headroom-floor "${poolHeadroomFloorFromFlag}". Use a ratio or percent between 2% and 50% (e.g. 0.05 or 5%).`);
+        console.error(`[dario] Invalid --pool-headroom-floor: ${headroomFloorFlagProblem(poolHeadroomFloorFromFlag)}`);
         process.exit(1);
     }
     const poolHeadroomFloor = poolHeadroomFloorFromFlag
         ?? process.env['DARIO_POOL_HEADROOM_FLOOR']
         ?? fileCfg.pool?.headroomFloor;
+    // An invalid flag value aborts startup; an invalid env or config value warns and uses the
+    // default floor.
+    if (poolHeadroomFloorFromFlag === undefined) {
+        const floorSource = process.env['DARIO_POOL_HEADROOM_FLOOR'] !== undefined ? 'DARIO_POOL_HEADROOM_FLOOR' : 'pool.headroomFloor in the config file';
+        const floorProblem = headroomFloorProblem(poolHeadroomFloor);
+        if (floorProblem)
+            console.warn(`[dario] ${floorSource}: ${floorProblem} Using the default 2%.`);
+    }
     // --pool-shared-state — share rate-limit readings and sticky bindings with
     // the other instances through the refresh-lock service (docs/multi-instance.md).
     const poolSharedState = args.includes('--pool-shared-state')

package/dist/doctor-core.js

@@ -1133,7 +1133,7 @@ export async function runChecks(opts = {}) {
             // (v5.0): it confirms the sole account is eligible, not rejected.
             if (aliases.length >= 1) {
                 try {
-                    const { AccountPool, configuredPoolRouting, describePoolStrategy } = await import('./pool.js');
+                    const { AccountPool, configuredPoolRouting, describePoolStrategy, headroomFloorProblem } = await import('./pool.js');
                     const { loadConfig } = await import('./config-file.js');
                     // The preview must use the strategy the proxy will run, not the
                     // default: `new AccountPool()` here always predicted a max-headroom
@@ -1159,6 +1159,16 @@ export async function runChecks(opts = {}) {
                             : `no eligible account — all rejected or near-expiry (${ps.exhausted}/${ps.accounts} exhausted)`)
                             + ` · ${describePoolStrategy(routing.strategy, routing.headroomFloor)} (env/config; a running proxy's --pool-strategy flag shows in GET /status)`,
                     });
+                    // Same precedence as configuredPoolRouting: the env var shadows the config file.
+                    const floorCandidate = process.env['DARIO_POOL_HEADROOM_FLOOR'] ?? loadConfig().config.pool?.headroomFloor;
+                    const floorProblem = headroomFloorProblem(floorCandidate);
+                    if (floorProblem) {
+                        checks.push({
+                            status: 'warn',
+                            label: 'Pool headroom floor',
+                            detail: `${process.env['DARIO_POOL_HEADROOM_FLOOR'] !== undefined ? 'DARIO_POOL_HEADROOM_FLOOR' : 'pool.headroomFloor'}: ${floorProblem} The default 2% is in effect.`,
+                        });
+                    }
                 }
                 catch (err) {
                     checks.push({ status: 'warn', label: 'Pool routing', detail: `check failed: ${err.message}` });

package/dist/pool.d.ts

@@ -588,12 +588,19 @@ export declare const MAX_POOL_HEADROOM_FLOOR = 0.5;
  */
 export declare function parsePoolHeadroomFloor(value: string | number | null | undefined): number | null;
 /**
- * Resolve the pool headroom floor from an explicit value (CLI flag / config
- * file, already precedence-merged by the caller) with
- * `DARIO_POOL_HEADROOM_FLOOR` as the env fallback. Unparseable or
- * out-of-bounds values fall through to the next source and finally to the
- * default, matching `resolvePoolStrategy`.
+ * Why a configured floor cannot be used, or null when it can (or is unset). The env var and the
+ * config file fall back to the default on a bad value, so without this a typo runs silently on 2%.
+ * A value between the maximum and 100% most likely names the usage at which to leave a seat
+ * rather than the headroom left (dario#1333 set `95` for "leave at 95% used"), so the message
+ * names the complement, never below the minimum. Pure.
  */
+export declare function headroomFloorProblem(value: string | number | null | undefined): string | null;
+/**
+ * Why a `--pool-headroom-floor` value was rejected. Unlike the env var and the config file, an
+ * empty flag value is an error rather than "unset", so this never returns null. Call it only for
+ * a value `parsePoolHeadroomFloor` rejected.
+ */
+export declare function headroomFloorFlagProblem(value: string): string;
 export declare function resolvePoolHeadroomFloor(explicit?: string | number | null, env?: NodeJS.ProcessEnv): number;
 /**
  * The 7-day reset `expiring-first` orders by, in epoch ms: the seat's own

package/dist/pool.js

@@ -813,6 +813,40 @@ export function parsePoolHeadroomFloor(value) {
  * out-of-bounds values fall through to the next source and finally to the
  * default, matching `resolvePoolStrategy`.
  */
+const floorPct = (r) => `${Math.round(r * 1000) / 10}%`;
+const unusableFloor = (raw) => `"${raw}" is not a usable headroom floor. Use a ratio or percent between ${floorPct(MIN_POOL_HEADROOM_FLOOR)} and ${floorPct(MAX_POOL_HEADROOM_FLOOR)} (e.g. 0.05 or 5%)`;
+/**
+ * Why a configured floor cannot be used, or null when it can (or is unset). The env var and the
+ * config file fall back to the default on a bad value, so without this a typo runs silently on 2%.
+ * A value between the maximum and 100% most likely names the usage at which to leave a seat
+ * rather than the headroom left (dario#1333 set `95` for "leave at 95% used"), so the message
+ * names the complement, never below the minimum. Pure.
+ */
+export function headroomFloorProblem(value) {
+    if (value === undefined || value === null)
+        return null;
+    const raw = String(value).trim();
+    if (raw === '' || parsePoolHeadroomFloor(value) !== null)
+        return null;
+    const base = unusableFloor(raw);
+    let n = typeof value === 'number' ? value : Number(raw.endsWith('%') ? raw.slice(0, -1).trim() : raw);
+    if (typeof value === 'string' && raw.endsWith('%'))
+        n /= 100;
+    if (Number.isFinite(n) && n > 1)
+        n /= 100;
+    if (!Number.isFinite(n) || n <= MAX_POOL_HEADROOM_FLOOR || n >= 1)
+        return `${base}.`;
+    const left = Math.max(1 - n, MIN_POOL_HEADROOM_FLOOR);
+    return `${base}. The floor is the headroom left on a seat, not its usage: to leave a seat at ${floorPct(n)} used, set ${floorPct(left)}.`;
+}
+/**
+ * Why a `--pool-headroom-floor` value was rejected. Unlike the env var and the config file, an
+ * empty flag value is an error rather than "unset", so this never returns null. Call it only for
+ * a value `parsePoolHeadroomFloor` rejected.
+ */
+export function headroomFloorFlagProblem(value) {
+    return headroomFloorProblem(value) ?? `${unusableFloor(value.trim())}.`;
+}
 export function resolvePoolHeadroomFloor(explicit, env = process.env) {
     for (const c of [explicit, env.DARIO_POOL_HEADROOM_FLOOR]) {
         const n = parsePoolHeadroomFloor(c);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@askalf/dario",
-  "version": "6.12.10",
+  "version": "6.12.11",
   "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": {