@poolzin/pool-bot 2026.2.0 → 2026.2.1

package/dist/agents/pi-embedded-helpers/errors.js

@@ -1,7 +1,9 @@
 import { formatSandboxToolPolicyBlockedMessage } from "../sandbox.js";
+export const BILLING_ERROR_USER_MESSAGE = "⚠️ API provider returned a billing error — your API key has run out of credits or has an insufficient balance. Check your provider's billing dashboard and top up or switch to a different API key.";
 export function isContextOverflowError(errorMessage) {
-    if (!errorMessage)
+    if (!errorMessage) {
         return false;
+    }
     const lower = errorMessage.toLowerCase();
     const hasRequestSizeExceeds = lower.includes("request size exceeds");
     const hasContextWindow = lower.includes("context window") ||
@@ -14,34 +16,43 @@ export function isContextOverflowError(errorMessage) {
         lower.includes("prompt is too long") ||
         lower.includes("exceeds model context window") ||
         (hasRequestSizeExceeds && hasContextWindow) ||
-        lower.includes("context overflow") ||
+        lower.includes("context overflow:") ||
         (lower.includes("413") && lower.includes("too large")));
 }
 const CONTEXT_WINDOW_TOO_SMALL_RE = /context window.*(too small|minimum is)/i;
 const CONTEXT_OVERFLOW_HINT_RE = /context.*overflow|context window.*(too (?:large|long)|exceed|over|limit|max(?:imum)?|requested|sent|tokens)|(?:prompt|request|input).*(too (?:large|long)|exceed|over|limit|max(?:imum)?)/i;
 export function isLikelyContextOverflowError(errorMessage) {
-    if (!errorMessage)
+    if (!errorMessage) {
         return false;
-    if (CONTEXT_WINDOW_TOO_SMALL_RE.test(errorMessage))
+    }
+    if (CONTEXT_WINDOW_TOO_SMALL_RE.test(errorMessage)) {
         return false;
-    if (isContextOverflowError(errorMessage))
+    }
+    if (isContextOverflowError(errorMessage)) {
         return true;
+    }
     return CONTEXT_OVERFLOW_HINT_RE.test(errorMessage);
 }
 export function isCompactionFailureError(errorMessage) {
-    if (!errorMessage)
-        return false;
-    if (!isContextOverflowError(errorMessage))
+    if (!errorMessage) {
         return false;
+    }
     const lower = errorMessage.toLowerCase();
-    return (lower.includes("summarization failed") ||
+    const hasCompactionTerm = lower.includes("summarization failed") ||
         lower.includes("auto-compaction") ||
         lower.includes("compaction failed") ||
-        lower.includes("compaction"));
+        lower.includes("compaction");
+    if (!hasCompactionTerm) {
+        return false;
+    }
+    // For compaction failures, also accept "context overflow" without colon
+    // since the error message itself describes a compaction/summarization failure
+    return isContextOverflowError(errorMessage) || lower.includes("context overflow");
 }
 const ERROR_PAYLOAD_PREFIX_RE = /^(?:error|api\s*error|apierror|openai\s*error|anthropic\s*error|gateway\s*error)[:\s-]+/i;
 const FINAL_TAG_RE = /<\s*\/?\s*final\s*>/gi;
 const ERROR_PREFIX_RE = /^(?:error|api\s*error|openai\s*error|anthropic\s*error|gateway\s*error|request failed|failed|exception)[:\s-]+/i;
+const CONTEXT_OVERFLOW_ERROR_HEAD_RE = /^(?:context overflow:|request_too_large\b|request size exceeds\b|request exceeds the maximum size\b|context length exceeded\b|maximum context length\b|prompt is too long\b|exceeds model context window\b)/i;
 const HTTP_STATUS_PREFIX_RE = /^(?:http\s*)?(\d{3})\s+(.+)$/i;
 const HTTP_ERROR_HINTS = [
     "error",
@@ -61,17 +72,20 @@ const HTTP_ERROR_HINTS = [
     "permission",
 ];
 function stripFinalTagsFromText(text) {
-    if (!text)
+    if (!text) {
         return text;
+    }
     return text.replace(FINAL_TAG_RE, "");
 }
 function collapseConsecutiveDuplicateBlocks(text) {
     const trimmed = text.trim();
-    if (!trimmed)
+    if (!trimmed) {
         return text;
+    }
     const blocks = trimmed.split(/\n{2,}/);
-    if (blocks.length < 2)
+    if (blocks.length < 2) {
         return text;
+    }
     const normalizeBlock = (value) => value.trim().replace(/\s+/g, " ");
     const result = [];
     let lastNormalized = null;
@@ -83,28 +97,43 @@ function collapseConsecutiveDuplicateBlocks(text) {
         result.push(block.trim());
         lastNormalized = normalized;
     }
-    if (result.length === blocks.length)
+    if (result.length === blocks.length) {
         return text;
+    }
     return result.join("\n\n");
 }
 function isLikelyHttpErrorText(raw) {
     const match = raw.match(HTTP_STATUS_PREFIX_RE);
-    if (!match)
+    if (!match) {
         return false;
+    }
     const code = Number(match[1]);
-    if (!Number.isFinite(code) || code < 400)
+    if (!Number.isFinite(code) || code < 400) {
         return false;
+    }
     const message = match[2].toLowerCase();
     return HTTP_ERROR_HINTS.some((hint) => message.includes(hint));
 }
+function shouldRewriteContextOverflowText(raw) {
+    if (!isContextOverflowError(raw)) {
+        return false;
+    }
+    return (isRawApiErrorPayload(raw) ||
+        isLikelyHttpErrorText(raw) ||
+        ERROR_PREFIX_RE.test(raw) ||
+        CONTEXT_OVERFLOW_ERROR_HEAD_RE.test(raw));
+}
 function isErrorPayloadObject(payload) {
-    if (!payload || typeof payload !== "object" || Array.isArray(payload))
+    if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
         return false;
+    }
     const record = payload;
-    if (record.type === "error")
+    if (record.type === "error") {
         return true;
-    if (typeof record.request_id === "string" || typeof record.requestId === "string")
+    }
+    if (typeof record.request_id === "string" || typeof record.requestId === "string") {
         return true;
+    }
     if ("error" in record) {
         const err = record.error;
         if (err && typeof err === "object" && !Array.isArray(err)) {
@@ -119,22 +148,26 @@ function isErrorPayloadObject(payload) {
     return false;
 }
 function parseApiErrorPayload(raw) {
-    if (!raw)
+    if (!raw) {
         return null;
+    }
     const trimmed = raw.trim();
-    if (!trimmed)
+    if (!trimmed) {
         return null;
+    }
     const candidates = [trimmed];
     if (ERROR_PAYLOAD_PREFIX_RE.test(trimmed)) {
         candidates.push(trimmed.replace(ERROR_PAYLOAD_PREFIX_RE, "").trim());
     }
     for (const candidate of candidates) {
-        if (!candidate.startsWith("{") || !candidate.endsWith("}"))
+        if (!candidate.startsWith("{") || !candidate.endsWith("}")) {
             continue;
+        }
         try {
             const parsed = JSON.parse(candidate);
-            if (isErrorPayloadObject(parsed))
+            if (isErrorPayloadObject(parsed)) {
                 return parsed;
+            }
         }
         catch {
             // ignore parse errors
@@ -150,27 +183,31 @@ function stableStringify(value) {
         return `[${value.map((entry) => stableStringify(entry)).join(",")}]`;
     }
     const record = value;
-    const keys = Object.keys(record).sort();
+    const keys = Object.keys(record).toSorted();
     const entries = keys.map((key) => `${JSON.stringify(key)}:${stableStringify(record[key])}`);
     return `{${entries.join(",")}}`;
 }
 export function getApiErrorPayloadFingerprint(raw) {
-    if (!raw)
+    if (!raw) {
         return null;
+    }
     const payload = parseApiErrorPayload(raw);
-    if (!payload)
+    if (!payload) {
         return null;
+    }
     return stableStringify(payload);
 }
 export function isRawApiErrorPayload(raw) {
     return getApiErrorPayloadFingerprint(raw) !== null;
 }
 export function parseApiErrorInfo(raw) {
-    if (!raw)
+    if (!raw) {
         return null;
+    }
     const trimmed = raw.trim();
-    if (!trimmed)
+    if (!trimmed) {
         return null;
+    }
     let httpCode;
     let candidate = trimmed;
     const httpPrefixMatch = candidate.match(/^(\d{3})\s+(.+)$/s);
@@ -179,8 +216,9 @@ export function parseApiErrorInfo(raw) {
         candidate = httpPrefixMatch[2].trim();
     }
     const payload = parseApiErrorPayload(candidate);
-    if (!payload)
+    if (!payload) {
         return null;
+    }
     const requestId = typeof payload.request_id === "string"
         ? payload.request_id
         : typeof payload.requestId === "string"
@@ -192,12 +230,15 @@ export function parseApiErrorInfo(raw) {
     let errMessage;
     if (payload.error && typeof payload.error === "object" && !Array.isArray(payload.error)) {
         const err = payload.error;
-        if (typeof err.type === "string")
+        if (typeof err.type === "string") {
             errType = err.type;
-        if (typeof err.code === "string" && !errType)
+        }
+        if (typeof err.code === "string" && !errType) {
             errType = err.code;
-        if (typeof err.message === "string")
+        }
+        if (typeof err.message === "string") {
             errMessage = err.message;
+        }
     }
     return {
         httpCode,
@@ -208,8 +249,9 @@ export function parseApiErrorInfo(raw) {
 }
 export function formatRawAssistantErrorForUi(raw) {
     const trimmed = (raw ?? "").trim();
-    if (!trimmed)
+    if (!trimmed) {
         return "LLM request failed with an unknown error.";
+    }
     const httpMatch = trimmed.match(HTTP_STATUS_PREFIX_RE);
     if (httpMatch) {
         const rest = httpMatch[2].trim();
@@ -229,10 +271,12 @@ export function formatRawAssistantErrorForUi(raw) {
 export function formatAssistantErrorText(msg, opts) {
     // Also format errors if errorMessage is present, even if stopReason isn't "error"
     const raw = (msg.errorMessage ?? "").trim();
-    if (msg.stopReason !== "error" && !raw)
+    if (msg.stopReason !== "error" && !raw) {
         return undefined;
-    if (!raw)
+    }
+    if (!raw) {
         return "LLM request failed with an unknown error.";
+    }
     const unknownTool = raw.match(/unknown tool[:\s]+["']?([a-z0-9_-]+)["']?/i) ??
         raw.match(/tool\s+["']?([a-z0-9_-]+)["']?\s+(?:not found|is not available)/i);
     if (unknownTool?.[1]) {
@@ -241,18 +285,24 @@ export function formatAssistantErrorText(msg, opts) {
             sessionKey: opts?.sessionKey,
             toolName: unknownTool[1],
         });
-        if (rewritten)
+        if (rewritten) {
             return rewritten;
+        }
     }
     if (isContextOverflowError(raw)) {
         return ("Context overflow: prompt too large for the model. " +
-            "Try again with less input or a larger-context model.");
+            "Try /reset (or /new) to start a fresh session, or use a larger-context model.");
     }
     // Catch role ordering errors - including JSON-wrapped and "400" prefix variants
     if (/incorrect role information|roles must alternate|400.*role|"message".*role.*information/i.test(raw)) {
         return ("Message ordering conflict - please try again. " +
             "If this persists, use /new to start a fresh session.");
     }
+    if (isMissingToolCallInputError(raw)) {
+        return ("Session history looks corrupted (tool call input missing). " +
+            "Use /new to start a fresh session. " +
+            "If this keeps happening, reset the session or delete the corrupted session transcript.");
+    }
     const invalidRequest = raw.match(/"type":"invalid_request_error".*?"message":"([^"]+)"/);
     if (invalidRequest?.[1]) {
         return `LLM request rejected: ${invalidRequest[1]}`;
@@ -260,6 +310,9 @@ export function formatAssistantErrorText(msg, opts) {
     if (isOverloadedErrorMessage(raw)) {
         return "The AI service is temporarily overloaded. Please try again in a moment.";
     }
+    if (isBillingErrorMessage(raw)) {
+        return BILLING_ERROR_USER_MESSAGE;
+    }
     if (isLikelyHttpErrorText(raw) || isRawApiErrorPayload(raw)) {
         return formatRawAssistantErrorForUi(raw);
     }
@@ -269,38 +322,49 @@ export function formatAssistantErrorText(msg, opts) {
     }
     return raw.length > 600 ? `${raw.slice(0, 600)}…` : raw;
 }
-export function sanitizeUserFacingText(text) {
-    if (!text)
+export function sanitizeUserFacingText(text, opts) {
+    if (!text) {
         return text;
+    }
+    const errorContext = opts?.errorContext ?? false;
     const stripped = stripFinalTagsFromText(text);
     const trimmed = stripped.trim();
-    if (!trimmed)
+    if (!trimmed) {
         return stripped;
-    if (/incorrect role information|roles must alternate/i.test(trimmed)) {
-        return ("Message ordering conflict - please try again. " +
-            "If this persists, use /new to start a fresh session.");
     }
-    if (isContextOverflowError(trimmed)) {
-        return ("Context overflow: prompt too large for the model. " +
-            "Try again with less input or a larger-context model.");
-    }
-    if (isRawApiErrorPayload(trimmed) || isLikelyHttpErrorText(trimmed)) {
-        return formatRawAssistantErrorForUi(trimmed);
-    }
-    if (ERROR_PREFIX_RE.test(trimmed)) {
-        if (isOverloadedErrorMessage(trimmed) || isRateLimitErrorMessage(trimmed)) {
-            return "The AI service is temporarily overloaded. Please try again in a moment.";
+    // Only apply error-pattern rewrites when the caller knows this text is an error payload.
+    // Otherwise we risk swallowing legitimate assistant text that merely *mentions* these errors.
+    if (errorContext) {
+        if (/incorrect role information|roles must alternate/i.test(trimmed)) {
+            return ("Message ordering conflict - please try again. " +
+                "If this persists, use /new to start a fresh session.");
+        }
+        if (shouldRewriteContextOverflowText(trimmed)) {
+            return ("Context overflow: prompt too large for the model. " +
+                "Try /reset (or /new) to start a fresh session, or use a larger-context model.");
         }
-        if (isTimeoutErrorMessage(trimmed)) {
-            return "LLM request timed out.";
+        if (isBillingErrorMessage(trimmed)) {
+            return BILLING_ERROR_USER_MESSAGE;
+        }
+        if (isRawApiErrorPayload(trimmed) || isLikelyHttpErrorText(trimmed)) {
+            return formatRawAssistantErrorForUi(trimmed);
+        }
+        if (ERROR_PREFIX_RE.test(trimmed)) {
+            if (isOverloadedErrorMessage(trimmed) || isRateLimitErrorMessage(trimmed)) {
+                return "The AI service is temporarily overloaded. Please try again in a moment.";
+            }
+            if (isTimeoutErrorMessage(trimmed)) {
+                return "LLM request timed out.";
+            }
+            return formatRawAssistantErrorForUi(trimmed);
         }
-        return formatRawAssistantErrorForUi(trimmed);
     }
     return collapseConsecutiveDuplicateBlocks(stripped);
 }
 export function isRateLimitAssistantError(msg) {
-    if (!msg || msg.stopReason !== "error")
+    if (!msg || msg.stopReason !== "error") {
         return false;
+    }
     return isRateLimitErrorMessage(msg.errorMessage ?? "");
 }
 const ERROR_PATTERNS = {
@@ -320,6 +384,7 @@ const ERROR_PATTERNS = {
         "insufficient credits",
         "credit balance",
         "plans & billing",
+        "insufficient balance",
     ],
     auth: [
         /invalid[_ ]?api[_ ]?key/,
@@ -346,11 +411,15 @@ const ERROR_PATTERNS = {
         "invalid request format",
     ],
 };
+const TOOL_CALL_INPUT_MISSING_RE = /tool_(?:use|call)\.(?:input|arguments).*?(?:field required|required)/i;
+const TOOL_CALL_INPUT_PATH_RE = /messages\.\d+\.content\.\d+\.tool_(?:use|call)\.(?:input|arguments)/i;
 const IMAGE_DIMENSION_ERROR_RE = /image dimensions exceed max allowed size for many-image requests:\s*(\d+)\s*pixels/i;
 const IMAGE_DIMENSION_PATH_RE = /messages\.(\d+)\.content\.(\d+)\.image/i;
+const IMAGE_SIZE_ERROR_RE = /image exceeds\s*(\d+(?:\.\d+)?)\s*mb/i;
 function matchesErrorPatterns(raw, patterns) {
-    if (!raw)
+    if (!raw) {
         return false;
+    }
     const value = raw.toLowerCase();
     return patterns.some((pattern) => pattern instanceof RegExp ? pattern.test(value) : value.includes(pattern));
 }
@@ -362,19 +431,21 @@ export function isTimeoutErrorMessage(raw) {
 }
 export function isBillingErrorMessage(raw) {
     const value = raw.toLowerCase();
-    if (!value)
+    if (!value) {
         return false;
-    if (matchesErrorPatterns(value, ERROR_PATTERNS.billing))
-        return true;
-    return (value.includes("billing") &&
-        (value.includes("upgrade") ||
-            value.includes("credits") ||
-            value.includes("payment") ||
-            value.includes("plan")));
+    }
+    return matchesErrorPatterns(value, ERROR_PATTERNS.billing);
+}
+export function isMissingToolCallInputError(raw) {
+    if (!raw) {
+        return false;
+    }
+    return TOOL_CALL_INPUT_MISSING_RE.test(raw) || TOOL_CALL_INPUT_PATH_RE.test(raw);
 }
 export function isBillingAssistantError(msg) {
-    if (!msg || msg.stopReason !== "error")
+    if (!msg || msg.stopReason !== "error") {
         return false;
+    }
     return isBillingErrorMessage(msg.errorMessage ?? "");
 }
 export function isAuthErrorMessage(raw) {
@@ -384,11 +455,13 @@ export function isOverloadedErrorMessage(raw) {
     return matchesErrorPatterns(raw, ERROR_PATTERNS.overloaded);
 }
 export function parseImageDimensionError(raw) {
-    if (!raw)
+    if (!raw) {
         return null;
+    }
     const lower = raw.toLowerCase();
-    if (!lower.includes("image dimensions exceed max allowed size"))
+    if (!lower.includes("image dimensions exceed max allowed size")) {
         return null;
+    }
     const limitMatch = raw.match(IMAGE_DIMENSION_ERROR_RE);
     const pathMatch = raw.match(IMAGE_DIMENSION_PATH_RE);
     return {
@@ -401,36 +474,68 @@ export function parseImageDimensionError(raw) {
 export function isImageDimensionErrorMessage(raw) {
     return Boolean(parseImageDimensionError(raw));
 }
+export function parseImageSizeError(raw) {
+    if (!raw) {
+        return null;
+    }
+    const lower = raw.toLowerCase();
+    if (!lower.includes("image exceeds") || !lower.includes("mb")) {
+        return null;
+    }
+    const match = raw.match(IMAGE_SIZE_ERROR_RE);
+    return {
+        maxMb: match?.[1] ? Number.parseFloat(match[1]) : undefined,
+        raw,
+    };
+}
+export function isImageSizeError(errorMessage) {
+    if (!errorMessage) {
+        return false;
+    }
+    return Boolean(parseImageSizeError(errorMessage));
+}
 export function isCloudCodeAssistFormatError(raw) {
     return !isImageDimensionErrorMessage(raw) && matchesErrorPatterns(raw, ERROR_PATTERNS.format);
 }
 export function isAuthAssistantError(msg) {
-    if (!msg || msg.stopReason !== "error")
+    if (!msg || msg.stopReason !== "error") {
         return false;
+    }
     return isAuthErrorMessage(msg.errorMessage ?? "");
 }
 export function classifyFailoverReason(raw) {
-    if (isImageDimensionErrorMessage(raw))
+    if (isImageDimensionErrorMessage(raw)) {
+        return null;
+    }
+    if (isImageSizeError(raw)) {
         return null;
-    if (isRateLimitErrorMessage(raw))
+    }
+    if (isRateLimitErrorMessage(raw)) {
         return "rate_limit";
-    if (isOverloadedErrorMessage(raw))
+    }
+    if (isOverloadedErrorMessage(raw)) {
         return "rate_limit";
-    if (isCloudCodeAssistFormatError(raw))
+    }
+    if (isCloudCodeAssistFormatError(raw)) {
         return "format";
-    if (isBillingErrorMessage(raw))
+    }
+    if (isBillingErrorMessage(raw)) {
         return "billing";
-    if (isTimeoutErrorMessage(raw))
+    }
+    if (isTimeoutErrorMessage(raw)) {
         return "timeout";
-    if (isAuthErrorMessage(raw))
+    }
+    if (isAuthErrorMessage(raw)) {
         return "auth";
+    }
     return null;
 }
 export function isFailoverErrorMessage(raw) {
     return classifyFailoverReason(raw) !== null;
 }
 export function isFailoverAssistantError(msg) {
-    if (!msg || msg.stopReason !== "error")
+    if (!msg || msg.stopReason !== "error") {
         return false;
+    }
     return isFailoverErrorMessage(msg.errorMessage ?? "");
 }

package/dist/agents/pi-embedded-helpers.js

@@ -1,5 +1,5 @@
 export { buildBootstrapContextFiles, DEFAULT_BOOTSTRAP_MAX_CHARS, ensureSessionHeader, resolveBootstrapMaxChars, stripThoughtSignatures, } from "./pi-embedded-helpers/bootstrap.js";
-export { classifyFailoverReason, formatRawAssistantErrorForUi, formatAssistantErrorText, getApiErrorPayloadFingerprint, isAuthAssistantError, isAuthErrorMessage, isBillingAssistantError, parseApiErrorInfo, sanitizeUserFacingText, isBillingErrorMessage, isCloudCodeAssistFormatError, isCompactionFailureError, isContextOverflowError, isLikelyContextOverflowError, isFailoverAssistantError, isFailoverErrorMessage, isImageDimensionErrorMessage, isOverloadedErrorMessage, isRawApiErrorPayload, isRateLimitAssistantError, isRateLimitErrorMessage, isTimeoutErrorMessage, parseImageDimensionError, } from "./pi-embedded-helpers/errors.js";
+export { BILLING_ERROR_USER_MESSAGE, classifyFailoverReason, formatRawAssistantErrorForUi, formatAssistantErrorText, getApiErrorPayloadFingerprint, isAuthAssistantError, isAuthErrorMessage, isBillingAssistantError, parseApiErrorInfo, parseImageSizeError, sanitizeUserFacingText, isBillingErrorMessage, isCloudCodeAssistFormatError, isCompactionFailureError, isContextOverflowError, isLikelyContextOverflowError, isFailoverAssistantError, isFailoverErrorMessage, isImageDimensionErrorMessage, isImageSizeError, isOverloadedErrorMessage, isRawApiErrorPayload, isRateLimitAssistantError, isRateLimitErrorMessage, isTimeoutErrorMessage, parseImageDimensionError, } from "./pi-embedded-helpers/errors.js";
 export { isGoogleModelApi, sanitizeGoogleTurnOrdering } from "./pi-embedded-helpers/google.js";
 export { downgradeOpenAIReasoningBlocks } from "./pi-embedded-helpers/openai.js";
 export { isEmptyAssistantMessageContent, sanitizeSessionMessagesImages, } from "./pi-embedded-helpers/images.js";

package/dist/agents/pi-embedded-runner/compact.js

@@ -152,6 +152,7 @@ export async function compactEmbeddedPiSessionDirect(params) {
             groupChannel: params.groupChannel,
             groupSpace: params.groupSpace,
             spawnedBy: params.spawnedBy,
+            senderIsOwner: params.senderIsOwner,
             agentDir,
             workspaceDir: effectiveWorkspace,
             config: params.config,

package/dist/agents/pi-embedded-runner/model.js

@@ -8,7 +8,12 @@ export function buildInlineProviderModels(providers) {
         const trimmed = providerId.trim();
         if (!trimmed)
             return [];
-        return (entry?.models ?? []).map((model) => ({ ...model, provider: trimmed }));
+        return (entry?.models ?? []).map((model) => ({
+            ...model,
+            provider: trimmed,
+            baseUrl: entry?.baseUrl,
+            ...(entry?.api && !model.api ? { api: entry.api } : {}),
+        }));
     });
 }
 export function buildModelAliasLines(cfg) {
@@ -24,15 +29,68 @@ export function buildModelAliasLines(cfg) {
         entries.push({ alias, model });
     }
     return entries
-        .sort((a, b) => a.alias.localeCompare(b.alias))
+        .toSorted((a, b) => a.alias.localeCompare(b.alias))
         .map((entry) => `- ${entry.alias}: ${entry.model}`);
 }
+// Well-known model IDs for forward-compatible resolution
+export const OPENAI_CODEX_GPT_53_MODEL_ID = "codex-gpt-5.3";
+export const OPENAI_CODEX_TEMPLATE_MODEL_IDS = ["codex-mini-*"];
+export const ANTHROPIC_OPUS_46_MODEL_ID = "claude-opus-4-0624";
+export const ANTHROPIC_OPUS_46_DOT_MODEL_ID = "claude-opus-4.6";
+export const ANTHROPIC_OPUS_TEMPLATE_MODEL_IDS = ["claude-opus-4-*", "claude-opus-4.*"];
+/**
+ * Resolve forward-compat fallback for OpenAI codex-gpt-5.3 requests.
+ * If the exact model is not in the registry, try `codex-mini-*` template matches.
+ */
+export function resolveOpenAICodexGpt53FallbackModel(modelRegistry, provider) {
+    for (const templateId of OPENAI_CODEX_TEMPLATE_MODEL_IDS) {
+        const match = modelRegistry.find(provider, templateId);
+        if (match)
+            return match;
+    }
+    return null;
+}
+/**
+ * Resolve forward-compat fallback for Anthropic claude-opus-4.6 requests.
+ * If the exact model is not in the registry, try `claude-opus-4-*` template matches.
+ */
+export function resolveAnthropicOpus46ForwardCompatModel(modelRegistry, provider, modelId) {
+    if (modelId !== ANTHROPIC_OPUS_46_MODEL_ID && modelId !== ANTHROPIC_OPUS_46_DOT_MODEL_ID) {
+        return null;
+    }
+    for (const templateId of ANTHROPIC_OPUS_TEMPLATE_MODEL_IDS) {
+        const match = modelRegistry.find(provider, templateId);
+        if (match)
+            return match;
+    }
+    return null;
+}
 export function resolveModel(provider, modelId, agentDir, cfg) {
     const resolvedAgentDir = agentDir ?? resolvePoolbotAgentDir();
     const authStorage = discoverAuthStorage(resolvedAgentDir);
     const modelRegistry = discoverModels(authStorage, resolvedAgentDir);
     const model = modelRegistry.find(provider, modelId);
     if (!model) {
+        // Try codex forward-compat fallback
+        if (modelId === OPENAI_CODEX_GPT_53_MODEL_ID) {
+            const codexFallback = resolveOpenAICodexGpt53FallbackModel(modelRegistry, provider);
+            if (codexFallback) {
+                return {
+                    model: normalizeModelCompat(codexFallback),
+                    authStorage,
+                    modelRegistry,
+                };
+            }
+        }
+        // Try Anthropic opus forward-compat fallback
+        const opusFallback = resolveAnthropicOpus46ForwardCompatModel(modelRegistry, provider, modelId);
+        if (opusFallback) {
+            return {
+                model: normalizeModelCompat(opusFallback),
+                authStorage,
+                modelRegistry,
+            };
+        }
         const providers = cfg?.models?.providers ?? {};
         const inlineModels = buildInlineProviderModels(providers);
         const normalizedProvider = normalizeProviderId(provider);
@@ -57,6 +115,7 @@ export function resolveModel(provider, modelId, agentDir, cfg) {
                 cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
                 contextWindow: providerCfg?.models?.[0]?.contextWindow ?? DEFAULT_CONTEXT_TOKENS,
                 maxTokens: providerCfg?.models?.[0]?.maxTokens ?? DEFAULT_CONTEXT_TOKENS,
+                baseUrl: providerCfg?.baseUrl,
             });
             return { model: fallbackModel, authStorage, modelRegistry };
         }