cc-viewer 1.7.2 → 1.7.4

package/cli.js

@@ -5,7 +5,7 @@ if (process.platform === 'win32' && !process.env.UV_THREADPOOL_SIZE) {
   process.env.UV_THREADPOOL_SIZE = '16';
 }
 
-import { readFileSync, writeFileSync, existsSync, realpathSync, unlinkSync, mkdirSync } from 'node:fs';
+import { readFileSync, writeFileSync, existsSync, realpathSync, unlinkSync, mkdirSync, statSync } from 'node:fs';
 import { resolve, isAbsolute } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { homedir } from 'node:os';
@@ -15,6 +15,7 @@ import { INJECT_IMPORT, LEGACY_INJECT_IMPORTS, resolveCliPath, resolveNativePath
 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 { mergeSettingsIntoArgs } from './server/lib/settings-merge.js';
 import { createHardenedCleanup, installWinKeypressFallback } from './server/lib/term-signals.js';
 
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
@@ -59,6 +60,14 @@ function reportClaudeNotFound(cliPathHint) {
   }
 }
 
+// Tombstone written by --uninstall; blocks the shell hook's background self-heal
+// (`ccv -logger --self-heal`) from silently re-installing the integration.
+// Anchored to the config dir (not LOG_DIR, which honors --log-dir/CCV_LOG_DIR
+// overrides) so --uninstall and the hook always resolve the same path.
+function getUninstallFlagPath() {
+  return resolve(getClaudeConfigDir(), 'cc-viewer', 'uninstalled.flag');
+}
+
 function getShellConfigPath() {
   const shell = process.env.SHELL || '';
   if (shell.includes('zsh')) return resolve(homedir(), '.zshrc');
@@ -93,6 +102,12 @@ function buildShellHook(isNative) {
     '--help', '-h',
   ];
 
+  // Guard shared by both variants: if ccv was uninstalled, the wrapper removes
+  // itself from the live shell and falls back to the real claude binary.
+  // `hash -r` first — otherwise a stale command-hash entry in a long-lived
+  // shell lets `command -v ccv` false-pass once after the binary is deleted.
+  const ccvGoneGuard = `hash -r 2>/dev/null; command -v ccv >/dev/null 2>&1 || { unset -f claude; command claude "$@"; return; }`;
+
   if (isNative) {
     return `${SHELL_HOOK_START}
 claude() {
@@ -102,6 +117,8 @@ claude() {
     command claude "$@"
     return
   fi
+  # If ccv is gone (uninstalled), drop this stale wrapper and use claude directly
+  ${ccvGoneGuard}
   # Pass through certain commands directly without ccv interception
   case "$1" in
     ${passthroughCommands.join('|')})
@@ -127,6 +144,8 @@ claude() {
     command claude "$@"
     return
   fi
+  # If ccv is gone (uninstalled), drop this stale wrapper and use claude directly
+  ${ccvGoneGuard}
   # Pass through certain commands directly without ccv interception
   case "$1" in
     ${passthroughCommands.join('|')})
@@ -148,12 +167,12 @@ claude() {
   if [ -z "$cli_js" ]; then
     # cli.js 消失 → Claude Code 已升级到 2.1.114+（native-only 分发）。
     # 后台重写 hook（下次 shell 就是 native hook），当前调用直接走 native proxy 路径。
-    ( ccv -logger >/dev/null 2>&1 & )
+    ( ccv -logger --self-heal >/dev/null 2>&1 & )
     ccv run -- claude --ccv-internal "$@"
     return $?
   fi
   if ! grep -q "CC Viewer" "$cli_js" 2>/dev/null; then
-    ccv -logger 2>/dev/null
+    ccv -logger --self-heal 2>/dev/null
   fi
   command claude "$@"
 }
@@ -195,7 +214,8 @@ function removeShellHook() {
   for (const f of ['.zshrc', '.zprofile', '.bashrc', '.bash_profile', '.profile']) {
     allPaths.add(resolve(home, f));
   }
-  let lastResult = { path: configPath, status: 'clean' };
+  // Per-file results; empty array = no file contained the hook marker
+  const results = [];
   for (const p of allPaths) {
     try {
       if (!existsSync(p)) continue;
@@ -203,13 +223,19 @@ function removeShellHook() {
       if (!content.includes(SHELL_HOOK_START)) continue;
       const regex = new RegExp(`\\n?${SHELL_HOOK_START}[\\s\\S]*?${SHELL_HOOK_END}\\n?`, 'g');
       const newContent = content.replace(regex, '\n');
+      if (newContent === content) {
+        // START marker present but the block is malformed (e.g. END marker damaged):
+        // leave the file untouched instead of reporting a removal that didn't happen
+        results.push({ file: p, status: 'corrupt' });
+        continue;
+      }
       writeFileSync(p, newContent);
-      lastResult = { path: p, status: 'removed' };
+      results.push({ file: p, status: 'removed' });
     } catch (err) {
-      lastResult = { path: p, status: 'error', error: err.message };
+      results.push({ file: p, status: 'error', error: err.message });
     }
   }
-  return lastResult;
+  return results;
 }
 
 function injectCliJs() {
@@ -272,17 +298,34 @@ async function runProxyCommand(args) {
     // 剥离 cc-viewer 的内部短路开关，避免泄漏给 claude 子进程
     delete env.CCV_SKIP_THINKING_DISPLAY;
 
-    const settingsJson = JSON.stringify({
+    const settingsObj = {
       env: {
         ANTHROPIC_BASE_URL: env.ANTHROPIC_BASE_URL
       }
-    });
+    };
+    let settingsJson = JSON.stringify(settingsObj);
+
+    const isClaudeCmd = cmd === 'claude' || /[\\/]claude(\.exe)?$/.test(cmd);
+
+    // Fold a user-supplied --settings into the injected settings and emit a single flag
+    // (claude is last-wins for duplicate --settings; two parallel flags let the user's
+    // silently clobber the injected ANTHROPIC_BASE_URL and break capture). claude only:
+    // another tool's --settings belongs to that tool and must not be touched.
+    // Runs on the RAW cmdArgs BEFORE the --thinking-display append below: otherwise a
+    // trailing valueless user --settings would consume our appended token as its value.
+    if (isClaudeCmd) {
+      const settingsMerge = mergeSettingsIntoArgs(cmdArgs, settingsObj, { cwd: process.cwd() });
+      if (settingsMerge.warningDetail) {
+        console.warn(t('cli.settingsMergeFailed', settingsMerge.warningDetail));
+      }
+      settingsJson = settingsMerge.settingsJson;
+      cmdArgs = settingsMerge.args;
+    }
 
     // 注入默认 --thinking-display summarized，仅对 claude 二进制（其他命令如 `ccv run -- sometool` 跳过）。
     // 若 claude 不识别该 flag（老版本/fork）会 unknown option 崩溃——由 pty-manager.js::spawnClaude 的
     // onExit reactive retry 兜底；cli.js 这条路径是一次性子进程，没有 respawn 机会，用户需手动重试。
     // 可通过环境变量 CCV_SKIP_THINKING_DISPLAY=1 强制跳过。
-    const isClaudeCmd = cmd === 'claude' || /[\\/]claude(\.exe)?$/.test(cmd);
     if (isClaudeCmd && process.env.CCV_SKIP_THINKING_DISPLAY !== '1') {
       const { withDefaultThinkingDisplay } = await import('./server/pty-manager.js');
       cmdArgs = withDefaultThinkingDisplay(cmdArgs);
@@ -445,12 +488,18 @@ async function runCliMode(extraClaudeArgs = [], cwd, noOpen = false) {
       // Win 上 `start` 是 cmd.exe 内置不是 .exe，必须 shell:true；用 spawn + 数组让 Node 自己 escape。
       // 第二个 arg '""' 是 `start` 的 window-title 占位（否则 start 会把 URL 当 title）。
       const { spawn } = await import('node:child_process');
+      // Headless/container envs may lack xdg-open/open/start → spawn asynchronously emits an 'error' event,
+      // which try/catch cannot catch (it only catches synchronous throws); without a handler the process
+      // would crash. Swallow it here as a best-effort fallback.
+      let child;
       if (process.platform === 'win32') {
-        spawn('cmd.exe', ['/c', 'start', '""', url], { stdio: 'ignore', detached: true, windowsHide: true }).unref();
+        child = spawn('cmd.exe', ['/c', 'start', '""', url], { stdio: 'ignore', detached: true, windowsHide: true });
       } else {
         const cmd = process.platform === 'darwin' ? 'open' : 'xdg-open';
-        spawn(cmd, [url], { stdio: 'ignore', detached: true }).unref();
+        child = spawn(cmd, [url], { stdio: 'ignore', detached: true });
       }
+      child.on('error', () => {});
+      child.unref();
     } catch {}
   }
 
@@ -628,12 +677,18 @@ async function runSdkMode(extraClaudeArgs = [], cwd, noOpen = false) {
       // Win 上 `start` 是 cmd.exe 内置不是 .exe，必须 shell:true；用 spawn + 数组让 Node 自己 escape。
       // 第二个 arg '""' 是 `start` 的 window-title 占位（否则 start 会把 URL 当 title）。
       const { spawn } = await import('node:child_process');
+      // Headless/container envs may lack xdg-open/open/start → spawn asynchronously emits an 'error' event,
+      // which try/catch cannot catch (it only catches synchronous throws); without a handler the process
+      // would crash. Swallow it here as a best-effort fallback.
+      let child;
       if (process.platform === 'win32') {
-        spawn('cmd.exe', ['/c', 'start', '""', url], { stdio: 'ignore', detached: true, windowsHide: true }).unref();
+        child = spawn('cmd.exe', ['/c', 'start', '""', url], { stdio: 'ignore', detached: true, windowsHide: true });
       } else {
         const cmd = process.platform === 'darwin' ? 'open' : 'xdg-open';
-        spawn(cmd, [url], { stdio: 'ignore', detached: true }).unref();
+        child = spawn(cmd, [url], { stdio: 'ignore', detached: true });
       }
+      child.on('error', () => {});
+      child.unref();
     } catch {}
   }
 
@@ -787,7 +842,7 @@ if (isVersion) {
 
 if (isUninstall) {
   const cliResult = removeCliJsInjection();
-  const shellResult = removeShellHook();
+  const shellResults = removeShellHook();
 
   if (cliResult === 'removed' || cliResult === 'clean') {
     console.log(t('cli.uninstall.cliCleaned'));
@@ -797,12 +852,18 @@ if (isUninstall) {
     console.log(t('cli.uninstall.cliFail'));
   }
 
-  if (shellResult.status === 'removed') {
-    console.log(t('cli.uninstall.hookRemoved', { path: shellResult.path }));
-  } else if (shellResult.status === 'clean' || shellResult.status === 'not_found') {
-    console.log(t('cli.uninstall.hookClean', { path: shellResult.path }));
+  if (shellResults.length === 0) {
+    console.log(t('cli.uninstall.hookClean', { path: getShellConfigPath() }));
   } else {
-    console.log(t('cli.uninstall.hookFail', { error: shellResult.error }));
+    for (const r of shellResults) {
+      if (r.status === 'removed') {
+        console.log(t('cli.uninstall.hookRemoved', { path: r.file }));
+      } else if (r.status === 'corrupt') {
+        console.log(t('cli.uninstall.corruptBlock', { file: r.file }));
+      } else {
+        console.log(t('cli.uninstall.hookFail', { file: r.file, error: r.error }));
+      }
+    }
   }
 
   // 清理 settings.json 里的 cc-viewer-managed hooks + 历史 statusLine 残留
@@ -845,12 +906,40 @@ if (isUninstall) {
     }
   } catch { }
 
+  // Tombstone: stale hooks in still-open shells background `ccv -logger --self-heal`,
+  // which would otherwise re-install everything right after this uninstall.
+  try {
+    mkdirSync(resolve(getClaudeConfigDir(), 'cc-viewer'), { recursive: true });
+    writeFileSync(getUninstallFlagPath(), new Date().toISOString() + '\n');
+  } catch { }
+
   console.log(t('cli.uninstall.reloadShell'));
   console.log(t('cli.uninstall.done'));
   process.exit(0);
 }
 
 if (isLogger) {
+  // Tombstone check must run before mode detection: a backgrounded self-heal with
+  // claude fully uninstalled must exit 0 silently, not emit reportClaudeNotFound noise.
+  try {
+    const flagPath = getUninstallFlagPath();
+    if (existsSync(flagPath)) {
+      if (args.includes('--self-heal')) {
+        // Explicitly uninstalled — never let a stale hook resurrect the integration
+        process.exit(0);
+      }
+      const ageMs = Date.now() - statSync(flagPath).mtimeMs;
+      const GRACE_MS = 10 * 60 * 1000;
+      if (ageMs < GRACE_MS && !args.includes('--force')) {
+        // Old deployed hooks self-heal via plain `ccv -logger`; a grace period keeps
+        // them from wiping a fresh tombstone during the uninstall race window.
+        console.log(t('cli.logger.justUninstalled'));
+        process.exit(0);
+      }
+      unlinkSync(flagPath);
+    }
+  } catch { }
+
   // 模式选择：有 cli.js 就走 npm 注入模式（pre-2.1.113），没有就走 native proxy
   // 模式（2.1.114+）。单一判据，不再靠 realpath 的启发式。
   const nativePath = resolveNativePath();