@seqyuan/annovibe 0.8.53 → 0.8.55

package/bin/annovibe-im-gateway.js

@@ -7,7 +7,9 @@
  *
  * Reads project IM configs from localhost:PORT/api/im/projects,
  * connects each enabled bot to WeCom WebSocket, and routes
- * incoming messages through /api/im/turn (SSE streaming).
+ * incoming messages through /api/im/turn (SSE streaming with delta push).
+ *
+ * Auto-started by annovibe supervisor; can also run standalone for debugging.
  */
 "use strict";
 
@@ -16,11 +18,41 @@ const http = require("http");
 const https = require("https");
 const os = require("os");
 const path = require("path");
+const crypto = require("crypto");
 const WebSocket = require("ws");
 
 const REVISION_DIGITS = ["\u200b", "\u200c", "\u200d", "\u2060", "\ufeff"];
 const REVISION_SUFFIX_PATTERN = /[\u200b\u200c\u200d\u2060\ufeff]+$/u;
 
+// ── Cancel command vocabulary ───────────────────────────────────────
+
+const IM_CANCEL_COMMANDS = new Set([
+  "取消", "停止", "终止", "cancel", "stop", "abort",
+]);
+
+function normalizeImCancelText(text) {
+  return text.trim()
+    .replace(REVISION_SUFFIX_PATTERN, "")
+    .replace(/[\u200b\u200c\u200d\u2060\ufeff\u00ad\ufe00-\ufe0f]/g, "")
+    .trim().toLowerCase().replace(/\s+/g, "");
+}
+
+function isImCancelCommand(text) {
+  return IM_CANCEL_COMMANDS.has(normalizeImCancelText(text));
+}
+
+// ── Reply text cleanup ──────────────────────────────────────────────
+
+const SHOW_WIDGET_FENCE_RE = /```\s*show-widget[\s\S]*?```/gi;
+const SHOW_WIDGET_PARTIAL_RE = /```\s*show-widget[\s\S]*$/;
+
+function cleanImReplyText(text) {
+  let cleaned = String(text || "").replace(SHOW_WIDGET_FENCE_RE, "");
+  cleaned = cleaned.replace(SHOW_WIDGET_PARTIAL_RE, "");
+  cleaned = cleaned.replace(/\n{3,}/g, "\n\n").trim();
+  return cleaned;
+}
+
 // ── Config ──────────────────────────────────────────────────────────
 
 function envFirst(...names) {
@@ -31,14 +63,29 @@ function envFirst(...names) {
   return undefined;
 }
 
-const ANNOvibe_PORT = envFirst("ANNOVIBE_PORT", "PORT") ?? "30141";
-const BASE_URL = `http://127.0.0.1:${ANNOvibe_PORT}`;
-const GATEWAY_TOKEN = process.env.ANNOVIBE_GATEWAY_TOKEN?.trim() || "";
-
 function getAgentDir() {
   return envFirst("PI_AGENT_DIR") ?? path.join(os.homedir(), ".pi", "agent");
 }
 
+function readAnnovibeState() {
+  const statePath = path.join(getAgentDir(), "annovibe.json");
+  try {
+    return JSON.parse(fs.readFileSync(statePath, "utf8"));
+  } catch {
+    return null;
+  }
+}
+
+function getAnnovibePort() {
+  const state = readAnnovibeState();
+  if (state?.port) return String(state.port);
+  return envFirst("ANNOVIBE_PORT", "PORT") ?? "30141";
+}
+
+function getBaseUrl() {
+  return `http://127.0.0.1:${getAnnovibePort()}`;
+}
+
 function readGatewayToken() {
   const statePath = path.join(getAgentDir(), "im", "gateway.json");
   try {
@@ -51,11 +98,15 @@ function readGatewayToken() {
 
 // ── HTTP helpers ────────────────────────────────────────────────────
 
+function getToken() {
+  return process.env.ANNOVIBE_GATEWAY_TOKEN?.trim() || readGatewayToken();
+}
+
 function requestJson(method, pathname, body) {
-  const url = new URL(pathname, BASE_URL);
+  const url = new URL(pathname, getBaseUrl());
   const payload = body === undefined ? undefined : JSON.stringify(body);
   const lib = url.protocol === "https:" ? https : http;
-  const token = GATEWAY_TOKEN || readGatewayToken();
+  const token = getToken();
 
   return new Promise((resolve, reject) => {
     const req = lib.request(
@@ -78,7 +129,8 @@ function requestJson(method, pathname, body) {
             return;
           }
           if (res.statusCode >= 400) {
-            reject(new Error(parsed.error || parsed.reply || `HTTP ${res.statusCode}`));
+            const msg = parsed.error || parsed.reply || `HTTP ${res.statusCode}`;
+            reject(new Error(formatImApiError(res.statusCode, msg)));
             return;
           }
           resolve(parsed);
@@ -91,11 +143,24 @@ function requestJson(method, pathname, body) {
   });
 }
 
-function requestImTurnStream(body) {
-  const url = new URL("/api/im/turn", BASE_URL);
+function formatImApiError(statusCode, message) {
+  if (statusCode === 401) {
+    return `${message}. Ensure annovibe is running in this Linux account and gateway token is synced (restart annovibe-im-gateway after saving IM settings).`;
+  }
+  if (statusCode === 403) {
+    return `${message}. annovibe-im-gateway must reach annovibe on localhost.`;
+  }
+  return message;
+}
+
+/**
+ * Consume SSE turn stream, yielding deltas and status changes to callbacks.
+ */
+function requestImTurnStream(body, callbacks) {
+  const url = new URL("/api/im/turn", getBaseUrl());
   const payload = JSON.stringify(body);
   const lib = url.protocol === "https:" ? https : http;
-  const token = GATEWAY_TOKEN || readGatewayToken();
+  const token = getToken();
 
   return new Promise((resolve, reject) => {
     const req = lib.request(
@@ -134,8 +199,15 @@ function requestImTurnStream(body) {
               if (!line.startsWith("data: ")) continue;
               try {
                 const event = JSON.parse(line.slice(6));
-                if (event && event.type === "done") doneEvent = event;
-              } catch { /* ignore */ }
+                if (!event) continue;
+                if (event.type === "done") {
+                  doneEvent = event;
+                } else if (event.type === "delta" && callbacks.onDelta) {
+                  callbacks.onDelta(event.text);
+                } else if (event.type === "status" && callbacks.onStatus) {
+                  callbacks.onStatus(event.phase);
+                }
+              } catch { /* ignore malformed frames */ }
             }
           }
         });
@@ -179,6 +251,12 @@ function stripRevisionSuffix(text) {
   return text.replace(REVISION_SUFFIX_PATTERN, "");
 }
 
+function shouldAcceptGroupMessage(message, requireMention) {
+  if (!message.chatId) return true;  // DM, always accept
+  if (!requireMention) return true;  // group chat, mention not required
+  return message.mentionedBot;       // group chat, mention required
+}
+
 // ── WeCom WebSocket client ──────────────────────────────────────────
 
 class WeComWsClient {
@@ -416,57 +494,93 @@ class ProjectWeComBridge {
     const message = extractInboundMessage(frame);
     if (!message) return;
 
-    // Skip group messages if requireMention and not mentioned
-    if (message.chatId && this.project.requireMentionInGroup && !message.mentionedBot) {
-      return;
-    }
+    // Group message filtering — respect requireMentionInGroup config
+    if (!shouldAcceptGroupMessage(message, this.project.requireMentionInGroup)) return;
 
-    // For group chats, skip if not mentioned at all
-    if (message.chatId && !message.mentionedBot) {
+    // ── Cancel command intercept ──
+    if (isImCancelCommand(message.content)) {
+      const reqId = message.reqId;
+      try {
+        const result = await requestJson("POST", "/api/im/cancel", {
+          cwd: this.project.cwd,
+          userId: message.userId,
+        });
+        const text = typeof result.reply === "string" && result.reply.trim()
+          ? result.reply.trim()
+          : (result.cancelled ? "已取消当前任务。" : "当前没有可取消的任务。");
+        if (this.client?.isConnected) {
+          const streamId = `${reqId}-cancel-${Date.now()}`;
+          await this.client.replyStream(reqId, streamId, text, true);
+        }
+      } catch (error) {
+        console.error(`[im] cancel failed for ${this.project.cwd} user ${message.userId}: ${String(error)}`);
+        if (this.client?.isConnected) {
+          const streamId = `${reqId}-cancel-${Date.now()}`;
+          await this.client.replyStream(reqId, streamId, `Error: ${String(error)}`, true);
+        }
+      }
       return;
     }
 
+    // ── Normal turn with streaming ──
     const reqId = message.reqId;
     const streamId = `${reqId}-stream`;
     let revision = 0;
+    const startedAt = Date.now();
+    let refreshTimer = null;
+    let toolsRunning = false;
+    let lastText = "";
 
     const pushText = async (text) => {
       revision += 1;
       if (this.client?.isConnected) {
-        await this.client.replyStream(reqId, streamId, applyRevisionSuffix(text, revision), false);
+        await this.client.replyStream(reqId, streamId, applyRevisionSuffix(text, revision), false).catch(() => undefined);
       }
     };
 
     const finishText = async (text) => {
       revision += 1;
       if (this.client?.isConnected) {
-        await this.client.replyStream(reqId, streamId, applyRevisionSuffix(text, revision), true);
+        await this.client.replyStream(reqId, streamId, applyRevisionSuffix(text, revision), true).catch(() => undefined);
       }
     };
 
     try {
-      // Start processing placeholder
-      await pushText(`(working 1s)`);
-
-      const elapsedInterval = setInterval(async () => {
-        const elapsed = Math.floor((Date.now() - startTime) / 1000);
-        await pushText(`(working ${elapsed}s)`);
-      }, 3000);
+      // Start processing
+      await pushText("(working 1s)");
 
-      const startTime = Date.now();
+      refreshTimer = setInterval(() => {
+        if (toolsRunning) {
+          const elapsed = Math.max(1, Math.floor((Date.now() - startedAt) / 1000));
+          void pushText(`(working ${elapsed}s)`).catch(() => undefined);
+        }
+      }, 5000);
 
-      const result = await requestImTurnStream({
-        cwd: this.project.cwd,
-        userId: message.userId,
-        message: message.content,
-        chatId: message.chatId,
-      });
+      const result = await requestImTurnStream(
+        { cwd: this.project.cwd, userId: message.userId, message: message.content, chatId: message.chatId },
+        {
+          onStatus(phase) {
+            toolsRunning = phase === "running_tools" || phase === "waiting_model";
+          },
+          onDelta(text) {
+            toolsRunning = false;
+            lastText = text;
+            // Schedule push — debounced by WeCom rate limits via replyStream
+            void pushText(text).catch(() => undefined);
+          },
+        },
+      );
 
-      clearInterval(elapsedInterval);
+      if (refreshTimer) clearInterval(refreshTimer);
 
-      const reply = stripRevisionSuffix(result.reply || "");
-      await finishText(reply || "(no response)");
+      const rawReply = typeof result.reply === "string" && result.reply.trim()
+        ? result.reply.trim()
+        : "No reply from annovibe.";
+      const cleaned = cleanImReplyText(lastText || rawReply);
+      const finishTextStr = cleaned || "No reply from annovibe.";
+      await finishText(finishTextStr);
     } catch (error) {
+      if (refreshTimer) clearInterval(refreshTimer);
       await finishText(`Error: ${error.message}`);
     }
   }
@@ -485,7 +599,7 @@ class ImGateway {
     // Write gateway state
     const imDir = path.join(getAgentDir(), "im");
     try { fs.mkdirSync(imDir, { recursive: true }); } catch {}
-    const token = require("crypto").randomBytes(32).toString("hex");
+    const token = crypto.randomBytes(32).toString("hex");
     fs.writeFileSync(
       path.join(imDir, "gateway.json"),
       JSON.stringify({
@@ -496,13 +610,14 @@ class ImGateway {
     );
 
     console.error(`[im] Gateway token: ${token.slice(0, 8)}...`);
+    console.error(`[im] Annovibe port: ${getAnnovibePort()}`);
 
     // Start config poll
-    await this.pollProjects();
-    this.pollTimer = setInterval(() => this.pollProjects(), 30000);
+    await this.refreshProjects();
+    this.pollTimer = setInterval(() => this.refreshProjects(), 30000);
   }
 
-  async pollProjects() {
+  async refreshProjects() {
     if (this.stopped) return;
     try {
       const data = await requestJson("GET", "/api/im/projects");
@@ -513,24 +628,20 @@ class ImGateway {
         if (!project.cwd || !project.botId) continue;
         activeCwds.add(project.cwd);
 
-        const key = project.cwd;
-        let bridge = this.bridges.get(key);
+        const bridge = this.bridges.get(project.cwd);
         if (bridge) {
-          // Update project info
           bridge.project = project;
         } else {
-          bridge = new ProjectWeComBridge(project);
-          this.bridges.set(key, bridge);
-          void bridge.start();
+          const newBridge = new ProjectWeComBridge(project);
+          this.bridges.set(project.cwd, newBridge);
+          void newBridge.start();
         }
       }
 
-      // Stop bridges for removed projects
       for (const [cwd, bridge] of this.bridges) {
-        if (!activeCwds.has(cwd)) {
-          await bridge.stop();
-          this.bridges.delete(cwd);
-        }
+        if (activeCwds.has(cwd)) continue;
+        await bridge.stop();
+        this.bridges.delete(cwd);
       }
     } catch (error) {
       console.error(`[im] Failed to poll projects: ${error.message}`);
@@ -545,7 +656,6 @@ class ImGateway {
     }
     this.bridges.clear();
 
-    // Clear gateway state
     try {
       const statePath = path.join(getAgentDir(), "im", "gateway.json");
       fs.writeFileSync(statePath, JSON.stringify({ token: "" }, null, 2));
@@ -562,5 +672,4 @@ process.on("SIGTERM", () => { void gateway.stop().then(() => process.exit(0)); }
 
 void gateway.start();
 
-// Keep process alive
 setInterval(() => {}, 60000);

package/bin/pi-web.js

@@ -37,6 +37,7 @@ const stateFile = path.join(agentDir, "annovibe.json");
 const legacyStateFile = path.join(agentDir, "pidex.json");
 const logFile = path.join(agentDir, "annovibe.log");
 const legacyLogFile = path.join(agentDir, "pidex.log");
+const imGatewayLogFile = path.join(agentDir, "annovibe-im-gateway.log");
 const STOP_TERM_TIMEOUT_MS = 6000;
 const STOP_KILL_TIMEOUT_MS = 2000;
 const PROCESS_TITLE = "annovibe";
@@ -487,6 +488,8 @@ function renderState(state, json = false) {
     restartStartedAt: state?.restartStartedAt ?? null,
     logFile,
     stateFile,
+    imGatewayPid: state?.imGatewayPid && isPidAlive(state.imGatewayPid) ? state.imGatewayPid : null,
+    imGatewayLogFile: state?.imGatewayLogFile ?? imGatewayLogFile,
   };
   if (json) return JSON.stringify(payload, null, 2);
   if (payload.status === "stopped") {
@@ -508,6 +511,7 @@ function renderState(state, json = false) {
       `restart: pending${payload.installedVersion ? ` for v${payload.installedVersion}` : ""}`,
     ] : []),
     `log: ${payload.logFile}`,
+    ...(payload.imGatewayPid ? [`im-gateway pid: ${payload.imGatewayPid}`, `im-gateway log: ${payload.imGatewayLogFile}`] : ["im-gateway: not started"]),
   ].join("\n");
 }
 
@@ -563,6 +567,21 @@ async function stopManagedServer(quiet = false) {
     stopped = portStop.stopped && stopped;
   }
 
+  // Stop orphaned IM gateway (in case supervisor died but gateway lived on)
+  let imGatewayStopped = true;
+  try {
+    const imStatePath = path.join(agentDir, "im", "gateway.json");
+    if (fs.existsSync(imStatePath)) {
+      const imState = JSON.parse(fs.readFileSync(imStatePath, "utf8"));
+      if (imState?.pid && isPidAlive(imState.pid)) {
+        imGatewayStopped = await terminatePid(imState.pid);
+        if (!quiet) console.log(`annovibe stop: stopped im-gateway pid ${imState.pid}`);
+      }
+    }
+  } catch {
+    // ignore errors reading IM gateway state
+  }
+
   if (stopped) {
     removeState();
     if (!quiet) {
@@ -572,6 +591,7 @@ async function stopManagedServer(quiet = false) {
         console.log("annovibe stop: state was stale; cleaned up");
       }
     }
+    if (!imGatewayStopped) return 1;
     return 0;
   }
   if (!quiet) console.error(`annovibe stop: failed to stop annovibe process${verifiedCount === 1 ? "" : "es"}`);
@@ -671,9 +691,10 @@ Usage:
   annovibe [options]
   annovibe start          Start annovibe in background
   annovibe restart        Stop then start annovibe in background
-  annovibe stop           Stop background annovibe
+  annovibe stop           Stop background annovibe and im-gateway (and orphaned processes)
   annovibe status [--json] Show background server status
   annovibe logs [-f]      Show background server logs
+  annovibe im-gateway     Run WeCom IM sidecar standalone (auto-started by annovibe start)
   annovibe passwd          Change password (or set if none)
   annovibe passwd --reset   Remove password (disable auth)
   annovibe update          Update to the latest version
@@ -744,6 +765,20 @@ if (firstPos === "restart") {
   return;
 }
 
+if (firstPos === "im-gateway") {
+  console.error("Note: im-gateway is auto-started by annovibe start. Use this command only for standalone debugging.");
+  const gatewayScript = path.join(__dirname, "annovibe-im-gateway.js");
+  const child = spawn(process.execPath, [gatewayScript, ...positionals.slice(1)], {
+    stdio: "inherit",
+    env: process.env,
+  });
+  child.on("exit", (code, signal) => {
+    if (signal) process.exit(1);
+    process.exit(code ?? 0);
+  });
+  return;
+}
+
 if (firstPos === "update") {
   console.log(`\n  Updating ${PKG_NAME} to latest version...\n`);
   const npmExecPath = process.env.npm_execpath;
@@ -1055,6 +1090,27 @@ async function runServerProcess() {
   });
   let restarting = false;
 
+  // Spawn IM gateway as a child of the supervisor
+  const gatewayScript = path.join(__dirname, "annovibe-im-gateway.js");
+  let imGatewayChild = null;
+  if (fs.existsSync(gatewayScript)) {
+    const gwFd = fs.openSync(imGatewayLogFile, "a");
+    imGatewayChild = spawn(process.execPath, [gatewayScript], {
+      cwd: pkgDir,
+      stdio: ["ignore", gwFd, gwFd],
+      env: {
+        ...process.env,
+        ANNOVIBE_SUPERVISOR_PID: String(process.pid),
+        ANNOVIBE_IM_GATEWAY_MANAGED: "1",
+      },
+    });
+    fs.closeSync(gwFd);
+    imGatewayChild.on("exit", (code, signal) => {
+      const reason = signal ? `signal ${signal}` : `code ${code ?? "null"}`;
+      console.error(`annovibe: im-gateway exited with ${reason}`);
+    });
+  }
+
   const writeCurrentState = (patch = {}) => {
     const current = readState() ?? {};
     writeState({
@@ -1063,6 +1119,8 @@ async function runServerProcess() {
       command: getServerCommand(),
       supervisorPid: process.pid,
       nextPid: child.pid ?? null,
+      imGatewayPid: imGatewayChild?.pid ?? null,
+      imGatewayLogFile,
       port: String(port),
       hostname,
       url,
@@ -1097,6 +1155,7 @@ async function runServerProcess() {
   const shutdown = async () => {
     stopAutoRestartWatcher();
     await terminatePid(child.pid);
+    if (imGatewayChild?.pid) await terminatePid(imGatewayChild.pid);
     if (!restarting) removeState();
     process.exit(0);
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seqyuan/annovibe",
-  "version": "0.8.53",
+  "version": "0.8.55",
   "description": "AI-native bioinformatics workspace by Annoroad",
   "license": "MIT",
   "bin": {