opencode-feishu-plugin 0.2.11 → 0.2.13

package/README.en.md

@@ -173,7 +173,7 @@ When the agent asks via `question` or other form tools, the form becomes a Feish
 | `logLevel` | `debug`\|`info`\|`warn`\|`error` | `info` | Log level |
 | `logFile` | string \| boolean | — | `true` = write `<configDir>/plugins/feishu.log`; recommended in server mode |
 | `approvalTtlMs` | number | `600000` | Approval token / card validity |
-| `staleExecutionMs` | number | `300000` | Watchdog threshold (1–60 min) |
+| `staleExecutionMs` | number | `300000` | Watchdog threshold (0–60 min; **0 = disabled**; sessions waiting on a form / pending approval are never killed) |
 | `gatewayLocation` | string | — | Only start the gateway at this location (or its subdirectories); empty = any location |
 
 Full config (including `cardMaxTables`, `topicStatus*`, `resumeSummary*`, `keepalive*`, `gatewayMatchGraceMs`) → [docs/advanced.en.md](./docs/advanced.en.md#full-configuration).
@@ -188,7 +188,7 @@ Full config (including `cardMaxTables`, `topicStatus*`, `resumeSummary*`, `keepa
 | Plugin not loaded at all | npm: confirm the package name is in the `plugins` array; directory: confirm `plugins/<name>/index.js` exists |
 | No approval cards | That session wasn't started from Feishu (no mapping); by design the plugin doesn't take it over |
 | Button click says invalid credential | Token expired (10 min default) or clicker not in allowlist |
-| Session seems stuck, messages only queue | Watchdog auto-interrupts after 5 min; or tap "⏹ force stop" / send `/stop` |
+| Session seems stuck, messages only queue | Watchdog auto-interrupts after 5 min (never while a form / approval is pending; `staleExecutionMs: 0` disables it); or tap "⏹ force stop" / send `/stop` |
 | Bot goes silent after ~1h idle | opencode recycles idle locations; built-in keepalive restores automatically, see [docs/advanced.en.md](./docs/advanced.en.md#location-keep-alive) |
 | Can't see plugin logs | stderr is discarded in server mode; set `logFile: true` |
 | Multiple long connections / duplicate replies | Set `gatewayLocation` to a common working directory, see [docs/advanced.en.md](./docs/advanced.en.md#multiple-instances-and-gateway-election) |

package/README.md

@@ -173,7 +173,7 @@ agent 反问时表单会变成飞书卡片，**点按钮或在话题里直接发
 | `logLevel` | `debug`\|`info`\|`warn`\|`error` | `info` | 日志级别 |
 | `logFile` | string \| boolean | — | `true` = 写 `<configDir>/plugins/feishu.log`，服务模式建议开启 |
 | `approvalTtlMs` | number | `600000` | 审批 token / 卡片有效期 |
-| `staleExecutionMs` | number | `300000` | 看门狗阈值（1–60 分钟） |
+| `staleExecutionMs` | number | `300000` | 看门狗阈值（0–60 分钟；**0 = 关闭看门狗**；待答表单 / 未决审批期间不判卡死） |
 | `gatewayLocation` | string | — | 只在该 location（及其子目录）启动网关；留空 = 任意 location 生效 |
 
 完整配置（含 `cardMaxTables`、`topicStatus*`、`resumeSummary*`、`keepalive*`、`gatewayMatchGraceMs` 等进阶项）见 [docs/advanced.md](./docs/advanced.md#完整配置项)。
@@ -188,7 +188,7 @@ agent 反问时表单会变成飞书卡片，**点按钮或在话题里直接发
 | 插件完全没被加载 | npm 方式确认包名在 `plugins` 数组；目录方式确认 `plugins/<名>/index.js` 存在 |
 | 审批卡收不到 | 该会话不是从飞书发起的（无映射），插件按设计不接管 |
 | 点按钮提示凭证无效 | token 过期（默认 10 分钟）或点击者不在白名单 |
-| 会话像卡死、只排队 | 看门狗默认 5 分钟后自动中断；也可点「⏹ 强制停止」或发 `/stop` |
+| 会话像卡死、只排队 | 看门狗默认 5 分钟后自动中断（**待答表单 / 未决审批期间不中断**；`staleExecutionMs: 0` 可关闭）；也可点「⏹ 强制停止」或发 `/stop` |
 | 空闲约 1 小时后失联 | opencode 会回收空闲 location；内置保活默认开启会自动恢复，见 [docs/advanced.md](./docs/advanced.md#位置保活) |
 | 看不到插件日志 | 服务模式下 stderr 被丢弃，设 `logFile: true` |
 | 多个长连接 / 重复回复 | 设置 `gatewayLocation` 为常用工作目录，见 [docs/advanced.md](./docs/advanced.md#多实例与网关选举) |

package/dist/index.js

@@ -144008,7 +144008,7 @@ function resolveConfig2(raw, env = process.env, deps = {}) {
   const topicGuidance = asBoolean(merged.topicGuidance, true);
   const throttle2 = clamp4(asNumber(merged.streamThrottleMs, 400), 400, 6e4);
   const approvalTtlMs = clamp4(asNumber(merged.approvalTtlMs, 10 * 60 * 1e3), 3e4, 24 * 60 * 60 * 1e3);
-  const staleExecutionMs = clamp4(asNumber(merged.staleExecutionMs, 5 * 60 * 1e3), 6e4, 60 * 60 * 1e3);
+  const staleExecutionMs = clamp4(asNumber(merged.staleExecutionMs, 5 * 60 * 1e3), 0, 60 * 60 * 1e3);
   const maxResourcesShown = clamp4(asNumber(merged.maxResourcesShown, 8), 1, 50);
   const allowedRootsRaw = asStringArray(merged.allowedRoots);
   const allowedRootsCandidates = (allowedRootsRaw.length > 0 ? allowedRootsRaw : [...DEFAULT_ALLOWED_ROOTS]).filter(isAbsolute);
@@ -144507,6 +144507,18 @@ var TtlMap = class {
     }
     this.data.delete(key);
   }
+  /** 遍历未过期条目（惰性清理已过期项；用于按会话反查 pending 状态）。 */
+  entries() {
+    const out = [];
+    for (const [key, hit] of this.data) {
+      if (hit.expiresAt <= this.now()) {
+        this.delete(key);
+        continue;
+      }
+      out.push([key, hit.value]);
+    }
+    return out;
+  }
   clear() {
     for (const timer of this.timers.values()) clearTimeout(timer);
     this.timers.clear();
@@ -145940,14 +145952,17 @@ var ExecutionTracker = class {
   /**
    * 返回「正在跑但超过 maxIdleMs 无任何活动」的 sessionID，并将其从运行态移除。
    * 用于插件层看门狗：事件丢失或交互工具（question/permission）永久挂起时兜底放开排队。
+   *
+   * `shouldSkip` 返回 true 的会话视为**合法等待**（如待答表单 / 未决审批）：
+   * 既不返回、也不移出运行态（避免在等待期被误杀，也避免丢追踪导致后续排队判定失真）。
    */
-  stale(maxIdleMs, now3 = Date.now()) {
+  stale(maxIdleMs, now3 = Date.now(), shouldSkip) {
     const out = [];
     for (const [sessionID, at] of this.running) {
-      if (now3 - at >= maxIdleMs) {
-        this.running.delete(sessionID);
-        out.push(sessionID);
-      }
+      if (now3 - at < maxIdleMs) continue;
+      if (shouldSkip?.(sessionID)) continue;
+      this.running.delete(sessionID);
+      out.push(sessionID);
     }
     return out;
   }
@@ -145955,6 +145970,41 @@ var ExecutionTracker = class {
     this.running.clear();
   }
 };
+var SessionParentLinks = class {
+  constructor(maxEntries = 2e3) {
+    this.maxEntries = maxEntries;
+  }
+  maxEntries;
+  parents = /* @__PURE__ */ new Map();
+  /** 登记/清理某会话的父链接（无 parentID = 顶级会话，清掉旧链接）。 */
+  remember(sessionID, parentID) {
+    if (!sessionID) return;
+    if (!parentID) {
+      this.parents.delete(sessionID);
+      return;
+    }
+    this.parents.delete(sessionID);
+    this.parents.set(sessionID, parentID);
+    while (this.parents.size > this.maxEntries) {
+      const oldest = this.parents.keys().next().value;
+      if (oldest === void 0) break;
+      this.parents.delete(oldest);
+    }
+  }
+  parentOf(sessionID) {
+    return this.parents.get(sessionID);
+  }
+  /** 沿父链逐级回调（含自身；防环 + 深度上限）。 */
+  walk(sessionID, visit) {
+    let current = sessionID;
+    const seen = /* @__PURE__ */ new Set();
+    for (let depth = 0; current && depth < 16 && !seen.has(current); depth += 1) {
+      seen.add(current);
+      visit(current);
+      current = this.parents.get(current);
+    }
+  }
+};
 
 // src/utils/throttle.ts
 function createThrottler(options2) {
@@ -146575,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) {
@@ -146689,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;
@@ -146696,51 +146783,64 @@ 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) {
       return sessions.get(sessionID)?.active !== void 0;
     },
-    staleQueued(maxIdleMs, now3 = Date.now()) {
+    staleQueued(maxIdleMs, now3 = Date.now(), shouldSkip) {
       const out = [];
       for (const [sessionID, runs] of sessions) {
         if (runs.active) continue;
         const first = runs.queued[0];
         if (!first || now3 - first.queuedAt < maxIdleMs) continue;
+        if (shouldSkip?.(sessionID)) continue;
         if (notifiedQueued.has(sessionID)) continue;
         notifiedQueued.add(sessionID);
         out.push(sessionID);
@@ -146767,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()) {
@@ -147251,6 +147353,13 @@ var FormRelay = class {
     this.forms.delete(id2);
     void this.finish(pending, "cancelled");
   }
+  /** 是否有尚未提交/取消的待答表单（看门狗判活：等表单属合法等待，不应判 stale）。 */
+  hasPendingFor(sessionID) {
+    for (const [, pending] of this.forms.entries()) {
+      if (pending.sessionID === sessionID && !pending.settled) return true;
+    }
+    return false;
+  }
   dispose() {
     this.disposed = true;
     this.forms.clear();
@@ -149014,6 +149123,13 @@ var ApprovalManager = class {
       parsed.decision === "reject" ? "\u5DF2\u62D2\u7EDD" : "\u5DF2\u5141\u8BB8"
     );
   }
+  /** 该会话是否有未决审批（看门狗判活：等审批属合法等待，不应判 stale）。 */
+  hasPendingFor(sessionID) {
+    for (const [, card] of this.cards.entries()) {
+      if (!card.resolved && card.input.sessionID === sessionID) return true;
+    }
+    return false;
+  }
   dispose() {
     this.seenRequests.clear();
     this.cards.clear();
@@ -150767,6 +150883,14 @@ async function routeEvent(event, deps) {
   const touched = event.data?.sessionID;
   if (typeof touched === "string") deps.touch(touched);
   switch (event.type) {
+    case "session.created": {
+      const data = event.data;
+      const childId = typeof data.sessionID === "string" && data.sessionID ? data.sessionID : typeof data.id === "string" && data.id ? data.id : "";
+      if (!childId) break;
+      const parent = typeof data.parentID === "string" && data.parentID ? data.parentID : typeof data.parentId === "string" && data.parentId ? data.parentId : void 0;
+      deps.onSessionCreated?.(childId, parent);
+      break;
+    }
     case "permission.asked":
       void deps.onPermissionAsked(event.data).catch((err2) => deps.log.warn("\u5904\u7406 permission.asked \u5931\u8D25", { error: errorMessage(err2) }));
       break;
@@ -150843,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);
@@ -150862,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;
@@ -150869,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" });
@@ -150879,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;
@@ -151556,6 +151686,7 @@ async function start(ctx, config, log2, logSink) {
   await owner.load().catch((err2) => log2.warn("owner \u8BFB\u53D6\u5931\u8D25", { error: errorMessage(err2) }));
   const dedup = new MessageDedup(storage, log2);
   const executions = new ExecutionTracker();
+  const sessionLinks = new SessionParentLinks();
   const runs = createRunController({
     sender,
     log: log2,
@@ -152161,9 +152292,13 @@ ${downloadedAttachmentPrompt(message.attachment, outcome)}`;
   })();
   const eventDeps = {
     log: log2,
-    touch: (sessionID) => executions.touch(sessionID),
+    touch: (sessionID) => sessionLinks.walk(sessionID, (id2) => executions.touch(id2)),
     markStarted: (sessionID) => executions.markStarted(sessionID),
     markEnded: (sessionID) => executions.markEnded(sessionID),
+    onSessionCreated: (sessionID, parentID) => {
+      sessionLinks.remember(sessionID, parentID);
+      log2.debug("session.created \u7236\u5B50\u767B\u8BB0", { sessionID, parentID: parentID ?? null });
+    },
     applyRun: (sessionID, event) => runs.apply(sessionID, event),
     onPermissionAsked: (data) => approvals.onAsked(data),
     onPermissionReplied: (data) => approvals.onReplied(data),
@@ -152186,13 +152321,16 @@ ${downloadedAttachmentPrompt(message.attachment, outcome)}`;
     }
     await sender.sendText(link2.chatId, text);
   }
-  const stopWatchdog = startWatchdog({
+  const hasPendingInteraction = (sessionID) => approvals.hasPendingFor(sessionID) || formRelay.hasPendingFor(sessionID);
+  const stopWatchdog = config.staleExecutionMs > 0 ? startWatchdog({
     log: log2,
     staleExecutionMs: config.staleExecutionMs,
-    staleExecutions: () => executions.stale(config.staleExecutionMs),
-    staleQueued: () => runs.staleQueued(config.staleExecutionMs),
+    staleExecutions: () => executions.stale(config.staleExecutionMs, Date.now(), hasPendingInteraction),
+    staleQueued: () => runs.staleQueued(config.staleExecutionMs, Date.now(), hasPendingInteraction),
     recover: (sessionID, reason) => recovery.recover(sessionID, reason)
-  });
+  }) : () => {
+    log2.info("\u770B\u95E8\u72D7\u5DF2\u5173\u95ED\uFF08staleExecutionMs=0\uFF09");
+  };
   async function notifyStuck(sessionID, reason, ok) {
     const link2 = await sessionMap.resolveBySession(sessionID);
     if (!link2) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-feishu-plugin",
-  "version": "0.2.11",
+  "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",