opencode-feishu-plugin 0.2.12 → 0.2.13

package/dist/index.js

@@ -146625,13 +146625,49 @@ function trailingText(blocks) {
   }
   return parts.join("\n\n").trim();
 }
+function isActivityEvent(type) {
+  return type === "text.started" || type === "text.delta" || type === "text.ended" || type === "tool.input.started" || type === "tool.input.ended" || type === "tool.success" || type === "tool.error";
+}
+var QUEUED_DRAIN_GRACE_MS = 3e3;
 function createRunController(deps) {
   const sessions = /* @__PURE__ */ new Map();
   const throttlers = /* @__PURE__ */ new Map();
   const sessionModels = /* @__PURE__ */ new Map();
   const notifiedQueued = /* @__PURE__ */ new Set();
+  const drainTimers = /* @__PURE__ */ new Map();
   const throttleMs = Math.max(400, deps.throttleMs);
   let disposed = false;
+  const cancelDrain = (sessionID) => {
+    const timer = drainTimers.get(sessionID);
+    if (timer) {
+      clearTimeout(timer);
+      drainTimers.delete(sessionID);
+    }
+  };
+  const scheduleDrain = (sessionID, runs) => {
+    if (runs.queued.length === 0) {
+      cancelDrain(sessionID);
+      return;
+    }
+    cancelDrain(sessionID);
+    const timer = setTimeout(() => {
+      drainTimers.delete(sessionID);
+      if (disposed) return;
+      const live = sessions.get(sessionID);
+      if (!live || live.queued.length === 0) return;
+      deps.log.info("\u6392\u961F\u5361\u6309\u300C\u5DF2\u968F\u672C\u8F6E\u5904\u7406\u300D\u6536\u5C3E\uFF08\u961F\u5217\u6D88\u606F\u5728\u5F53\u524D\u6267\u884C\u5185\u88AB\u6D88\u8D39\uFF09", {
+        sessionID,
+        count: live.queued.length
+      });
+      for (const card of live.queued) {
+        card.state = reduce6(card.state, { type: "execution.succeeded" });
+        finalize2(card);
+      }
+      live.queued.length = 0;
+    }, QUEUED_DRAIN_GRACE_MS);
+    timer.unref?.();
+    drainTimers.set(sessionID, timer);
+  };
   const sessionRuns = (sessionID) => {
     let runs = sessions.get(sessionID);
     if (!runs) {
@@ -146739,6 +146775,7 @@ function createRunController(deps) {
       if (!runs) return;
       if (event.type === "execution.started") {
         notifiedQueued.delete(sessionID);
+        cancelDrain(sessionID);
         if (runs.active) {
           update2(runs.active, event, true);
           return;
@@ -146746,40 +146783,52 @@ function createRunController(deps) {
         const next = runs.queued.shift();
         if (next) {
           runs.active = next;
+          deps.log.debug("\u6392\u961F\u5361\u664B\u5347\u4E3A\u8FD0\u884C\u5361", { sessionID, runID: next.runID });
           update2(next, event, true);
         }
+        if (runs.queued.length > 0) scheduleDrain(sessionID, runs);
         return;
       }
+      if (!runs.active && runs.queued.length > 0 && isActivityEvent(event.type)) {
+        const next = runs.queued.shift();
+        runs.active = next;
+        deps.log.info("\u6536\u5230\u6D3B\u52A8\u4E8B\u4EF6\u4F46\u65E0\u8FD0\u884C\u5361\uFF1A\u664B\u5347\u961F\u9996\u6392\u961F\u5361", {
+          sessionID,
+          runID: next.runID,
+          event: event.type
+        });
+        next.state = reduce6(next.state, { type: "execution.started" });
+      }
       const card = runs.active;
-      if (!card) return;
-      if (event.type === "execution.succeeded") {
-        const text = trailingText(card.state.blocks);
-        const long = deps.sendFinalAnswer !== void 0 && deps.finalAnswer !== void 0 && text.length >= deps.finalAnswer.minChars;
-        if (long) {
-          card.state = reduce6(reduce6(card.state, { type: "final.separated" }), event);
+      if (event.type === "execution.succeeded" || event.type === "execution.failed") {
+        if (card) {
+          if (event.type === "execution.succeeded") {
+            const text = trailingText(card.state.blocks);
+            const long = deps.sendFinalAnswer !== void 0 && deps.finalAnswer !== void 0 && text.length >= deps.finalAnswer.minChars;
+            if (long) {
+              card.state = reduce6(reduce6(card.state, { type: "final.separated" }), event);
+              finalize2(card);
+              runs.active = void 0;
+              void deps.sendFinalAnswer({
+                sessionID,
+                chatId: card.chatId,
+                ...card.replyToMessageId ? { replyToMessageId: card.replyToMessageId } : {},
+                text
+              }).catch((err2) => {
+                deps.log.warn("\u6700\u7EC8\u7B54\u6848\u53D1\u9001\u5931\u8D25", { sessionID, error: errorMessage(err2) });
+              });
+              scheduleDrain(sessionID, runs);
+              return;
+            }
+          }
+          update2(card, event, true);
           finalize2(card);
           runs.active = void 0;
-          void deps.sendFinalAnswer({
-            sessionID,
-            chatId: card.chatId,
-            ...card.replyToMessageId ? { replyToMessageId: card.replyToMessageId } : {},
-            text
-          }).catch((err2) => {
-            deps.log.warn("\u6700\u7EC8\u7B54\u6848\u53D1\u9001\u5931\u8D25", { sessionID, error: errorMessage(err2) });
-          });
-          return;
         }
-        update2(card, event, true);
-        finalize2(card);
-        runs.active = void 0;
-        return;
-      }
-      if (event.type === "execution.failed") {
-        update2(card, event, true);
-        finalize2(card);
-        runs.active = void 0;
+        scheduleDrain(sessionID, runs);
         return;
       }
+      if (!card) return;
       update2(card, event, false);
     },
     hasActive(sessionID) {
@@ -146818,6 +146867,8 @@ function createRunController(deps) {
       disposed = true;
       sessionModels.clear();
       notifiedQueued.clear();
+      for (const timer of drainTimers.values()) clearTimeout(timer);
+      drainTimers.clear();
       for (const throttler of throttlers.values()) throttler.cancel();
       throttlers.clear();
       for (const runs of sessions.values()) {
@@ -150916,18 +150967,21 @@ async function routeEvent(event, deps) {
     }
     case "session.execution.started": {
       const data = event.data;
+      deps.log.debug("execution.started", { sessionID: data.sessionID });
       deps.markStarted(data.sessionID);
       deps.applyRun(data.sessionID, { type: "execution.started" });
       break;
     }
     case "session.execution.succeeded": {
       const data = event.data;
+      deps.log.debug("execution.succeeded", { sessionID: data.sessionID });
       deps.markEnded(data.sessionID);
       deps.applyRun(data.sessionID, { type: "execution.succeeded" });
       break;
     }
     case "session.execution.failed": {
       const data = event.data;
+      deps.log.debug("execution.failed", { sessionID: data.sessionID });
       deps.markEnded(data.sessionID);
       deps.applyRun(data.sessionID, { type: "execution.failed", error: extractErrorText(data.error) });
       void deps.notifyFailure(data.sessionID, data.error);
@@ -150935,6 +150989,7 @@ async function routeEvent(event, deps) {
     }
     case "session.execution.interrupted": {
       const data = event.data;
+      deps.log.debug("execution.interrupted", { sessionID: data.sessionID, reason: data.reason });
       deps.markEnded(data.sessionID);
       deps.applyRun(data.sessionID, { type: "execution.failed", error: `\u5DF2\u4E2D\u65AD\uFF08${data.reason ?? "unknown"}\uFF09` });
       break;
@@ -150942,6 +150997,7 @@ async function routeEvent(event, deps) {
     case "session.status": {
       const data = event.data;
       const statusType = data.status?.type;
+      deps.log.debug("session.status", { sessionID: data.sessionID, status: statusType });
       if (statusType === "idle") {
         deps.markEnded(data.sessionID);
         deps.applyRun(data.sessionID, { type: "execution.succeeded" });
@@ -150952,6 +151008,7 @@ async function routeEvent(event, deps) {
     }
     case "session.idle": {
       const data = event.data;
+      deps.log.debug("session.idle", { sessionID: data.sessionID });
       deps.markEnded(data.sessionID);
       deps.applyRun(data.sessionID, { type: "execution.succeeded" });
       break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-feishu-plugin",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "description": "Feishu/Lark plugin for OpenCode V2 — single-user topics as sessions, in-card permission approvals, streaming cards. Minimal permissions, no public endpoint.",
   "type": "module",
   "main": "index.js",