cc-viewer 1.2.2 → 1.2.3

package/cli.js

@@ -1,8 +1,9 @@
 #!/usr/bin/env node
 
 import { readFileSync, writeFileSync, existsSync } from 'node:fs';
-import { resolve } from 'node:path';
+import { resolve, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { execSync } from 'node:child_process';
 import { homedir } from 'node:os';
 import { t } from './i18n.js';
 
@@ -17,7 +18,41 @@ const INJECT_BLOCK = `${INJECT_START}\n${INJECT_IMPORT}\n${INJECT_END}`;
 const SHELL_HOOK_START = '# >>> CC-Viewer Auto-Inject >>>';
 const SHELL_HOOK_END = '# <<< CC-Viewer Auto-Inject <<<';
 
-const cliPath = resolve(__dirname, '../@anthropic-ai/claude-code/cli.js');
+// Claude Code cli.js 包名候选列表，按优先级排列
+const CLAUDE_CODE_PACKAGES = [
+  '@anthropic-ai/claude-code',
+  '@ali/claude-code',
+];
+
+function getGlobalNodeModulesDir() {
+  try {
+    return execSync('npm root -g', { encoding: 'utf-8' }).trim();
+  } catch {
+    return null;
+  }
+}
+
+function resolveClaudeCodeCliPath() {
+  // 候选基础目录：__dirname 的上级（适用于常规 npm 安装）+ 全局 node_modules（适用于符号链接安装）
+  const baseDirs = [resolve(__dirname, '..')];
+  const globalRoot = getGlobalNodeModulesDir();
+  if (globalRoot && globalRoot !== resolve(__dirname, '..')) {
+    baseDirs.push(globalRoot);
+  }
+
+  for (const baseDir of baseDirs) {
+    for (const packageName of CLAUDE_CODE_PACKAGES) {
+      const candidate = join(baseDir, packageName, 'cli.js');
+      if (existsSync(candidate)) {
+        return candidate;
+      }
+    }
+  }
+  // 兜底：返回全局目录下的默认路径，便于错误提示
+  return join(globalRoot || resolve(__dirname, '..'), CLAUDE_CODE_PACKAGES[0], 'cli.js');
+}
+
+const cliPath = resolveClaudeCodeCliPath();
 
 function getShellConfigPath() {
   const shell = process.env.SHELL || '';
@@ -33,8 +68,14 @@ function getShellConfigPath() {
 function buildShellHook() {
   return `${SHELL_HOOK_START}
 claude() {
-  local cli_js="$HOME/.npm-global/lib/node_modules/@anthropic-ai/claude-code/cli.js"
-  if [ -f "$cli_js" ] && ! grep -q "CC Viewer" "$cli_js" 2>/dev/null; then
+  local cli_js=""
+  for candidate in "$HOME/.npm-global/lib/node_modules/@anthropic-ai/claude-code/cli.js" "$HOME/.npm-global/lib/node_modules/@ali/claude-code/cli.js"; do
+    if [ -f "$candidate" ]; then
+      cli_js="$candidate"
+      break
+    fi
+  done
+  if [ -n "$cli_js" ] && ! grep -q "CC Viewer" "$cli_js" 2>/dev/null; then
     ccv 2>/dev/null
   fi
   command claude "$@"

package/interceptor.js

@@ -514,19 +514,23 @@ export function setupInterceptor() {
                         .map(block => {
                           // SSE 块可能包含多行: event: xxx\ndata: {...}
                           const lines = block.split('\n');
-                          const dataLine = lines.find(l => l.startsWith('data: '));
+                          const dataLine = lines.find(l => l.startsWith('data:'));
                           if (dataLine) {
+                            // 处理 "data:" 或 "data: " 两种格式
+                            const jsonStr = dataLine.startsWith('data: ')
+                              ? dataLine.substring(6)
+                              : dataLine.substring(5);
                             try {
-                              return JSON.parse(dataLine.substring(6));
+                              return JSON.parse(jsonStr);
                             } catch {
-                              return dataLine.substring(6);
+                              return jsonStr;
                             }
                           }
                           return null;
                         })
                         .filter(Boolean);
 
-                      // 组装完整的 message 对象
+                      // 组装完整的 message 对象（GLM 使用标准格式，但 data: 后无空格）
                       const assembledMessage = assembleStreamMessage(events);
 
                       // 直接使用组装后的 message 对象作为 response.body

package/package.json

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

package/server.js

@@ -598,7 +598,7 @@ export async function startViewer() {
   return new Promise((resolve, reject) => {
     function tryListen(port) {
       if (port > MAX_PORT) {
-        console.log(t('server.portsBusy', { start: START_PORT, end: MAX_PORT }));
+        console.error(t('server.portsBusy', { start: START_PORT, end: MAX_PORT }));
         resolve(null);
         return;
       }
@@ -609,7 +609,7 @@ export async function startViewer() {
         server = currentServer;
         actualPort = port;
         const url = `http://${HOST}:${port}`;
-        console.log(t('server.started', { host: HOST, port }));
+        console.error(t('server.started', { host: HOST, port }));
         // v2.0.69 之前的版本会清空控制台，自动打开浏览器确保用户能看到界面
         try {
           const ccPkgPath = join(__dirname, '..', '@anthropic-ai', 'claude-code', 'package.json');