cc-viewer 1.6.299 → 1.6.301

package/cli.js

@@ -14,6 +14,8 @@ import { t } from './server/i18n.js';
 import { INJECT_IMPORT, LEGACY_INJECT_IMPORTS, resolveCliPath, resolveNativePath, resolveNpmClaudePath, buildShellCandidates, setLogDir, LOG_DIR, hasClaude2xWrapper, getGlobalNodeModulesDir, PACKAGES, getClaudeConfigDir } from './findcc.js';
 import { ensureHooks, removeAllManagedHooks } from './server/lib/ensure-hooks.js';
 import { injectCliJsAt, removeCliJsInjectionAt, INJECT_START as _INJECT_START, INJECT_END as _INJECT_END, buildInjectBlock as _buildInjectBlock } from './server/lib/cli-inject.js';
+import { normalizeBasePath } from './server/lib/base-path.js';
+import { createHardenedCleanup, installWinKeypressFallback } from './server/lib/term-signals.js';
 
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
 
@@ -389,8 +391,8 @@ async function runCliMode(extraClaudeArgs = [], cwd, noOpen = false) {
 
   // 4. 自动打开浏览器
   const protocol = serverMod.getProtocol();
-  const basePath = process.env.CCV_BASE_PATH || '';
-const url = `${protocol}://127.0.0.1:${port}${basePath}`;
+  const basePath = normalizeBasePath(process.env.CCV_BASE_PATH);
+  const url = `${protocol}://127.0.0.1:${port}${basePath}`;
   if (!noOpen) {
     try {
       // URL 含 & 在 cmd.exe 下会被当命令分隔符切断 query；用 spawn 数组传参避免 shell interpolation。
@@ -421,13 +423,20 @@ const url = `${protocol}://127.0.0.1:${port}${basePath}`;
     else console.log(`  ${t('server.passwordActive', { password: _auth.password })}`);
   }
 
-  // 5. 注册退出处理
-  const cleanup = () => {
-    killPty();
-    serverMod.stopViewer().finally(() => process.exit());
-  };
+  // 5. 注册退出处理（hardened：watchdog 5s 强退 + 连按 Ctrl+C 立退，
+  //    防 Windows 上 ConPTY kill / IM teardown 挂住导致"Ctrl+C 完全无反应"）
+  const cleanup = createHardenedCleanup({
+    doCleanup: () => {
+      killPty();
+      return serverMod.stopViewer();
+    },
+  });
   process.on('SIGINT', cleanup);
   process.on('SIGTERM', cleanup);
+  // Windows 兜底：ConPTY 下控制台 Ctrl+C 事件偶发不送达（SIGINT 永不触发），
+  // raw mode keypress 直连 cleanup。silent 模式本地终端无人读 stdin，无副作用；
+  // darwin / 非 TTY 内部自动跳过。
+  installWinKeypressFallback({ onInterrupt: cleanup });
 }
 
 // 启动一个独立常驻 IM worker。本质是「在 IM_<id>/ 工作目录、绑 127.0.0.1、skip-permissions」的 runCliMode，
@@ -552,8 +561,8 @@ async function runSdkMode(extraClaudeArgs = [], cwd, noOpen = false) {
 
   // 自动打开浏览器
   const protocol = serverMod.getProtocol();
-  const basePath = process.env.CCV_BASE_PATH || '';
-const url = `${protocol}://127.0.0.1:${port}${basePath}`;
+  const basePath = normalizeBasePath(process.env.CCV_BASE_PATH);
+  const url = `${protocol}://127.0.0.1:${port}${basePath}`;
   if (!noOpen) {
     try {
       // URL 含 & 在 cmd.exe 下会被当命令分隔符切断 query；用 spawn 数组传参避免 shell interpolation。
@@ -584,86 +593,16 @@ const url = `${protocol}://127.0.0.1:${port}${basePath}`;
     else console.log(`  ${t('server.passwordActive', { password: _auth.password })}`);
   }
 
-  // 注册退出处理
-  const cleanup = () => {
-    sdkManager.stopSession();
-    serverMod.stopViewer().finally(() => process.exit());
-  };
-  process.on('SIGINT', cleanup);
-  process.on('SIGTERM', cleanup);
-}
-
-async function runCliModeWorkspaceSelector(extraClaudeArgs = [], noOpen = false) {
-  // 首先尝试 npm 版本（包括 nvm 安装），找不到再尝试 native 版本
-  let claudePath = resolveNpmClaudePath();
-  let isNpmVersion = !!claudePath;
-
-  if (!claudePath) {
-    claudePath = resolveNativePath();
-  }
-
-  if (!claudePath) {
-    reportClaudeNotFound(cliPath);
-    process.exit(1);
-  }
-
-  console.log(t('cli.cMode.starting'));
-
-  process.env.CCV_CLI_MODE = '1';
-  process.env.CCV_WORKSPACE_MODE = '1';
-
-  // 启动代理
-  const { startProxy } = await import('./server/proxy.js');
-  const proxyPort = await startProxy();
-  process.env.CCV_PROXY_PORT = String(proxyPort);
-
-  // 启动 HTTP 服务器（工作区模式，不初始化 interceptor 日志）
-  const serverMod = await import('./server/server.js');
-
-  // 工作区模式下 server.js 跳过了自动启动，需要手动调用
-  await serverMod.startViewer();
-
-  const port = serverMod.getPort();
-
-  // 保存 extraClaudeArgs 和 claudePath 供后续 launch 使用
-  serverMod.setWorkspaceClaudeArgs(extraClaudeArgs);
-  serverMod.setWorkspaceClaudePath(claudePath, isNpmVersion);
-
-  // 自动打开浏览器
-  const basePath = process.env.CCV_BASE_PATH || '';
-  const wsProtocol = serverMod.getProtocol();
-  const url = `${wsProtocol}://127.0.0.1:${port}${basePath}`;
-  if (!noOpen) {
-    try {
-      // URL 含 & 在 cmd.exe 下会被当命令分隔符切断 query；用 spawn 数组传参避免 shell interpolation。
-      // Win 上 `start` 是 cmd.exe 内置不是 .exe，必须 shell:true；用 spawn + 数组让 Node 自己 escape。
-      // 第二个 arg '""' 是 `start` 的 window-title 占位（否则 start 会把 URL 当 title）。
-      const { spawn } = await import('node:child_process');
-      if (process.platform === 'win32') {
-        spawn('cmd.exe', ['/c', 'start', '""', url], { stdio: 'ignore', detached: true, windowsHide: true }).unref();
-      } else {
-        const cmd = process.platform === 'darwin' ? 'open' : 'xdg-open';
-        spawn(cmd, [url], { stdio: 'ignore', detached: true }).unref();
-      }
-    } catch {}
-  }
-
-  console.log(`CC Viewer (Workspace):`);
-  console.log(`  ➜ Local:   ${url}`);
-  const _lanIps = serverMod.getAllLocalIps();
-  const _token = serverMod.getAccessToken();
-  for (const _ip of _lanIps) {
-    console.log(`  ➜ Network: ${wsProtocol}://${_ip}:${port}${basePath}?token=${_token}`);
-  }
-
-  // 注册退出处理
-  const { killPty } = await import('./server/pty-manager.js');
-  const cleanup = () => {
-    killPty();
-    serverMod.stopViewer().finally(() => process.exit());
-  };
+  // 注册退出处理（hardened，与 PTY 模式同款三层防御）
+  const cleanup = createHardenedCleanup({
+    doCleanup: () => {
+      sdkManager.stopSession();
+      return serverMod.stopViewer();
+    },
+  });
   process.on('SIGINT', cleanup);
   process.on('SIGTERM', cleanup);
+  installWinKeypressFallback({ onInterrupt: cleanup });
 }
 
 // === 主逻辑 ===