@bangdao-ai/acw-tools 1.2.7 → 1.2.8-beta.1

package/cursorConversationParser.js

@@ -95,6 +95,89 @@ function extractFilePath(toolResult, rawArgs) {
   return filePath;
 }
 
+/**
+ * 解析write工具的代码变更统计
+ * @param {Object} bubble - bubble数据
+ * @returns {Object|null} 按语言聚合的代码变更统计，格式：{ languageId: { added: number, removed: number } }
+ */
+function parseCodeChanges(bubble) {
+  // 1. 检查是否是accepted的write操作
+  const toolFormerData = bubble.toolFormerData;
+  if (!toolFormerData || toolFormerData.name !== 'write' || toolFormerData.userDecision !== 'accepted') {
+    return null;
+  }
+
+  // 2. 解析result获取diff chunks
+  let result;
+  try {
+    result = typeof toolFormerData.result === 'string'
+      ? JSON.parse(toolFormerData.result)
+      : toolFormerData.result;
+  } catch (error) {
+    return null;
+  }
+
+  if (!result || !result.diff || !Array.isArray(result.diff.chunks)) {
+    return null;
+  }
+
+  // 3. 从rawArgs获取file_path
+  let filePath = null;
+  try {
+    const rawArgs = typeof toolFormerData.rawArgs === 'string'
+      ? JSON.parse(toolFormerData.rawArgs)
+      : toolFormerData.rawArgs;
+    filePath = rawArgs?.file_path;
+  } catch (error) {
+    // 忽略解析错误
+  }
+
+  if (!filePath) {
+    return null;
+  }
+
+  // 4. 在codeBlocks中查找对应的languageId
+  let languageId = 'unknown';
+  if (bubble.codeBlocks && Array.isArray(bubble.codeBlocks)) {
+    const matchedBlock = bubble.codeBlocks.find(block => {
+      if (!block.uri || !block.uri.path) return false;
+      
+      // 尝试精确匹配
+      if (block.uri.path === filePath) return true;
+      
+      // 尝试路径结尾匹配（处理相对路径 vs 绝对路径的情况）
+      // 例如: filePath="frontend/README.md" 可以匹配 uri.path="/path/to/frontend/README.md"
+      if (block.uri.path.endsWith(filePath)) return true;
+      if (filePath.endsWith(block.uri.path)) return true;
+      
+      return false;
+    });
+    
+    if (matchedBlock && matchedBlock.languageId) {
+      languageId = matchedBlock.languageId;
+    }
+  }
+
+  // 5. 统计所有chunks的增删行数
+  let totalAdded = 0;
+  let totalRemoved = 0;
+
+  for (const chunk of result.diff.chunks) {
+    // 直接使用chunk中的linesAdded和linesRemoved字段
+    totalAdded += chunk.linesAdded || 0;
+    totalRemoved += chunk.linesRemoved || 0;
+  }
+
+  // 6. 返回按语言聚合的结果（增加文件路径信息）
+  return {
+    [languageId]: {
+      added: totalAdded,
+      removed: totalRemoved,
+      filePath: filePath  // 新增：文件路径，用于后端识别真实语言
+    }
+  };
+}
+
 /**
  * 提取附加信息（性能指标和会话元数据）
  * @param {Object} composerData - Composer数据
@@ -146,12 +229,19 @@ function extractAdditionalInfo(composerData, bubbles, markdownContent = '') {
   for (const bubble of bubbles) {
     const bubbleType = bubble.type || 0;
     
+    // 跳过没有bubbleId的bubble（不应该发生，但作为保护措施）
+    if (!bubble.bubbleId) {
+      console.error('[WARN] bubble缺少bubbleId，跳过:', { type: bubbleType, createdAt: bubble.createdAt });
+      continue;
+    }
+    
     if (bubbleType === 1) {
       // User消息
       additionalInfo.performance.userMessageCount++;
       
       // 记录用户消息的时间戳和提示词内容
       const execution = {
+        bubbleId: bubble.bubbleId, // 添加bubbleId作为主键
         type: 'user',
         timestamp: bubble.createdAt || null,
         modelName: null,
@@ -166,7 +256,15 @@ function extractAdditionalInfo(composerData, bubbles, markdownContent = '') {
       // 提取用户提示词内容并添加到 execution 中
       const userText = bubble.text || bubble.richText || '';
       if (userText && userText.trim() && userText.trim() !== '*(无文本内容)*') {
-        execution.prompt = userText.trim();
+        const trimmedText = userText.trim();
+        // 限制prompt最大长度为10MB，避免超大内容导致上传失败
+        const MAX_PROMPT_LENGTH = 10 * 1024 * 1024; // 10MB
+        if (trimmedText.length > MAX_PROMPT_LENGTH) {
+          execution.prompt = trimmedText.substring(0, MAX_PROMPT_LENGTH) + 
+            '\n\n...[内容过长已截断，原始长度: ' + trimmedText.length + ' 字符]';
+        } else {
+          execution.prompt = trimmedText;
+        }
       }
       
       // 新增: 记录 cursorCommands (只在数组不为空时添加)
@@ -193,6 +291,7 @@ function extractAdditionalInfo(composerData, bubbles, markdownContent = '') {
       
       // 构建execution对象
       const execution = {
+        bubbleId: bubble.bubbleId, // 添加bubbleId作为主键
         type: 'ai',
         timestamp: bubble.createdAt || null,
         modelName: modelInfo.modelName || null,
@@ -215,6 +314,12 @@ function extractAdditionalInfo(composerData, bubbles, markdownContent = '') {
         };
       }
       
+      // 提取代码变更统计（write工具）
+      const codeChanges = parseCodeChanges(bubble);
+      if (codeChanges) {
+        execution.codeChanges = codeChanges;
+      }
+      
       additionalInfo.performance.executions.push(execution);
     }
   }
@@ -504,9 +609,11 @@ function extractConversationCore(composerId, outputPath, db) {
     }
     
     // 使用 console.error 输出到 stderr，避免污染 MCP 的 stdout 通道
-    console.error(`fullConversationHeadersOnly 中有 ${validBubbleIds.size} 个bubble`);
-    console.error(`已跳过 ${skippedNotInHeaderBubbles} 个不在fullConversationHeadersOnly中的bubble`);
-    console.error(`已过滤 ${skippedEmptyBubbles} 个空bubble，保留 ${bubbles.length} 个有效bubble`);
+    const sessionName = composerData?.name || 'Unnamed';
+    console.error(`[会话: ${sessionName}] (ID: ${composerId})`);
+    console.error(`  fullConversationHeadersOnly 中有 ${validBubbleIds.size} 个bubble`);
+    console.error(`  已跳过 ${skippedNotInHeaderBubbles} 个不在fullConversationHeadersOnly中的bubble`);
+    console.error(`  已过滤 ${skippedEmptyBubbles} 个空bubble，保留 ${bubbles.length} 个有效bubble`);
     
     // 检查是否为空对话（所有bubble都不存在或被清理）
     if (bubbles.length === 0) {

package/index.js

@@ -770,17 +770,32 @@ async function uploadExecutions(sessionId, executionsList) {
     
     // 转换为后端期望的格式
     const executions = executionsList.map(exec => {
-      // 将timestamp转换为毫秒时间戳(Long类型)
-      let timestampMs = exec.timestamp;
-      if (typeof timestampMs === 'string') {
-        timestampMs = new Date(timestampMs).getTime();
-      } else if (timestampMs == null) {
-        timestampMs = 0;
+      // 将timestamp转换为datetime字符串（yyyy-MM-dd HH:mm:ss.SSS格式，UTC+8）
+      let timestampStr = null;
+      if (exec.timestamp) {
+        const date = typeof exec.timestamp === 'string' ? new Date(exec.timestamp) : new Date(exec.timestamp);
+        if (!isNaN(date.getTime())) {
+          // 格式化为 yyyy-MM-dd HH:mm:ss.SSS
+          const year = date.getFullYear();
+          const month = String(date.getMonth() + 1).padStart(2, '0');
+          const day = String(date.getDate()).padStart(2, '0');
+          const hours = String(date.getHours()).padStart(2, '0');
+          const minutes = String(date.getMinutes()).padStart(2, '0');
+          const seconds = String(date.getSeconds()).padStart(2, '0');
+          const milliseconds = String(date.getMilliseconds()).padStart(3, '0');
+          timestampStr = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}.${milliseconds}`;
+        }
+      }
+      
+      // DEBUG: 检查bubbleId
+      if (!exec.bubbleId) {
+        logger.error('execution缺少bubbleId！', { type: exec.type, timestamp: exec.timestamp });
       }
       
       const data = {
+        id: exec.bubbleId, // bubbleId作为主键
         type: exec.type,
-        timestamp: timestampMs,
+        timestamp: timestampStr,
         executionTime: exec.executionTime != null ? exec.executionTime : 0,
         inputTokens: exec.tokens && exec.tokens.input != null ? exec.tokens.input : 0,
         outputTokens: exec.tokens && exec.tokens.output != null ? exec.tokens.output : 0,
@@ -797,9 +812,22 @@ async function uploadExecutions(sessionId, executionsList) {
         data.cursorCommands = exec.cursorCommands;
       }
       
-      // 添加详细时间信息（仅type=ai时）
+      // 添加详细时间信息（仅type=ai时）- 序列化为JSON字符串
       if (exec.type === 'ai' && exec.timingInfo) {
-        data.timingInfo = exec.timingInfo;
+        data.timingInfo = JSON.stringify(exec.timingInfo);
+      }
+      
+      // 初始化additionalInfo为空对象（确保字段不为NULL）
+      const additionalInfo = {};
+      
+      // 添加代码变更统计（仅type=ai且有codeChanges时）
+      if (exec.type === 'ai' && exec.codeChanges) {
+        additionalInfo.codeChanges = exec.codeChanges;
+      }
+      
+      // 序列化为JSON字符串（如果有内容）
+      if (Object.keys(additionalInfo).length > 0) {
+        data.additionalInfo = JSON.stringify(additionalInfo);
       }
       
       return data;

package/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "ACW工具集",
   "description": "ACW平台工具集：智能下载规则到项目、初始化Common Admin模板项目",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "author": "邦道科技 - 产品技术中心",
   "homepage": "https://www.npmjs.com/package/@bangdao-ai/acw-tools",
   "repository": "https://www.npmjs.com/package/@bangdao-ai/acw-tools?activeTab=readme",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bangdao-ai/acw-tools",
-  "version": "1.2.7",
+  "version": "1.2.8-beta.1",
   "type": "module",
   "description": "MCP (Model Context Protocol) tools for ACW - download rules and initialize Common Admin projects",
   "main": "index.js",