@poolzin/pool-bot 2026.2.3 → 2026.2.5

package/dist/commands/auth-choice.apply.api-providers.js

@@ -3,7 +3,7 @@ import { resolveEnvApiKey } from "../agents/model-auth.js";
 import { formatApiKeyPreview, normalizeApiKeyInput, validateApiKeyInput, } from "./auth-choice.api-key.js";
 import { applyDefaultModelChoice } from "./auth-choice.default-model.js";
 import { applyGoogleGeminiModelDefault, GOOGLE_GEMINI_DEFAULT_MODEL, } from "./google-gemini-model-default.js";
-import { applyAuthProfileConfig, applyCloudflareAiGatewayConfig, applyCloudflareAiGatewayProviderConfig, applyQianfanConfig, applyQianfanProviderConfig, applyKimiCodeConfig, applyKimiCodeProviderConfig, applyMoonshotConfig, applyMoonshotConfigCn, applyMoonshotProviderConfig, applyMoonshotProviderConfigCn, applyOpencodeZenConfig, applyOpencodeZenProviderConfig, applyOpenrouterConfig, applyOpenrouterProviderConfig, applySyntheticConfig, applySyntheticProviderConfig, applyTogetherConfig, applyTogetherProviderConfig, applyVeniceConfig, applyVeniceProviderConfig, applyVercelAiGatewayConfig, applyVercelAiGatewayProviderConfig, applyXiaomiConfig, applyXiaomiProviderConfig, applyZaiConfig, CLOUDFLARE_AI_GATEWAY_DEFAULT_MODEL_REF, QIANFAN_DEFAULT_MODEL_REF, KIMI_CODING_MODEL_REF, MOONSHOT_DEFAULT_MODEL_REF, OPENROUTER_DEFAULT_MODEL_REF, SYNTHETIC_DEFAULT_MODEL_REF, TOGETHER_DEFAULT_MODEL_REF, VENICE_DEFAULT_MODEL_REF, VERCEL_AI_GATEWAY_DEFAULT_MODEL_REF, XIAOMI_DEFAULT_MODEL_REF, setCloudflareAiGatewayConfig, setQianfanApiKey, setGeminiApiKey, setKimiCodingApiKey, setMoonshotApiKey, setOpencodeZenApiKey, setOpenrouterApiKey, setSyntheticApiKey, setTogetherApiKey, setVeniceApiKey, setVercelAiGatewayApiKey, setXiaomiApiKey, setZaiApiKey, ZAI_DEFAULT_MODEL_REF, } from "./onboard-auth.js";
+import { applyAuthProfileConfig, applyCloudflareAiGatewayConfig, applyCloudflareAiGatewayProviderConfig, applyQianfanConfig, applyQianfanProviderConfig, applyKimiCodeConfig, applyKimiCodeProviderConfig, applyMoonshotConfig, applyMoonshotConfigCn, applyMoonshotProviderConfig, applyMoonshotProviderConfigCn, applyOpencodeZenConfig, applyOpencodeZenProviderConfig, applyOpenrouterConfig, applyOpenrouterProviderConfig, applySyntheticConfig, applySyntheticProviderConfig, applyTogetherConfig, applyTogetherProviderConfig, applyVeniceConfig, applyVeniceProviderConfig, applyVercelAiGatewayConfig, applyVercelAiGatewayProviderConfig, applyXiaomiConfig, applyXiaomiProviderConfig, applyZaiConfig, applyNvidiaConfig, applyNvidiaProviderConfig, CLOUDFLARE_AI_GATEWAY_DEFAULT_MODEL_REF, NVIDIA_DEFAULT_MODEL_REF, QIANFAN_DEFAULT_MODEL_REF, KIMI_CODING_MODEL_REF, MOONSHOT_DEFAULT_MODEL_REF, OPENROUTER_DEFAULT_MODEL_REF, SYNTHETIC_DEFAULT_MODEL_REF, TOGETHER_DEFAULT_MODEL_REF, VENICE_DEFAULT_MODEL_REF, VERCEL_AI_GATEWAY_DEFAULT_MODEL_REF, XIAOMI_DEFAULT_MODEL_REF, setCloudflareAiGatewayConfig, setQianfanApiKey, setGeminiApiKey, setKimiCodingApiKey, setMoonshotApiKey, setNvidiaApiKey, setOpencodeZenApiKey, setOpenrouterApiKey, setSyntheticApiKey, setTogetherApiKey, setVeniceApiKey, setVercelAiGatewayApiKey, setXiaomiApiKey, setZaiApiKey, ZAI_DEFAULT_MODEL_REF, } from "./onboard-auth.js";
 import { OPENCODE_ZEN_DEFAULT_MODEL } from "./opencode-zen-model-default.js";
 export async function applyAuthChoiceApiProviders(params) {
     let nextConfig = params.config;
@@ -59,6 +59,9 @@ export async function applyAuthChoiceApiProviders(params) {
         else if (params.opts.tokenProvider === "qianfan") {
             authChoice = "qianfan-api-key";
         }
+        else if (params.opts.tokenProvider === "nvidia") {
+            authChoice = "nvidia-api-key";
+        }
     }
     if (authChoice === "openrouter-api-key") {
         const store = ensureAuthProfileStore(params.agentDir, {
@@ -786,5 +789,56 @@ export async function applyAuthChoiceApiProviders(params) {
         }
         return { config: nextConfig, agentModelOverride };
     }
+    if (authChoice === "nvidia-api-key") {
+        let hasCredential = false;
+        if (!hasCredential && params.opts?.token && params.opts?.tokenProvider === "nvidia") {
+            setNvidiaApiKey(normalizeApiKeyInput(params.opts.token), params.agentDir);
+            hasCredential = true;
+        }
+        if (!hasCredential) {
+            await params.prompter.note([
+                "Get your API key at: https://build.nvidia.com/settings/api-key",
+                "Free tier includes 1,000 requests/day across 23+ frontier models.",
+            ].join("\n"), "NVIDIA");
+        }
+        const envKey = resolveEnvApiKey("nvidia");
+        if (envKey) {
+            const useExisting = await params.prompter.confirm({
+                message: `Use existing NVIDIA_API_KEY (${envKey.source}, ${formatApiKeyPreview(envKey.apiKey)})?`,
+                initialValue: true,
+            });
+            if (useExisting) {
+                setNvidiaApiKey(envKey.apiKey, params.agentDir);
+                hasCredential = true;
+            }
+        }
+        if (!hasCredential) {
+            const key = await params.prompter.text({
+                message: "Enter NVIDIA API key",
+                validate: validateApiKeyInput,
+            });
+            setNvidiaApiKey(normalizeApiKeyInput(String(key)), params.agentDir);
+        }
+        nextConfig = applyAuthProfileConfig(nextConfig, {
+            profileId: "nvidia:default",
+            provider: "nvidia",
+            mode: "api_key",
+        });
+        {
+            const applied = await applyDefaultModelChoice({
+                config: nextConfig,
+                setDefaultModel: params.setDefaultModel,
+                defaultModel: NVIDIA_DEFAULT_MODEL_REF,
+                applyDefaultConfig: applyNvidiaConfig,
+                applyProviderConfig: applyNvidiaProviderConfig,
+                noteDefault: NVIDIA_DEFAULT_MODEL_REF,
+                noteAgentModel,
+                prompter: params.prompter,
+            });
+            nextConfig = applied.config;
+            agentModelOverride = applied.agentModelOverride ?? agentModelOverride;
+        }
+        return { config: nextConfig, agentModelOverride };
+    }
     return null;
 }

package/dist/commands/auth-choice.apply.plugin-provider.js

@@ -1,7 +1,6 @@
 import { resolvePoolbotAgentDir } from "../agents/agent-paths.js";
 import { resolveDefaultAgentId, resolveAgentDir, resolveAgentWorkspaceDir, } from "../agents/agent-scope.js";
 import { upsertAuthProfile } from "../agents/auth-profiles.js";
-import { normalizeProviderId } from "../agents/model-selection.js";
 import { resolveDefaultAgentWorkspaceDir } from "../agents/workspace.js";
 import { enablePluginInConfig } from "../plugins/enable.js";
 import { resolvePluginProviders } from "../plugins/providers.js";
@@ -9,61 +8,7 @@ import { applyAuthProfileConfig } from "./onboard-auth.js";
 import { openUrl } from "./onboard-helpers.js";
 import { createVpsAwareOAuthHandlers } from "./oauth-flow.js";
 import { isRemoteEnvironment } from "./oauth-env.js";
-function resolveProviderMatch(providers, rawProvider) {
-    const normalized = normalizeProviderId(rawProvider);
-    return (providers.find((provider) => normalizeProviderId(provider.id) === normalized) ??
-        providers.find((provider) => provider.aliases?.some((alias) => normalizeProviderId(alias) === normalized) ?? false) ??
-        null);
-}
-function pickAuthMethod(provider, rawMethod) {
-    const raw = rawMethod?.trim();
-    if (!raw)
-        return null;
-    const normalized = raw.toLowerCase();
-    return (provider.auth.find((method) => method.id.toLowerCase() === normalized) ??
-        provider.auth.find((method) => method.label.toLowerCase() === normalized) ??
-        null);
-}
-function isPlainRecord(value) {
-    return Boolean(value && typeof value === "object" && !Array.isArray(value));
-}
-function mergeConfigPatch(base, patch) {
-    if (!isPlainRecord(base) || !isPlainRecord(patch)) {
-        return patch;
-    }
-    const next = { ...base };
-    for (const [key, value] of Object.entries(patch)) {
-        const existing = next[key];
-        if (isPlainRecord(existing) && isPlainRecord(value)) {
-            next[key] = mergeConfigPatch(existing, value);
-        }
-        else {
-            next[key] = value;
-        }
-    }
-    return next;
-}
-function applyDefaultModel(cfg, model) {
-    const models = { ...cfg.agents?.defaults?.models };
-    models[model] = models[model] ?? {};
-    const existingModel = cfg.agents?.defaults?.model;
-    return {
-        ...cfg,
-        agents: {
-            ...cfg.agents,
-            defaults: {
-                ...cfg.agents?.defaults,
-                models,
-                model: {
-                    ...(existingModel && typeof existingModel === "object" && "fallbacks" in existingModel
-                        ? { fallbacks: existingModel.fallbacks }
-                        : undefined),
-                    primary: model,
-                },
-            },
-        },
-    };
-}
+import { applyDefaultModel, mergeConfigPatch, pickAuthMethod, resolveProviderMatch, } from "./provider-auth-helpers.js";
 export async function applyAuthChoicePluginProvider(params, options) {
     if (params.authChoice !== options.authChoice)
         return null;

package/dist/commands/auth-choice.preferred-provider.js

@@ -32,6 +32,7 @@ const PREFERRED_PROVIDER_BY_AUTH_CHOICE = {
     "xai-api-key": "xai",
     "qwen-portal": "qwen-portal",
     "qianfan-api-key": "qianfan",
+    "nvidia-api-key": "nvidia",
 };
 export function resolvePreferredProviderForAuthChoice(choice) {
     return PREFERRED_PROVIDER_BY_AUTH_CHOICE[choice];

package/dist/commands/configure.wizard.js

@@ -132,8 +132,12 @@ export async function runConfigureWizard(opts, runtime = defaultRuntime) {
         const localUrl = "ws://127.0.0.1:18789";
         const localProbe = await probeGatewayReachable({
             url: localUrl,
-            token: baseConfig.gateway?.auth?.token ?? process.env.POOLBOT_GATEWAY_TOKEN ?? process.env.CLAWDBOT_GATEWAY_TOKEN,
-            password: baseConfig.gateway?.auth?.password ?? process.env.POOLBOT_GATEWAY_PASSWORD ?? process.env.CLAWDBOT_GATEWAY_PASSWORD,
+            token: baseConfig.gateway?.auth?.token ??
+                process.env.POOLBOT_GATEWAY_TOKEN ??
+                process.env.CLAWDBOT_GATEWAY_TOKEN,
+            password: baseConfig.gateway?.auth?.password ??
+                process.env.POOLBOT_GATEWAY_PASSWORD ??
+                process.env.CLAWDBOT_GATEWAY_PASSWORD,
         });
         const remoteUrl = baseConfig.gateway?.remote?.url?.trim() ?? "";
         const remoteProbe = remoteUrl
@@ -192,7 +196,8 @@ export async function runConfigureWizard(opts, runtime = defaultRuntime) {
         let gatewayPort = resolveGatewayPort(baseConfig);
         let gatewayToken = nextConfig.gateway?.auth?.token ??
             baseConfig.gateway?.auth?.token ??
-            process.env.POOLBOT_GATEWAY_TOKEN ?? process.env.CLAWDBOT_GATEWAY_TOKEN;
+            process.env.POOLBOT_GATEWAY_TOKEN ??
+            process.env.CLAWDBOT_GATEWAY_TOKEN;
         const persistConfig = async () => {
             nextConfig = applyWizardMetadata(nextConfig, {
                 command: opts.command,
@@ -277,8 +282,12 @@ export async function runConfigureWizard(opts, runtime = defaultRuntime) {
                 });
                 const remoteUrl = nextConfig.gateway?.remote?.url?.trim();
                 const wsUrl = nextConfig.gateway?.mode === "remote" && remoteUrl ? remoteUrl : localLinks.wsUrl;
-                const token = nextConfig.gateway?.auth?.token ?? process.env.POOLBOT_GATEWAY_TOKEN ?? process.env.CLAWDBOT_GATEWAY_TOKEN;
-                const password = nextConfig.gateway?.auth?.password ?? process.env.POOLBOT_GATEWAY_PASSWORD ?? process.env.CLAWDBOT_GATEWAY_PASSWORD;
+                const token = nextConfig.gateway?.auth?.token ??
+                    process.env.POOLBOT_GATEWAY_TOKEN ??
+                    process.env.CLAWDBOT_GATEWAY_TOKEN;
+                const password = nextConfig.gateway?.auth?.password ??
+                    process.env.POOLBOT_GATEWAY_PASSWORD ??
+                    process.env.CLAWDBOT_GATEWAY_PASSWORD;
                 await waitForGatewayReachable({
                     url: wsUrl,
                     token,
@@ -386,8 +395,12 @@ export async function runConfigureWizard(opts, runtime = defaultRuntime) {
                     });
                     const remoteUrl = nextConfig.gateway?.remote?.url?.trim();
                     const wsUrl = nextConfig.gateway?.mode === "remote" && remoteUrl ? remoteUrl : localLinks.wsUrl;
-                    const token = nextConfig.gateway?.auth?.token ?? process.env.POOLBOT_GATEWAY_TOKEN ?? process.env.CLAWDBOT_GATEWAY_TOKEN;
-                    const password = nextConfig.gateway?.auth?.password ?? process.env.POOLBOT_GATEWAY_PASSWORD ?? process.env.CLAWDBOT_GATEWAY_PASSWORD;
+                    const token = nextConfig.gateway?.auth?.token ??
+                        process.env.POOLBOT_GATEWAY_TOKEN ??
+                        process.env.CLAWDBOT_GATEWAY_TOKEN;
+                    const password = nextConfig.gateway?.auth?.password ??
+                        process.env.POOLBOT_GATEWAY_PASSWORD ??
+                        process.env.CLAWDBOT_GATEWAY_PASSWORD;
                     await waitForGatewayReachable({
                         url: wsUrl,
                         token,
@@ -429,9 +442,15 @@ export async function runConfigureWizard(opts, runtime = defaultRuntime) {
             basePath: nextConfig.gateway?.controlUi?.basePath,
         });
         // Try both new and old passwords since gateway may still have old config.
-        const newPassword = nextConfig.gateway?.auth?.password ?? process.env.POOLBOT_GATEWAY_PASSWORD ?? process.env.CLAWDBOT_GATEWAY_PASSWORD;
-        const oldPassword = baseConfig.gateway?.auth?.password ?? process.env.POOLBOT_GATEWAY_PASSWORD ?? process.env.CLAWDBOT_GATEWAY_PASSWORD;
-        const token = nextConfig.gateway?.auth?.token ?? process.env.POOLBOT_GATEWAY_TOKEN ?? process.env.CLAWDBOT_GATEWAY_TOKEN;
+        const newPassword = nextConfig.gateway?.auth?.password ??
+            process.env.POOLBOT_GATEWAY_PASSWORD ??
+            process.env.CLAWDBOT_GATEWAY_PASSWORD;
+        const oldPassword = baseConfig.gateway?.auth?.password ??
+            process.env.POOLBOT_GATEWAY_PASSWORD ??
+            process.env.CLAWDBOT_GATEWAY_PASSWORD;
+        const token = nextConfig.gateway?.auth?.token ??
+            process.env.POOLBOT_GATEWAY_TOKEN ??
+            process.env.CLAWDBOT_GATEWAY_TOKEN;
         let gatewayProbe = await probeGatewayReachable({
             url: links.wsUrl,
             token,

package/dist/commands/dashboard.js

@@ -9,7 +9,10 @@ export async function dashboardCommand(runtime = defaultRuntime, options = {}) {
     const bind = cfg.gateway?.bind ?? "loopback";
     const basePath = cfg.gateway?.controlUi?.basePath;
     const customBindHost = cfg.gateway?.customBindHost;
-    const token = cfg.gateway?.auth?.token ?? process.env.POOLBOT_GATEWAY_TOKEN ?? process.env.CLAWDBOT_GATEWAY_TOKEN ?? "";
+    const token = cfg.gateway?.auth?.token ??
+        process.env.POOLBOT_GATEWAY_TOKEN ??
+        process.env.CLAWDBOT_GATEWAY_TOKEN ??
+        "";
     const links = resolveControlUiLinks({
         port,
         bind,

package/dist/commands/doctor-gateway-daemon-flow.js

@@ -72,7 +72,11 @@ export async function maybeRepairGatewayDaemon(params) {
             prompter: params.prompter,
         });
         await maybeRepairLaunchAgentBootstrap({
-            env: { ...process.env, POOLBOT_LAUNCHD_LABEL: resolveNodeLaunchAgentLabel(), CLAWDBOT_LAUNCHD_LABEL: resolveNodeLaunchAgentLabel() },
+            env: {
+                ...process.env,
+                POOLBOT_LAUNCHD_LABEL: resolveNodeLaunchAgentLabel(),
+                CLAWDBOT_LAUNCHD_LABEL: resolveNodeLaunchAgentLabel(),
+            },
             title: "Node",
             runtime: params.runtime,
             prompter: params.prompter,
@@ -121,7 +125,9 @@ export async function maybeRepairGatewayDaemon(params) {
                 const { programArguments, workingDirectory, environment } = await buildGatewayInstallPlan({
                     env: process.env,
                     port,
-                    token: params.cfg.gateway?.auth?.token ?? process.env.POOLBOT_GATEWAY_TOKEN ?? process.env.CLAWDBOT_GATEWAY_TOKEN,
+                    token: params.cfg.gateway?.auth?.token ??
+                        process.env.POOLBOT_GATEWAY_TOKEN ??
+                        process.env.CLAWDBOT_GATEWAY_TOKEN,
                     runtime: daemonRuntime,
                     warn: (message, title) => note(message, title),
                     config: params.cfg,

package/dist/commands/doctor-gateway-services.js

@@ -80,7 +80,9 @@ export async function maybeMigrateLegacyGatewayService(cfg, mode, runtime, promp
     const { programArguments, workingDirectory, environment } = await buildGatewayInstallPlan({
         env: process.env,
         port,
-        token: cfg.gateway?.auth?.token ?? process.env.POOLBOT_GATEWAY_TOKEN ?? process.env.CLAWDBOT_GATEWAY_TOKEN,
+        token: cfg.gateway?.auth?.token ??
+            process.env.POOLBOT_GATEWAY_TOKEN ??
+            process.env.CLAWDBOT_GATEWAY_TOKEN,
         runtime: daemonRuntime,
         warn: (message, title) => note(message, title),
         config: cfg,
@@ -138,7 +140,9 @@ export async function maybeRepairGatewayServiceConfig(cfg, mode, runtime, prompt
     const { programArguments, workingDirectory, environment } = await buildGatewayInstallPlan({
         env: process.env,
         port,
-        token: cfg.gateway?.auth?.token ?? process.env.POOLBOT_GATEWAY_TOKEN ?? process.env.CLAWDBOT_GATEWAY_TOKEN,
+        token: cfg.gateway?.auth?.token ??
+            process.env.POOLBOT_GATEWAY_TOKEN ??
+            process.env.CLAWDBOT_GATEWAY_TOKEN,
         runtime: needsNodeRuntime && systemNodePath ? "node" : runtimeChoice,
         nodePath: systemNodePath ?? undefined,
         warn: (message, title) => note(message, title),

package/dist/commands/doctor-platform-notes.js

@@ -69,7 +69,9 @@ export async function noteMacLaunchctlGatewayEnvOverrides(cfg, deps) {
         passwordUnsets.push("  launchctl unsetenv CLAWDBOT_GATEWAY_PASSWORD");
     const lines = [
         "- launchctl environment overrides detected (can cause confusing unauthorized errors).",
-        hasToken ? `- \`${poolbotToken ? "POOLBOT" : "CLAWDBOT"}_GATEWAY_TOKEN\` is set; it overrides config tokens.` : undefined,
+        hasToken
+            ? `- \`${poolbotToken ? "POOLBOT" : "CLAWDBOT"}_GATEWAY_TOKEN\` is set; it overrides config tokens.`
+            : undefined,
         hasPassword
             ? `- \`${poolbotPassword ? "POOLBOT" : "CLAWDBOT"}_GATEWAY_PASSWORD\` is set; it overrides config passwords.`
             : undefined,

package/dist/commands/gateway-status/helpers.js

@@ -92,7 +92,9 @@ export function resolveAuthForTarget(cfg, target, overrides) {
         };
     }
     const envToken = process.env.POOLBOT_GATEWAY_TOKEN?.trim() || process.env.CLAWDBOT_GATEWAY_TOKEN?.trim() || "";
-    const envPassword = process.env.POOLBOT_GATEWAY_PASSWORD?.trim() || process.env.CLAWDBOT_GATEWAY_PASSWORD?.trim() || "";
+    const envPassword = process.env.POOLBOT_GATEWAY_PASSWORD?.trim() ||
+        process.env.CLAWDBOT_GATEWAY_PASSWORD?.trim() ||
+        "";
     const cfgToken = typeof cfg.gateway?.auth?.token === "string" ? cfg.gateway.auth.token.trim() : "";
     const cfgPassword = typeof cfg.gateway?.auth?.password === "string" ? cfg.gateway.auth.password.trim() : "";
     return {

package/dist/commands/models/auth.js

@@ -12,6 +12,7 @@ import { applyAuthProfileConfig } from "../onboard-auth.js";
 import { isRemoteEnvironment } from "../oauth-env.js";
 import { openUrl } from "../onboard-helpers.js";
 import { createVpsAwareOAuthHandlers } from "../oauth-flow.js";
+import { applyDefaultModel, mergeConfigPatch, pickAuthMethod, resolveProviderMatch, } from "../provider-auth-helpers.js";
 import { updateConfig } from "./shared.js";
 import { resolvePluginProviders } from "../../plugins/providers.js";
 import { createClackPrompter } from "../../wizard/clack-prompter.js";
@@ -167,64 +168,6 @@ export async function modelsAuthAddCommand(_opts, runtime) {
         : undefined;
     await modelsAuthPasteTokenCommand({ provider: providerId, profileId, expiresIn }, runtime);
 }
-function resolveProviderMatch(providers, rawProvider) {
-    const raw = rawProvider?.trim();
-    if (!raw)
-        return null;
-    const normalized = normalizeProviderId(raw);
-    return (providers.find((provider) => normalizeProviderId(provider.id) === normalized) ??
-        providers.find((provider) => provider.aliases?.some((alias) => normalizeProviderId(alias) === normalized) ?? false) ??
-        null);
-}
-function pickAuthMethod(provider, rawMethod) {
-    const raw = rawMethod?.trim();
-    if (!raw)
-        return null;
-    const normalized = raw.toLowerCase();
-    return (provider.auth.find((method) => method.id.toLowerCase() === normalized) ??
-        provider.auth.find((method) => method.label.toLowerCase() === normalized) ??
-        null);
-}
-function isPlainRecord(value) {
-    return Boolean(value && typeof value === "object" && !Array.isArray(value));
-}
-function mergeConfigPatch(base, patch) {
-    if (!isPlainRecord(base) || !isPlainRecord(patch)) {
-        return patch;
-    }
-    const next = { ...base };
-    for (const [key, value] of Object.entries(patch)) {
-        const existing = next[key];
-        if (isPlainRecord(existing) && isPlainRecord(value)) {
-            next[key] = mergeConfigPatch(existing, value);
-        }
-        else {
-            next[key] = value;
-        }
-    }
-    return next;
-}
-function applyDefaultModel(cfg, model) {
-    const models = { ...cfg.agents?.defaults?.models };
-    models[model] = models[model] ?? {};
-    const existingModel = cfg.agents?.defaults?.model;
-    return {
-        ...cfg,
-        agents: {
-            ...cfg.agents,
-            defaults: {
-                ...cfg.agents?.defaults,
-                models,
-                model: {
-                    ...(existingModel && typeof existingModel === "object" && "fallbacks" in existingModel
-                        ? { fallbacks: existingModel.fallbacks }
-                        : undefined),
-                    primary: model,
-                },
-            },
-        },
-    };
-}
 function credentialMode(credential) {
     if (credential.type === "api_key")
         return "api_key";

package/dist/commands/models/list.errors.js

@@ -0,0 +1,14 @@
+export const MODEL_AVAILABILITY_UNAVAILABLE_CODE = "MODEL_AVAILABILITY_UNAVAILABLE";
+export function formatErrorWithStack(err) {
+    if (err instanceof Error) {
+        return err.stack ?? `${err.name}: ${err.message}`;
+    }
+    return String(err);
+}
+export function shouldFallbackToAuthHeuristics(err) {
+    if (!(err instanceof Error)) {
+        return false;
+    }
+    const code = err.code;
+    return code === MODEL_AVAILABILITY_UNAVAILABLE_CODE;
+}

package/dist/commands/models/list.list-command.js

@@ -1,10 +1,13 @@
 import { ensureAuthProfileStore } from "../../agents/auth-profiles.js";
+import { resolveForwardCompatModel } from "../../agents/model-forward-compat.js";
 import { parseModelRef } from "../../agents/model-selection.js";
+import { resolveModel } from "../../agents/pi-embedded-runner/model.js";
 import { loadConfig } from "../../config/config.js";
 import { resolveConfiguredEntries } from "./list.configured.js";
+import { formatErrorWithStack } from "./list.errors.js";
 import { loadModelRegistry, toModelRow } from "./list.registry.js";
 import { printModelTable } from "./list.table.js";
-import { DEFAULT_PROVIDER, ensureFlagCompatibility, modelKey } from "./shared.js";
+import { DEFAULT_PROVIDER, ensureFlagCompatibility, isLocalBaseUrl, modelKey } from "./shared.js";
 export async function modelsListCommand(opts, runtime) {
     ensureFlagCompatibility(opts);
     const cfg = loadConfig();
@@ -17,35 +20,30 @@ export async function modelsListCommand(opts, runtime) {
         return parsed?.provider ?? raw.toLowerCase();
     })();
     let models = [];
+    let modelRegistry;
     let availableKeys;
+    let availabilityErrorMessage;
     try {
         const loaded = await loadModelRegistry(cfg);
+        modelRegistry = loaded.registry;
         models = loaded.models;
         availableKeys = loaded.availableKeys;
+        availabilityErrorMessage = loaded.availabilityErrorMessage;
     }
     catch (err) {
-        runtime.error(`Model registry unavailable: ${String(err)}`);
+        runtime.error(`Model registry unavailable:\n${formatErrorWithStack(err)}`);
+        process.exitCode = 1;
+        return;
+    }
+    if (availabilityErrorMessage !== undefined) {
+        runtime.error(`Model availability lookup failed; falling back to auth heuristics for discovered models: ${availabilityErrorMessage}`);
     }
     const modelByKey = new Map(models.map((model) => [modelKey(model.provider, model.id), model]));
     const { entries } = resolveConfiguredEntries(cfg);
     const configuredByKey = new Map(entries.map((entry) => [entry.key, entry]));
     const rows = [];
-    const isLocalBaseUrl = (baseUrl) => {
-        try {
-            const url = new URL(baseUrl);
-            const host = url.hostname.toLowerCase();
-            return (host === "localhost" ||
-                host === "127.0.0.1" ||
-                host === "0.0.0.0" ||
-                host === "::1" ||
-                host.endsWith(".local"));
-        }
-        catch {
-            return false;
-        }
-    };
     if (opts.all) {
-        const sorted = [...models].sort((a, b) => {
+        const sorted = [...models].toSorted((a, b) => {
             const p = a.provider.localeCompare(b.provider);
             if (p !== 0)
                 return p;
@@ -55,8 +53,9 @@ export async function modelsListCommand(opts, runtime) {
             if (providerFilter && model.provider.toLowerCase() !== providerFilter) {
                 continue;
             }
-            if (opts.local && !isLocalBaseUrl(model.baseUrl))
+            if (opts.local && !isLocalBaseUrl(model.baseUrl)) {
                 continue;
+            }
             const key = modelKey(model.provider, model.id);
             const configured = configuredByKey.get(key);
             rows.push(toModelRow({
@@ -75,11 +74,23 @@ export async function modelsListCommand(opts, runtime) {
             if (providerFilter && entry.ref.provider.toLowerCase() !== providerFilter) {
                 continue;
             }
-            const model = modelByKey.get(entry.key);
-            if (opts.local && model && !isLocalBaseUrl(model.baseUrl))
+            let model = modelByKey.get(entry.key);
+            if (!model && modelRegistry) {
+                const forwardCompat = resolveForwardCompatModel(entry.ref.provider, entry.ref.model, modelRegistry);
+                if (forwardCompat) {
+                    model = forwardCompat;
+                    modelByKey.set(entry.key, forwardCompat);
+                }
+            }
+            if (!model) {
+                model = resolveModel(entry.ref.provider, entry.ref.model, undefined, cfg).model;
+            }
+            if (opts.local && model && !isLocalBaseUrl(model.baseUrl)) {
                 continue;
-            if (opts.local && !model)
+            }
+            if (opts.local && !model) {
                 continue;
+            }
             rows.push(toModelRow({
                 model,
                 key: entry.key,