@shun-js/aibaiban-server 1.2.5 → 1.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shun-js/aibaiban-server",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "aibaiban.com server",
   "keywords": [
     "ai aibaiban"
@@ -45,5 +45,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "1f7c6983686ef774df53ad8aa2ec452ec439d8e9"
+  "gitHead": "7f2b401901bcf0070e9349fab5e18b8a7c8484ee"
 }

package/server/service/LLMService.js

@@ -164,6 +164,14 @@ exports.drawAgent = async (req, res) => {
   req.logger.info(methodName, 'lastUserMsg', lastUserMsg);
   chatFeishuMsg(req, `${lastUserMsg}`);
 
+  // 清洗对话历史：将前端确认文案替换为简短标记，避免 LLM 模仿自然语言回复
+  const cleanedMessages = messages.map((m) => {
+    if (m.role === 'assistant' && /^[✅❌]/.test(m.content)) {
+      return { ...m, content: '[已执行]' };
+    }
+    return m;
+  });
+
   try {
     const startTime = Date.now();
 
@@ -171,26 +179,46 @@ exports.drawAgent = async (req, res) => {
     res.streaming(`data: ${JSON.stringify({ type: 'status', step: 'thinking' })}\n\n`);
 
     let decision = null;
-    await runAgents([
-      {
-        agentStartCallback: () => {
-          req.logger.info(methodName, 'step: agent decision');
-        },
-        agentRequestOptions: {
-          llm,
-          modelName,
-          thinking,
-          isJson: true,
-          messages: [{ role: 'system', content: prompts.AGENT_PROMPT }, ...messages],
-        },
-        agentEndCallback: (result) => {
-          decision = result;
-          const duration = Date.now() - startTime;
-          req.logger.info(methodName, 'decision', JSON.stringify(decision), `${duration}ms`);
-          chatFeishuMsg(req, `decision-${decision.action}`);
+    try {
+      await runAgents([
+        {
+          agentStartCallback: () => {
+            req.logger.info(methodName, 'step: agent decision');
+          },
+          agentRequestOptions: {
+            llm,
+            modelName,
+            thinking,
+            isJson: true,
+            messages: [{ role: 'system', content: prompts.AGENT_PROMPT }, ...cleanedMessages],
+          },
+          agentEndCallback: (result) => {
+            decision = result;
+            const duration = Date.now() - startTime;
+            req.logger.info(methodName, 'decision', JSON.stringify(decision), `${duration}ms`);
+            chatFeishuMsg(req, `decision-${decision.action}`);
+          },
         },
-      },
-    ]);
+      ]);
+    } catch (jsonErr) {
+      // LLM 未返回 JSON，兜底为 reply
+      req.logger.warn(methodName, 'JSON parse fallback', jsonErr.message);
+      const rawText = jsonErr.message.replace('Cannot parse JSON from LLM response:', '').trim();
+      req.logger.info(methodName, 'LLM raw response', rawText);
+
+      // 尝试从原始文本中提取 JSON（LLM 可能在 JSON 前后加了多余文字）
+      const jsonMatch = rawText.match(/\{[\s\S]*\}/);
+      if (jsonMatch) {
+        try {
+          decision = JSON.parse(jsonMatch[0]);
+          req.logger.info(methodName, 'extracted JSON from raw text', JSON.stringify(decision));
+        } catch {
+          decision = { action: 'reply', message: '好的，请告诉我你想画什么图表？' };
+        }
+      } else {
+        decision = { action: 'reply', message: '好的，请告诉我你想画什么图表？' };
+      }
+    }
 
     // 2. 分发
     if (decision.action === 'reply') {
@@ -312,7 +340,11 @@ exports.drawAgent = async (req, res) => {
   } catch (error) {
     req.logger.error(methodName, 'error', error);
     errorFeishuMsg(req, error.message);
-    res.streaming(`data: ${JSON.stringify({ type: 'error', message: error.message })}\n\n`);
+    // 对用户隐藏内部错误细节
+    const userMessage = error.message?.includes('Cannot parse JSON')
+      ? '请求处理失败，请重新描述你的需求'
+      : '服务暂时出错，请稍后重试';
+    res.streaming(`data: ${JSON.stringify({ type: 'error', message: userMessage })}\n\n`);
     res.streamingEnd();
   }
 };

package/server/util/prompt-agent.js

@@ -45,7 +45,10 @@ module.exports = {
 - generate 时 description 要尽可能详细完整
 - canvas 时 description 要包含形状、颜色、位置等用户提到的所有细节
 
-只回复 JSON。`,
+严格要求：
+1. 你的回复必须是且仅是一个合法的 JSON 对象，不要包含任何其他文字、解释或 markdown 标记。
+2. 每条用户消息都是独立的新请求，即使对话历史中有之前生成过图表的记录，也要重新判断当前消息的意图。
+3. 永远不要回复"已生成"、"已完成"之类的文字，你只负责决策，不负责执行。`,
 
   /**
    * 图表内容细化
@@ -62,7 +65,7 @@ module.exports = {
 - classDiagram: {"classes": [{"name": "", "attributes": [...], "methods": [...]}], "relations": [...]}
 - erDiagram: {"entities": [{"name": "", "attributes": [...]}], "relations": [...]}
 
-只回复 JSON。`,
+严格要求：你的回复必须是且仅是一个合法的 JSON 对象，不要包含任何其他文字、解释或 markdown 标记。`,
 
   /**
    * Mermaid 生成

package/views/index.html

@@ -105,7 +105,7 @@
     <script
       type="module"
       crossorigin
-      src="https://static-small.vincentqiao.com/aibaiban/static/index-DCJwq4XN.js"
+      src="https://static-small.vincentqiao.com/aibaiban/static/index-BKiaaj_x.js"
     ></script>
     <link
       rel="modulepreload"