@georgedong32/ccs 7.66.0

package/dist/cliproxy/executor/session-bridge.js

@@ -0,0 +1,236 @@
+"use strict";
+/**
+ * Session Bridge - Integration with session tracking and proxy detection
+ *
+ * Handles:
+ * - Session registration and unregistration
+ * - Proxy detection and version checking
+ * - Orphaned proxy reclamation
+ * - Startup lock coordination
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupCleanupHandlers = exports.registerProxySession = exports.checkOrJoinProxy = void 0;
+const ui_1 = require("../../utils/ui");
+const binary_manager_1 = require("../binary-manager");
+const session_tracker_1 = require("../session-tracker");
+const proxy_detector_1 = require("../proxy-detector");
+const startup_lock_1 = require("../startup-lock");
+const platform_commands_1 = require("../../utils/platform-commands");
+const quota_manager_1 = require("../quota-manager");
+/**
+ * Check for existing proxy and handle version mismatch, or determine if new spawn needed
+ */
+async function checkOrJoinProxy(port, timeout, verbose) {
+    const log = (msg) => {
+        if (verbose) {
+            console.error(`[cliproxy] ${msg}`);
+        }
+    };
+    // Cleanup orphaned sessions before detection
+    (0, session_tracker_1.cleanupOrphanedSessions)(port);
+    let sessionId;
+    let shouldSpawn = false;
+    // Use startup lock to coordinate with other CCS processes
+    await (0, startup_lock_1.withStartupLock)(async () => {
+        // Detect running proxy using multiple methods (HTTP, session-lock, port-process)
+        let proxyStatus = await (0, proxy_detector_1.detectRunningProxy)(port);
+        log(`Proxy detection: ${JSON.stringify(proxyStatus)}`);
+        // Check for version mismatch - restart proxy if installed version differs from running
+        if (proxyStatus.running && proxyStatus.verified && proxyStatus.version) {
+            const installedVersion = (0, binary_manager_1.getInstalledCliproxyVersion)();
+            if (installedVersion !== proxyStatus.version) {
+                console.log((0, ui_1.warn)(`Version mismatch: running v${proxyStatus.version}, installed v${installedVersion}. Restarting proxy...`));
+                log(`Stopping outdated proxy (PID: ${proxyStatus.pid ?? 'unknown'})...`);
+                const stopResult = await (0, session_tracker_1.stopProxy)(port);
+                if (stopResult.stopped) {
+                    log(`Stopped outdated proxy successfully`);
+                }
+                else {
+                    log(`Stop proxy result: ${stopResult.error ?? 'unknown error'}`);
+                }
+                // Wait for port to be released
+                await new Promise((r) => setTimeout(r, 500));
+                // Re-detect proxy status (should now be not running)
+                proxyStatus = await (0, proxy_detector_1.detectRunningProxy)(port);
+                log(`Re-detection after version mismatch restart: ${JSON.stringify(proxyStatus)}`);
+            }
+        }
+        if (proxyStatus.running && proxyStatus.verified) {
+            // Healthy proxy found - join it
+            if (proxyStatus.pid) {
+                sessionId = (0, proxy_detector_1.reclaimOrphanedProxy)(port, proxyStatus.pid, verbose) ?? undefined;
+            }
+            if (sessionId) {
+                console.log((0, ui_1.info)(`Joined existing CLIProxy on port ${port} (${proxyStatus.method})`));
+            }
+            else {
+                // Failed to register session - proxy is running but we can't track it
+                console.log((0, ui_1.info)(`Using existing CLIProxy on port ${port} (session tracking unavailable)`));
+                log(`PID=${proxyStatus.pid ?? 'unknown'}, session registration skipped`);
+            }
+            return; // Exit lock early, skip spawning
+        }
+        if (proxyStatus.running && !proxyStatus.verified) {
+            // Proxy detected but not ready yet (another process is starting it)
+            log(`Proxy starting up (detected via ${proxyStatus.method}), waiting...`);
+            const becameHealthy = await (0, proxy_detector_1.waitForProxyHealthy)(port, timeout);
+            if (becameHealthy) {
+                if (proxyStatus.pid) {
+                    sessionId = (0, proxy_detector_1.reclaimOrphanedProxy)(port, proxyStatus.pid, verbose) ?? undefined;
+                }
+                console.log((0, ui_1.info)(`Joined CLIProxy after startup wait`));
+                return; // Exit lock early
+            }
+            // Proxy didn't become healthy - kill and respawn
+            if (proxyStatus.pid) {
+                log(`Proxy PID ${proxyStatus.pid} not responding, killing...`);
+                (0, platform_commands_1.killProcessOnPort)(port, verbose);
+                await new Promise((r) => setTimeout(r, 500));
+            }
+        }
+        if (proxyStatus.blocked && proxyStatus.blocker) {
+            // Port blocked by non-CLIProxy process
+            // Last resort: try HTTP health check (handles Windows PID-XXXXX case)
+            const isActuallyOurs = await (0, proxy_detector_1.waitForProxyHealthy)(port, 1000);
+            if (isActuallyOurs) {
+                sessionId = (0, proxy_detector_1.reclaimOrphanedProxy)(port, proxyStatus.blocker.pid, verbose) ?? undefined;
+                console.log((0, ui_1.info)(`Reclaimed CLIProxy with unrecognized process name`));
+                return;
+            }
+            // Truly blocked by another application
+            const { getPortCheckCommand } = await Promise.resolve().then(() => __importStar(require('../../utils/platform-commands')));
+            console.error('');
+            console.error((0, ui_1.warn)(`Port ${port} is blocked by ${proxyStatus.blocker.processName} (PID ${proxyStatus.blocker.pid})`));
+            console.error('');
+            console.error('To fix this, close the blocking application or run:');
+            console.error(`  ${getPortCheckCommand(port)}`);
+            console.error('');
+            throw new Error(`Port ${port} is in use by another application`);
+        }
+        // No proxy found - need to spawn
+        shouldSpawn = true;
+    });
+    return { sessionId, shouldSpawn };
+}
+exports.checkOrJoinProxy = checkOrJoinProxy;
+/**
+ * Register a new proxy session after spawning
+ */
+function registerProxySession(port, pid, backend, verbose) {
+    const installedVersion = (0, binary_manager_1.getInstalledCliproxyVersion)();
+    const sessionId = (0, session_tracker_1.registerSession)(port, pid, installedVersion, backend);
+    if (verbose) {
+        console.error(`[cliproxy] Registered session ${sessionId} with new proxy (PID ${pid}, version ${installedVersion})`);
+    }
+    return sessionId;
+}
+exports.registerProxySession = registerProxySession;
+/**
+ * Setup cleanup handlers for session unregistration
+ */
+function setupCleanupHandlers(claude, sessionId, sessionPort, codexReasoningProxy, toolSanitizationProxy, httpsTunnel, verbose) {
+    const log = (msg) => {
+        if (verbose) {
+            console.error(`[cliproxy] ${msg}`);
+        }
+    };
+    const cleanup = () => {
+        (0, quota_manager_1.stopQuotaMonitor)();
+        log('Parent signal received, cleaning up');
+        if (codexReasoningProxy &&
+            typeof codexReasoningProxy === 'object' &&
+            'stop' in codexReasoningProxy) {
+            codexReasoningProxy.stop();
+        }
+        if (toolSanitizationProxy &&
+            typeof toolSanitizationProxy === 'object' &&
+            'stop' in toolSanitizationProxy) {
+            toolSanitizationProxy.stop();
+        }
+        if (httpsTunnel && typeof httpsTunnel === 'object' && 'stop' in httpsTunnel) {
+            httpsTunnel.stop();
+        }
+        // Unregister session, proxy keeps running (local mode only)
+        if (sessionId) {
+            (0, session_tracker_1.unregisterSession)(sessionId, sessionPort);
+        }
+        claude.kill('SIGTERM');
+    };
+    claude.on('exit', (code, signal) => {
+        (0, quota_manager_1.stopQuotaMonitor)();
+        log(`Claude exited: code=${code}, signal=${signal}`);
+        if (codexReasoningProxy &&
+            typeof codexReasoningProxy === 'object' &&
+            'stop' in codexReasoningProxy) {
+            codexReasoningProxy.stop();
+        }
+        if (toolSanitizationProxy &&
+            typeof toolSanitizationProxy === 'object' &&
+            'stop' in toolSanitizationProxy) {
+            toolSanitizationProxy.stop();
+        }
+        if (httpsTunnel && typeof httpsTunnel === 'object' && 'stop' in httpsTunnel) {
+            httpsTunnel.stop();
+        }
+        // Unregister this session (proxy keeps running for persistence) - only for local mode
+        if (sessionId) {
+            (0, session_tracker_1.unregisterSession)(sessionId, sessionPort);
+            log(`Session ${sessionId} unregistered, proxy persists for other sessions or future use`);
+        }
+        if (signal) {
+            process.kill(process.pid, signal);
+        }
+        else {
+            process.exit(code || 0);
+        }
+    });
+    claude.on('error', (error) => {
+        (0, quota_manager_1.stopQuotaMonitor)();
+        console.error(require('../../utils/ui').fail(`Claude CLI error: ${error}`));
+        if (codexReasoningProxy &&
+            typeof codexReasoningProxy === 'object' &&
+            'stop' in codexReasoningProxy) {
+            codexReasoningProxy.stop();
+        }
+        if (toolSanitizationProxy &&
+            typeof toolSanitizationProxy === 'object' &&
+            'stop' in toolSanitizationProxy) {
+            toolSanitizationProxy.stop();
+        }
+        if (httpsTunnel && typeof httpsTunnel === 'object' && 'stop' in httpsTunnel) {
+            httpsTunnel.stop();
+        }
+        // Unregister session, proxy keeps running (local mode only)
+        if (sessionId) {
+            (0, session_tracker_1.unregisterSession)(sessionId, sessionPort);
+        }
+        process.exit(1);
+    });
+    process.once('SIGTERM', cleanup);
+    process.once('SIGINT', cleanup);
+}
+exports.setupCleanupHandlers = setupCleanupHandlers;
+//# sourceMappingURL=session-bridge.js.map

package/dist/cliproxy/executor/session-bridge.js.map

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

package/dist/cliproxy/executor/thinking-arg-parser.d.ts

@@ -0,0 +1,27 @@
+/**
+ * Parse CLI thinking/effort override flags.
+ *
+ * Supported aliases:
+ * - --thinking <value>
+ * - --thinking=<value>
+ * - --effort <value>
+ * - --effort=<value>
+ */
+export type ThinkingFlag = '--thinking' | '--effort';
+export interface ThinkingParseError {
+    flag: ThinkingFlag;
+    form: 'inline' | 'separate';
+}
+export interface ThinkingParseResult {
+    value?: string | number;
+    sourceFlag?: ThinkingFlag;
+    sourceDisplay?: string;
+    duplicateDisplays: string[];
+    error?: ThinkingParseError;
+}
+/**
+ * Parse first thinking/effort value from args.
+ * If multiple flags are provided, first occurrence wins and later ones are reported as duplicates.
+ */
+export declare function parseThinkingOverride(args: string[]): ThinkingParseResult;
+//# sourceMappingURL=thinking-arg-parser.d.ts.map

package/dist/cliproxy/executor/thinking-arg-parser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"thinking-arg-parser.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/thinking-arg-parser.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,MAAM,MAAM,YAAY,GAAG,YAAY,GAAG,UAAU,CAAC;AAErD,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE,QAAQ,GAAG,UAAU,CAAC;CAC7B;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,YAAY,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,KAAK,CAAC,EAAE,kBAAkB,CAAC;CAC5B;AAaD;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,mBAAmB,CAyDzE"}

package/dist/cliproxy/executor/thinking-arg-parser.js

@@ -0,0 +1,80 @@
+"use strict";
+/**
+ * Parse CLI thinking/effort override flags.
+ *
+ * Supported aliases:
+ * - --thinking <value>
+ * - --thinking=<value>
+ * - --effort <value>
+ * - --effort=<value>
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseThinkingOverride = void 0;
+function parseThinkingValue(raw) {
+    const trimmed = raw.trim();
+    // Keep strict integer parsing for legacy compatibility with --thinking numeric budgets.
+    if (/^-?\d+$/.test(trimmed)) {
+        return Number.parseInt(trimmed, 10);
+    }
+    return trimmed;
+}
+/**
+ * Parse first thinking/effort value from args.
+ * If multiple flags are provided, first occurrence wins and later ones are reported as duplicates.
+ */
+function parseThinkingOverride(args) {
+    let value;
+    let sourceFlag;
+    let sourceDisplay;
+    const duplicateDisplays = [];
+    for (let i = 0; i < args.length; i++) {
+        const arg = args[i];
+        let flag = null;
+        let rawValue;
+        let display = '';
+        let form = 'separate';
+        if (arg === '--thinking' || arg === '--effort') {
+            flag = arg;
+            const nextArg = args[i + 1];
+            if (!nextArg || nextArg.startsWith('-')) {
+                if (value === undefined) {
+                    return { value, sourceFlag, sourceDisplay, duplicateDisplays, error: { flag, form } };
+                }
+                duplicateDisplays.push(`${flag} <missing-value>`);
+                continue;
+            }
+            rawValue = nextArg;
+            display = `${flag} ${rawValue}`;
+            i += 1; // Consume value
+        }
+        else if (arg.startsWith('--thinking=') || arg.startsWith('--effort=')) {
+            const [rawFlag, ...rest] = arg.split('=');
+            const joined = rest.join('=');
+            flag = rawFlag;
+            rawValue = joined;
+            form = 'inline';
+            if (!rawValue || rawValue.trim() === '') {
+                if (value === undefined) {
+                    return { value, sourceFlag, sourceDisplay, duplicateDisplays, error: { flag, form } };
+                }
+                duplicateDisplays.push(`${flag}=<missing-value>`);
+                continue;
+            }
+            display = `${flag}=${rawValue}`;
+        }
+        if (!flag || rawValue === undefined) {
+            continue;
+        }
+        if (value === undefined) {
+            value = parseThinkingValue(rawValue);
+            sourceFlag = flag;
+            sourceDisplay = display;
+        }
+        else {
+            duplicateDisplays.push(display);
+        }
+    }
+    return { value, sourceFlag, sourceDisplay, duplicateDisplays };
+}
+exports.parseThinkingOverride = parseThinkingOverride;
+//# sourceMappingURL=thinking-arg-parser.js.map

package/dist/cliproxy/executor/thinking-arg-parser.js.map

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

package/dist/cliproxy/executor/thinking-override-resolver.d.ts

@@ -0,0 +1,28 @@
+import type { ThinkingConfig } from '../../config/unified-config-types';
+export type RuntimeThinkingSource = 'flag' | 'env' | 'config' | undefined;
+/**
+ * Parse CCS_THINKING env value using same rules as CLI parsing:
+ * integer string => number, known level/off aliases => normalized string.
+ * Unknown/invalid values are ignored to preserve config fallback behavior.
+ */
+export declare function parseEnvThinkingOverride(raw: string | undefined): string | number | undefined;
+/**
+ * Runtime precedence: CLI flag > CCS_THINKING env var.
+ * Config is handled later during model/env resolution.
+ */
+export declare function resolveRuntimeThinkingOverride(flagOverride: string | number | undefined, envValue: string | undefined): {
+    thinkingOverride: string | number | undefined;
+    thinkingSource: RuntimeThinkingSource;
+};
+/**
+ * Effective off logic for codex reasoning proxy wiring.
+ */
+export declare function shouldDisableCodexReasoning(thinkingConfig: ThinkingConfig, thinkingOverride: string | number | undefined): boolean;
+/**
+ * Build user-facing startup feedback label/source based on effective precedence.
+ */
+export declare function buildThinkingStartupStatus(thinkingConfig: ThinkingConfig, thinkingOverride: string | number | undefined, thinkingSource: RuntimeThinkingSource, sourceDisplay?: string): {
+    thinkingLabel: string;
+    sourceLabel: string;
+};
+//# sourceMappingURL=thinking-override-resolver.d.ts.map

package/dist/cliproxy/executor/thinking-override-resolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"thinking-override-resolver.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/thinking-override-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAQxE,MAAM,MAAM,qBAAqB,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,SAAS,CAAC;AAE1E;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAqB7F;AAED;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,EACzC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAC3B;IAAE,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAAC,cAAc,EAAE,qBAAqB,CAAA;CAAE,CAS1F;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,cAAc,EAAE,cAAc,EAC9B,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAC5C,OAAO,CAQT;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,cAAc,EAAE,cAAc,EAC9B,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,EAC7C,cAAc,EAAE,qBAAqB,EACrC,aAAa,CAAC,EAAE,MAAM,GACrB;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAgDhD"}

package/dist/cliproxy/executor/thinking-override-resolver.js

@@ -0,0 +1,109 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildThinkingStartupStatus = exports.shouldDisableCodexReasoning = exports.resolveRuntimeThinkingOverride = exports.parseEnvThinkingOverride = void 0;
+const thinking_validator_1 = require("../thinking-validator");
+/**
+ * Parse CCS_THINKING env value using same rules as CLI parsing:
+ * integer string => number, known level/off aliases => normalized string.
+ * Unknown/invalid values are ignored to preserve config fallback behavior.
+ */
+function parseEnvThinkingOverride(raw) {
+    if (raw === undefined)
+        return undefined;
+    const trimmed = raw.trim();
+    if (!trimmed)
+        return undefined;
+    if (/^\d+$/.test(trimmed)) {
+        const parsed = Number.parseInt(trimmed, 10);
+        if (parsed < thinking_validator_1.THINKING_BUDGET_MIN || parsed > thinking_validator_1.THINKING_BUDGET_MAX) {
+            return undefined;
+        }
+        return parsed;
+    }
+    const normalized = trimmed.toLowerCase();
+    if ((0, thinking_validator_1.isThinkingOffValue)(normalized)) {
+        return 'off';
+    }
+    if (thinking_validator_1.VALID_THINKING_LEVELS.includes(normalized)) {
+        return normalized;
+    }
+    return undefined;
+}
+exports.parseEnvThinkingOverride = parseEnvThinkingOverride;
+/**
+ * Runtime precedence: CLI flag > CCS_THINKING env var.
+ * Config is handled later during model/env resolution.
+ */
+function resolveRuntimeThinkingOverride(flagOverride, envValue) {
+    if (flagOverride !== undefined) {
+        return { thinkingOverride: flagOverride, thinkingSource: 'flag' };
+    }
+    const envOverride = parseEnvThinkingOverride(envValue);
+    if (envOverride !== undefined) {
+        return { thinkingOverride: envOverride, thinkingSource: 'env' };
+    }
+    return { thinkingOverride: undefined, thinkingSource: undefined };
+}
+exports.resolveRuntimeThinkingOverride = resolveRuntimeThinkingOverride;
+/**
+ * Effective off logic for codex reasoning proxy wiring.
+ */
+function shouldDisableCodexReasoning(thinkingConfig, thinkingOverride) {
+    return ((thinkingConfig.mode === 'off' && thinkingOverride === undefined) ||
+        (0, thinking_validator_1.isThinkingOffValue)(thinkingOverride) ||
+        (thinkingOverride === undefined &&
+            thinkingConfig.mode === 'manual' &&
+            (0, thinking_validator_1.isThinkingOffValue)(thinkingConfig.override)));
+}
+exports.shouldDisableCodexReasoning = shouldDisableCodexReasoning;
+/**
+ * Build user-facing startup feedback label/source based on effective precedence.
+ */
+function buildThinkingStartupStatus(thinkingConfig, thinkingOverride, thinkingSource, sourceDisplay) {
+    const overrideDisablesThinking = (0, thinking_validator_1.isThinkingOffValue)(thinkingOverride);
+    const configDisablesThinking = thinkingOverride === undefined &&
+        (thinkingConfig.mode === 'off' ||
+            (thinkingConfig.mode === 'manual' && (0, thinking_validator_1.isThinkingOffValue)(thinkingConfig.override)));
+    if (overrideDisablesThinking || configDisablesThinking) {
+        if (thinkingSource === 'flag') {
+            return {
+                thinkingLabel: 'off',
+                sourceLabel: `flag: ${sourceDisplay ?? '--thinking off'}`,
+            };
+        }
+        if (thinkingSource === 'env') {
+            return {
+                thinkingLabel: 'off',
+                sourceLabel: 'env: CCS_THINKING',
+            };
+        }
+        return {
+            thinkingLabel: 'off',
+            sourceLabel: thinkingConfig.mode === 'manual' ? 'config: manual' : 'config: off',
+        };
+    }
+    if (thinkingSource === 'flag') {
+        return {
+            thinkingLabel: String(thinkingOverride),
+            sourceLabel: `flag: ${sourceDisplay ?? '--thinking'}`,
+        };
+    }
+    if (thinkingSource === 'env') {
+        return {
+            thinkingLabel: String(thinkingOverride),
+            sourceLabel: 'env: CCS_THINKING',
+        };
+    }
+    if (thinkingConfig.mode === 'manual' && thinkingConfig.override !== undefined) {
+        return {
+            thinkingLabel: String(thinkingConfig.override),
+            sourceLabel: 'config: manual',
+        };
+    }
+    return {
+        thinkingLabel: thinkingConfig.mode === 'auto' ? 'auto' : 'default',
+        sourceLabel: 'config: auto',
+    };
+}
+exports.buildThinkingStartupStatus = buildThinkingStartupStatus;
+//# sourceMappingURL=thinking-override-resolver.js.map

package/dist/cliproxy/executor/thinking-override-resolver.js.map

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

package/dist/cliproxy/gemini-cli-quota-normalizer.d.ts

@@ -0,0 +1,10 @@
+import type { GeminiCliBucket } from './quota-types';
+export interface GeminiCliParsedBucket {
+    modelId: string;
+    tokenType: string | null;
+    remainingFraction: number | null;
+    remainingAmount: number | null;
+    resetTime: string | null;
+}
+export declare function buildGeminiCliBucketsFromParsedBuckets(buckets: GeminiCliParsedBucket[]): GeminiCliBucket[];
+//# sourceMappingURL=gemini-cli-quota-normalizer.d.ts.map

package/dist/cliproxy/gemini-cli-quota-normalizer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gemini-cli-quota-normalizer.d.ts","sourceRoot":"","sources":["../../src/cliproxy/gemini-cli-quota-normalizer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAErD,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAmFD,wBAAgB,sCAAsC,CACpD,OAAO,EAAE,qBAAqB,EAAE,GAC/B,eAAe,EAAE,CA2EnB"}

package/dist/cliproxy/gemini-cli-quota-normalizer.js

@@ -0,0 +1,122 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildGeminiCliBucketsFromParsedBuckets = void 0;
+const GEMINI_CLI_QUOTA_GROUPS = [
+    {
+        id: 'gemini-flash-lite-series',
+        label: 'Gemini Flash Lite Series',
+        preferredModelId: 'gemini-2.5-flash-lite',
+        modelIds: ['gemini-2.5-flash-lite'],
+    },
+    {
+        id: 'gemini-flash-series',
+        label: 'Gemini Flash Series',
+        preferredModelId: 'gemini-3-flash-preview',
+        modelIds: ['gemini-3-flash-preview', 'gemini-3.1-flash-preview', 'gemini-2.5-flash'],
+    },
+    {
+        id: 'gemini-pro-series',
+        label: 'Gemini Pro Series',
+        preferredModelId: 'gemini-3.1-pro-preview',
+        modelIds: ['gemini-3.1-pro-preview', 'gemini-3-pro-preview', 'gemini-2.5-pro'],
+    },
+];
+const GEMINI_CLI_GROUP_ORDER = new Map(GEMINI_CLI_QUOTA_GROUPS.map((group, index) => [group.id, index]));
+const GEMINI_CLI_GROUP_LOOKUP = new Map(GEMINI_CLI_QUOTA_GROUPS.flatMap((group) => group.modelIds.map((modelId) => [modelId, group])));
+const GEMINI_CLI_IGNORED_MODEL_PREFIXES = ['gemini-2.0-flash'];
+function isIgnoredGeminiCliModel(modelId) {
+    return GEMINI_CLI_IGNORED_MODEL_PREFIXES.some((prefix) => modelId.startsWith(prefix));
+}
+function pickEarlierResetTime(current, next) {
+    if (!current)
+        return next;
+    if (!next)
+        return current;
+    const currentTime = new Date(current).getTime();
+    const nextTime = new Date(next).getTime();
+    if (Number.isNaN(currentTime))
+        return next;
+    if (Number.isNaN(nextTime))
+        return current;
+    return currentTime <= nextTime ? current : next;
+}
+function minNullableNumber(current, next) {
+    if (current === null)
+        return next;
+    if (next === null)
+        return current;
+    return Math.min(current, next);
+}
+function clampQuotaFraction(value) {
+    if (value === null)
+        return 0;
+    return Math.max(0, Math.min(1, value));
+}
+function getGroupOrder(bucket) {
+    return GEMINI_CLI_GROUP_ORDER.get(bucket.id) ?? Number.MAX_SAFE_INTEGER;
+}
+function buildGeminiCliBucketsFromParsedBuckets(buckets) {
+    if (buckets.length === 0)
+        return [];
+    const grouped = new Map();
+    for (const bucket of buckets) {
+        if (isIgnoredGeminiCliModel(bucket.modelId))
+            continue;
+        const group = GEMINI_CLI_GROUP_LOOKUP.get(bucket.modelId);
+        const groupId = group?.id ?? bucket.modelId;
+        const label = group?.label ?? bucket.modelId;
+        const tokenKey = bucket.tokenType ?? '';
+        const cacheKey = `${groupId}::${tokenKey || 'combined'}`;
+        const existing = grouped.get(cacheKey);
+        if (!existing) {
+            const preferredModelId = group?.preferredModelId;
+            grouped.set(cacheKey, {
+                id: groupId,
+                label,
+                tokenType: bucket.tokenType,
+                modelIds: [bucket.modelId],
+                preferredModelId,
+                preferredBucket: preferredModelId && bucket.modelId === preferredModelId ? bucket : undefined,
+                fallbackRemainingFraction: bucket.remainingFraction,
+                fallbackRemainingAmount: bucket.remainingAmount,
+                fallbackResetTime: bucket.resetTime,
+            });
+            continue;
+        }
+        existing.modelIds.push(bucket.modelId);
+        existing.fallbackRemainingFraction = minNullableNumber(existing.fallbackRemainingFraction, bucket.remainingFraction);
+        existing.fallbackRemainingAmount = minNullableNumber(existing.fallbackRemainingAmount, bucket.remainingAmount);
+        existing.fallbackResetTime = pickEarlierResetTime(existing.fallbackResetTime, bucket.resetTime);
+        if (existing.preferredModelId && bucket.modelId === existing.preferredModelId) {
+            existing.preferredBucket = bucket;
+        }
+    }
+    return Array.from(grouped.values())
+        .sort((a, b) => {
+        const orderDiff = getGroupOrder(a) - getGroupOrder(b);
+        if (orderDiff !== 0)
+            return orderDiff;
+        const tokenDiff = (a.tokenType ?? '').localeCompare(b.tokenType ?? '');
+        if (tokenDiff !== 0)
+            return tokenDiff;
+        return a.label.localeCompare(b.label);
+    })
+        .map((bucket) => {
+        const preferred = bucket.preferredBucket;
+        const remainingFraction = clampQuotaFraction(preferred?.remainingFraction ?? bucket.fallbackRemainingFraction);
+        const remainingAmount = preferred?.remainingAmount ?? bucket.fallbackRemainingAmount;
+        const resetTime = preferred?.resetTime ?? bucket.fallbackResetTime;
+        return {
+            id: `${bucket.id}::${bucket.tokenType || 'combined'}`,
+            label: bucket.label,
+            tokenType: bucket.tokenType,
+            remainingFraction,
+            remainingPercent: Math.round(remainingFraction * 100),
+            remainingAmount,
+            resetTime,
+            modelIds: Array.from(new Set(bucket.modelIds)),
+        };
+    });
+}
+exports.buildGeminiCliBucketsFromParsedBuckets = buildGeminiCliBucketsFromParsedBuckets;
+//# sourceMappingURL=gemini-cli-quota-normalizer.js.map