coding-tool-x 3.9.5-261009 → 3.9.5-261013

package/CHANGELOG.md

@@ -23,6 +23,8 @@
 - **依赖安全升级** - adm-zip 升至 0.6.0（GHSA-xcpc-8h2w-3j85）、js-yaml 升至 4.3.1（GHSA-h67p-54hq-rp68 / GHSA-52cp-r559-cp3m / GHSA-5p4m-2wfm-xmqj）、pm2 升至 7.0.3（GHSA-x5gf-qvw8-r2rm），overrides 同步更新 basic-ftp / qs / systeminformation / js-yaml；`npm audit` 报告归零
 
 ### Fixed
+- **代理连接与内存回收** - 修复各 CLI 请求残留、客户端断开后的上游取消和渠道释放；后台退出时排空代理请求，延长上游空闲超时；OMP 重试取消失败响应，过滤连接保活头，并增加内存压力回收。
+- **CLI 状态和错误子命令** - 修复 `ctx status` 的代理 Driver 状态解析；错误子命令返回非零退出码，不再进入控制面。
 - **Claude / Gemini 原生 wire 兼容** - OpenCode Claude / Gemini 代理、模型探测和测速统一使用 Anthropic Messages 与 Google Generative AI（含 Gemini CLI）原生请求格式、认证头与目标 URL；OMP managed provider 写入 `anthropic-messages` / `google-generative-ai` 标识，避免代理、adapter 与探测各自维护不一致的请求格式
 - **OMP Codex Responses 路径兼容** - managed gateway 将 OMP 原生 `openai-codex-responses` 的 `/codex/responses` 请求映射到 OpenAI-compatible 渠道的 `/v1/responses`，避免 Codex-only 服务返回 HTTP 404
 - **OMP 渠道失败不再冻结** - OMP 动态切换开启后，失败渠道不再进入冻结状态。OMP 网关按请求即时回退其他渠道，冻结会导致短暂故障的渠道在恢复前被排除在后续分配之外

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coding-tool-x",
-  "version": "3.9.5-261009",
+  "version": "3.9.5-261013",
   "description": "Vibe Coding 增强工作助手 - 智能会话管理、动态渠道切换、全局搜索、实时监控",
   "main": "src/index.js",
   "bin": {

package/src/commands/daemon.js

@@ -12,7 +12,8 @@ const {
   formatPortToolIssue
 } = require('../utils/port-helper');
 const { hasHostFlag } = require('../utils/cli-flags');
-const { getPlatformRegistry, getPlatformRuntime } = require('../platforms/runtime');
+const { getPlatformRegistry } = require('../platforms/runtime');
+const { createProxyControl } = require('./proxy-control');
 const PM2_APP_NAME = 'cc-tool';
 const STARTUP_LOG_FILE = 'cc-tool-out.log';
 const PM2_RUNTIME_ENV_KEYS = [
@@ -279,34 +280,48 @@ function getPlatformPort(platform, config = {}) {
   return configured || platform.defaultPort || null;
 }
 
-async function getProxyStatusEntries({ registry = getPlatformRegistry(), runtime = getPlatformRuntime(), config = loadConfig() } = {}) {
-  const entries = [];
-  for (const platform of listProxyPlatforms(registry)) {
+function getUIConnectionOptions(existing, config = loadConfig()) {
+  const env = existing?.pm2_env || {};
+  const port = Number(env.CC_TOOL_PORT || env.env?.CC_TOOL_PORT || config.ports?.webUI || 19999);
+  const args = Array.isArray(env.args) ? env.args : String(env.args || '').split(/\s+/);
+  return { port, useHttps: args.includes('--https') };
+}
+
+async function getProxyStatusEntries({ registry = getPlatformRegistry(), config = loadConfig(), httpRequest, connection } = {}) {
+  // Servers live in the UI daemon. Loading a driver here creates a separate
+  // singleton in the CLI process whose status will always be stopped.
+  const control = createProxyControl({ registry, loadConfig: () => config, httpRequest, connection });
+  return Promise.all(listProxyPlatforms(registry).map(async (platform) => {
     const context = {
       platform: platform.key,
       capability: 'proxy',
       operation: 'status'
     };
     try {
-      const driver = runtime && typeof runtime.getDriver === 'function'
-        ? runtime.getDriver(platform.key, 'proxy')
-        : null;
-      if (!driver || (typeof driver.status === 'string' && driver.status !== 'ok')) {
-        entries.push({ platform, state: { status: 'unsupported', ...context }, port: getPlatformPort(platform, config) });
-        continue;
+      if (platform.capabilities?.proxy === 'unsupported' || platform.capabilities?.proxy === false) {
+        return { platform, state: { status: 'unsupported', ...context }, port: getPlatformPort(platform, config) };
       }
-      if (typeof driver.status !== 'function') {
-        entries.push({ platform, state: { status: 'unsupported', ...context }, port: getPlatformPort(platform, config) });
-        continue;
+      const { response } = await control.status(platform.key);
+      const result = response.data;
+      if (!Number.isInteger(response.status) || response.status < 200 || response.status >= 300) {
+        const failure = result?.error;
+        if (failure && typeof failure === 'object') {
+          return { platform, state: { ...failure, status: failure.status && failure.status !== 'ok' ? failure.status : 'failed', ...context }, port: getPlatformPort(platform, config) };
+        }
+        throw new Error(typeof failure === 'string' ? failure : `HTTP ${response.status}`);
       }
-      const state = await Promise.resolve(driver.status());
+      // The API normally unwraps the Driver result. Accept wrapped payloads
+      // too, but never interpret an invalid response as a stopped proxy.
+      const state = result && result.status === 'ok'
+        ? (result.data && typeof result.data === 'object' ? result.data : {})
+        : result;
       if (state && typeof state.status === 'string' && state.status !== 'ok') {
-        entries.push({ platform, state: { ...state, ...context }, port: getPlatformPort(platform, config) });
-      } else {
-        entries.push({ platform, state: state || {}, port: getPlatformPort(platform, config) });
+        return { platform, state: { ...state, ...context }, port: getPlatformPort(platform, config) };
       }
+      if (!state || typeof state.running !== 'boolean') throw new Error('Invalid proxy status response');
+      return { platform, state, port: getPlatformPort(platform, config) };
     } catch (error) {
-      entries.push({
+      return {
         platform,
         state: {
           status: 'failed',
@@ -314,10 +329,9 @@ async function getProxyStatusEntries({ registry = getPlatformRegistry(), runtime
           error: error && error.message ? error.message : String(error)
         },
         port: getPlatformPort(platform, config)
-      });
+      };
     }
-  }
-  return entries;
+  }));
 }
 
 function getManagedPorts(config = loadConfig(), registry = getPlatformRegistry()) {
@@ -508,8 +522,10 @@ function buildStartOptions(port, enableHost, enableHttps) {
     interpreter: 'node',
     windowsHide: true,
     autorestart: true,
-    kill_timeout: 5000,
+    // Let active OMP streams drain before PM2 forcibly terminates the process.
+    kill_timeout: 125000,
     max_memory_restart: '500M',
+    node_args: '--expose-gc',
     env,
     output: path.join(PATHS.logs, STARTUP_LOG_FILE),
     error: path.join(PATHS.logs, STARTUP_LOG_FILE),
@@ -731,6 +747,12 @@ async function handleStatus() {
 
     const existing = await getCCToolProcess();
     const config = loadConfig();
+    const connection = getUIConnectionOptions(existing, config);
+    const protocol = connection.useHttps ? 'https' : 'http';
+    if (connection.useHttps && PATHS.config) {
+      const certPath = path.join(PATHS.config, 'https', 'localhost-cert.pem');
+      if (fs.existsSync(certPath)) connection.ca = fs.readFileSync(certPath);
+    }
 
     console.log(chalk.bold.cyan('\n╔======================================╗'));
     console.log(chalk.bold.cyan('║        Coding-Tool 服务状态         ║'));
@@ -740,7 +762,7 @@ async function handleStatus() {
     console.log(chalk.bold('[UI] Web UI 服务:'));
     if (existing && existing.pm2_env.status === 'online') {
       console.log(chalk.green('  [OK] 状态: 运行中'));
-      console.log(chalk.gray(`  [NET] 地址: http://localhost:${config.ports?.webUI || 19999}`));
+      console.log(chalk.gray(`  [NET] 地址: ${protocol}://localhost:${connection.port}`));
       console.log(chalk.gray(`  [KEY] 进程 ID: ${existing.pid}`));
       console.log(chalk.gray(`  [TIMER]  运行时长: ${formatUptime(existing.pm2_env.pm_uptime)}`));
       console.log(chalk.gray(`  [SAVE] 内存使用: ${formatMemory(existing.monit?.memory)}`));
@@ -749,8 +771,11 @@ async function handleStatus() {
       console.log(chalk.gray('  [ERROR] 状态: 未运行'));
     }
 
-    // 代理服务状态由 Registry 中声明的 proxy driver 提供
-    const proxyStatuses = await getProxyStatusEntries({ config });
+    // Query the drivers in the running backend through manifest-declared APIs.
+    const proxyStatuses = await getProxyStatusEntries({
+      config: { ...config, ports: { ...config.ports, webUI: connection.port } },
+      connection
+    });
 
     console.log(chalk.bold('\n[PROXY] 代理服务:'));
     for (const entry of proxyStatuses) {
@@ -761,9 +786,9 @@ async function handleStatus() {
         console.log(chalk.gray(`  ${label}${chalk.gray('[N/A]  不支持')}`));
         continue;
       }
-      if (state.status === 'failed') {
+      if (state.status && state.status !== 'ok') {
         console.log(chalk.red(`  ${label}${chalk.red('[ERROR] 查询失败')}`) +
-          chalk.gray(` (${state.error || 'unknown error'})`));
+          chalk.gray(` (${state.error || state.status || 'unknown error'})`));
         continue;
       }
       console.log(chalk.gray(`  ${label}`) + (state.running
@@ -827,6 +852,7 @@ module.exports = {
     shouldTreatPortOwnershipAsReady,
     getManagedPorts,
     getProxyStatusEntries,
+    getUIConnectionOptions,
     listProxyPlatforms,
     shouldStopPM2Process
   }

package/src/commands/proxy-control.js

@@ -1,5 +1,6 @@
 const chalk = require('chalk');
 const http = require('http');
+const https = require('https');
 const { loadConfig } = require('../config/loader');
 const { normalizePlatformKey } = require('../shared/platforms');
 
@@ -38,7 +39,7 @@ function getPlatformInfo(channel, registry = getDefaultRegistry()) {
   };
 }
 
-function createHttpRequest(loadConfigImpl = loadConfig) {
+function createHttpRequest(loadConfigImpl = loadConfig, { useHttps = false, ca } = {}) {
   return function request(method, requestPath, data = null) {
     const config = loadConfigImpl();
     const port = config.ports?.webUI || 19999;
@@ -56,10 +57,19 @@ function createHttpRequest(loadConfigImpl = loadConfig) {
         },
         timeout: 5000
       };
+      if (useHttps) {
+        // This client only connects to localhost. Trust the daemon's generated
+        // certificate when available (Windows may use a PFX instead of PEM).
+        options.ca = ca;
+        options.rejectUnauthorized = Boolean(ca);
+      }
 
-      const req = http.request(options, (res) => {
+      const req = (useHttps ? https : http).request(options, (res) => {
         let responseData = '';
 
+        res.on('error', reject);
+        res.on('aborted', () => reject(new Error('Response connection closed unexpectedly')));
+
         res.on('data', (chunk) => {
           responseData += chunk;
         });
@@ -86,8 +96,8 @@ function createHttpRequest(loadConfigImpl = loadConfig) {
   };
 }
 
-function createProxyControl({ registry = getDefaultRegistry(), httpRequest: request, loadConfig: loadConfigImpl, sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms)) } = {}) {
-  const requestImpl = request || createHttpRequest(loadConfigImpl || loadConfig);
+function createProxyControl({ registry = getDefaultRegistry(), httpRequest: request, loadConfig: loadConfigImpl, connection, sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms)) } = {}) {
+  const requestImpl = request || createHttpRequest(loadConfigImpl || loadConfig, connection);
 
   function resolve(channel) {
     const info = getPlatformInfo(channel, registry);

package/src/index.js

@@ -164,6 +164,11 @@ async function dispatchPlatformCommand(platform, args = [], dependencies = {}) {
   const channel = platform.key;
   const options = dependencies.registry ? { registry: dependencies.registry } : {};
 
+  if (args.length > 1) {
+    reportInvalidCommand('参数', args[1], `ctx ${platform.command || platform.key} ${action}`);
+    return;
+  }
+
   switch (action) {
     case 'start':
       await proxyStart(channel, options);
@@ -178,11 +183,23 @@ async function dispatchPlatformCommand(platform, args = [], dependencies = {}) {
       await proxyStatus(channel, options);
       return;
     default:
-      console.log(chalk.red(`\n[ERROR] 未知操作: ${action}\n`));
-      console.log(chalk.gray('支持的操作: start, stop, restart, status\n'));
+      reportInvalidCommand('操作', action, '支持的操作: start, stop, restart, status');
   }
 }
 
+function reportInvalidCommand(kind, value, usage = '') {
+  console.error(chalk.red(`\n[ERROR] 未知${kind}: ${value}\n`));
+  if (usage) console.error(chalk.gray(`${usage}\n`));
+  process.exitCode = 1;
+}
+
+function validateCommandOptions(command, args, allowedOptions) {
+  const invalidOption = args.find(argument => !allowedOptions.has(argument));
+  if (!invalidOption) return true;
+  reportInvalidCommand('参数', invalidOption, `用法: ${command}`);
+  return false;
+}
+
 let processShutdownPromise = null;
 
 async function stopOwnedOmpGatewayBeforeExit() {
@@ -193,7 +210,7 @@ async function stopOwnedOmpGatewayBeforeExit() {
     } = require('./platforms/drivers/omp/proxy-implementation');
     if (getOmpProxyStatus().running) {
       const preserveManagedMode = process.argv.includes('--daemon');
-      await stopOmpProxyServer({ forceAfterMs: 1500, preserveManagedMode });
+      await stopOmpProxyServer({ forceAfterMs: 120000, preserveManagedMode });
     }
   } catch (error) {
     console.error(chalk.yellow(`[WARN]  OMP 动态网关退出清理失败: ${error.message}`));
@@ -203,12 +220,21 @@ async function stopOwnedOmpGatewayBeforeExit() {
 function shutdownProcess(code = 0, error = null) {
   if (processShutdownPromise) return processShutdownPromise;
   processShutdownPromise = (async () => {
+    try {
+      require('./server/services/memory-reclaimer').stopMemoryReclaimer();
+    } catch (memoryError) {
+      console.error(chalk.yellow(`[WARN] 内存回收器退出清理失败: ${memoryError.message}`));
+    }
     try {
       require('./server/services/native-log-observer').shutdownNativeCliLogObserver();
     } catch (observerError) {
       console.error(chalk.yellow(`[WARN] CLI 原生会话日志退出清理失败: ${observerError.message}`));
     }
-    await stopOwnedOmpGatewayBeforeExit();
+    await Promise.all([
+      stopOwnedOmpGatewayBeforeExit(),
+      require('./server/services/server-shutdown').drainProxyServers({ forceAfterMs: 120000 })
+        .catch(drainError => console.error(`[WARN] Proxy drain failed: ${drainError.message}`))
+    ]);
     eventBus.emitSync('cli:shutdown', {});
     PluginManager.shutdownPlugins();
     try {
@@ -282,6 +308,11 @@ async function main({ menuDependencies } = {}) {
   if (args[0] === 'daemon') {
     const subCommand = args[1] || 'status';
 
+    if (['start', 'stop', 'restart', 'status'].includes(subCommand) && args.length > 2) {
+      reportInvalidCommand('参数', args[2], `ctx daemon ${subCommand}`);
+      return;
+    }
+
     if (subCommand === 'start') {
       await handleStart();
       return finishCli(0);
@@ -314,25 +345,37 @@ async function main({ menuDependencies } = {}) {
       return;
     }
 
-    console.log(chalk.red(`\n[ERROR] 未知 daemon 子命令: ${subCommand}\n`));
-    console.log(chalk.gray('支持的命令: start, stop, restart, status, logs\n'));
+    reportInvalidCommand('daemon 子命令', subCommand, '支持的命令: start, stop, restart, status, logs');
     return;
   }
 
   // reset 命令 - 恢复默认配置
   if (args[0] === 'reset') {
+    if (args.length > 1) {
+      reportInvalidCommand('参数', args[1], '用法: ctx reset');
+      return;
+    }
     await resetConfig();
     return;
   }
 
   // security 命令 - 安全设置
   if (args[0] === 'security') {
-    const { showSecurityHelp, handleSecurityReset } = require('./commands/security');
     const subCommand = args[1] || 'help';
 
+    if (!['reset', 'disable', 'off', 'help'].includes(subCommand)) {
+      reportInvalidCommand('security 子命令', subCommand, '支持的命令: reset, disable, off, help');
+      return;
+    }
+    const { showSecurityHelp, handleSecurityReset } = require('./commands/security');
+
     if (subCommand === 'reset' || subCommand === 'disable' || subCommand === 'off') {
+      if (args.length > 2) {
+        reportInvalidCommand('参数', args[2], `ctx security ${subCommand}`);
+        return;
+      }
       await handleSecurityReset();
-    } else {
+    } else if (subCommand === 'help') {
       showSecurityHelp();
     }
     return;
@@ -340,31 +383,52 @@ async function main({ menuDependencies } = {}) {
 
   // start 命令 - 启动服务（后台）
   if (args[0] === 'start') {
+    if (!validateCommandOptions('ctx start [--host|--hosts] [--https]', args.slice(1), new Set(['--host', '--hosts', '--https']))) return;
     await handleStart();
     return finishCli(0);
   }
 
   // stop 命令 - 停止服务
   if (args[0] === 'stop') {
+    if (args.length > 1) {
+      reportInvalidCommand('参数', args[1], '用法: ctx stop');
+      return;
+    }
     await handleStop();
     return finishCli(0);
   }
 
   // restart 命令 - 重启服务
   if (args[0] === 'restart') {
+    if (!validateCommandOptions('ctx restart [--host|--hosts] [--https]', args.slice(1), new Set(['--host', '--hosts', '--https']))) return;
     await handleRestart();
     return finishCli(0);
   }
 
   // status 命令 - 查看服务状态
   if (args[0] === 'status') {
+    if (args.length > 1) {
+      reportInvalidCommand('参数', args[1], '用法: ctx status');
+      return;
+    }
     await handleStatus();
     return finishCli(0);
   }
 
   // ui 命令 - Web UI 管理
   if (args[0] === 'ui') {
-    const subCommand = args[1];
+    const commandArgs = args.slice(1);
+    const subCommand = commandArgs[0] && !commandArgs[0].startsWith('-') ? commandArgs[0] : null;
+    const optionArgs = subCommand ? commandArgs.slice(1) : commandArgs;
+    const allowedOptions = new Set(['--https', '--host', '--hosts', '--daemon']);
+
+    if (subCommand && !['start', 'stop', 'restart'].includes(subCommand)) {
+      reportInvalidCommand('ui 子命令', subCommand, '支持的命令: start, stop, restart');
+      return;
+    }
+    if (!validateCommandOptions(`ctx ui${subCommand ? ` ${subCommand}` : ''}`, optionArgs,
+      subCommand === 'stop' ? new Set() : allowedOptions)) return;
+
     if (subCommand === 'start') {
       await handleStart();  // UI start 实际上就是启动整个服务
       return finishCli(0);
@@ -440,12 +504,17 @@ async function main({ menuDependencies } = {}) {
 
   // doctor 命令 - 系统诊断
   if (args[0] === 'doctor') {
+    if (args.length > 1) {
+      reportInvalidCommand('参数', args[1], '用法: ctx doctor');
+      return;
+    }
     await handleDoctor();
     return;
   }
 
   // update 命令 - 检查并更新到最新版本
   if (args[0] === 'update') {
+    if (!validateCommandOptions('ctx update [--check]', args.slice(1), new Set(['--check']))) return;
     const checkOnly = args.includes('--check');
     await handleUpdate({ checkOnly });
     return;
@@ -453,6 +522,10 @@ async function main({ menuDependencies } = {}) {
 
   // port 命令 - 配置端口
   if (args[0] === 'port') {
+    if (args.length > 1) {
+      reportInvalidCommand('参数', args[1], '用法: ctx port');
+      return;
+    }
     const { handlePortConfig } = require('./commands/port-config');
     await handlePortConfig();
     return;
@@ -460,9 +533,18 @@ async function main({ menuDependencies } = {}) {
 
   // 代理命令
   if (args[0] === 'proxy') {
-    const { handleProxyStart, handleProxyStop, handleProxyStatus } = require('./commands/proxy');
     const subCommand = args[1] || 'start';
 
+    if (!['start', 'stop', 'status'].includes(subCommand)) {
+      reportInvalidCommand('proxy 子命令', subCommand, '支持的命令: start, stop, status');
+      return;
+    }
+    if (args.length > 2) {
+      reportInvalidCommand('参数', args[2], `ctx proxy ${subCommand}`);
+      return;
+    }
+    const { handleProxyStart, handleProxyStop, handleProxyStatus } = require('./commands/proxy');
+
     switch (subCommand) {
       case 'start':
         await handleProxyStart();
@@ -476,10 +558,6 @@ async function main({ menuDependencies } = {}) {
         handleProxyStatus();
         return;
 
-      default:
-        // 默认执行 start
-        await handleProxyStart();
-        return;
     }
   }
 
@@ -508,6 +586,12 @@ async function main({ menuDependencies } = {}) {
     return;
   }
 
+  if (args.length > 0) {
+    reportInvalidCommand('命令', args[0], '运行 ctx --help 查看可用命令');
+    PluginManager.shutdownPlugins();
+    return;
+  }
+
   while (true) {
     // 显示主菜单
     const { showMainMenu } = require('./ui/menu');

package/src/platforms/drivers/claude/openai-gateway.js

@@ -7,7 +7,7 @@ const { createDecodedStream } = require('../../../server/services/response-decod
 const { parseNonStreamingUsage } = require('../../../shared/response-usage-parser');
 const { convertClaudeToOpenCodePayload } = require('../opencode/gateway-converter');
 
-const REQUEST_TIMEOUT_MS = 120000;
+const { PROXY_IDLE_TIMEOUT_MS: REQUEST_TIMEOUT_MS } = require('../../../server/services/server-shutdown');
 
 function getRequestPathname(urlPath = '') {
   try {

package/src/platforms/drivers/claude/proxy-implementation.js

@@ -19,14 +19,15 @@ const {
 const { persistProxyRequestSnapshot, persistClaudeRequestTemplate } = require('../../../server/services/request-logger');
 const { redirectModel, normalizeGatewaySourceType } = require('../../../shared/proxy-utils');
 const { handleClaudeOpenAiGatewayRequest } = require('./openai-gateway');
-const { attachServerShutdownHandling, expediteServerShutdown } = require('../../../server/services/server-shutdown');
+const { bindProxyRequest, prepareProxyResponse } = require('../../../shared/proxy-transport');
+const { attachServerShutdownHandling, expediteServerShutdown, PROXY_IDLE_TIMEOUT_MS } = require('../../../server/services/server-shutdown');
 
 let proxyServer = null;
 let proxyApp = null;
 let currentPort = null;
 
 // 用于存储每个请求的元数据（用于 WebSocket 日志）
-const requestMetadata = new Map();
+let requestMetadata = new WeakMap();
 
 // 用于缓存已打印过的模型重定向规则，避免重复打印
 // 格式: { channelId: { "originalModel": "redirectedModel", ... } }
@@ -35,7 +36,7 @@ const printedRedirectCache = new Map();
 const jsonBodyParser = express.json({
   limit: '100mb',
   verify: (req, res, buf) => {
-    req.rawBody = Buffer.from(buf);
+    req.rawBody = buf;
   }
 });
 
@@ -174,6 +175,7 @@ async function startProxyServer(options = {}) {
     const proxy = httpProxy.createProxyServer({});
 
     proxy.on('proxyReq', (proxyReq, req, res) => {
+      bindProxyRequest(proxyReq, res);
       const selectedChannel = req.selectedChannel;
       if (selectedChannel) {
         const requestId = `${Date.now()}-${Math.random()}`;
@@ -238,9 +240,10 @@ async function startProxyServer(options = {}) {
         };
 
         req.__releaseChannel = release;
-
+        res.on('finish', release);
         res.on('close', release);
         res.on('error', release);
+        if (res.destroyed || res.writableEnded) { release(); return; }
 
         const effectiveKey = getEffectiveApiKey(channel);
         if (!effectiveKey) {
@@ -306,8 +309,8 @@ async function startProxyServer(options = {}) {
         const proxyOptions = {
           target: channel.baseUrl,
           changeOrigin: true,
-          proxyTimeout: 120000,  // 代理连接超时 2 分钟
-          timeout: 120000        // 请求超时 2 分钟
+          proxyTimeout: PROXY_IDLE_TIMEOUT_MS,  // Allow long reasoning gaps without an unbounded upstream wait
+          timeout: 0            // The upstream timeout bounds idle waits; streaming clients may pause
         };
 
         if (channel.proxyUrl) {
@@ -329,6 +332,7 @@ async function startProxyServer(options = {}) {
           }
         });
       } catch (error) {
+        req.__releaseChannel?.();
         console.error('Channel allocation error:', error);
         if (!res.headersSent) {
           res.status(503).json({
@@ -341,6 +345,7 @@ async function startProxyServer(options = {}) {
 
     // 代理响应只负责维护传输健康状态；实时日志和 usage 来自 CLI 原生日志。
     proxy.on('proxyRes', (proxyRes, req, res) => {
+      prepareProxyResponse(proxyRes, res);
       const metadata = requestMetadata.get(req);
       if (!metadata) return;
 
@@ -425,9 +430,9 @@ async function stopProxyServer(options = {}) {
     return { success: true, message: 'Proxy server not running' };
   }
 
-  requestMetadata.clear();
+  requestMetadata = new WeakMap();
 
-  const shutdownTimer = expediteServerShutdown(proxyServer);
+  const shutdownTimer = expediteServerShutdown(proxyServer, { forceAfterMs: options.forceAfterMs });
 
   return new Promise((resolve) => {
     proxyServer.close(() => {

package/src/platforms/drivers/codex/proxy-implementation.js

@@ -15,14 +15,15 @@ const {
   isChatCompletionsPath,
   ensureOpenAiStreamUsage
 } = require('../../../shared/proxy-utils');
-const { attachServerShutdownHandling, expediteServerShutdown } = require('../../../server/services/server-shutdown');
+const { bindProxyRequest, prepareProxyResponse } = require('../../../shared/proxy-transport');
+const { attachServerShutdownHandling, expediteServerShutdown, PROXY_IDLE_TIMEOUT_MS } = require('../../../server/services/server-shutdown');
 
 let proxyServer = null;
 let proxyApp = null;
 let currentPort = null;
 
 // 用于存储每个请求的元数据
-const requestMetadata = new Map();
+let requestMetadata = new WeakMap();
 
 // 用于缓存已打印过的模型重定向规则，避免重复打印
 // 格式: { channelId: { "originalModel": "redirectedModel", ... } }
@@ -37,7 +38,7 @@ const resolveCodexTarget = resolveTargetUrl;
 const jsonBodyParser = express.json({
   limit: '100mb',
   verify: (req, res, buf) => {
-    req.rawBody = Buffer.from(buf);
+    req.rawBody = buf;
   }
 });
 
@@ -77,7 +78,8 @@ async function startCodexProxyServer(options = {}) {
 
     const proxy = httpProxy.createProxyServer({});
 
-    proxy.on('proxyReq', (proxyReq, req) => {
+    proxy.on('proxyReq', (proxyReq, req, res) => {
+      bindProxyRequest(proxyReq, res);
       const activeChannel = req.selectedChannel;
       if (!activeChannel) return;
 
@@ -127,8 +129,11 @@ async function startCodexProxyServer(options = {}) {
           };
         })();
 
+        req.__releaseChannel = release;
+        res.on('finish', release);
         res.on('close', release);
         res.on('error', release);
+        if (res.destroyed || res.writableEnded) { release(); return; }
 
         broadcastSchedulerState('codex', getSchedulerState('codex'));
 
@@ -200,8 +205,8 @@ async function startCodexProxyServer(options = {}) {
         proxy.web(req, res, {
           target,
           changeOrigin: true,
-          proxyTimeout: 120000,  // 代理连接超时 2 分钟
-          timeout: 120000        // 请求超时 2 分钟
+          proxyTimeout: PROXY_IDLE_TIMEOUT_MS,  // Allow long reasoning gaps without an unbounded upstream wait
+          timeout: 0            // The upstream timeout bounds idle waits; streaming clients may pause
         }, (err) => {
           release();
           if (err) {
@@ -218,6 +223,7 @@ async function startCodexProxyServer(options = {}) {
           }
         });
       } catch (error) {
+        req.__releaseChannel?.();
         console.error('Codex channel allocation error:', error);
         if (!res.headersSent) {
           res.status(503).json({
@@ -232,6 +238,7 @@ async function startCodexProxyServer(options = {}) {
 
     // 代理响应只负责维护传输健康状态；实时日志和 usage 来自 CLI 原生日志。
     proxy.on('proxyRes', (proxyRes, req, res) => {
+      prepareProxyResponse(proxyRes, res);
       const metadata = requestMetadata.get(req);
       if (!metadata) return;
 
@@ -277,8 +284,7 @@ async function startCodexProxyServer(options = {}) {
       console.error('Codex proxy error:', err);
       if (req && req.selectedChannel) {
         recordFailure(req.selectedChannel.id, 'codex', err);
-        releaseChannel(req.selectedChannel.id, 'codex');
-        broadcastSchedulerState('codex', getSchedulerState('codex'));
+        req.__releaseChannel?.();
       }
       if (res && !res.headersSent) {
         res.status(502).json({
@@ -331,9 +337,9 @@ async function stopCodexProxyServer(options = {}) {
     return { success: true, message: 'Codex proxy server not running' };
   }
 
-  requestMetadata.clear();
+  requestMetadata = new WeakMap();
 
-  const shutdownTimer = expediteServerShutdown(proxyServer);
+  const shutdownTimer = expediteServerShutdown(proxyServer, { forceAfterMs: options.forceAfterMs });
 
   return new Promise((resolve) => {
     proxyServer.close(() => {