@kaitranntt/ccs 7.43.0 → 7.44.0-dev.1

package/dist/cliproxy/config/thinking-config.js

@@ -10,6 +10,26 @@ const unified_config_loader_1 = require("../../config/unified-config-loader");
 const model_catalog_1 = require("../model-catalog");
 const thinking_validator_1 = require("../thinking-validator");
 const ui_1 = require("../../utils/ui");
+/**
+ * Normalize model ID for provider capability lookup.
+ * Codex may carry effort suffixes in either legacy "(high)" or current "-high" forms.
+ */
+function normalizeModelForThinkingLookup(model, provider) {
+    const withoutExtendedContext = model.replace(/\[1m\]$/i, '').trim();
+    if (provider !== 'codex')
+        return withoutExtendedContext;
+    // New codex suffix form: gpt-5.3-codex-high -> gpt-5.3-codex
+    const codexSuffixMatch = withoutExtendedContext.match(/^(.*)-(xhigh|high|medium)$/i);
+    if (codexSuffixMatch?.[1]) {
+        return codexSuffixMatch[1].trim();
+    }
+    // Legacy codex suffix form: gpt-5.3-codex(high) -> gpt-5.3-codex
+    const codexLegacyMatch = withoutExtendedContext.match(/^(.*)\((xhigh|high|medium)\)$/i);
+    if (codexLegacyMatch?.[1]) {
+        return codexLegacyMatch[1].trim();
+    }
+    return withoutExtendedContext;
+}
 /**
  * Check if warnings should be shown based on thinking config.
  * Defaults to true if show_warnings is not explicitly false.
@@ -39,14 +59,41 @@ exports.detectTierFromModel = detectTierFromModel;
  * @returns Model name with thinking suffix, e.g., "gemini-3-pro-preview(high)"
  */
 function applyThinkingSuffix(model, thinkingValue) {
-    // Don't apply if model already ends with a parenthesized suffix (e.g., "model(high)" or "model(8192)")
-    // Matches: ends with "(...)" where content is non-empty
-    if (/\([^)]+\)$/.test(model)) {
+    return applyThinkingSuffixForProvider(model, thinkingValue);
+}
+exports.applyThinkingSuffix = applyThinkingSuffix;
+/**
+ * Apply provider-aware thinking suffix to model name.
+ * - Most providers: model(level|budget) e.g. "gemini-2.5-pro(high)"
+ * - Codex: model-effort e.g. "gpt-5.3-codex-xhigh"
+ */
+function applyThinkingSuffixForProvider(model, thinkingValue, provider) {
+    const codexEffortRegex = /^(medium|high|xhigh)$/i;
+    const codexModelSuffixRegex = /-(medium|high|xhigh)$/i;
+    const parenthesizedSuffixMatch = model.match(/\(([^)]+)\)$/);
+    // Existing parenthesized suffix:
+    // - keep as-is for non-codex providers
+    // - for codex effort levels, normalize to codex model suffix style
+    if (parenthesizedSuffixMatch) {
+        if (provider === 'codex') {
+            const normalizedParensValue = parenthesizedSuffixMatch[1]?.trim().toLowerCase() || '';
+            if (codexEffortRegex.test(normalizedParensValue)) {
+                return model.replace(/\([^)]+\)$/, `-${normalizedParensValue}`);
+            }
+        }
         return model;
     }
+    if (provider === 'codex') {
+        if (codexModelSuffixRegex.test(model)) {
+            return model;
+        }
+        const normalized = String(thinkingValue).trim().toLowerCase();
+        if (codexEffortRegex.test(normalized)) {
+            return `${model}-${normalized}`;
+        }
+    }
     return `${model}(${thinkingValue})`;
 }
-exports.applyThinkingSuffix = applyThinkingSuffix;
 /**
  * Get thinking value for tier based on config.
  * Respects provider-specific overrides if configured.
@@ -66,25 +113,35 @@ exports.getThinkingValueForTier = getThinkingValueForTier;
  * Modifies ANTHROPIC_MODEL and tier models with thinking suffixes.
  *
  * @param envVars - Environment variables to modify
- * @param provider - CLIProxy provider
+ * @param provider - CLIProxy provider (default provider for base model)
  * @param thinkingOverride - Optional CLI override (takes priority over config)
+ * @param compositeTierThinking - Optional per-tier thinking overrides for composite variants
+ * @param compositeTiers - Optional per-tier provider config for composite variants
  * @returns Modified env vars with thinking suffixes applied
  */
-function applyThinkingConfig(envVars, provider, thinkingOverride) {
+function applyThinkingConfig(envVars, provider, thinkingOverride, compositeTierThinking, compositeTiers) {
     const thinkingConfig = (0, unified_config_loader_1.getThinkingConfig)();
     const result = { ...envVars };
     // Check if thinking is off
     if (thinkingConfig.mode === 'off' && thinkingOverride === undefined) {
         return result;
     }
+    // Explicit "off" (CLI override or manual config override) must disable ALL tier thinking.
+    const explicitOffOverride = thinkingOverride === 'off' ||
+        (thinkingOverride === undefined &&
+            thinkingConfig.mode === 'manual' &&
+            thinkingConfig.override === 'off');
+    if (explicitOffOverride) {
+        return result;
+    }
     // Get base model to check thinking support
     const baseModel = result.ANTHROPIC_MODEL || '';
-    if (!(0, model_catalog_1.supportsThinking)(provider, baseModel)) {
-        // U2: Warn user if they explicitly provided --thinking but model doesn't support it
-        if (thinkingOverride !== undefined && shouldShowWarnings(thinkingConfig)) {
-            console.warn((0, ui_1.warn)(`Model ${baseModel || 'unknown'} (provider: ${provider}) does not support thinking budget. --thinking flag ignored.`));
-        }
-        return result;
+    const normalizedBaseModel = normalizeModelForThinkingLookup(baseModel, provider);
+    const baseModelSupportsThinking = (0, model_catalog_1.supportsThinking)(provider, normalizedBaseModel);
+    if (!baseModelSupportsThinking &&
+        thinkingOverride !== undefined &&
+        shouldShowWarnings(thinkingConfig)) {
+        console.warn((0, ui_1.warn)(`Model ${baseModel || 'unknown'} (provider: ${provider}) does not support thinking budget. --thinking flag ignored for default model.`));
     }
     // Determine thinking value to use
     let thinkingValue;
@@ -98,25 +155,40 @@ function applyThinkingConfig(envVars, provider, thinkingOverride) {
     }
     else if (thinkingConfig.mode === 'auto') {
         // Auto mode: detect tier and apply default
-        const tier = detectTierFromModel(baseModel);
-        thinkingValue = getThinkingValueForTier(tier, provider, thinkingConfig);
+        const tier = detectTierFromModel(normalizedBaseModel);
+        // Check per-tier config first if composite
+        const perTierValue = compositeTierThinking?.[tier];
+        if (perTierValue !== undefined) {
+            thinkingValue = perTierValue;
+        }
+        else {
+            thinkingValue = getThinkingValueForTier(tier, provider, thinkingConfig);
+        }
     }
     else {
         return result; // No thinking to apply
     }
-    // Validate thinking value against model capabilities
-    const validation = (0, thinking_validator_1.validateThinking)(provider, baseModel, thinkingValue);
-    if (validation.warning && shouldShowWarnings(thinkingConfig)) {
-        console.warn((0, ui_1.warn)(validation.warning));
+    if (baseModelSupportsThinking) {
+        // Validate thinking value against default model capabilities.
+        const validation = (0, thinking_validator_1.validateThinking)(provider, normalizedBaseModel, thinkingValue);
+        if (validation.warning && shouldShowWarnings(thinkingConfig)) {
+            console.warn((0, ui_1.warn)(validation.warning));
+        }
+        thinkingValue = validation.value;
     }
-    thinkingValue = validation.value;
-    // If validation says off, don't apply suffix
+    // If auto-detection resolves default tier to "off", skip the main model but still allow
+    // explicit per-tier thinking values for other tiers.
     if (thinkingValue === 'off') {
-        return result;
+        const hasPerTierThinking = compositeTierThinking &&
+            Object.values(compositeTierThinking).some((v) => v !== undefined && v !== 'off');
+        if (!hasPerTierThinking) {
+            return result; // No thinking to apply anywhere
+        }
+        // Otherwise, continue to process tiers with their own config (skip main model)
     }
-    // Apply thinking suffix to main model
-    if (result.ANTHROPIC_MODEL) {
-        result.ANTHROPIC_MODEL = applyThinkingSuffix(result.ANTHROPIC_MODEL, thinkingValue);
+    else if (baseModelSupportsThinking && result.ANTHROPIC_MODEL) {
+        // Apply thinking suffix to main model (only if not off)
+        result.ANTHROPIC_MODEL = applyThinkingSuffixForProvider(result.ANTHROPIC_MODEL, thinkingValue, provider);
     }
     // Apply to tier models if they support thinking
     const tierModels = [
@@ -126,15 +198,43 @@ function applyThinkingConfig(envVars, provider, thinkingOverride) {
     ];
     for (const tierVar of tierModels) {
         const model = result[tierVar];
-        if (model && (0, model_catalog_1.supportsThinking)(provider, model)) {
+        if (model) {
             // Get tier-specific thinking value
             const tier = tierVar.includes('OPUS')
                 ? 'opus'
                 : tierVar.includes('SONNET')
                     ? 'sonnet'
                     : 'haiku';
-            const tierThinkingValue = thinkingOverride ?? getThinkingValueForTier(tier, provider, thinkingConfig);
-            result[tierVar] = applyThinkingSuffix(model, tierThinkingValue);
+            // P2 FIX: Use tier-specific provider from compositeTiers for mixed-provider composites
+            // Falls back to the default provider if not a composite or tier not specified
+            const tierProvider = compositeTiers?.[tier]?.provider ?? provider;
+            const normalizedTierModel = normalizeModelForThinkingLookup(model, tierProvider);
+            // Check if this tier's model supports thinking (using tier-specific provider)
+            if (!(0, model_catalog_1.supportsThinking)(tierProvider, normalizedTierModel)) {
+                continue;
+            }
+            // Priority chain: CLI --thinking > per-tier config > global config > defaults
+            let tierThinkingValue;
+            if (thinkingOverride !== undefined) {
+                // CLI override takes priority
+                tierThinkingValue = thinkingOverride;
+            }
+            else {
+                const perTierValue = compositeTierThinking?.[tier];
+                if (perTierValue !== undefined) {
+                    // Per-tier config from composite variant
+                    tierThinkingValue = perTierValue;
+                }
+                else {
+                    // Global config or defaults (use tier-specific provider for provider overrides)
+                    tierThinkingValue = getThinkingValueForTier(tier, tierProvider, thinkingConfig);
+                }
+            }
+            // If per-tier thinking is 'off', skip this tier
+            if (tierThinkingValue === 'off') {
+                continue;
+            }
+            result[tierVar] = applyThinkingSuffixForProvider(model, tierThinkingValue, tierProvider);
         }
     }
     return result;

package/dist/cliproxy/config/thinking-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"thinking-config.js","sourceRoot":"","sources":["../../../src/cliproxy/config/thinking-config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"thinking-config.js","sourceRoot":"","sources":["../../../src/cliproxy/config/thinking-config.ts"],"names":[],"mappings":"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"}

package/dist/cliproxy/executor/env-resolver.d.ts

@@ -9,6 +9,7 @@
  * - WebSearch and ImageAnalysis hook integration
  */
 import { CLIProxyProvider } from '../types';
+import { CompositeTierConfig } from '../../config/unified-config-types';
 import { CodexReasoningProxy } from '../codex-reasoning-proxy';
 import { ToolSanitizationProxy } from '../tool-sanitization-proxy';
 import { HttpsTunnelProxy } from '../https-tunnel-proxy';
@@ -34,6 +35,16 @@ export interface ProxyChainConfig {
     /** Extended context override: true = force on, false = force off, undefined = auto */
     extendedContextOverride?: boolean;
     verbose: boolean;
+    /** Composite variant: true when mixing providers per tier */
+    isComposite?: boolean;
+    /** Composite variant: per-tier provider+model mappings */
+    compositeTiers?: {
+        opus: CompositeTierConfig;
+        sonnet: CompositeTierConfig;
+        haiku: CompositeTierConfig;
+    };
+    /** Composite variant: which tier is the default */
+    compositeDefaultTier?: 'opus' | 'sonnet' | 'haiku';
 }
 /**
  * Build final environment variables for Claude CLI execution
@@ -44,4 +55,9 @@ export declare function buildClaudeEnvironment(config: ProxyChainConfig): Record
  * Log environment configuration for debugging
  */
 export declare function logEnvironment(env: Record<string, string>, webSearchEnv: Record<string, string>, verbose: boolean): void;
+/** Apply fallback provider config to env vars for a failed tier */
+export declare function applyFallback(env: Record<string, string>, failedTier: 'opus' | 'sonnet' | 'haiku', fallback: {
+    provider: string;
+    model: string;
+}): Record<string, string>;
 //# sourceMappingURL=env-resolver.d.ts.map

package/dist/cliproxy/executor/env-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env-resolver.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/env-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAG5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;IAC9C,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACnC,sFAAsF;IACtF,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,OAAO,EAAE,OAAO,CAAC;CAClB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAuGvF;AAED;;GAEG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,OAAO,EAAE,OAAO,GACf,IAAI,CAgBN"}
+{"version":3,"file":"env-resolver.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/env-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AASH,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAGxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;IAC9C,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACnC,sFAAsF;IACtF,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,6DAA6D;IAC7D,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,0DAA0D;IAC1D,cAAc,CAAC,EAAE;QACf,IAAI,EAAE,mBAAmB,CAAC;QAC1B,MAAM,EAAE,mBAAmB,CAAC;QAC5B,KAAK,EAAE,mBAAmB,CAAC;KAC5B,CAAC;IACF,mDAAmD;IACnD,oBAAoB,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;CACpD;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAmKvF;AAED;;GAEG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,OAAO,EAAE,OAAO,GACf,IAAI,CAgBN;AAED,mEAAmE;AACnE,wBAAgB,aAAa,CAC3B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3B,UAAU,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,EACvC,QAAQ,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC5C,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAcxB"}

package/dist/cliproxy/executor/env-resolver.js

@@ -10,7 +10,7 @@
  * - WebSearch and ImageAnalysis hook integration
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logEnvironment = exports.buildClaudeEnvironment = void 0;
+exports.applyFallback = exports.logEnvironment = exports.buildClaudeEnvironment = void 0;
 const config_generator_1 = require("../config-generator");
 const extended_context_config_1 = require("../config/extended-context-config");
 const websearch_manager_1 = require("../../utils/websearch-manager");
@@ -20,43 +20,82 @@ const get_image_analysis_hook_env_1 = require("../../utils/hooks/get-image-analy
  * Handles proxy chain ordering and integration with hooks
  */
 function buildClaudeEnvironment(config) {
-    const { provider, useRemoteProxy, remoteConfig, httpsTunnel, tunnelPort, localPort, customSettingsPath, thinkingOverride, extendedContextOverride, codexReasoningPort, toolSanitizationPort, } = config;
-    // Build base env vars - remote or local
+    const { provider, useRemoteProxy, remoteConfig, httpsTunnel, tunnelPort, localPort, customSettingsPath, thinkingOverride, extendedContextOverride, codexReasoningPort, toolSanitizationPort, isComposite, compositeTiers, compositeDefaultTier, } = config;
+    // Build base env vars - check remote mode first
     let envVars;
     if (useRemoteProxy && remoteConfig) {
         if (httpsTunnel && tunnelPort) {
-            // HTTPS remote via local tunnel - use HTTP to tunnel
-            envVars = (0, config_generator_1.getRemoteEnvVars)(provider, {
-                host: '127.0.0.1',
-                port: tunnelPort,
-                protocol: 'http', // Tunnel speaks HTTP locally
-                authToken: remoteConfig.authToken,
-            }, customSettingsPath);
+            // HTTPS remote via local tunnel
+            if (isComposite && compositeTiers && compositeDefaultTier) {
+                envVars = (0, config_generator_1.getCompositeEnvVars)(compositeTiers, compositeDefaultTier, tunnelPort, customSettingsPath, {
+                    host: '127.0.0.1',
+                    port: tunnelPort,
+                    protocol: 'http',
+                    authToken: remoteConfig.authToken,
+                });
+            }
+            else {
+                envVars = (0, config_generator_1.getRemoteEnvVars)(provider, {
+                    host: '127.0.0.1',
+                    port: tunnelPort,
+                    protocol: 'http', // Tunnel speaks HTTP locally
+                    authToken: remoteConfig.authToken,
+                }, customSettingsPath);
+            }
         }
         else {
             // HTTP remote - direct connection
-            envVars = (0, config_generator_1.getRemoteEnvVars)(provider, {
-                host: remoteConfig.host,
-                port: remoteConfig.port,
-                protocol: remoteConfig.protocol,
-                authToken: remoteConfig.authToken,
-            }, customSettingsPath);
+            if (isComposite && compositeTiers && compositeDefaultTier) {
+                envVars = (0, config_generator_1.getCompositeEnvVars)(compositeTiers, compositeDefaultTier, remoteConfig.port, customSettingsPath, {
+                    host: remoteConfig.host,
+                    port: remoteConfig.port,
+                    protocol: remoteConfig.protocol,
+                    authToken: remoteConfig.authToken,
+                });
+            }
+            else {
+                envVars = (0, config_generator_1.getRemoteEnvVars)(provider, {
+                    host: remoteConfig.host,
+                    port: remoteConfig.port,
+                    protocol: remoteConfig.protocol,
+                    authToken: remoteConfig.authToken,
+                }, customSettingsPath);
+            }
         }
     }
     else {
         // Local proxy mode
-        const remoteRewriteConfig = remoteConfig
-            ? {
-                host: remoteConfig.host,
-                port: remoteConfig.port,
-                protocol: remoteConfig.protocol,
-                authToken: remoteConfig.authToken,
-            }
-            : undefined;
-        envVars = (0, config_generator_1.getEffectiveEnvVars)(provider, localPort, customSettingsPath, remoteRewriteConfig);
+        if (isComposite && compositeTiers && compositeDefaultTier) {
+            envVars = (0, config_generator_1.getCompositeEnvVars)(compositeTiers, compositeDefaultTier, localPort, customSettingsPath);
+        }
+        else {
+            const remoteRewriteConfig = remoteConfig
+                ? {
+                    host: remoteConfig.host,
+                    port: remoteConfig.port,
+                    protocol: remoteConfig.protocol,
+                    authToken: remoteConfig.authToken,
+                }
+                : undefined;
+            envVars = (0, config_generator_1.getEffectiveEnvVars)(provider, localPort, customSettingsPath, remoteRewriteConfig);
+        }
+    }
+    // Extract per-tier thinking from composite config
+    let compositeTierThinking;
+    if (isComposite && compositeTiers) {
+        const tierThinking = {};
+        if (compositeTiers.opus?.thinking)
+            tierThinking.opus = compositeTiers.opus.thinking;
+        if (compositeTiers.sonnet?.thinking)
+            tierThinking.sonnet = compositeTiers.sonnet.thinking;
+        if (compositeTiers.haiku?.thinking)
+            tierThinking.haiku = compositeTiers.haiku.thinking;
+        if (Object.keys(tierThinking).length > 0) {
+            compositeTierThinking = tierThinking;
+        }
     }
     // Apply thinking configuration to model (auto tier-based or manual override)
-    (0, config_generator_1.applyThinkingConfig)(envVars, provider, thinkingOverride);
+    envVars = (0, config_generator_1.applyThinkingConfig)(envVars, provider, thinkingOverride, compositeTierThinking, compositeTiers);
     // Apply extended context suffix for 1M token context window
     // Auto-enabled for Gemini, opt-in for Claude (--1m flag)
     (0, extended_context_config_1.applyExtendedContextConfig)(envVars, provider, extendedContextOverride);
@@ -107,4 +146,21 @@ function logEnvironment(env, webSearchEnv, verbose) {
     }
 }
 exports.logEnvironment = logEnvironment;
+/** Apply fallback provider config to env vars for a failed tier */
+function applyFallback(env, failedTier, fallback) {
+    const tierEnvMap = {
+        opus: 'ANTHROPIC_DEFAULT_OPUS_MODEL',
+        sonnet: 'ANTHROPIC_DEFAULT_SONNET_MODEL',
+        haiku: 'ANTHROPIC_DEFAULT_HAIKU_MODEL',
+    };
+    const result = { ...env };
+    const originalModel = result[tierEnvMap[failedTier]];
+    result[tierEnvMap[failedTier]] = fallback.model;
+    // If failed tier is default tier, also update ANTHROPIC_MODEL
+    if (result.ANTHROPIC_MODEL === originalModel) {
+        result.ANTHROPIC_MODEL = fallback.model;
+    }
+    return result;
+}
+exports.applyFallback = applyFallback;
 //# sourceMappingURL=env-resolver.js.map

package/dist/cliproxy/executor/env-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"env-resolver.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/env-resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"env-resolver.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/env-resolver.ts"],"names":[],"mappings":"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"}

package/dist/cliproxy/executor/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAqBH,OAAO,EAAE,gBAAgB,EAAwC,cAAc,EAAE,MAAM,UAAU,CAAC;AAkDlG;;;;;;;GAOG;AACH,wBAAsB,sBAAsB,CAC1C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,GAAE,OAAO,CAAC,cAAc,CAAM,GACnC,OAAO,CAAC,IAAI,CAAC,CAitBf;AAGD,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAEzE,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAqBH,OAAO,EAAE,gBAAgB,EAAwC,cAAc,EAAE,MAAM,UAAU,CAAC;AAoDlG;;;;;;;GAOG;AACH,wBAAsB,sBAAsB,CAC1C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,GAAE,OAAO,CAAC,cAAc,CAAM,GACnC,OAAO,CAAC,IAAI,CAAC,CA+1Bf;AAGD,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAEzE,eAAe,sBAAsB,CAAC"}