chaimi-keep-mcp 3.1.41 → 3.1.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chaimi-keep-mcp",
-  "version": "3.1.41",
+  "version": "3.1.43",
   "description": "柴米记账 MCP Server - 支持 Claude、Cursor、OpenClaw、WorkBuddy 等 AI 工具直接记账",
   "main": "server.js",
   "bin": {

package/server.js

@@ -483,11 +483,105 @@ function generateSignature(body, timestamp, secret) {
     .digest('hex');
 }
 
+// MCP 调用日志记录函数
+async function logMcpCall(logData) {
+  try {
+    // 异步发送日志到云函数，不阻塞主流程
+    const body = {
+      tool: 'logMcpCall',
+      params: logData,
+    };
+    const timestamp = Date.now().toString();
+    const signature = generateSignature(body, timestamp, CHAIMI_API_SECRET);
+
+    fetch(MCP_HUB_URL, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'Authorization': `Bearer ${await getToken()}`,
+        'X-Chaimi-Signature': signature,
+        'X-Chaimi-Timestamp': timestamp,
+      },
+      body: JSON.stringify(body),
+    }).catch(err => {
+      // 日志记录失败不影响主流程
+      console.error('MCP 调用日志记录失败:', err.message);
+    });
+  } catch (e) {
+    // 日志记录失败不影响主流程
+    console.error('MCP 调用日志记录异常:', e.message);
+  }
+}
+
+// 生成 traceId
+function generateTraceId() {
+  return `trace_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
+}
+
+// 获取操作系统信息
+function getOSInfo() {
+  return {
+    osType: process.platform,        // 'darwin', 'win32', 'linux'
+    osVersion: os.release()          // '23.6.0', '10.0.19045'
+  };
+}
+
+// 调用 mcpHub 云函数（带日志和链路追踪）
+async function callMcpHubWithLogging(tool, params, token, traceId, startTime, osInfo) {
+  // 记录即将调用云函数
+  logMcpCall({
+    traceId,
+    stage: 'cloud_calling',
+    toolName: tool,
+    timestamp: new Date().toISOString(),
+    logSource: 'mcp',
+    osType: osInfo?.osType,
+    osVersion: osInfo?.osVersion
+  });
+
+  try {
+    const result = await callMcpHub(tool, params, token, traceId, osInfo);
+
+    // 记录云函数调用成功
+    logMcpCall({
+      traceId,
+      stage: 'cloud_success',
+      toolName: tool,
+      duration: Date.now() - startTime,
+      timestamp: new Date().toISOString(),
+      logSource: 'mcp',
+      osType: osInfo?.osType,
+      osVersion: osInfo?.osVersion
+    });
+
+    return result;
+  } catch (cloudErr) {
+    // 记录云函数调用失败
+    logMcpCall({
+      traceId,
+      stage: 'cloud_failed',
+      toolName: tool,
+      error: cloudErr.message,
+      duration: Date.now() - startTime,
+      timestamp: new Date().toISOString(),
+      logSource: 'mcp',
+      osType: osInfo?.osType,
+      osVersion: osInfo?.osVersion
+    });
+    throw cloudErr;
+  }
+}
+
 // 调用 mcpHub 云函数
-async function callMcpHub(tool, params, token) {
+async function callMcpHub(tool, params, token, traceId, osInfo) {
   const body = {
     tool: tool,
-    params: params,
+    params: {
+      ...params,
+      _traceId: traceId,  // 传递 traceId 用于链路追踪
+      osType: osInfo?.osType,       // 传递操作系统类型
+      osVersion: osInfo?.osVersion, // 传递操作系统版本
+    },
   };
   const timestamp = Date.now().toString();
   const signature = generateSignature(body, timestamp, CHAIMI_API_SECRET);
@@ -551,12 +645,42 @@ function recordSkillRead() {
 // 工具调用处理
 server.setRequestHandler(CallToolRequestSchema, async (request) => {
   const { name, arguments: args } = request.params;
+  const startTime = Date.now();
+  const traceId = generateTraceId();
+  const osInfo = getOSInfo();
+
+  // 记录请求到达
+  logMcpCall({
+    traceId,
+    stage: 'request_received',
+    toolName: name,
+    params: sanitizeLogParams(args),
+    agentType: args.agentType || process.env.AGENT_TYPE || process.env.MCP_AGENT_TYPE || '',
+    apiProvider: args.apiProvider || process.env.API_PROVIDER || process.env.MCP_API_PROVIDER || '',
+    mcp_version: MCP_VERSION,
+    osType: osInfo.osType,
+    osVersion: osInfo.osVersion,
+    timestamp: new Date().toISOString(),
+    logSource: 'mcp'
+  });
 
   // 强制检查：记账工具必须先调用 get_skill
   if (name === 'save_expense' || name === 'save_receipt' || name === 'save_income') {
     const now = Date.now();
     const lastReadTime = getLastSkillReadTime();
     if (now - lastReadTime > SKILL_VALID_DURATION) {
+      // 记录校验失败
+      logMcpCall({
+        traceId,
+        stage: 'validation_failed',
+        toolName: name,
+        error: 'SKILL_NOT_READ',
+        duration: Date.now() - startTime,
+        timestamp: new Date().toISOString(),
+        logSource: 'mcp',
+        osType: osInfo.osType,
+        osVersion: osInfo.osVersion
+      });
       return {
         content: [
           {
@@ -696,7 +820,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         }
         
         const mcpParams = convertParams('save_expense', processedArgs);
-        result = await callMcpHub('addExpense', mcpParams, token);
+        result = await callMcpHubWithLogging('addExpense', mcpParams, token, traceId, startTime, osInfo);
         
         if (result.success) {
           const displayName = processedArgs.name || '未知商品';
@@ -721,9 +845,15 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             insightsText = '\n\n消费洞察：' + result.insights.map(ins => ins.message || ins.title).join('；');
           }
           
-          // 按 SKILL 规范格式：记账成功 + 友好结束语 + 消费洞察 + 版本号
+          // 新解锁成就（如果有）
+          let achievementsText = '';
+          if (result.newlyUnlocked && result.newlyUnlocked.length > 0) {
+            achievementsText = '\n\n🎉 成就解锁：' + result.newlyUnlocked.map(a => `${a.icon} ${a.title}（+${a.points}分）`).join('；');
+          }
+          
+          // 按 SKILL 规范格式：记账成功 + 友好结束语 + 消费洞察 + 成就 + 版本号
           const displayStoreText = displayStore ? `【${displayStore}】` : '';
-          userMessage = `✅ ${displayName}${displayStoreText} ¥${displayAmount} 已录入柴米AI记账。\n\n${friendlyEnding}${insightsText}\n-------------\nchaimi-keep-mcp: v${MCP_VERSION}`;
+          userMessage = `✅ ${displayName}${displayStoreText} ¥${displayAmount} 已录入柴米AI记账。\n\n${friendlyEnding}${insightsText}${achievementsText}\n-------------\nchaimi-keep-mcp: v${MCP_VERSION}`;
           
           if (!processedArgs.agentType || !processedArgs.apiProvider) {
             userMessage += '\n\n💡 提示：传递agentType和apiProvider参数可解锁小程序记录来源统计功能，示例：agentType="openclaw", apiProvider="doubao"';
@@ -957,7 +1087,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         }
         
         const mcpParams = convertParams('save_receipt', processedArgs);
-        result = await callMcpHub('addReceipt', mcpParams, token);
+        result = await callMcpHubWithLogging('addReceipt', mcpParams, token, traceId, startTime, osInfo);
         
         if (result.success) {
           const totalAmount = processedArgs.totalAmount || processedArgs.items?.reduce((sum, item) => sum + (item.amount || 0), 0) || 0;
@@ -980,7 +1110,13 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             insightsText = '\n\n消费洞察：' + result.insights.map(ins => ins.message || ins.title).join('；');
           }
           
-          userMessage = `✅ ${storeName} ¥${totalAmount} 已录入柴米AI记账（${itemCount}件商品）。\n\n${friendlyEnding}${insightsText}\n-------------\nchaimi-keep-mcp: v${MCP_VERSION}`;
+          // 新解锁成就（如果有）
+          let achievementsText = '';
+          if (result.newlyUnlocked && result.newlyUnlocked.length > 0) {
+            achievementsText = '\n\n🎉 成就解锁：' + result.newlyUnlocked.map(a => `${a.icon} ${a.title}（+${a.points}分）`).join('；');
+          }
+          
+          userMessage = `✅ ${storeName} ¥${totalAmount} 已录入柴米AI记账（${itemCount}件商品）。\n\n${friendlyEnding}${insightsText}${achievementsText}\n-------------\nchaimi-keep-mcp: v${MCP_VERSION}`;
           
           if (!processedArgs.agentType || !processedArgs.apiProvider) {
             userMessage += '\n\n💡 提示：传递agentType和apiProvider参数可解锁小程序记录来源统计功能，示例：agentType="openclaw", apiProvider="doubao"';
@@ -993,7 +1129,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       case 'get_receipt_list': {
         const toolName = toolMapping[name];
         const mcpParams = convertParams(name, processedArgs);
-        result = await callMcpHub(toolName, mcpParams, token);
+        result = await callMcpHubWithLogging(toolName, mcpParams, token, traceId, startTime, osInfo);
 
         if (result.success) {
           const total = result.data?.total || 0;
@@ -1034,7 +1170,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       case 'get_statistics': {
         const toolName = toolMapping[name];
         const mcpParams = convertParams(name, processedArgs);
-        result = await callMcpHub(toolName, mcpParams, token);
+        result = await callMcpHubWithLogging(toolName, mcpParams, token, traceId, startTime, osInfo);
 
         if (result.success) {
           const data = result.data || {};
@@ -1082,7 +1218,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       case 'get_insights': {
         const toolName = toolMapping[name];
         const mcpParams = convertParams(name, processedArgs);
-        result = await callMcpHub(toolName, mcpParams, token);
+        result = await callMcpHubWithLogging(toolName, mcpParams, token, traceId, startTime, osInfo);
 
         if (result.success) {
           const data = result.data || {};
@@ -1128,7 +1264,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       case 'export_data': {
         const toolName = toolMapping[name];
         const mcpParams = convertParams(name, processedArgs);
-        result = await callMcpHub(toolName, mcpParams, token);
+        result = await callMcpHubWithLogging(toolName, mcpParams, token, traceId, startTime, osInfo);
 
         if (result.success) {
           const summary = result.data?.summary || {};
@@ -1182,7 +1318,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         }
 
         const mcpParams = convertParams('save_income', processedArgs);
-        result = await callMcpHub('addIncome', mcpParams, token);
+        result = await callMcpHubWithLogging('addIncome', mcpParams, token, traceId, startTime, osInfo);
 
         if (result.success) {
           const displayName = processedArgs.name || '未知收入';
@@ -1222,7 +1358,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
 
       case 'get_text_parse_prompt': {
         // 获取文字记账解析 Prompt
-        const textParseResult = await callMcpHub('getTextParsePrompt', {}, token);
+        const textParseResult = await callMcpHubWithLogging('getTextParsePrompt', {}, token, traceId, startTime, osInfo);
 
         if (textParseResult.success) {
           result = {
@@ -1254,7 +1390,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           userAgent: request.headers?.['user-agent'] || ''
         };
 
-        result = await callMcpHub('addFeedback', feedbackData, token);
+        result = await callMcpHubWithLogging('addFeedback', feedbackData, token, traceId, startTime, osInfo);
 
         if (result.success) {
           const typeText = {
@@ -1295,6 +1431,19 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       ],
     };
   } catch (error) {
+    // 记录异常错误
+    logMcpCall({
+      traceId,
+      stage: 'mcp_error',
+      toolName: name,
+      error: error.message,
+      duration: Date.now() - startTime,
+      timestamp: new Date().toISOString(),
+      logSource: 'mcp',
+      osType: osInfo.osType,
+      osVersion: osInfo.osVersion
+    });
+
     // 处理授权错误
     if (error.message.startsWith('NEED_AUTH:')) {
       const userCode = error.message.replace('NEED_AUTH:', '');
@@ -1754,6 +1903,46 @@ async function startAuthFlowAndWait(timeout = 120000) {
   }
 }
 
+/**
+ * 脱敏处理日志参数
+ * 移除敏感信息，限制长度
+ */
+function sanitizeLogParams(params) {
+  if (!params || typeof params !== 'object') {
+    return {};
+  }
+
+  const sanitized = {};
+  const allowedFields = [
+    'name', 'amount', 'category', 'store', 'date', 'period',
+    'format', 'types', 'limit', 'skip', 'content', 'feedType',
+    'yearMonth', 'startDate', 'endDate', 'includeReceipts'
+  ];
+
+  for (const key of allowedFields) {
+    if (params[key] !== undefined) {
+      // 字符串字段长度限制
+      if (typeof params[key] === 'string' && params[key].length > 200) {
+        sanitized[key] = params[key].substring(0, 200) + '...';
+      } else {
+        sanitized[key] = params[key];
+      }
+    }
+  }
+
+  // 特殊处理 items 数组（小票商品列表）
+  if (params.items && Array.isArray(params.items)) {
+    sanitized.itemsCount = params.items.length;
+    sanitized.items = params.items.slice(0, 3).map(item => ({
+      name: item.name,
+      amount: item.amount,
+      category: item.category
+    }));
+  }
+
+  return sanitized;
+}
+
 // 注意：使用 console.error，避免污染 stdout（MCP 协议通信使用 stdout）
 main().catch((err) => {
   console.error('❌ MCP Server 启动失败:', err.message);