@bangdao-ai/acw-tools 1.3.7 → 1.3.9-beta.1

package/cursorConversationParser.js

@@ -23,6 +23,7 @@ if (DEBUG_MODE && !fs.existsSync(DEBUG_LOG_DIR)) {
 /**
  * DEBUG 日志函数
  * 仅在 DEBUG_MODE 启用时输出详细日志到文件
+ * 日志格式设计：方便贴给AI分析问题
  */
 function debugLog(message, data = null) {
   if (!DEBUG_MODE) return;
@@ -31,7 +32,7 @@ function debugLog(message, data = null) {
   const timestamp = now.toISOString().replace('T', ' ').replace('Z', '');
   const logFile = path.join(DEBUG_LOG_DIR, `acw-mcp-debug-${now.toISOString().split('T')[0]}.log`);
   
-  let logLine = `${timestamp} [DEBUG] ${message}`;
+  let logLine = `[${timestamp}] ${message}`;
   if (data !== null) {
     if (typeof data === 'object') {
       logLine += '\n' + JSON.stringify(data, null, 2);
@@ -237,6 +238,18 @@ function extractAdditionalInfo(composerData, bubbles, markdownContent = '') {
     duration = Math.max(0, duration);
   }
   
+  // DEBUG 模式：记录解析开始
+  if (DEBUG_MODE) {
+    debugLog(`\n========== [开始解析会话] ==========`);
+    debugLog(`composerId: ${composerData?.composerId}`);
+    debugLog(`会话名称: ${composerData?.name || '无'}`);
+    debugLog(`bubble总数: ${bubbles.length}`);
+    // 统计有 timingInfo 的 bubble 数量
+    const bubblesWithTimingInfo = bubbles.filter(b => b.type === 2 && b.timingInfo);
+    debugLog(`其中AI bubble有timingInfo的数量: ${bubblesWithTimingInfo.length}`);
+    debugLog(`====================================`);
+  }
+  
   const additionalInfo = {
     // 会话元数据
     metadata: {
@@ -342,46 +355,50 @@ function extractAdditionalInfo(composerData, bubbles, markdownContent = '') {
       const tokenCount = bubble.tokenCount || {};
       const modelInfo = bubble.modelInfo || {};
       
-      // DEBUG: 输出原始 bubble.timingInfo 情况
-      const hasRawTimingInfo = !!bubble.timingInfo;
+      // DEBUG: 只记录有 timingInfo 的 bubble（这才是关键数据）
+      const hasTimingInfo = !!bubble.timingInfo;
       const hasClientRpcSendTime = !!(bubble.timingInfo && bubble.timingInfo.clientRpcSendTime);
       const hasClientSettleTime = !!(bubble.timingInfo && bubble.timingInfo.clientSettleTime);
       
-      // DEBUG 模式：记录每个 AI bubble 的 timingInfo 详情
-      if (DEBUG_MODE) {
-        debugLog(`[AI Bubble] bubbleId=${bubble.bubbleId}`, {
-          hasTimingInfo: hasRawTimingInfo,
-          hasClientRpcSendTime,
-          hasClientSettleTime,
-          rawTimingInfo: bubble.timingInfo,
-          modelName: modelInfo.modelName,
-          tokenCount: tokenCount
+      // DEBUG 模式：只打印有 timingInfo 的 bubble，并输出完整 value
+      if (DEBUG_MODE && hasTimingInfo) {
+        debugLog(`━━━ [有timingInfo的Bubble] ━━━`);
+        debugLog(`bubbleId: ${bubble.bubbleId}`);
+        debugLog(`timingInfo原始值:`, bubble.timingInfo);
+        debugLog(`解析过程:`, {
+          step1_hasTimingInfo: hasTimingInfo,
+          step2_hasClientRpcSendTime: hasClientRpcSendTime,
+          step3_hasClientSettleTime: hasClientSettleTime,
+          step4_clientRpcSendTime: aiTimingInfo.clientRpcSendTime,
+          step5_clientSettleTime: aiTimingInfo.clientSettleTime,
+          step6_计算executionTime: hasClientRpcSendTime && hasClientSettleTime 
+            ? `${aiTimingInfo.clientSettleTime} - ${aiTimingInfo.clientRpcSendTime} = ${aiTimingInfo.clientSettleTime - aiTimingInfo.clientRpcSendTime}ms`
+            : '缺少必要字段，无法计算'
         });
-        
-        // 如果缺少 timingInfo，输出完整的 bubble 数据用于排查
-        if (!hasRawTimingInfo || !hasClientRpcSendTime || !hasClientSettleTime) {
-          debugLog(`[AI Bubble 缺少 timingInfo] 完整 bubble 数据:`, {
-            bubbleId: bubble.bubbleId,
-            type: bubble.type,
-            createdAt: bubble.createdAt,
-            // 输出 bubble 的所有顶级字段（排除可能很大的 text/richText）
-            bubbleKeys: Object.keys(bubble),
-            // 完整的 bubble 数据（用于深度排查）
-            fullBubble: {
-              ...bubble,
-              // 截断可能很长的文本字段
-              text: bubble.text ? `[长度: ${bubble.text.length}] ${bubble.text.substring(0, 200)}...` : null,
-              richText: bubble.richText ? `[长度: ${bubble.richText.length}]` : null
-            }
-          });
-        }
+        // 输出完整 bubble（排除超长文本）
+        debugLog(`bubble完整数据:`, {
+          bubbleId: bubble.bubbleId,
+          type: bubble.type,
+          createdAt: bubble.createdAt,
+          timingInfo: bubble.timingInfo,
+          tokenCount: bubble.tokenCount,
+          modelInfo: bubble.modelInfo,
+          toolFormerData: bubble.toolFormerData ? { name: bubble.toolFormerData.name } : null,
+          // 其他字段（排除大文本）
+          otherKeys: Object.keys(bubble).filter(k => !['text', 'richText', 'timingInfo', 'tokenCount', 'modelInfo', 'toolFormerData', 'bubbleId', 'type', 'createdAt'].includes(k))
+        });
+        debugLog(`━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━`);
       }
       
       let executionTime = 0;
+      let isEstimated = false; // 标记是否为估算值
+      
       if (aiTimingInfo.clientRpcSendTime && aiTimingInfo.clientSettleTime) {
+        // 有 timingInfo，使用精确计算
         executionTime = aiTimingInfo.clientSettleTime - aiTimingInfo.clientRpcSendTime;
         additionalInfo.performance.totalExecutionTime += executionTime;
       }
+      // 注意：兜底计算将在第二遍遍历中进行
       
       // 构建execution对象（timestamp已在上面统一处理）
       const execution = {
@@ -398,9 +415,10 @@ function extractAdditionalInfo(composerData, bubbles, markdownContent = '') {
         }
       };
       
-      // 如果有timingInfo，添加原始时间戳
+      // 如果有timingInfo，添加原始时间戳，并标记为精确值
       if (Object.keys(aiTimingInfo).length > 0) {
         execution.timingInfo = {
+          isEstimated: false,  // 标记为精确值（来自 Cursor 原生 timingInfo）
           clientStartTime: aiTimingInfo.clientStartTime || null,
           clientRpcSendTime: aiTimingInfo.clientRpcSendTime || null,
           clientSettleTime: aiTimingInfo.clientSettleTime || null,
@@ -424,6 +442,134 @@ function extractAdditionalInfo(composerData, bubbles, markdownContent = '') {
     }
   }
   
+  // ==================== 兜底方案：使用 createdAt 时间差估算执行时间 ====================
+  // 核心逻辑：
+  // 1. 一个会话包含多轮对话，每轮对话 = 1个User bubble + N个连续AI bubble
+  // 2. 正常情况下，第一个AI bubble有timingInfo，其executionTime包含整轮对话的执行时间
+  // 3. 兜底：如果第一个AI bubble没有timingInfo，用「下一个User bubble的createdAt - 第一个AI bubble的createdAt」估算
+  // 4. 对于最后一轮对话，用「composerData.lastUpdatedAt - 第一个AI bubble的createdAt」估算
+  
+  const executions = additionalInfo.performance.executions;
+  let estimatedCount = 0;
+  
+  // 辅助函数：解析时间戳为毫秒
+  const parseTimestamp = (ts) => {
+    if (!ts) return null;
+    if (typeof ts === 'number') return ts;
+    const parsed = new Date(ts).getTime();
+    return isNaN(parsed) ? null : parsed;
+  };
+  
+  // 获取 composerData.lastUpdatedAt 作为最后一轮的结束时间
+  const lastUpdatedAt = parseTimestamp(composerData?.lastUpdatedAt);
+  
+  // 遍历 executions，识别每一轮对话并处理兜底
+  let i = 0;
+  while (i < executions.length) {
+    const current = executions[i];
+    
+    // 跳过非 User bubble
+    if (current.type !== 'user') {
+      i++;
+      continue;
+    }
+    
+    // 找到 User bubble，开始处理这一轮对话
+    const userBubbleIndex = i;
+    i++; // 移动到下一个 bubble
+    
+    // 找到这一轮的第一个 AI bubble
+    if (i >= executions.length || executions[i].type !== 'ai') {
+      continue; // 没有 AI bubble，跳过
+    }
+    
+    const firstAiBubbleIndex = i;
+    const firstAiBubble = executions[firstAiBubbleIndex];
+    
+    // 找到这一轮的最后一个 AI bubble（连续的 AI bubble）
+    let lastAiBubbleIndex = firstAiBubbleIndex;
+    while (lastAiBubbleIndex + 1 < executions.length && executions[lastAiBubbleIndex + 1].type === 'ai') {
+      lastAiBubbleIndex++;
+    }
+    
+    // 移动索引到下一轮
+    i = lastAiBubbleIndex + 1;
+    
+    // 检查第一个 AI bubble 是否需要兜底
+    // 条件：没有 timingInfo 且 executionTime 为 0
+    if (firstAiBubble.timingInfo || firstAiBubble.executionTime > 0) {
+      continue; // 已有执行时间，不需要兜底
+    }
+    
+    // 计算估算执行时间
+    const firstAiCreatedAt = parseTimestamp(firstAiBubble.timestamp);
+    if (!firstAiCreatedAt) {
+      continue; // 没有时间戳，无法估算
+    }
+    
+    let endTime = null;
+    let endTimeSource = '';
+    
+    // 优先使用下一个 User bubble 的 createdAt
+    if (i < executions.length && executions[i].type === 'user') {
+      endTime = parseTimestamp(executions[i].timestamp);
+      endTimeSource = 'nextUserBubble';
+    }
+    
+    // 如果是最后一轮对话，使用 lastUpdatedAt
+    if (!endTime && lastUpdatedAt) {
+      endTime = lastUpdatedAt;
+      endTimeSource = 'lastUpdatedAt';
+    }
+    
+    if (!endTime) {
+      continue; // 无法确定结束时间
+    }
+    
+    // 计算时间差
+    const estimatedTime = endTime - firstAiCreatedAt;
+    
+    // 验证估算值的合理性（正数且小于30分钟）
+    if (estimatedTime <= 0 || estimatedTime > 30 * 60 * 1000) {
+      if (DEBUG_MODE) {
+        debugLog(`[兜底跳过] 估算值不合理`, {
+          bubbleId: firstAiBubble.bubbleId,
+          firstAiCreatedAt,
+          endTime,
+          endTimeSource,
+          estimatedTime: `${estimatedTime}ms`
+        });
+      }
+      continue;
+    }
+    
+    // 应用估算值
+    firstAiBubble.executionTime = estimatedTime;
+    firstAiBubble.timingInfo = {
+      isEstimated: true,  // 标记为估算值
+      estimatedFrom: endTimeSource,
+      firstAiCreatedAt: firstAiCreatedAt,
+      endTime: endTime
+    };
+    additionalInfo.performance.totalExecutionTime += estimatedTime;
+    estimatedCount++;
+    
+    if (DEBUG_MODE) {
+      debugLog(`[兜底估算成功]`, {
+        bubbleId: firstAiBubble.bubbleId,
+        轮次AI_bubble数: lastAiBubbleIndex - firstAiBubbleIndex + 1,
+        firstAiCreatedAt: new Date(firstAiCreatedAt).toISOString(),
+        endTime: new Date(endTime).toISOString(),
+        endTimeSource,
+        estimatedExecutionTime: `${estimatedTime}ms (${(estimatedTime / 1000).toFixed(1)}s)`
+      });
+    }
+  }
+  
+  if (DEBUG_MODE && estimatedCount > 0) {
+    debugLog(`[兜底估算汇总] 共估算了 ${estimatedCount} 轮对话的执行时间`);
+  }
+  
   // 计算平均执行时间、最大执行时间和最小执行时间（只统计type='ai'且executionTime>0的）
   let validAiExecutionCount = 0;
   let validTotalExecutionTime = 0;
@@ -469,20 +615,34 @@ function extractAdditionalInfo(composerData, bubbles, markdownContent = '') {
     additionalInfo.performance.minExecutionTime = 0;
   }
   
-  // DEBUG 模式：输出 timingInfo 统计汇总
+  // DEBUG 模式：输出 timingInfo 解析结果汇总
   if (DEBUG_MODE) {
-    debugLog(`[timingInfo 统计汇总] composerId=${composerData?.composerId}`, {
-      totalAiExecutions: additionalInfo.performance.aiExecutionCount,
-      withTimingInfo: aiExecutionsWithTimingInfo,
-      withoutTimingInfo: aiExecutionsWithoutTimingInfo,
-      validExecutionCount: validAiExecutionCount,
-      totalExecutionTime: additionalInfo.performance.totalExecutionTime,
-      averageExecutionTime: additionalInfo.performance.averageExecutionTime,
-      // 列出所有缺少 timingInfo 的 AI execution
-      missingTimingInfoBubbles: additionalInfo.performance.executions
-        .filter(e => e.type === 'ai' && !e.timingInfo)
-        .map(e => ({ bubbleId: e.bubbleId, modelName: e.modelName, timestamp: e.timestamp }))
+    debugLog(`\n========== [会话解析完成] ==========`);
+    debugLog(`composerId: ${composerData?.composerId}`);
+    debugLog(`会话名称: ${composerData?.name || '无'}`);
+    debugLog(`解析结果汇总:`, {
+      总AI_bubble数: additionalInfo.performance.aiExecutionCount,
+      有timingInfo的数量: aiExecutionsWithTimingInfo,
+      无timingInfo的数量: aiExecutionsWithoutTimingInfo,
+      有效执行时间的数量: validAiExecutionCount,
+      总执行时间ms: additionalInfo.performance.totalExecutionTime,
+      平均执行时间ms: Math.round(additionalInfo.performance.averageExecutionTime)
     });
+    // 列出所有解析出的 execution（带 timingInfo 的）
+    const executionsWithTiming = additionalInfo.performance.executions
+      .filter(e => e.type === 'ai' && e.timingInfo);
+    if (executionsWithTiming.length > 0) {
+      debugLog(`有timingInfo的execution列表 (共${executionsWithTiming.length}个):`, 
+        executionsWithTiming.map(e => ({
+          bubbleId: e.bubbleId,
+          executionTime: e.executionTime,
+          timingInfo: e.timingInfo
+        }))
+      );
+    } else {
+      debugLog(`⚠️ 警告: 该会话没有任何带timingInfo的AI bubble!`);
+    }
+    debugLog(`====================================\n`);
   }
   
   // 分离executions数组

package/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "ACW工具集",
   "description": "ACW平台工具集：智能下载规则到项目、初始化Common Admin模板项目",
-  "version": "1.3.7",
+  "version": "1.3.9",
   "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.3.7",
+  "version": "1.3.9-beta.1",
   "type": "module",
   "description": "MCP (Model Context Protocol) tools for ACW - download rules and initialize Common Admin projects",
   "main": "index.js",