cc-viewer 1.4.21 → 1.4.22

package/cli.js

@@ -6,7 +6,7 @@ import { fileURLToPath } from 'node:url';
 import { homedir } from 'node:os';
 import { spawn } from 'node:child_process';
 import { t } from './i18n.js';
-import { INJECT_IMPORT, resolveCliPath, resolveNativePath, buildShellCandidates } from './findcc.js';
+import { INJECT_IMPORT, resolveCliPath, resolveNativePath, resolveNpmClaudePath, buildShellCandidates } from './findcc.js';
 
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
 
@@ -233,8 +233,15 @@ async function runProxyCommand(args) {
 }
 
 async function runCliMode(extraClaudeArgs = [], cwd) {
-  const nativePath = resolveNativePath();
-  if (!nativePath) {
+  // 首先尝试 npm 版本（包括 nvm 安装），找不到再尝试 native 版本
+  let claudePath = resolveNpmClaudePath();
+  let isNpmVersion = !!claudePath;
+
+  if (!claudePath) {
+    claudePath = resolveNativePath();
+  }
+
+  if (!claudePath) {
     console.error(t('cli.cMode.notFound'));
     process.exit(1);
   }
@@ -276,7 +283,7 @@ async function runCliMode(extraClaudeArgs = [], cwd) {
   // 3. 启动 PTY 中的 claude
   const { spawnClaude, killPty } = await import('./pty-manager.js');
   try {
-    await spawnClaude(proxyPort, workingDir, extraClaudeArgs);
+    await spawnClaude(proxyPort, workingDir, extraClaudeArgs, claudePath, isNpmVersion);
   } catch (err) {
     console.error('[CC Viewer] Failed to spawn Claude:', err.message);
     serverMod.stopViewer();
@@ -304,8 +311,15 @@ async function runCliMode(extraClaudeArgs = [], cwd) {
 }
 
 async function runCliModeWorkspaceSelector(extraClaudeArgs = []) {
-  const nativePath = resolveNativePath();
-  if (!nativePath) {
+  // 首先尝试 npm 版本（包括 nvm 安装），找不到再尝试 native 版本
+  let claudePath = resolveNpmClaudePath();
+  let isNpmVersion = !!claudePath;
+
+  if (!claudePath) {
+    claudePath = resolveNativePath();
+  }
+
+  if (!claudePath) {
     console.error(t('cli.cMode.notFound'));
     process.exit(1);
   }
@@ -328,8 +342,9 @@ async function runCliModeWorkspaceSelector(extraClaudeArgs = []) {
 
   const port = serverMod.getPort();
 
-  // 保存 extraClaudeArgs 供后续 launch 使用
+  // 保存 extraClaudeArgs 和 claudePath 供后续 launch 使用
   serverMod.setWorkspaceClaudeArgs(extraClaudeArgs);
+  serverMod.setWorkspaceClaudePath(claudePath, isNpmVersion);
 
   // 自动打开浏览器
   const url = `http://127.0.0.1:${port}`;

package/findcc.js

@@ -61,6 +61,54 @@ export function resolveCliPath() {
   return join(globalRoot || resolve(__dirname, '..'), PACKAGES[0], CLI_ENTRY);
 }
 
+/**
+ * 查找 npm 版本的 claude（包括 nvm 安装）
+ * 返回 node_modules 中的 claude cli.js 路径
+ */
+export function resolveNpmClaudePath() {
+  // 1. 尝试 which/command -v 找到 npm 安装的 claude
+  for (const cmd of [`which ${BINARY_NAME}`, `command -v ${BINARY_NAME}`]) {
+    try {
+      const result = execSync(cmd, { encoding: 'utf-8', shell: true, env: process.env }).trim();
+      // 排除 shell function 的输出（多行说明不是路径）
+      if (result && !result.includes('\n') && existsSync(result)) {
+        // 只接受 npm 安装的符号链接（解析后指向 node_modules）
+        try {
+          const real = realpathSync(result);
+          if (real.includes('node_modules')) {
+            // 找到 npm 版本，返回 cli.js 的路径
+            // real 可能是 .../node_modules/@anthropic-ai/claude-code/bin/claude
+            // 我们需要返回 .../node_modules/@anthropic-ai/claude-code/cli.js
+            const match = real.match(/(.*node_modules\/@[^/]+\/[^/]+)\//);
+            if (match) {
+              const packageDir = match[1];
+              const cliPath = join(packageDir, CLI_ENTRY);
+              if (existsSync(cliPath)) {
+                return cliPath;
+              }
+            }
+          }
+        } catch {}
+      }
+    } catch {
+      // ignore
+    }
+  }
+
+  // 2. 尝试从全局 node_modules 查找
+  const globalRoot = getGlobalNodeModulesDir();
+  if (globalRoot) {
+    for (const packageName of PACKAGES) {
+      const cliPath = join(globalRoot, packageName, CLI_ENTRY);
+      if (existsSync(cliPath)) {
+        return cliPath;
+      }
+    }
+  }
+
+  return null;
+}
+
 export function resolveNativePath() {
   // 1. 尝试 which/command -v（继承当前 process.env PATH）
   for (const cmd of [`which ${BINARY_NAME}`, `command -v ${BINARY_NAME}`]) {

package/lib/plugin-loader.js

@@ -130,7 +130,26 @@ export function getPluginsInfo() {
 
   return files.map(file => {
     const loaded = _plugins.find(p => p.file === file);
-    const name = loaded ? loaded.name : file;
+    let name = file;
+
+    // 如果插件已加载，使用加载时的 name
+    if (loaded) {
+      name = loaded.name;
+    } else {
+      // 如果插件未加载（可能被禁用），尝试读取文件获取真实的 name
+      try {
+        const filePath = join(PLUGINS_DIR, file);
+        const content = readFileSync(filePath, 'utf-8');
+        // 简单匹配 name: 'xxx' 或 name: "xxx"
+        const match = content.match(/name\s*:\s*['"]([^'"]+)['"]/);
+        if (match) {
+          name = match[1];
+        }
+      } catch {
+        // 读取失败，使用文件名
+      }
+    }
+
     const hooks = loaded ? Object.keys(loaded.hooks) : [];
     const enabled = !disabledPlugins.includes(name);
     return { name, file, hooks, enabled };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-viewer",
-  "version": "1.4.21",
+  "version": "1.4.22",
   "description": "Claude Code Logger visualization management tool",
   "license": "MIT",
   "main": "server.js",

package/pty-manager.js

@@ -25,7 +25,7 @@ function fixSpawnHelperPermissions() {
   } catch {}
 }
 
-export async function spawnClaude(proxyPort, cwd, extraArgs = []) {
+export async function spawnClaude(proxyPort, cwd, extraArgs = [], claudePath = null, isNpmVersion = false) {
   if (ptyProcess) {
     killPty();
   }
@@ -35,9 +35,12 @@ export async function spawnClaude(proxyPort, cwd, extraArgs = []) {
 
   fixSpawnHelperPermissions();
 
-  const claudePath = resolveNativePath();
+  // 如果没有提供 claudePath，尝试自动查找
   if (!claudePath) {
-    throw new Error('claude not found');
+    claudePath = resolveNativePath();
+    if (!claudePath) {
+      throw new Error('claude not found');
+    }
   }
 
   const env = { ...process.env };
@@ -48,13 +51,20 @@ export async function spawnClaude(proxyPort, cwd, extraArgs = []) {
     env: { ANTHROPIC_BASE_URL: env.ANTHROPIC_BASE_URL }
   });
 
-  const args = ['--settings', settingsJson, ...extraArgs];
+  let command = claudePath;
+  let args = ['--settings', settingsJson, ...extraArgs];
+
+  // 如果是 npm 版本（cli.js），需要使用 node 来运行
+  if (isNpmVersion && claudePath.endsWith('.js')) {
+    command = process.execPath; // node 可执行文件路径
+    args = [claudePath, '--settings', settingsJson, ...extraArgs];
+  }
 
   lastExitCode = null;
   outputBuffer = '';
   currentWorkspacePath = cwd || process.cwd();
 
-  ptyProcess = pty.spawn(claudePath, args, {
+  ptyProcess = pty.spawn(command, args, {
     name: 'xterm-256color',
     cols: 120,
     rows: 30,

package/server.js

@@ -26,10 +26,16 @@ const IGNORED_PATTERNS = new Set([
 
 // 工作区模式：保存 Claude 额外参数，供 launch API 使用
 let _workspaceClaudeArgs = [];
+let _workspaceClaudePath = null;
+let _workspaceIsNpmVersion = false;
 let _workspaceLaunched = false; // 工作区是否已经启动了会话
 export function setWorkspaceClaudeArgs(args) {
   _workspaceClaudeArgs = args;
 }
+export function setWorkspaceClaudePath(path, isNpm) {
+  _workspaceClaudePath = path;
+  _workspaceIsNpmVersion = isNpm;
+}
 
 
 // macOS user profile (avatar + display name), cached once
@@ -504,7 +510,7 @@ async function handleRequest(req, res) {
         const proxyPort = process.env.CCV_PROXY_PORT;
         if (proxyPort) {
           const { spawnClaude } = await import('./pty-manager.js');
-          await spawnClaude(parseInt(proxyPort), wsPath, _workspaceClaudeArgs);
+          await spawnClaude(parseInt(proxyPort), wsPath, _workspaceClaudeArgs, _workspaceClaudePath, _workspaceIsNpmVersion);
         }
 
         _workspaceLaunched = true;