llm-relay 0.47.0 → 0.48.0

package/dist/cli.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { isRecord } from "./json-shape.js";
 import { existsSync, mkdirSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { homedir } from "node:os";
@@ -8,7 +9,7 @@ import { loadEnvFile } from "./dotenv.js";
 import { recoverWindowsEnv } from "./winenv.js";
 import { offloadState, setOffload } from "./offload.js";
 import { buildCandidates } from "./candidates.js";
-import { CREDENTIAL_LABEL_PATTERN, makeCredentialId, parseCredentialId } from "./credential-id.js";
+import { CREDENTIAL_LABEL_PATTERN, makeCredentialId } from "./credential-id.js";
 import { providerCredentialSlots, slotAllowsModel } from "./credential-fleet.js";
 import { loadLaneManifest, verifyModel } from "./lane-manifest.js";
 import { probeLanes } from "./lane-probe.js";
@@ -28,6 +29,7 @@ import { materializeDynamicPools } from "./dynamic-pools.js";
 import { currentVersion, ensureUpToDate, shouldCheckUpdates } from "./self-update.js";
 import { deleteConfigPath, parseConfigValue, readConfigDocument, readConfigPath, updateConfigDocument, writeConfigPath, } from "./config-edit.js";
 import { createControlAuthorization, resolveControlAuthorizationConfigDir } from "./control-authorization.js";
+import { isCooldownClearResult } from "./cooldown-clear.js";
 import { createDashboardSnapshotReadPort } from "./dashboard-snapshot.js";
 import { DASHBOARD_MEDIA_TYPE, isDashboardUtcTimestamp } from "./dashboard-contract.js";
 import { DASHBOARD_BOOTSTRAP_SCHEMA, DASHBOARD_BOOTSTRAP_REQUEST_SCHEMA } from "./dashboard-routes.js";
@@ -751,136 +753,6 @@ function cooldownCommandFailure(message) {
     process.stderr.write(`llm-relay cooldowns: ${message}\n`);
     process.exit(1);
 }
-function isRecord(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function hasExactKeys(value, keys) {
-    const actual = Object.keys(value);
-    return actual.length === keys.length && actual.every((key) => keys.includes(key));
-}
-function nonEmptyString(value) {
-    return typeof value === "string" && value.length > 0;
-}
-const COOLING_FACT_KINDS = new Set([
-    "allowance-exhausted",
-    "rate-limited",
-    "credential-invalid",
-]);
-function credentialIdBelongsTo(provider, value) {
-    if (typeof value !== "string")
-        return false;
-    return parseCredentialId(value)?.provider === provider;
-}
-function isCooldownFactScope(value) {
-    if (!isRecord(value))
-        return false;
-    switch (value.kind) {
-        case "attempt":
-            return hasExactKeys(value, ["kind", "provider", "credentialId", "model"]) &&
-                nonEmptyString(value.provider) &&
-                credentialIdBelongsTo(value.provider, value.credentialId) &&
-                nonEmptyString(value.model);
-        case "group": {
-            const keys = Object.hasOwn(value, "credentialId")
-                ? ["kind", "provider", "credentialId", "members"]
-                : ["kind", "provider", "members"];
-            return hasExactKeys(value, keys) &&
-                nonEmptyString(value.provider) &&
-                Array.isArray(value.members) &&
-                value.members.length > 0 &&
-                value.members.every(nonEmptyString) &&
-                (!Object.hasOwn(value, "credentialId") || credentialIdBelongsTo(value.provider, value.credentialId));
-        }
-        case "deployment":
-            return hasExactKeys(value, ["kind", "provider", "model"]) &&
-                nonEmptyString(value.provider) && nonEmptyString(value.model);
-        case "credential":
-            return hasExactKeys(value, ["kind", "provider", "credentialId"]) &&
-                nonEmptyString(value.provider) && credentialIdBelongsTo(value.provider, value.credentialId);
-        case "provider":
-            return hasExactKeys(value, ["kind", "provider"]) && nonEmptyString(value.provider);
-        case "model":
-            return hasExactKeys(value, ["kind", "model"]) && nonEmptyString(value.model);
-        default:
-            return false;
-    }
-}
-function scopeIsContainedByTarget(scope, target) {
-    const credentialId = target.credential === undefined
-        ? undefined
-        : makeCredentialId(target.provider, target.credential);
-    switch (scope.kind) {
-        case "attempt":
-            return scope.provider === target.provider &&
-                (target.model === undefined || scope.model === target.model) &&
-                (credentialId === undefined || scope.credentialId === credentialId);
-        case "group":
-            return scope.provider === target.provider &&
-                (target.model === undefined || scope.members.every((member) => member === target.model)) &&
-                (credentialId === undefined || scope.credentialId === credentialId);
-        case "deployment":
-            return scope.provider === target.provider && credentialId === undefined &&
-                (target.model === undefined || scope.model === target.model);
-        case "credential":
-            return scope.provider === target.provider && target.model === undefined &&
-                (credentialId === undefined || scope.credentialId === credentialId);
-        case "provider":
-            return scope.provider === target.provider && target.model === undefined && credentialId === undefined;
-        case "model":
-            return false;
-    }
-}
-function isCooldownCell(value, target) {
-    if (!isRecord(value) || !hasExactKeys(value, ["provider", "model", "credential"]))
-        return false;
-    if (!nonEmptyString(value.provider) || value.provider !== target.provider)
-        return false;
-    if (!(value.model === null || nonEmptyString(value.model)))
-        return false;
-    if (!nonEmptyString(value.credential) || !CREDENTIAL_LABEL_PATTERN.test(value.credential))
-        return false;
-    return (target.model === undefined || value.model === target.model) &&
-        (target.credential === undefined || value.credential === target.credential);
-}
-function isCooldownFact(value, target) {
-    return isRecord(value) &&
-        hasExactKeys(value, ["kind", "scope"]) &&
-        typeof value.kind === "string" &&
-        COOLING_FACT_KINDS.has(value.kind) &&
-        isCooldownFactScope(value.scope) &&
-        scopeIsContainedByTarget(value.scope, target);
-}
-function isClearedGroup(value, isItem) {
-    if (!isRecord(value) || !hasExactKeys(value, ["count", "items"]) ||
-        typeof value.count !== "number" || !Number.isSafeInteger(value.count) ||
-        value.count < 0 || !Array.isArray(value.items)) {
-        return false;
-    }
-    return value.count === value.items.length && value.items.every(isItem);
-}
-function isExactCooldownTarget(value, expected) {
-    if (!isRecord(value))
-        return false;
-    const keys = [
-        "provider",
-        ...(expected.model === undefined ? [] : ["model"]),
-        ...(expected.credential === undefined ? [] : ["credential"]),
-    ];
-    return hasExactKeys(value, keys) &&
-        value.provider === expected.provider &&
-        (expected.model === undefined || value.model === expected.model) &&
-        (expected.credential === undefined || value.credential === expected.credential);
-}
-function isCooldownClearResult(value, target) {
-    if (!isRecord(value) || !hasExactKeys(value, ["target", "cleared"]) ||
-        !isExactCooldownTarget(value.target, target) || !isRecord(value.cleared) ||
-        !hasExactKeys(value.cleared, ["breakerCells", "credentialFaults", "facts"])) {
-        return false;
-    }
-    return isClearedGroup(value.cleared.breakerCells, (item) => isCooldownCell(item, target)) &&
-        isClearedGroup(value.cleared.credentialFaults, (item) => isCooldownCell(item, target)) &&
-        isClearedGroup(value.cleared.facts, (item) => isCooldownFact(item, target));
-}
 const COOLDOWN_CLEAR_OPTIONS = new Map([
     ["--credential", { semantic: "credential", takesValue: true }],
     ["--json", { semantic: "json", takesValue: false }],
@@ -1089,6 +961,11 @@ export async function runCooldowns(_action, _spec) {
         ...(model === undefined ? {} : { model }),
         ...(credential === undefined ? {} : { credential }),
     };
+    const acceptedTargetKeys = [
+        "provider",
+        ...(model === undefined ? [] : ["model"]),
+        ...(credential === undefined ? [] : ["credential"]),
+    ];
     const cfg = loadOrExit();
     if (!Object.hasOwn(cfg.providers, provider)) {
         cooldownCommandFailure(`no provider "${provider}" configured`);
@@ -1126,7 +1003,7 @@ export async function runCooldowns(_action, _spec) {
         const detail = controlErrorMessage(payload);
         cooldownCommandFailure(`the running relay rejected the clear${detail === null ? "" : `: ${detail}`}`);
     }
-    if (!isCooldownClearResult(payload, target)) {
+    if (!isCooldownClearResult(payload, target, acceptedTargetKeys)) {
         cooldownCommandFailure("the running relay returned an invalid cooldown-clear response");
     }
     if (parsed.json) {
@@ -2348,29 +2225,7 @@ export async function runCandidates() {
         .join(", ");
     process.stdout.write(`Offload targets — ${clientState || `legacy/global: ${view.offload_enabled ? "on" : "off"}`}\n`);
     process.stdout.write(`${view.note}\n\n`);
-    const head = "target".padEnd(32) +
-        "credential".padEnd(40) +
-        "pools / tiers".padEnd(24) +
-        "fit".padEnd(7) +
-        "raw".padEnd(7) +
-        "cap".padEnd(11) +
-        "agentic".padEnd(9) +
-        "coding".padEnd(8) +
-        "BFCL".padEnd(7) +
-        "aider".padEnd(7) +
-        "arena".padEnd(7) +
-        "$/Mout".padEnd(8) +
-        "verdict".padEnd(10) +
-        "p95".padEnd(8) +
-        // Latency actually observed on this proxy's own traffic. The synthetic-probe p95 beside it is
-        // routinely blank, so the table could show the first pool member with NO latency signal at all
-        // while the proxy had already measured it at 60+ seconds per call — which is the difference
-        // between a pool that suits mechanical batch work and one that does not.
-        "obs".padEnd(8) +
-        "breaker".padEnd(9) +
-        "ctx";
-    process.stdout.write(head + "\n" + "-".repeat(head.length) + "\n");
-    for (const c of view.candidates) {
+    for (const [index, c] of view.candidates.entries()) {
         const credential = candidateCredential(c);
         const tags = [...c.pools, ...c.subagentTiers.map((t) => `@${t}`)].join(",") || "-";
         const live = c.listed === null ? "?" : c.listed ? "yes" : "NO";
@@ -2387,32 +2242,46 @@ export async function runCandidates() {
                 : c.breaker.credentialFault
                     ? `AUTH ${c.breaker.lastCredentialStatus ?? ""}`.trim()
                     : "closed";
-        process.stdout.write(c.spec.slice(0, 31).padEnd(32) +
-            `${credential.label} (${c.credentialId})`.padEnd(40) +
-            tags.slice(0, 23).padEnd(24) +
-            c.sortInputs.fitness.toFixed(1).padEnd(7) +
-            c.sortInputs.rawStrength.toFixed(1).padEnd(7) +
+        const columns = [
+            ["target", 32, c.spec.slice(0, 31)],
+            ["credential", 40, `${credential.label} (${c.credentialId})`],
+            ["pools / tiers", 24, tags.slice(0, 23)],
+            ["fit", 7, c.sortInputs.fitness.toFixed(1)],
+            ["raw", 7, c.sortInputs.rawStrength.toFixed(1)],
             // Capability plus how well-evidenced it is: "76.6/4" = 4 published signals behind it,
             // "50.0 neut" = nothing known. Never show the number alone.
-            `${c.sortInputs.strength.toFixed(1)}${strengthTag(c)}`.padEnd(11) +
-            fmt(c.scores.aaAgentic).padEnd(9) +
-            fmt(c.scores.aaCoding).padEnd(8) +
-            fmt(c.scores.bfclOverall).padEnd(7) +
-            fmt(c.scores.aiderPassRate).padEnd(7) +
-            (c.scores.arenaRating ? String(Math.round(c.scores.arenaRating)) : "-").padEnd(7) +
-            (c.pricePerMTokOut !== null
-                ? `$${c.pricePerMTokOut}${c.priceSource === "reference" ? "~" : ""}`
-                : "-").padEnd(8) +
-            (c.health?.verdict ?? "-").padEnd(10) +
-            fmt(c.health?.p95Ms ?? null, "ms").padEnd(8) +
-            obsLatency(c.observed).padEnd(8) +
-            breaker.padEnd(9) +
+            ["cap", 11, `${c.sortInputs.strength.toFixed(1)}${strengthTag(c)}`],
+            ["agentic", 9, fmt(c.scores.aaAgentic)],
+            ["coding", 8, fmt(c.scores.aaCoding)],
+            ["BFCL", 7, fmt(c.scores.bfclOverall)],
+            ["aider", 7, fmt(c.scores.aiderPassRate)],
+            ["arena", 7, c.scores.arenaRating ? String(Math.round(c.scores.arenaRating)) : "-"],
+            ["$/Mout", 8, c.pricePerMTokOut !== null
+                    ? `$${c.pricePerMTokOut}${c.priceSource === "reference" ? "~" : ""}`
+                    : "-"],
+            ["verdict", 10, c.health?.verdict ?? "-"],
+            ["p95", 8, fmt(c.health?.p95Ms ?? null, "ms")],
+            // Latency actually observed on this proxy's own traffic. The synthetic-probe p95 beside it is
+            // routinely blank, so the table could show the first pool member with NO latency signal at all
+            // while the proxy had already measured it at 60+ seconds per call — which is the difference
+            // between a pool that suits mechanical batch work and one that does not.
+            ["obs", 8, obsLatency(c.observed)],
+            ["breaker", 9, breaker],
             // Provenance inline: "~" = another provider's figure for this model id. A NIM row must
-            // never present OpenRouter's ceiling as its own.
-            ctx +
-            (c.contextLengthSource === "reference" ? "~" : "") +
-            (live === "NO" ? "  ⚠UNLISTED" : "") +
-            "\n");
+            // never present OpenRouter's ceiling as its own. `content` keeps this trailing column unpadded.
+            ["ctx", "content", ctx +
+                    (c.contextLengthSource === "reference" ? "~" : "") +
+                    (live === "NO" ? "  ⚠UNLISTED" : "")],
+        ];
+        const formatColumns = (part) => columns.map(([heading, width, cell]) => {
+            const content = part === "heading" ? heading : cell;
+            return width === "content" ? content : content.padEnd(width);
+        }).join("");
+        if (index === 0) {
+            const head = formatColumns("heading");
+            process.stdout.write(head + "\n" + "-".repeat(head.length) + "\n");
+        }
+        process.stdout.write(`${formatColumns("cell")}\n`);
         // The resolved ladders print on their own line: raw observations first (what providers
         // said), then the derived view with its basis, so a computed figure never appears without
         // its provenance. Spec §5: unknown stays "-", and a negative remaining prints as-is.