@shun-js/aibaiban-server 1.1.9 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shun-js/aibaiban-server",
-  "version": "1.1.9",
+  "version": "1.2.0",
   "description": "aibaiban.com server",
   "keywords": [
     "ai aibaiban"
@@ -45,5 +45,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "88720ea1ee9b70de855692877cb23008f3bb539e"
+  "gitHead": "7b094023fede487784f42ca71277997906841cb1"
 }

package/server/service/LLMServiceV2.js

@@ -12,6 +12,44 @@ const llm = OpenAIAPI(finalLLMConfig);
 const modelName = finalLLMConfig.modelName;
 const thinking = finalLLMConfig.thinking;
 
+/**
+ * 从 LLM 返回文本中提取 JSON（兼容 markdown 代码块、前后有多余文字等情况）
+ */
+function extractJSON(text) {
+  if (typeof text === 'object' && text !== null) return text;
+  const str = String(text).trim();
+
+  // 1. 尝试直接解析
+  try {
+    return JSON.parse(str);
+  } catch (_) {
+    /* ignore */
+  }
+
+  // 2. 尝试从 markdown 代码块提取
+  const codeBlockMatch = str.match(/```(?:json)?\s*\n?([\s\S]*?)\n?```/);
+  if (codeBlockMatch) {
+    try {
+      return JSON.parse(codeBlockMatch[1].trim());
+    } catch (_) {
+      /* ignore */
+    }
+  }
+
+  // 3. 尝试提取第一个 {...} 块
+  const firstBrace = str.indexOf('{');
+  const lastBrace = str.lastIndexOf('}');
+  if (firstBrace !== -1 && lastBrace > firstBrace) {
+    try {
+      return JSON.parse(str.slice(firstBrace, lastBrace + 1));
+    } catch (_) {
+      /* ignore */
+    }
+  }
+
+  throw new Error(`Cannot parse JSON from LLM response: ${str.slice(0, 200)}`);
+}
+
 /**
  * drawAgentV2 - 对话式 Agent
  * 1 次决策 LLM → reply / generate(elaborate+generate) / irrelevant
@@ -50,11 +88,10 @@ exports.drawAgent = async (req, res) => {
           llm,
           modelName,
           thinking,
-          isJson: true,
           messages: [{ role: 'system', content: prompts.AGENT_PROMPT }, ...messages],
         },
         agentEndCallback: (result) => {
-          decision = result;
+          decision = extractJSON(result);
           const duration = Date.now() - startTime;
           req.logger.info(methodName, 'decision', JSON.stringify(decision), `${duration}ms`);
           chatFeishuMsg(req, `v2-decision-${decision.action}`);