opencode-chat-channel 1.2.11 → 1.2.12

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAsVlD,eAAO,MAAM,iBAAiB,EAAE,MAyF/B,CAAC;AAEF,eAAe,iBAAiB,CAAC;AAMjC,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAuPlD,eAAO,MAAM,iBAAiB,EAAE,MA6G/B,CAAC;AAEF,eAAe,iBAAiB,CAAC;AAMjC,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC"}

package/dist/index.js

@@ -2,7 +2,17 @@
 import { join } from "path";
 
 // src/session-manager.ts
-import { readFileSync } from "fs";
+import { readFileSync, appendFileSync, mkdirSync } from "fs";
+var LOG_DIR = `${process.env["HOME"] ?? "/tmp"}/.local/share/opencode/log`;
+var LOG_FILE = `${LOG_DIR}/chat-channel.log`;
+function fileLog(level, message) {
+  try {
+    mkdirSync(LOG_DIR, { recursive: true });
+    const ts = new Date().toISOString();
+    appendFileSync(LOG_FILE, `${ts} [${level.toUpperCase()}] ${message}
+`, "utf8");
+  } catch {}
+}
 var SESSION_TTL_MS = 2 * 60 * 60 * 1000;
 
 class SessionManager {
@@ -320,28 +330,16 @@ function resolveEnabledChannels(client) {
   }
   return enabled;
 }
-function stripMarkdownTables(text) {
-  return text.split(`
-`).map((line) => {
-    const trimmed = line.trim();
-    if (/^\|[-:\s|]+\|$/.test(trimmed))
-      return "";
-    if (trimmed.startsWith("|"))
-      return "[表格内容]";
-    return line;
-  }).filter((line, i, arr) => !(line === "[表格内容]" && arr[i - 1] === "[表格内容]")).join(`
-`).trim();
-}
-var REASONING_PREVIEW_LEN = 200;
-var PATCH_THROTTLE_MS = 3000;
-function createMessageHandler(channel, sessionManager, client) {
+function createMessageHandler(channel, sessionManager, client, pendingMap) {
   return async (msg) => {
     const { userId, replyTarget, text } = msg;
+    const incomingMsg = `[${channel.name}] 收到消息: "${text.slice(0, 80)}${text.length > 80 ? "..." : ""}"`;
+    fileLog("info", incomingMsg);
     await client.app.log({
       body: {
         service: "chat-channel",
         level: "info",
-        message: `[${channel.name}] 收到消息: "${text.slice(0, 80)}${text.length > 80 ? "..." : ""}"`,
+        message: incomingMsg,
         extra: { userId, replyTarget }
       }
     });
@@ -354,20 +352,14 @@ function createMessageHandler(channel, sessionManager, client) {
       sessionId = await sessionManager.getOrCreate(userId);
     } catch (err) {
       const errorMsg = err?.message ?? String(err);
+      const errMsg1 = `[${channel.name}] 获取 session 失败: ${errorMsg}`;
+      fileLog("error", errMsg1);
       await client.app.log({
-        body: { service: "chat-channel", level: "error", message: `[${channel.name}] 获取 session 失败: ${errorMsg}`, extra: { userId } }
+        body: { service: "chat-channel", level: "error", message: errMsg1, extra: { userId } }
       });
       await channel.send(replyTarget, `⚠️ 出错了：${errorMsg}`);
       return;
     }
-    let eventStream = null;
-    try {
-      eventStream = await client.event.subscribe();
-    } catch (err) {
-      await client.app.log({
-        body: { service: "chat-channel", level: "warn", message: `[${channel.name}] SSE 订阅失败，降级为轮询: ${String(err)}` }
-      });
-    }
     try {
       await client.session.promptAsync({
         path: { id: sessionId },
@@ -387,123 +379,54 @@ function createMessageHandler(channel, sessionManager, client) {
       }
       return;
     }
-    await consumeSessionEvents(client, channel, sessionId, replyTarget, thinkingMsgId, eventStream);
+    await waitForSessionAndReply(client, channel, sessionId, replyTarget, thinkingMsgId, pendingMap);
   };
 }
-async function consumeSessionEvents(client, channel, sessionId, replyTarget, thinkingMsgId, eventStream) {
-  let lastPatchAt = 0;
-  let reasoningAccum = "";
-  const log = (level, message) => void client.app.log({ body: { service: "chat-channel", level, message } });
-  async function throttledPatch(text, force = false) {
-    if (!thinkingMsgId || !channel.updateThinkingCard)
-      return;
-    const now = Date.now();
-    if (!force && now - lastPatchAt < PATCH_THROTTLE_MS)
-      return;
-    lastPatchAt = now;
-    await channel.updateThinkingCard(thinkingMsgId, text);
-  }
-  if (eventStream) {
-    let alreadyDone = false;
-    try {
-      const statusRes = await client.session.status();
-      const allStatuses = statusRes.data ?? {};
-      const sessionStatus = allStatuses[sessionId];
-      if (!sessionStatus || sessionStatus.type === "idle") {
-        alreadyDone = true;
-        log("info", `[${channel.name}] session 已完成，跳过 SSE 等待`);
-      }
-    } catch {}
-    if (!alreadyDone) {
-      const SSE_TIMEOUT_MS = 3 * 60 * 1000;
-      const abortController = new AbortController;
-      const timeoutId = setTimeout(() => {
-        log("warn", `[${channel.name}] SSE 等待超时，强制结束`);
-        abortController.abort();
-      }, SSE_TIMEOUT_MS);
-      try {
-        for await (const event of eventStream.stream) {
-          if (abortController.signal.aborted)
-            break;
-          if (!isSessionEvent(event, sessionId))
-            continue;
-          if (event.type === "message.part.updated") {
-            const part = event.properties?.part;
-            if (!part)
-              continue;
-            if (part.type === "reasoning" && part.text) {
-              reasoningAccum = part.text;
-              const preview = stripMarkdownTables(reasoningAccum.slice(0, REASONING_PREVIEW_LEN));
-              const suffix = reasoningAccum.length > REASONING_PREVIEW_LEN ? "..." : "";
-              await throttledPatch(`\uD83D\uDCAD **正在思考...**
-
-${preview}${suffix}`);
-            } else if (part.type === "tool" && part.state?.status === "running") {
-              const toolLabel = (part.tool ?? "") || "工具";
-              await throttledPatch(`\uD83D\uDD27 **正在使用工具：${toolLabel}**`);
-            }
-          }
-          if (event.type === "session.idle" || event.type === "session.error") {
-            break;
-          }
-        }
-      } catch (err) {
-        if (!abortController.signal.aborted) {
-          log("warn", `[${channel.name}] SSE 事件流中断: ${String(err)}`);
-        }
-      } finally {
+async function waitForSessionAndReply(client, channel, sessionId, replyTarget, thinkingMsgId, pendingMap) {
+  const log = (level, message) => {
+    fileLog(level, message);
+    client.app.log({ body: { service: "chat-channel", level, message } });
+  };
+  const SESSION_TIMEOUT_MS = 5 * 60 * 1000;
+  await new Promise((resolve, reject) => {
+    const timeoutId = setTimeout(() => {
+      pendingMap.delete(sessionId);
+      log("warn", `[${channel.name}] session 等待超时（5分钟），强制继续读取回复`);
+      resolve();
+    }, SESSION_TIMEOUT_MS);
+    pendingMap.set(sessionId, {
+      resolve: () => {
+        clearTimeout(timeoutId);
+        pendingMap.delete(sessionId);
+        resolve();
+      },
+      reject: (err) => {
         clearTimeout(timeoutId);
+        pendingMap.delete(sessionId);
+        reject(err);
       }
-    }
-  } else {
-    await pollForSessionCompletion(client, channel.name, sessionId);
-  }
+    });
+  }).catch((err) => {
+    log("error", `[${channel.name}] session 出错: ${err.message}`);
+  });
   let responseText = null;
   try {
     const messagesRes = await client.session.messages({ path: { id: sessionId } });
     const messages = messagesRes.data ?? [];
     const lastAssistant = [...messages].reverse().find((m) => m.info?.role === "assistant");
+    log("info", `[${channel.name}] [diag] messages count=${messages.length}, lastAssistant=${lastAssistant ? `id=${lastAssistant.info?.id} parts=${JSON.stringify((lastAssistant.parts ?? []).map((p) => ({ type: p.type, textLen: p.text?.length ?? 0 })))}` : "null"}`);
     if (lastAssistant) {
       responseText = extractResponseText(lastAssistant.parts ?? []);
     }
   } catch (err) {
     log("error", `[${channel.name}] 获取最终回复失败: ${String(err)}`);
   }
+  log("info", `[${channel.name}] [diag] responseText length=${responseText?.length ?? 0} preview="${responseText?.slice(0, 80)}"`);
   if (!responseText) {
     responseText = "（AI 没有返回文字回复）";
   }
   await channel.send(replyTarget, responseText);
 }
-async function pollForSessionCompletion(client, channelName, sessionId) {
-  const POLL_INTERVAL_MS = 1000;
-  const MAX_WAIT_MS = 5 * 60 * 1000;
-  const started = Date.now();
-  while (Date.now() - started < MAX_WAIT_MS) {
-    await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));
-    try {
-      const res = await client.session.status();
-      const allStatuses = res.data ?? {};
-      const sessionStatus = allStatuses[sessionId];
-      if (!sessionStatus || sessionStatus.type === "idle")
-        break;
-    } catch {
-      client.app.log({
-        body: { service: "chat-channel", level: "warn", message: `[${channelName}] 轮询 session 状态失败，继续等待...` }
-      });
-    }
-  }
-}
-function isSessionEvent(event, sessionId) {
-  if (!event || !event.type)
-    return false;
-  const props = event.properties;
-  if (!props)
-    return false;
-  if (event.type === "message.part.updated") {
-    return props.part?.sessionID === sessionId;
-  }
-  return props.sessionID === sessionId || props.id === sessionId;
-}
 var ChatChannelPlugin = async ({ client }) => {
   const configDir = join(process.env["HOME"] ?? `/Users/${process.env["USER"] ?? "unknown"}`, ".config", "opencode");
   loadDotEnv(join(configDir, ".env"));
@@ -535,12 +458,13 @@ var ChatChannelPlugin = async ({ client }) => {
     });
     return {};
   }
+  const pendingMap = new Map;
   const cleanupTimers = [];
   for (const channel of channels) {
     const sessionManager = new SessionManager(client, channel.name, (userId) => `${channel.name} 对话 · ${userId}`);
     const timer = sessionManager.startAutoCleanup();
     cleanupTimers.push(timer);
-    const handleMessage = createMessageHandler(channel, sessionManager, client);
+    const handleMessage = createMessageHandler(channel, sessionManager, client, pendingMap);
     await channel.start(handleMessage);
   }
   await client.app.log({
@@ -552,15 +476,29 @@ var ChatChannelPlugin = async ({ client }) => {
   });
   return {
     event: async ({ event }) => {
+      const props = event.properties;
+      if (event.type === "session.idle") {
+        const sessionId = props?.["sessionID"] ?? props?.["id"];
+        if (sessionId) {
+          fileLog("info", `[diag] event hook: session.idle sessionId=${sessionId}`);
+          pendingMap.get(sessionId)?.resolve();
+        }
+      }
       if (event.type === "session.error") {
+        const sessionId = props?.["sessionID"] ?? props?.["id"];
+        const errMsg = props?.["message"] ?? "unknown error";
         await client.app.log({
           body: {
             service: "chat-channel",
             level: "warn",
             message: "opencode session 出现错误",
-            extra: event.properties
+            extra: props
           }
         });
+        if (sessionId) {
+          fileLog("info", `[diag] event hook: session.error sessionId=${sessionId} err=${errMsg}`);
+          pendingMap.get(sessionId)?.reject(new Error(errMsg));
+        }
       }
     }
   };

package/dist/session-manager.d.ts

@@ -5,6 +5,11 @@
  * 与具体渠道无关，所有 channel 实现共享同一套逻辑。
  */
 import type { PluginClient } from "./types.js";
+/**
+ * 写日志到文件（同步追加），同时调用 client.app.log()。
+ * 用于替代纯依赖 client.app.log() 的场景，确保日志落盘可查。
+ */
+export declare function fileLog(level: "info" | "warn" | "error", message: string): void;
 export declare class SessionManager {
     private readonly client;
     private readonly channel;

package/dist/session-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../src/session-manager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAgB/C,qBAAa,cAAc;IAOvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAR1B;;;;OAIG;gBAEgB,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MACxB;IAGxB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;IAE3D,wCAAwC;IAClC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA6BlD,2BAA2B;IAC3B,OAAO,IAAI,IAAI;IASf,oDAAoD;IACpD,gBAAgB,CAAC,UAAU,SAAiB,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC;CAG9E;AAID;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,CAO5D;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAiBhD"}
+{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../src/session-manager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAO/C;;;GAGG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAQ/E;AAgBD,qBAAa,cAAc;IAOvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAR1B;;;;OAIG;gBAEgB,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MACxB;IAGxB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;IAE3D,wCAAwC;IAClC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA6BlD,2BAA2B;IAC3B,OAAO,IAAI,IAAI;IASf,oDAAoD;IACpD,gBAAgB,CAAC,UAAU,SAAiB,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC;CAG9E;AAID;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,CAO5D;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAiBhD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-chat-channel",
-  "version": "1.2.11",
+  "version": "1.2.12",
   "description": "opencode plugin — multi-channel bot (Feishu/Lark, WeCom) with extensible ChatChannel interface",
   "type": "module",
   "main": "./dist/index.js",