@shun-js/aibaiban-server 1.4.4 → 1.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shun-js/aibaiban-server",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "description": "aibaiban.com server",
   "keywords": [
     "ai aibaiban"
@@ -46,5 +46,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "9d4e0bbc0f78fe5d2fcd8eb17549f5beda097c7e"
+  "gitHead": "db63ae30bdb80c743746bdb4727bf3b9f0b62b83"
 }

package/server/service/CCService.js

@@ -44,7 +44,7 @@ exports.drawCC = async (req, res) => {
     const result = await sendPromptViaRelay({
       wsUrl: relayConfig.wsUrl,
       authSecret: relayConfig.authSecret,
-      userId: req.user?.id || "guest",
+      userId: req.headers.userid || "guest",
       prompt: lastUserMsg,
       timeout: relayConfig.timeout || 600000,
     });
@@ -52,10 +52,22 @@ exports.drawCC = async (req, res) => {
     clearInterval(keepalive);
     const duration = Date.now() - startTime;
 
-    // 解析 Claude Code 返回结果：[MERMAID]、[REPLY]、[IRRELEVANT] 前缀
+    // 解析 Claude Code 返回结果：[MERMAID]、[CLEAR_AND_MERMAID]、[REPLY]、[IRRELEVANT] 前缀
     const trimmed = result.trim();
 
-    if (trimmed.startsWith("[MERMAID]")) {
+    if (trimmed.startsWith("[CLEAR_AND_MERMAID]")) {
+      const code = trimmed.slice("[CLEAR_AND_MERMAID]".length).trim();
+      req.logger.info(
+        methodName,
+        "clear_and_mermaid",
+        code.length,
+        `${duration}ms`,
+      );
+      chatFeishuMsg(req, `cc-clear-mermaid-${code.length}chars`);
+      res.streaming(
+        `data: ${JSON.stringify({ type: "clear_and_mermaid", code, duration })}\n\n`,
+      );
+    } else if (trimmed.startsWith("[MERMAID]")) {
       const code = trimmed.slice("[MERMAID]".length).trim();
       req.logger.info(methodName, "mermaid", code.length, `${duration}ms`);
       chatFeishuMsg(req, `cc-mermaid-${code.length}chars`);

package/server/service/LLMService.js

@@ -4,7 +4,6 @@ const prompts = require("../util/prompt-agent.js");
 
 // util
 const { chatFeishuMsg, errorFeishuMsg } = require("../util/feishu.js");
-const { sendPromptViaRelay } = require("../util/relay-client.js");
 
 // LLM 配置
 const llmConfig = global.QZ_CONFIG.llm;
@@ -196,86 +195,6 @@ exports.drawAgent = async (req, res) => {
   try {
     const startTime = Date.now();
 
-    // LLM Mermaid 管线函数
-    const runLLMMermaidPipeline = async () => {
-      let elaboration = "";
-
-      await runAgents([
-        // elaborate
-        {
-          agentStartCallback: () => {
-            res.streaming(
-              `data: ${JSON.stringify({ type: "status", step: "elaborate" })}\n\n`,
-            );
-            req.logger.info(methodName, "step: elaborate");
-          },
-          agentRequestOptions: {
-            llm,
-            modelName,
-            thinking,
-            get messages() {
-              return [
-                {
-                  role: "user",
-                  content: prompts.ELABORATE_PROMPT.replace(
-                    "{input}",
-                    decision.description,
-                  ).replace("{diagramType}", decision.diagramType),
-                },
-              ];
-            },
-          },
-          agentEndCallback: (result) => {
-            elaboration = result;
-            req.logger.info(
-              methodName,
-              "elaboration",
-              String(elaboration).slice(0, 100) + "...",
-            );
-          },
-        },
-        // generate
-        {
-          agentStartCallback: () => {
-            res.streaming(
-              `data: ${JSON.stringify({ type: "status", step: "generate" })}\n\n`,
-            );
-            req.logger.info(methodName, "step: generate");
-          },
-          agentRequestOptions: {
-            llm,
-            modelName,
-            thinking,
-            get messages() {
-              return [
-                {
-                  role: "user",
-                  content: prompts.GENERATE_PROMPT.replace(
-                    "{diagramType}",
-                    decision.diagramType,
-                  ).replace("{elaboration}", elaboration),
-                },
-              ];
-            },
-          },
-          agentEndCallback: (result) => {
-            const mermaidCode = result;
-            const duration = Date.now() - startTime;
-            req.logger.info(
-              methodName,
-              "mermaidCode",
-              String(mermaidCode).slice(0, 100) + "...",
-              `total: ${duration}ms`,
-            );
-            chatFeishuMsg(req, `mermaid-${mermaidCode}`);
-            res.streaming(
-              `data: ${JSON.stringify({ type: "mermaid", code: mermaidCode, duration })}\n\n`,
-            );
-          },
-        },
-      ]);
-    };
-
     // 1. Agent 决策
     res.streaming(
       `data: ${JSON.stringify({ type: "status", step: "thinking" })}\n\n`,
@@ -351,85 +270,82 @@ exports.drawAgent = async (req, res) => {
     } else if (decision.action === "irrelevant") {
       res.streaming(`data: ${JSON.stringify({ type: "welcome" })}\n\n`);
     } else if (decision.action === "generate") {
-      // Docker 模式优先，降级到 LLM Mermaid
-      const relayConfig = global.QZ_CONFIG.relay;
-      const useDocker = relayConfig?.wsUrl;
-
-      if (useDocker) {
-        try {
-          req.logger.info(methodName, "using Docker mode via relay");
-          res.streaming(
-            `data: ${JSON.stringify({ type: "status", step: "docker" })}\n\n`,
-          );
-
-          // SSE keepalive 防超时
-          const keepalive = setInterval(() => {
-            res.streaming(": keepalive\n\n");
-          }, 15000);
-
-          const result = await sendPromptViaRelay({
-            wsUrl: relayConfig.wsUrl,
-            authSecret: relayConfig.authSecret,
-            userId: req.user?.id || "guest",
-            prompt: JSON.stringify({ messages }),
-            timeout: relayConfig.timeout || 600000,
-          });
-
-          clearInterval(keepalive);
+      let elaboration = "";
 
-          // 解析结果
-          if (result.startsWith("[IRRELEVANT]")) {
-            res.streaming(`data: ${JSON.stringify({ type: "welcome" })}\n\n`);
-          } else if (result.startsWith("[REPLY]")) {
-            const replyText = result.slice(7).trim();
+      await runAgents([
+        // elaborate
+        {
+          agentStartCallback: () => {
             res.streaming(
-              `data: ${JSON.stringify({ type: "message", content: replyText })}\n\n`,
+              `data: ${JSON.stringify({ type: "status", step: "elaborate" })}\n\n`,
             );
-          } else {
-            // 尝试解析为 excalidraw JSON
-            try {
-              const data = JSON.parse(result);
-              if (data.type === "excalidraw" && data.elements) {
-                const duration = Date.now() - startTime;
-                req.logger.info(
-                  methodName,
-                  "excalidraw elements",
-                  data.elements.length,
-                  `${duration}ms`,
-                );
-                chatFeishuMsg(
-                  req,
-                  `docker-excalidraw-${data.elements.length}-elements`,
-                );
-                res.streaming(
-                  `data: ${JSON.stringify({ type: "draw", elements: data.elements, duration })}\n\n`,
-                );
-              } else {
-                // 未知格式，当文字回复
-                res.streaming(
-                  `data: ${JSON.stringify({ type: "message", content: result })}\n\n`,
-                );
-              }
-            } catch {
-              // JSON 解析失败，当文字回复
-              res.streaming(
-                `data: ${JSON.stringify({ type: "message", content: result })}\n\n`,
-              );
-            }
-          }
-        } catch (dockerErr) {
-          req.logger.error(
-            methodName,
-            "Docker mode failed, fallback to LLM",
-            dockerErr.message,
-          );
-          // 降级到 LLM Mermaid 管线
-          await runLLMMermaidPipeline();
-        }
-      } else {
-        // 无 relay 配置，直接走 LLM Mermaid
-        await runLLMMermaidPipeline();
-      }
+            req.logger.info(methodName, "step: elaborate");
+          },
+          agentRequestOptions: {
+            llm,
+            modelName,
+            thinking,
+            get messages() {
+              return [
+                {
+                  role: "user",
+                  content: prompts.ELABORATE_PROMPT.replace(
+                    "{input}",
+                    decision.description,
+                  ).replace("{diagramType}", decision.diagramType),
+                },
+              ];
+            },
+          },
+          agentEndCallback: (result) => {
+            elaboration = result;
+            req.logger.info(
+              methodName,
+              "elaboration",
+              String(elaboration).slice(0, 100) + "...",
+            );
+          },
+        },
+        // generate
+        {
+          agentStartCallback: () => {
+            res.streaming(
+              `data: ${JSON.stringify({ type: "status", step: "generate" })}\n\n`,
+            );
+            req.logger.info(methodName, "step: generate");
+          },
+          agentRequestOptions: {
+            llm,
+            modelName,
+            thinking,
+            get messages() {
+              return [
+                {
+                  role: "user",
+                  content: prompts.GENERATE_PROMPT.replace(
+                    "{diagramType}",
+                    decision.diagramType,
+                  ).replace("{elaboration}", elaboration),
+                },
+              ];
+            },
+          },
+          agentEndCallback: (result) => {
+            const mermaidCode = result;
+            const duration = Date.now() - startTime;
+            req.logger.info(
+              methodName,
+              "mermaidCode",
+              String(mermaidCode).slice(0, 100) + "...",
+              `total: ${duration}ms`,
+            );
+            chatFeishuMsg(req, `mermaid-${mermaidCode}`);
+            res.streaming(
+              `data: ${JSON.stringify({ type: "mermaid", code: mermaidCode, duration })}\n\n`,
+            );
+          },
+        },
+      ]);
     } else if (decision.action === "canvas") {
       // 3. Canvas - Function Calling 直接画图
       res.streaming(