chaimi-keep-mcp 3.1.42 → 3.1.44-beta.1

package/package.json

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

package/server.js

@@ -320,6 +320,17 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
           required: ['name', 'amount', 'category', 'agentType', 'apiProvider', 'rawInput'],
         },
       },
+      {
+        name: 'get_text_parse_prompt',
+        description: '获取文字记账解析的Prompt模板，用于指导大模型如何解析用户输入的记账文字。返回的Prompt应作为system message，配合用户输入的记账文字作为user message调用大模型',
+        inputSchema: {
+          type: 'object',
+          properties: {
+            agentType: { type: 'string', description: '【推荐自动填充】Agent类型，如：claude-desktop、cursor、openclaw、workbuddy、trae' },
+            apiProvider: { type: 'string', description: '【推荐自动填充】AI服务提供商，如：anthropic、openai、doubao、aliyun' },
+          },
+        },
+      },
       {
         name: 'get_parse_prompt',
         description: '获取小票图片解析的Prompt模板，用于指导大模型如何格式化输出小票信息。返回的Prompt应作为system message，配合小票图片作为user message调用大模型',
@@ -483,11 +494,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 +656,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 +831,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 || '未知商品';
@@ -963,7 +1098,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;
@@ -1005,7 +1140,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;
@@ -1046,7 +1181,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 || {};
@@ -1094,7 +1229,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 || {};
@@ -1140,7 +1275,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 || {};
@@ -1194,7 +1329,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 || '未知收入';
@@ -1233,23 +1368,23 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       }
 
       case 'get_text_parse_prompt': {
-        // 获取文字记账解析 Prompt
-        const textParseResult = await callMcpHub('getTextParsePrompt', {}, token);
+        // 调用 mcpPrompt 云函数获取文字记账解析 Prompt
+        const promptResult = await callMcpPrompt('getTextParsePrompt', {}, token);
 
-        if (textParseResult.success) {
+        if (promptResult.success) {
           result = {
             success: true,
             data: {
-              prompt: textParseResult.data.prompt,
-              currentDate: textParseResult.data.currentDate,
-              currentTime: textParseResult.data.currentTime,
-              instructions: '请将返回的 prompt 作为 system message，把用户输入的记账文字作为 user message，调用大模型解析。解析完成后，调用 save_expense 或 save_income 工具保存结果。'
+              prompt: promptResult.data.prompt,
+              currentDate: promptResult.data.currentDate,
+              currentTime: promptResult.data.currentTime,
+              instructions: promptResult.data.instructions
             }
           };
-          userMessage = `✅ 获取文字记账解析 Prompt 成功\n\n当前日期: ${textParseResult.data.currentDate}\n当前时间: ${textParseResult.data.currentTime}\n\n## Prompt\n\n请将以下内容作为 system message 发送给大模型：\n\n\`\`\`\n${textParseResult.data.prompt}\n\`\`\`\n\n## 使用说明\n\n1. 将上面的 Prompt 作为 system message\n2. 将用户输入的记账文字（如"午餐 24块"）作为 user message\n3. 调用大模型解析，获取 JSON 结果\n4. 解析完成后，调用 save_expense 或 save_income 工具保存结果\n\n## 解析结果示例\n\n\`\`\`json\n{\n  "name": "午餐",\n  "amount": 24,\n  "category": "餐饮",\n  "datetime": "2026-04-14T12:30:00+08:00",\n  "transactionType": "expense"\n}\n\`\`\``;
+          userMessage = `✅ 获取文字记账解析 Prompt 成功\n\n当前日期: ${promptResult.data.currentDate}\n当前时间: ${promptResult.data.currentTime}\n\n## Prompt\n\n请将以下内容作为 system message 发送给大模型：\n\n\`\`\`\n${promptResult.data.prompt}\n\`\`\`\n\n## 使用说明\n\n1. 将上面的 Prompt 作为 system message\n2. 将用户输入的记账文字（如"午餐 24块"）作为 user message\n3. 调用大模型解析，获取 JSON 结果\n4. 解析完成后，调用 save_expense 或 save_income 工具保存结果`;
         } else {
-          result = { success: false, error: textParseResult.error };
-          userMessage = `❌ 获取文字记账解析 Prompt 失败：${textParseResult.error}`;
+          result = { success: false, error: promptResult.error };
+          userMessage = `❌ 获取文字记账解析 Prompt 失败：${promptResult.error}`;
         }
         break;
       }
@@ -1266,7 +1401,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 = {
@@ -1307,6 +1442,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:', '');
@@ -1766,6 +1914,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);