cc-team-viewer 1.5.6 → 1.5.8

package/cli/cli.js

@@ -135,6 +135,9 @@ function removeShellHook() {
 }
 
 function injectCliJs() {
+  if (!existsSync(cliPath)) {
+    return 'skipped'; // 原生二进制安装，无 cli.js 可注入
+  }
   const content = readFileSync(cliPath, 'utf-8');
   if (content.includes(INJECT_START)) {
     // 已经是自己的注入
@@ -182,6 +185,8 @@ async function runProxyCommand(args) {
     const injectResult = injectCliJs();
     if (injectResult === 'injected') {
       console.log('[cctv] 已重新注入 interceptor 到 cli.js');
+    } else if (injectResult === 'skipped') {
+      console.log('[cctv] 原生安装模式，跳过 cli.js 注入');
     }
 
     // Dynamic import to avoid side effects when just installing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-team-viewer",
-  "version": "1.5.6",
+  "version": "1.5.8",
   "description": "Claude Code Logger visualization management tool",
   "license": "MIT",
   "main": "server/server.js",
@@ -48,7 +48,9 @@
     "src/vite.config.js",
     "src/i18n/",
     "src/utils/apiUrl.js",
-    "src/utils/env.js"
+    "src/utils/contentFilter.js",
+    "src/utils/env.js",
+    "src/utils/sessionBuilder.js"
   ],
   "devDependencies": {
     "@codemirror/lang-cpp": "^6.0.3",

package/proxy/interceptor.js

@@ -81,7 +81,7 @@ function setupTeamConfigWatcher() {
   if (teamsDirWatcher) return;  // 已经启动了监听器
   const teamsDir = join(homedir(), '.claude', 'teams');
 
-  // 即使目录不存在也创建监听器（后续创建会触发）
+  if (!existsSync(teamsDir)) return;  // 目录不存在时跳过，避免 ENOENT
   try {
     teamsDirWatcher = watch(teamsDir, { recursive: true }, (eventType, filename) => {
       // 监听所有 config.json 文件的变化
@@ -660,7 +660,7 @@ export function setupInterceptor() {
     const tryStartProxy = async () => {
       const START = 7008, END = 7020;
       for (let port = START; port <= END; port++) {
-        if (await checkProxyPort(port)) return; // proxy 已在运行，跳过
+        if (await checkProxyPort(port)) return; // proxy 已在运行��跳过
       }
       // 没有找到 proxy，启动一个（不会阻塞 Claude Code）
       _proxyStarted = true;
@@ -670,27 +670,29 @@ export function setupInterceptor() {
         stdio: 'ignore',
         env: { ...process.env, CCV_DETACHED: '1' }
       }).unref();
+    };
 
-      // 等待 viewer 服务器就绪后打印访问地址
-      const waitAndPrint = async () => {
-        for (let i = 0; i < 30; i++) {
-          await new Promise(r => setTimeout(r, 500));
-          for (let p = 7008; p <= 7020; p++) {
-            const ok = await new Promise(res => {
-              const c = connect(p, '127.0.0.1', () => { c.end(); res(true); });
-              c.on('error', () => res(false));
-            });
-            if (ok) {
-              process.stderr.write(`\n[cctv] 监控面板: http://127.0.0.1:${p}\n`);
-              return;
-            }
+    tryStartProxy().catch(() => {});
+  }
+
+  // 即使 proxy 已在运行（isLocalProxy），也打印端口信息
+  if (!_proxyStarted && !isProxyMode) {
+    const printExistingProxy = async () => {
+      for (let i = 0; i < 10; i++) {
+        await new Promise(r => setTimeout(r, 500));
+        for (let p = 7008; p <= 7020; p++) {
+          const ok = await new Promise(res => {
+            const c = connect(p, '127.0.0.1', () => { c.end(); res(true); });
+            c.on('error', () => res(false));
+          });
+          if (ok) {
+            process.stderr.write(`\n[cctv] 监控面板: http://127.0.0.1:${p}\n`);
+            return;
           }
         }
-      };
-      waitAndPrint().catch(() => {});
+      }
     };
-
-    tryStartProxy().catch(() => {});
+    printExistingProxy().catch(() => {});
   }
 
   // 注册退出处理器

package/src/utils/contentFilter.js

@@ -0,0 +1,153 @@
+// 内容分类与过滤规则
+// ChatView（对话模式）和 AppHeader（用户 Prompt 弹窗）共用此模块，确保过滤逻辑一致。
+// MainAgent 判断也收敛于此，供全局统一调用。
+
+// ============== 请求体辅助 ==============
+
+const SUBAGENT_SYSTEM_RE = /command execution specialist|file search specialist|planning specialist|general-purpose agent/i;
+
+/**
+ * 从请求中提取团队成员名称
+ * 优先使用 request.teamMember 字段（由 interceptor 填充），若无则从 system prompt 解析
+ */
+export function extractTeamMember(req) {
+  if (!req) return null;
+
+  // 1. 优先使用 interceptor 填充的 teamMember 字段
+  if (req.teamMember) return req.teamMember;
+
+  // 2. 从 system prompt 解析（旧日志兼容）
+  const body = req.body || {};
+  const sysText = getSystemText(body);
+
+  // 检查是否为团队成员（general-purpose agent 或 specialist）
+  if (/general-purpose agent/i.test(sysText)) return 'general-purpose';
+  if (/command execution specialist/i.test(sysText)) return 'command-execution';
+  if (/file search specialist/i.test(sysText)) return 'file-search';
+  if (/planning specialist/i.test(sysText)) return 'planning';
+
+  // 尝试匹配 "You are xxx agent" 模式
+  const match = sysText.match(/You are (?:a |the )?([-\w]+)(?:\s+agent| specialist| explorer| developer)?/i);
+  if (match) {
+    const member = match[1].toLowerCase().replace(/[-\s]+/g, '-');
+    // 排除常见的非成员名
+    if (!['claude', 'code', 'anthropic', 'interactive', 'ai', 'general', 'purpose'].includes(member)) {
+      return member;
+    }
+  }
+
+  return null;
+}
+
+/**
+ * 提取请求体中的 system prompt 文本
+ */
+export function getSystemText(body) {
+  const system = body?.system;
+  if (typeof system === 'string') return system;
+  if (Array.isArray(system)) {
+    return system.map(s => (s && s.text) || '').join('');
+  }
+  return '';
+}
+
+/**
+ * 判断请求是否为 MainAgent 请求。
+ * 包含 interceptor 标记校验 + 旧日志回退检测，全局唯一入口。
+ */
+export function isMainAgent(req) {
+  if (!req) return false;
+
+  if (req.mainAgent) {
+    // 排除被误标记的 SubAgent（旧日志兼容）
+    const sysText = getSystemText(req.body || {});
+    if (SUBAGENT_SYSTEM_RE.test(sysText)) return false;
+    return true;
+  }
+
+  // 回退检测：旧版 interceptor 未标记 mainAgent，但实际符合 MainAgent 特征
+  const body = req.body || {};
+  const tools = body.tools;
+  if (body.system && Array.isArray(tools) && tools.length > 10) {
+    const hasEdit = tools.some(t => t.name === 'Edit');
+    const hasBash = tools.some(t => t.name === 'Bash');
+    const hasTaskOrAgent = tools.some(t => t.name === 'Task' || t.name === 'Agent');
+    if (hasEdit && hasBash && hasTaskOrAgent) {
+      const sysText = getSystemText(body);
+      if (sysText.includes('You are Claude Code') && !SUBAGENT_SYSTEM_RE.test(sysText)) {
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+// ============== 文本内容过滤 ==============
+
+/**
+ * 判断文本是否为 Skill 加载内容
+ */
+export function isSkillText(text) {
+  if (!text) return false;
+  return /^Base directory for this skill:/i.test(text.trim());
+}
+
+/**
+ * 判断文本是否为系统注入文本（不应作为用户消息展示）
+ */
+export function isSystemText(text) {
+  if (!text) return true;
+  const trimmed = text.trim();
+  if (!trimmed) return true;
+  if (/^<[a-zA-Z_][\w-]*[\s>]/i.test(trimmed)) return true;
+  if (/^\[SUGGESTION MODE:/i.test(trimmed)) return true;
+  // Claude Code 输出截断时注入的系统消息
+  if (/^Your response was cut off because it exceeded the output token limit/i.test(trimmed)) return true;
+  // Skill 加载的文档内容
+  if (/^Base directory for this skill:/i.test(trimmed)) return true;
+  return false;
+}
+
+/**
+ * 从 user message 的 content 数组中分类提取各类文本块。
+ * @param {Array} content — message.content 数组
+ * @returns {{ commands: string[], textBlocks: Array, skillBlocks: Array }}
+ *   commands    — 提取到的 slash command 名称（如 "/clear"）
+ *   textBlocks  — 过滤后的普通用户文本块（不含系统文本、command 块、skill 块）
+ *   skillBlocks — skill 加载的文本块
+ */
+export function classifyUserContent(content) {
+  if (!Array.isArray(content)) return { commands: [], textBlocks: [], skillBlocks: [] };
+
+  const hasCommand = content.some(b => b.type === 'text' && /<command-message>/i.test(b.text || ''));
+
+  // 提取 slash command 名称
+  const commands = [];
+  if (hasCommand) {
+    for (const b of content) {
+      if (b.type !== 'text') continue;
+      const m = (b.text || '').match(/<command-name>\s*([^<]*)<\/command-name>/i);
+      if (m) {
+        const cmd = m[1].trim();
+        commands.push(cmd.startsWith('/') ? cmd : `/${cmd}`);
+      }
+    }
+  }
+
+  // 过滤出非系统文本块
+  let textBlocks = content.filter(b => b.type === 'text' && !isSystemText(b.text));
+
+  // 过滤掉 command 相关块
+  if (hasCommand) {
+    textBlocks = textBlocks.filter(b => !/<command-message>/i.test(b.text || ''));
+  }
+
+  // 分离 skill 块
+  const skillBlocks = textBlocks.filter(b => isSkillText(b.text));
+  if (skillBlocks.length > 0) {
+    textBlocks = textBlocks.filter(b => !isSkillText(b.text));
+  }
+
+  return { commands, textBlocks, skillBlocks };
+}

package/src/utils/sessionBuilder.js

@@ -0,0 +1,102 @@
+/**
+ * 会话构建工具
+ * 负责从请求列表中构建 MainAgent 会话
+ */
+import { isMainAgent } from './contentFilter.js';
+
+/**
+ * 合并 MainAgent sessions
+ * 通过 metadata.user_id 判断 session 归属
+ */
+export function mergeMainAgentSessions(prevSessions, entry) {
+  const newMessages = entry.body.messages;
+  const newResponse = entry.response;
+  const userId = entry.body.metadata?.user_id || null;
+  const entryTimestamp = entry.timestamp || null;
+  const teamMember = entry.teamMember || null;
+
+  if (prevSessions.length === 0) {
+    return [{ userId, messages: newMessages, response: newResponse, entryTimestamp, teamMember }];
+  }
+
+  const lastSession = prevSessions[prevSessions.length - 1];
+  const prevMsgCount = lastSession.messages ? lastSession.messages.length : 0;
+
+  // 消息数量大幅缩减视为新对话
+  const isNewConversation = prevMsgCount > 0 &&
+    newMessages.length < prevMsgCount * 0.5 &&
+    (prevMsgCount - newMessages.length) > 4;
+
+  if (userId && userId === lastSession.userId && !isNewConversation) {
+    // 更新当前 session
+    const updated = [...prevSessions];
+    updated[updated.length - 1] = {
+      ...lastSession,
+      messages: newMessages,
+      response: newResponse,
+      entryTimestamp,
+      teamMember: teamMember || lastSession.teamMember,
+    };
+    return updated;
+  } else {
+    // 新开一段
+    return [...prevSessions, { userId, messages: newMessages, response: newResponse, entryTimestamp, teamMember }];
+  }
+}
+
+/**
+ * 从批量 entries 构建 sessions
+ */
+export function buildSessionsFromEntries(entries, includeAllRequests = false) {
+  let sessions = [];
+  for (const entry of entries) {
+    const shouldInclude = includeAllRequests
+      ? entry.body && Array.isArray(entry.body.messages)
+      : isMainAgent(entry) && entry.body && Array.isArray(entry.body.messages);
+
+    if (shouldInclude) {
+      sessions = mergeMainAgentSessions(sessions, entry);
+    }
+  }
+  return sessions;
+}
+
+/**
+ * 前置处理：遍历所有 MainAgent entries，给每条消息注入 _timestamp
+ */
+export function assignMessageTimestamps(entries) {
+  let timestamps = [];
+  let prevUserId = null;
+
+  for (const entry of entries) {
+    if (!isMainAgent(entry) || !entry.body || !Array.isArray(entry.body.messages)) continue;
+
+    const messages = entry.body.messages;
+    const count = messages.length;
+    const userId = entry.body.metadata?.user_id || null;
+    const timestamp = entry.timestamp || new Date().toISOString();
+
+    // 检测 session 切换
+    const prevCount = timestamps.length;
+    const isNewSession = prevCount > 0 && (
+      (count < prevCount * 0.5 && (prevCount - count) > 4) ||
+      (prevUserId && userId && userId !== prevUserId)
+    );
+
+    if (isNewSession) {
+      timestamps = [];
+    }
+
+    // 新增的消息用当前 entry.timestamp
+    for (let i = timestamps.length; i < count; i++) {
+      timestamps.push(timestamp);
+    }
+
+    // 把累积的时间戳写入当前 entry 的所有消息
+    for (let i = 0; i < count; i++) {
+      messages[i]._timestamp = timestamps[i];
+    }
+
+    prevUserId = userId;
+  }
+}