@poolzin/pool-bot 2026.2.21 → 2026.2.23

package/dist/agents/live-auth-keys.js

@@ -1,7 +1,40 @@
+import { normalizeProviderId } from "./model-selection.js";
 const KEY_SPLIT_RE = /[\s,;]+/g;
+const GOOGLE_LIVE_SINGLE_KEY = "POOLBOT_LIVE_GEMINI_KEY";
+const PROVIDER_PREFIX_OVERRIDES = {
+    google: "GEMINI",
+    "google-vertex": "GEMINI",
+};
+const PROVIDER_API_KEY_CONFIG = {
+    anthropic: {
+        liveSingle: "POOLBOT_LIVE_ANTHROPIC_KEY",
+        listVar: "POOLBOT_LIVE_ANTHROPIC_KEYS",
+        primaryVar: "ANTHROPIC_API_KEY",
+        prefixedVar: "ANTHROPIC_API_KEY_",
+    },
+    google: {
+        liveSingle: GOOGLE_LIVE_SINGLE_KEY,
+        listVar: "GEMINI_API_KEYS",
+        primaryVar: "GEMINI_API_KEY",
+        prefixedVar: "GEMINI_API_KEY_",
+    },
+    "google-vertex": {
+        liveSingle: GOOGLE_LIVE_SINGLE_KEY,
+        listVar: "GEMINI_API_KEYS",
+        primaryVar: "GEMINI_API_KEY",
+        prefixedVar: "GEMINI_API_KEY_",
+    },
+    openai: {
+        liveSingle: "POOLBOT_LIVE_OPENAI_KEY",
+        listVar: "OPENAI_API_KEYS",
+        primaryVar: "OPENAI_API_KEY",
+        prefixedVar: "OPENAI_API_KEY_",
+    },
+};
 function parseKeyList(raw) {
-    if (!raw)
+    if (!raw) {
         return [];
+    }
     return raw
         .split(KEY_SPLIT_RE)
         .map((value) => value.trim())
@@ -10,62 +43,126 @@ function parseKeyList(raw) {
 function collectEnvPrefixedKeys(prefix) {
     const keys = [];
     for (const [name, value] of Object.entries(process.env)) {
-        if (!name.startsWith(prefix))
+        if (!name.startsWith(prefix)) {
             continue;
+        }
         const trimmed = value?.trim();
-        if (!trimmed)
+        if (!trimmed) {
             continue;
+        }
         keys.push(trimmed);
     }
     return keys;
 }
-export function collectAnthropicApiKeys() {
-    const forcedSingle = process.env.POOLBOT_LIVE_ANTHROPIC_KEY?.trim() ||
-        process.env.CLAWDBOT_LIVE_ANTHROPIC_KEY?.trim();
-    if (forcedSingle)
+function resolveProviderApiKeyConfig(provider) {
+    const normalized = normalizeProviderId(provider);
+    const custom = PROVIDER_API_KEY_CONFIG[normalized];
+    const base = PROVIDER_PREFIX_OVERRIDES[normalized] ?? normalized.toUpperCase().replace(/-/g, "_");
+    const liveSingle = custom?.liveSingle ?? `POOLBOT_LIVE_${base}_KEY`;
+    const listVar = custom?.listVar ?? `${base}_API_KEYS`;
+    const primaryVar = custom?.primaryVar ?? `${base}_API_KEY`;
+    const prefixedVar = custom?.prefixedVar ?? `${base}_API_KEY_`;
+    if (normalized === "google" || normalized === "google-vertex") {
+        return {
+            liveSingle,
+            listVar,
+            primaryVar,
+            prefixedVar,
+            fallbackVars: ["GOOGLE_API_KEY"],
+        };
+    }
+    return {
+        liveSingle,
+        listVar,
+        primaryVar,
+        prefixedVar,
+        fallbackVars: [],
+    };
+}
+export function collectProviderApiKeys(provider) {
+    const config = resolveProviderApiKeyConfig(provider);
+    const forcedSingle = config.liveSingle ? process.env[config.liveSingle]?.trim() : undefined;
+    if (forcedSingle) {
         return [forcedSingle];
-    const fromList = parseKeyList(process.env.POOLBOT_LIVE_ANTHROPIC_KEYS || process.env.CLAWDBOT_LIVE_ANTHROPIC_KEYS);
-    const fromEnv = collectEnvPrefixedKeys("ANTHROPIC_API_KEY");
-    const primary = process.env.ANTHROPIC_API_KEY?.trim();
+    }
+    const fromList = parseKeyList(config.listVar ? process.env[config.listVar] : undefined);
+    const primary = config.primaryVar ? process.env[config.primaryVar]?.trim() : undefined;
+    const fromPrefixed = config.prefixedVar ? collectEnvPrefixedKeys(config.prefixedVar) : [];
+    const fallback = config.fallbackVars
+        .map((envVar) => process.env[envVar]?.trim())
+        .filter(Boolean);
     const seen = new Set();
     const add = (value) => {
-        if (!value)
+        if (!value) {
             return;
-        if (seen.has(value))
+        }
+        if (seen.has(value)) {
             return;
+        }
         seen.add(value);
     };
-    for (const value of fromList)
+    for (const value of fromList) {
+        add(value);
+    }
+    add(primary);
+    for (const value of fromPrefixed) {
         add(value);
-    if (primary)
-        add(primary);
-    for (const value of fromEnv)
+    }
+    for (const value of fallback) {
         add(value);
+    }
     return Array.from(seen);
 }
-export function isAnthropicRateLimitError(message) {
+export function collectAnthropicApiKeys() {
+    return collectProviderApiKeys("anthropic");
+}
+export function collectGeminiApiKeys() {
+    return collectProviderApiKeys("google");
+}
+export function isApiKeyRateLimitError(message) {
     const lower = message.toLowerCase();
-    if (lower.includes("rate_limit"))
+    if (lower.includes("rate_limit")) {
+        return true;
+    }
+    if (lower.includes("rate limit")) {
+        return true;
+    }
+    if (lower.includes("429")) {
+        return true;
+    }
+    if (lower.includes("quota exceeded") || lower.includes("quota_exceeded")) {
         return true;
-    if (lower.includes("rate limit"))
+    }
+    if (lower.includes("resource exhausted") || lower.includes("resource_exhausted")) {
         return true;
-    if (lower.includes("429"))
+    }
+    if (lower.includes("too many requests")) {
         return true;
+    }
     return false;
 }
+export function isAnthropicRateLimitError(message) {
+    return isApiKeyRateLimitError(message);
+}
 export function isAnthropicBillingError(message) {
     const lower = message.toLowerCase();
-    if (lower.includes("credit balance"))
+    if (lower.includes("credit balance")) {
         return true;
-    if (lower.includes("insufficient credit"))
+    }
+    if (lower.includes("insufficient credit")) {
         return true;
-    if (lower.includes("insufficient credits"))
+    }
+    if (lower.includes("insufficient credits")) {
         return true;
-    if (lower.includes("payment required"))
+    }
+    if (lower.includes("payment required")) {
         return true;
-    if (lower.includes("billing") && lower.includes("disabled"))
+    }
+    if (lower.includes("billing") && lower.includes("disabled")) {
         return true;
-    if (lower.includes("402"))
+    }
+    if (/["']?(?:status|code)["']?\s*[:=]\s*402\b|\bhttp\s*402\b|\berror(?:\s+code)?\s*[:=]?\s*402\b|\b(?:got|returned|received)\s+(?:a\s+)?402\b|^\s*402\spayment/i.test(lower)) {
         return true;
+    }
     return false;
 }

package/dist/agents/live-model-filter.js

@@ -1,15 +1,23 @@
-const ANTHROPIC_PREFIXES = ["claude-opus-4-5", "claude-sonnet-4-5", "claude-haiku-4-5"];
+const ANTHROPIC_PREFIXES = [
+    "claude-opus-4-6",
+    "claude-sonnet-4-6",
+    "claude-opus-4-5",
+    "claude-sonnet-4-5",
+    "claude-haiku-4-5",
+];
 const OPENAI_MODELS = ["gpt-5.2", "gpt-5.0"];
 const CODEX_MODELS = [
     "gpt-5.2",
     "gpt-5.2-codex",
+    "gpt-5.3-codex",
+    "gpt-5.3-codex-spark",
     "gpt-5.1-codex",
     "gpt-5.1-codex-mini",
     "gpt-5.1-codex-max",
 ];
 const GOOGLE_PREFIXES = ["gemini-3"];
-const ZAI_PREFIXES = ["glm-4.7"];
-const MINIMAX_PREFIXES = ["minimax-m2.1"];
+const ZAI_PREFIXES = ["glm-5", "glm-4.7", "glm-4.7-flash", "glm-4.7-flashx"];
+const MINIMAX_PREFIXES = ["minimax-m2.1", "minimax-m2.5"];
 const XAI_PREFIXES = ["grok-4"];
 function matchesPrefix(id, prefixes) {
     return prefixes.some((prefix) => id.startsWith(prefix));
@@ -23,8 +31,9 @@ function matchesAny(id, values) {
 export function isModernModelRef(ref) {
     const provider = ref.provider?.trim().toLowerCase() ?? "";
     const id = ref.id?.trim().toLowerCase() ?? "";
-    if (!provider || !id)
+    if (!provider || !id) {
         return false;
+    }
     if (provider === "anthropic") {
         return matchesPrefix(id, ANTHROPIC_PREFIXES);
     }

package/dist/agents/model-catalog.js

@@ -5,6 +5,25 @@ let modelCatalogPromise = null;
 let hasLoggedModelCatalogError = false;
 const defaultImportPiSdk = () => import("./pi-model-discovery.js");
 let importPiSdk = defaultImportPiSdk;
+const CODEX_PROVIDER = "openai-codex";
+const OPENAI_CODEX_GPT53_MODEL_ID = "gpt-5.3-codex";
+const OPENAI_CODEX_GPT53_SPARK_MODEL_ID = "gpt-5.3-codex-spark";
+function applyOpenAICodexSparkFallback(models) {
+    const hasSpark = models.some((entry) => entry.provider === CODEX_PROVIDER &&
+        entry.id.toLowerCase() === OPENAI_CODEX_GPT53_SPARK_MODEL_ID);
+    if (hasSpark) {
+        return;
+    }
+    const baseModel = models.find((entry) => entry.provider === CODEX_PROVIDER && entry.id.toLowerCase() === OPENAI_CODEX_GPT53_MODEL_ID);
+    if (!baseModel) {
+        return;
+    }
+    models.push({
+        ...baseModel,
+        id: OPENAI_CODEX_GPT53_SPARK_MODEL_ID,
+        name: OPENAI_CODEX_GPT53_SPARK_MODEL_ID,
+    });
+}
 export function resetModelCatalogCacheForTest() {
     modelCatalogPromise = null;
     hasLoggedModelCatalogError = false;
@@ -14,49 +33,61 @@ export function resetModelCatalogCacheForTest() {
 export function __setModelCatalogImportForTest(loader) {
     importPiSdk = loader ?? defaultImportPiSdk;
 }
+function createAuthStorage(AuthStorageLike, path) {
+    const withFactory = AuthStorageLike;
+    if (typeof withFactory.create === "function") {
+        return withFactory.create(path);
+    }
+    return new AuthStorageLike(path);
+}
 export async function loadModelCatalog(params) {
     if (params?.useCache === false) {
         modelCatalogPromise = null;
     }
-    if (modelCatalogPromise)
+    if (modelCatalogPromise) {
         return modelCatalogPromise;
+    }
     modelCatalogPromise = (async () => {
         const models = [];
         const sortModels = (entries) => entries.sort((a, b) => {
             const p = a.provider.localeCompare(b.provider);
-            if (p !== 0)
+            if (p !== 0) {
                 return p;
+            }
             return a.name.localeCompare(b.name);
         });
         try {
             const cfg = params?.config ?? loadConfig();
             await ensurePoolbotModelsJson(cfg);
+            await (await import("./pi-auth-json.js")).ensurePiAuthJsonFromAuthProfiles(resolvePoolbotAgentDir());
             // IMPORTANT: keep the dynamic import *inside* the try/catch.
             // If this fails once (e.g. during a pnpm install that temporarily swaps node_modules),
             // we must not poison the cache with a rejected promise (otherwise all channel handlers
             // will keep failing until restart).
             const piSdk = await importPiSdk();
             const agentDir = resolvePoolbotAgentDir();
-            const authStorage = piSdk.discoverAuthStorage(agentDir);
-            const registry = piSdk.discoverModels(authStorage, agentDir);
+            const { join } = await import("node:path");
+            const authStorage = createAuthStorage(piSdk.AuthStorage, join(agentDir, "auth.json"));
+            const registry = new piSdk.ModelRegistry(authStorage, join(agentDir, "models.json"));
             const entries = Array.isArray(registry) ? registry : registry.getAll();
             for (const entry of entries) {
                 const id = String(entry?.id ?? "").trim();
-                if (!id)
+                if (!id) {
                     continue;
+                }
                 const provider = String(entry?.provider ?? "").trim();
-                if (!provider)
+                if (!provider) {
                     continue;
+                }
                 const name = String(entry?.name ?? id).trim() || id;
                 const contextWindow = typeof entry?.contextWindow === "number" && entry.contextWindow > 0
                     ? entry.contextWindow
                     : undefined;
                 const reasoning = typeof entry?.reasoning === "boolean" ? entry.reasoning : undefined;
-                const input = Array.isArray(entry?.input)
-                    ? entry.input
-                    : undefined;
+                const input = Array.isArray(entry?.input) ? entry.input : undefined;
                 models.push({ id, name, provider, contextWindow, reasoning, input });
             }
+            applyOpenAICodexSparkFallback(models);
             if (models.length === 0) {
                 // If we found nothing, don't cache this result so we can try again.
                 modelCatalogPromise = null;

package/dist/agents/model-forward-compat.js

@@ -6,6 +6,9 @@ const OPENAI_CODEX_TEMPLATE_MODEL_IDS = ["gpt-5.2-codex"];
 const ANTHROPIC_OPUS_46_MODEL_ID = "claude-opus-4-6";
 const ANTHROPIC_OPUS_46_DOT_MODEL_ID = "claude-opus-4.6";
 const ANTHROPIC_OPUS_TEMPLATE_MODEL_IDS = ["claude-opus-4-5", "claude-opus-4.5"];
+const ANTHROPIC_SONNET_46_MODEL_ID = "claude-sonnet-4-6";
+const ANTHROPIC_SONNET_46_DOT_MODEL_ID = "claude-sonnet-4.6";
+const ANTHROPIC_SONNET_TEMPLATE_MODEL_IDS = ["claude-sonnet-4-5", "claude-sonnet-4.5"];
 const ZAI_GLM5_MODEL_ID = "glm-5";
 const ZAI_GLM5_TEMPLATE_MODEL_IDS = ["glm-4.7"];
 const ANTIGRAVITY_OPUS_46_MODEL_ID = "claude-opus-4-6";
@@ -30,6 +33,22 @@ export const ANTIGRAVITY_OPUS_46_FORWARD_COMPAT_CANDIDATES = [
         templatePrefixes: ["google-antigravity/claude-opus-4-5", "google-antigravity/claude-opus-4.5"],
     },
 ];
+function cloneFirstTemplateModel(params) {
+    const { normalizedProvider, trimmedModelId, templateIds, modelRegistry } = params;
+    for (const templateId of [...new Set(templateIds)].filter(Boolean)) {
+        const template = modelRegistry.find(normalizedProvider, templateId);
+        if (!template) {
+            continue;
+        }
+        return normalizeModelCompat({
+            ...template,
+            id: trimmedModelId,
+            name: trimmedModelId,
+            ...params.patch,
+        });
+    }
+    return undefined;
+}
 function resolveOpenAICodexGpt53FallbackModel(provider, modelId, modelRegistry) {
     const normalizedProvider = normalizeProviderId(provider);
     const trimmedModelId = modelId.trim();
@@ -85,18 +104,41 @@ function resolveAnthropicOpus46ForwardCompatModel(provider, modelId, modelRegist
         templateIds.push(lower.replace(ANTHROPIC_OPUS_46_DOT_MODEL_ID, "claude-opus-4.5"));
     }
     templateIds.push(...ANTHROPIC_OPUS_TEMPLATE_MODEL_IDS);
-    for (const templateId of [...new Set(templateIds)].filter(Boolean)) {
-        const template = modelRegistry.find(normalizedProvider, templateId);
-        if (!template) {
-            continue;
-        }
-        return normalizeModelCompat({
-            ...template,
-            id: trimmedModelId,
-            name: trimmedModelId,
-        });
+    return cloneFirstTemplateModel({
+        normalizedProvider,
+        trimmedModelId,
+        templateIds,
+        modelRegistry,
+    });
+}
+function resolveAnthropicSonnet46ForwardCompatModel(provider, modelId, modelRegistry) {
+    const normalizedProvider = normalizeProviderId(provider);
+    if (normalizedProvider !== "anthropic") {
+        return undefined;
     }
-    return undefined;
+    const trimmedModelId = modelId.trim();
+    const lower = trimmedModelId.toLowerCase();
+    const isSonnet46 = lower === ANTHROPIC_SONNET_46_MODEL_ID ||
+        lower === ANTHROPIC_SONNET_46_DOT_MODEL_ID ||
+        lower.startsWith(`${ANTHROPIC_SONNET_46_MODEL_ID}-`) ||
+        lower.startsWith(`${ANTHROPIC_SONNET_46_DOT_MODEL_ID}-`);
+    if (!isSonnet46) {
+        return undefined;
+    }
+    const templateIds = [];
+    if (lower.startsWith(ANTHROPIC_SONNET_46_MODEL_ID)) {
+        templateIds.push(lower.replace(ANTHROPIC_SONNET_46_MODEL_ID, "claude-sonnet-4-5"));
+    }
+    if (lower.startsWith(ANTHROPIC_SONNET_46_DOT_MODEL_ID)) {
+        templateIds.push(lower.replace(ANTHROPIC_SONNET_46_DOT_MODEL_ID, "claude-sonnet-4.5"));
+    }
+    templateIds.push(...ANTHROPIC_SONNET_TEMPLATE_MODEL_IDS);
+    return cloneFirstTemplateModel({
+        normalizedProvider,
+        trimmedModelId,
+        templateIds,
+        modelRegistry,
+    });
 }
 // Z.ai's GLM-5 may not be present in pi-ai's built-in model catalog yet.
 // When a user configures zai/glm-5 without a models.json entry, clone glm-4.7 as a forward-compat fallback.
@@ -166,22 +208,17 @@ function resolveAntigravityOpus46ForwardCompatModel(provider, modelId, modelRegi
     }
     templateIds.push(...ANTIGRAVITY_OPUS_TEMPLATE_MODEL_IDS);
     templateIds.push(...ANTIGRAVITY_OPUS_THINKING_TEMPLATE_MODEL_IDS);
-    for (const templateId of [...new Set(templateIds)].filter(Boolean)) {
-        const template = modelRegistry.find(normalizedProvider, templateId);
-        if (!template) {
-            continue;
-        }
-        return normalizeModelCompat({
-            ...template,
-            id: trimmedModelId,
-            name: trimmedModelId,
-        });
-    }
-    return undefined;
+    return cloneFirstTemplateModel({
+        normalizedProvider,
+        trimmedModelId,
+        templateIds,
+        modelRegistry,
+    });
 }
 export function resolveForwardCompatModel(provider, modelId, modelRegistry) {
     return (resolveOpenAICodexGpt53FallbackModel(provider, modelId, modelRegistry) ??
         resolveAnthropicOpus46ForwardCompatModel(provider, modelId, modelRegistry) ??
+        resolveAnthropicSonnet46ForwardCompatModel(provider, modelId, modelRegistry) ??
         resolveZaiGlm5ForwardCompatModel(provider, modelId, modelRegistry) ??
         resolveAntigravityOpus46ForwardCompatModel(provider, modelId, modelRegistry));
 }