opencode-feishu 1.0.2 → 1.1.0

package/dist/index.js

@@ -112509,7 +112509,9 @@ var AutoPromptSchema = external_exports.object({
   enabled: external_exports.boolean().default(false),
   intervalSeconds: external_exports.number().int().positive().default(30),
   maxIterations: external_exports.number().int().positive().default(10),
-  message: external_exports.string().min(1).default("\u8BF7\u540C\u6B65\u5F53\u524D\u8FDB\u5EA6\uFF0C\u5982\u9700\u5E2E\u52A9\u8BF7\u8BF4\u660E")
+  message: external_exports.string().min(1).default("\u8BF7\u540C\u6B65\u5F53\u524D\u8FDB\u5EA6\uFF0C\u5982\u9700\u5E2E\u52A9\u8BF7\u8BF4\u660E"),
+  idleThreshold: external_exports.number().int().min(1).default(2),
+  idleMaxLength: external_exports.number().int().min(10).default(50)
 });
 var FeishuConfigSchema = external_exports.object({
   appId: external_exports.string().min(1, "appId \u4E0D\u80FD\u4E3A\u7A7A"),
@@ -113762,7 +113764,6 @@ var StreamingCard = class {
 };
 
 // src/handler/chat.ts
-var activeAutoPrompts = /* @__PURE__ */ new Map();
 async function finalizeReply(streamingCard, feishuClient, chatId, placeholderId, text) {
   if (streamingCard) {
     await streamingCard.close(text);
@@ -113780,19 +113781,13 @@ async function abortCleanup(streamingCard, feishuClient, placeholderId) {
 }
 async function handleChat(ctx, deps, signal) {
   const { content, chatId, chatType, senderId, shouldReply, messageType, rawContent, messageId } = ctx;
-  if (!content.trim() && messageType === "text") return;
+  if (!content.trim() && messageType === "text") return void 0;
   const { config: config2, client, feishuClient, log, directory } = deps;
   const query = directory ? { directory } : void 0;
   const sessionKey = buildSessionKey(chatType, chatType === "p2p" ? senderId : chatId);
-  const existing = activeAutoPrompts.get(sessionKey);
-  if (existing) {
-    existing.abort();
-    activeAutoPrompts.delete(sessionKey);
-    log("info", "\u7528\u6237\u4ECB\u5165\uFF0C\u81EA\u52A8\u63D0\u793A\u5DF2\u4E2D\u65AD", { sessionKey });
-  }
   const session = await getOrCreateSession(client, sessionKey, directory);
   const parts = await buildPromptParts(feishuClient, messageId, messageType, rawContent, content, chatType, senderId, log);
-  if (!parts.length) return;
+  if (!parts.length) return void 0;
   log("info", "\u6536\u5230\u7528\u6237\u6D88\u606F", {
     sessionKey,
     sessionId: session.id,
@@ -113816,7 +113811,7 @@ async function handleChat(ctx, deps, signal) {
         error: err instanceof Error ? err.message : String(err)
       });
     }
-    return;
+    return void 0;
   }
   const timeout = config2.timeout;
   const thinkingDelay = config2.thinkingDelay;
@@ -113857,46 +113852,6 @@ async function handleChat(ctx, deps, signal) {
       });
     }
   }, thinkingDelay) : null;
-  async function runAutoPromptLoop(activeId) {
-    const { autoPrompt } = config2;
-    if (!autoPrompt.enabled || !shouldReply) return;
-    const ac = new AbortController();
-    activeAutoPrompts.set(sessionKey, ac);
-    log("info", "\u542F\u52A8\u81EA\u52A8\u63D0\u793A\u5FAA\u73AF", { sessionKey, maxIterations: autoPrompt.maxIterations });
-    try {
-      for (let i = 0; i < autoPrompt.maxIterations; i++) {
-        await abortableSleep(autoPrompt.intervalSeconds * 1e3, ac.signal);
-        log("info", "\u53D1\u9001\u81EA\u52A8\u63D0\u793A", { sessionKey, iteration: i + 1 });
-        clearSessionError(activeId);
-        await client.session.prompt({
-          path: { id: activeId },
-          query,
-          body: { parts: [{ type: "text", text: autoPrompt.message }] }
-        });
-        const text = await pollForResponse(client, activeId, { timeout, pollInterval, stablePolls, query, signal: ac.signal });
-        if (text) {
-          log("info", "\u81EA\u52A8\u63D0\u793A\u54CD\u5E94", {
-            sessionKey,
-            iteration: i + 1,
-            output: text
-          });
-          await sendTextMessage(feishuClient, chatId, text);
-        }
-      }
-      log("info", "\u81EA\u52A8\u63D0\u793A\u5FAA\u73AF\u7ED3\u675F\uFF08\u8FBE\u5230\u6700\u5927\u6B21\u6570\uFF09", { sessionKey });
-    } catch (loopErr) {
-      if (loopErr.name === "AbortError") {
-        log("info", "\u81EA\u52A8\u63D0\u793A\u5FAA\u73AF\u88AB\u4E2D\u65AD", { sessionKey });
-      } else {
-        log("error", "\u81EA\u52A8\u63D0\u793A\u5FAA\u73AF\u5F02\u5E38", {
-          sessionKey,
-          error: loopErr instanceof Error ? loopErr.message : String(loopErr)
-        });
-      }
-    } finally {
-      activeAutoPrompts.delete(sessionKey);
-    }
-  }
   let cardUnsub;
   {
     const card = streamingCard;
@@ -113942,12 +113897,15 @@ async function handleChat(ctx, deps, signal) {
     });
     clearRetryAttempts(sessionKey);
     await finalizeReply(streamingCard, feishuClient, chatId, placeholderId, finalText || "\u26A0\uFE0F \u54CD\u5E94\u8D85\u65F6");
-    await runAutoPromptLoop(session.id);
+    if (config2.autoPrompt.enabled && shouldReply) {
+      return { sessionId: session.id, sessionKey, chatId, deps };
+    }
+    return void 0;
   } catch (err) {
     if (err instanceof Error && err.name === "AbortError") {
       log("info", "\u5904\u7406\u88AB\u4E2D\u65AD", { sessionKey, sessionId: session.id });
       await abortCleanup(streamingCard, feishuClient, placeholderId);
-      return;
+      return void 0;
     }
     let sessionError;
     if (err instanceof SessionErrorDetected) {
@@ -114006,14 +113964,16 @@ async function handleChat(ctx, deps, signal) {
               model: `${modelOverride.providerID}/${modelOverride.modelID}`,
               attempt: attempts + 1
             });
-            await runAutoPromptLoop(session.id);
-            return;
+            if (config2.autoPrompt.enabled && shouldReply) {
+              return { sessionId: session.id, sessionKey, chatId, deps };
+            }
+            return void 0;
           }
         } catch (recoveryErr) {
           if (recoveryErr instanceof Error && recoveryErr.name === "AbortError") {
             log("info", "\u6A21\u578B\u6062\u590D\u88AB\u4E2D\u65AD", { sessionKey });
             await abortCleanup(streamingCard, feishuClient, placeholderId);
-            return;
+            return void 0;
           }
           const errMsg = recoveryErr instanceof Error ? recoveryErr.message : String(recoveryErr);
           if (recoveryErr instanceof SessionErrorDetected) {
@@ -114145,6 +114105,43 @@ async function replyOrUpdate(feishuClient, chatId, placeholderId, text) {
     await sendTextMessage(feishuClient, chatId, text);
   }
 }
+var idlePatterns = [
+  /^(无|没有)(任务|变化|进行中)/,
+  /空闲|闲置|等待(指令|中|新|你)/,
+  /随时可(开始|开始新)/,
+  /等你指令/
+];
+function isIdleResponse(text, maxLength = 50) {
+  if (text.length >= maxLength) return false;
+  return idlePatterns.some((p) => p.test(text));
+}
+async function runOneAutoPromptIteration(apCtx, iteration, signal) {
+  const { sessionId, chatId, deps } = apCtx;
+  const { config: config2, client, feishuClient, log, directory } = deps;
+  const query = directory ? { directory } : void 0;
+  const { autoPrompt, timeout, pollInterval, stablePolls } = config2;
+  log("info", "\u53D1\u9001\u81EA\u52A8\u63D0\u793A", { sessionKey: apCtx.sessionKey, iteration });
+  clearSessionError(sessionId);
+  await client.session.promptAsync({
+    path: { id: sessionId },
+    query,
+    body: { parts: [{ type: "text", text: autoPrompt.message }] }
+  });
+  const text = await pollForResponse(client, sessionId, {
+    timeout,
+    pollInterval,
+    stablePolls,
+    query,
+    signal
+  });
+  if (!text) return { text: null, isIdle: false };
+  const idle = isIdleResponse(text, autoPrompt.idleMaxLength);
+  if (!idle) {
+    log("info", "\u81EA\u52A8\u63D0\u793A\u54CD\u5E94", { sessionKey: apCtx.sessionKey, iteration, output: text });
+    await sendTextMessage(feishuClient, chatId, text);
+  }
+  return { text, isIdle: idle };
+}
 function abortableSleep(ms, signal) {
   return new Promise((resolve, reject) => {
     if (signal.aborted) {
@@ -114191,6 +114188,9 @@ function cleanupStateIfIdle(sessionKey, state) {
     states.delete(sessionKey);
   }
 }
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
 async function enqueueMessage(ctx, deps) {
   if (!ctx.shouldReply) {
     await handleChat(ctx, deps);
@@ -114221,7 +114221,18 @@ async function handleP2PMessage(sessionKey, ctx, deps) {
   const controller = new AbortController();
   state.controller = controller;
   state.processing = true;
-  const task = processMessage(ctx, deps, controller.signal).finally(() => {
+  const task = (async () => {
+    const apCtx = await processMessage(ctx, deps, controller.signal);
+    if (apCtx) {
+      await runP2PAutoPrompt(apCtx, controller.signal);
+    }
+  })().catch((err) => {
+    if (err instanceof Error && err.name === "AbortError") return;
+    deps.log("error", "P2P \u6D88\u606F\u6216\u81EA\u52A8\u63D0\u793A\u5904\u7406\u5931\u8D25", {
+      sessionKey,
+      error: err instanceof Error ? err.message : String(err)
+    });
+  }).finally(() => {
     state.processing = false;
     state.controller = null;
     state.currentTask = null;
@@ -114230,6 +114241,31 @@ async function handleP2PMessage(sessionKey, ctx, deps) {
   state.currentTask = task;
   await task;
 }
+async function runP2PAutoPrompt(apCtx, signal) {
+  const { autoPrompt } = apCtx.deps.config;
+  if (!autoPrompt.enabled) return;
+  let idleCount = 0;
+  for (let i = 0; i < autoPrompt.maxIterations; i++) {
+    await abortableSleep(autoPrompt.intervalSeconds * 1e3, signal);
+    const result = await runOneAutoPromptIteration(apCtx, i + 1, signal);
+    if (result.isIdle) {
+      idleCount++;
+      if (idleCount >= autoPrompt.idleThreshold) {
+        apCtx.deps.log("info", "P2P \u81EA\u52A8\u63D0\u793A\u5FAA\u73AF\u7ED3\u675F\uFF08\u68C0\u6D4B\u5230\u7A7A\u95F2\uFF09", {
+          sessionKey: apCtx.sessionKey,
+          iteration: i + 1,
+          idleCount
+        });
+        return;
+      }
+    } else {
+      idleCount = 0;
+    }
+  }
+  apCtx.deps.log("info", "P2P \u81EA\u52A8\u63D0\u793A\u5FAA\u73AF\u7ED3\u675F\uFF08\u8FBE\u5230\u6700\u5927\u6B21\u6570\uFF09", {
+    sessionKey: apCtx.sessionKey
+  });
+}
 async function handleGroupMessage(sessionKey, ctx, deps) {
   const state = getOrCreateState(sessionKey);
   state.queue.push({ ctx, deps });
@@ -114238,21 +114274,81 @@ async function handleGroupMessage(sessionKey, ctx, deps) {
 }
 async function drainLoop(sessionKey, state) {
   state.processing = true;
+  let autoPromptCtx;
+  let idleCount = 0;
+  let autoPromptIteration = 0;
   try {
-    while (state.queue.length > 0) {
-      const item = state.queue.shift();
-      if (!item) break;
-      const controller = new AbortController();
-      state.controller = controller;
+    while (true) {
+      if (state.queue.length > 0) {
+        const item = state.queue.shift();
+        const controller = new AbortController();
+        state.controller = controller;
+        try {
+          autoPromptCtx = await processMessage(item.ctx, item.deps, controller.signal);
+          idleCount = 0;
+          autoPromptIteration = 0;
+        } catch (err) {
+          item.deps.log("error", "\u7FA4\u804A\u961F\u5217\u6D88\u606F\u5904\u7406\u5931\u8D25", {
+            sessionKey,
+            error: err instanceof Error ? err.message : String(err)
+          });
+        } finally {
+          state.controller = null;
+        }
+        continue;
+      }
+      if (!autoPromptCtx) break;
+      const { autoPrompt } = autoPromptCtx.deps.config;
+      if (!autoPrompt.enabled) break;
+      if (autoPromptIteration >= autoPrompt.maxIterations) {
+        autoPromptCtx.deps.log("info", "\u81EA\u52A8\u63D0\u793A\u5FAA\u73AF\u7ED3\u675F\uFF08\u8FBE\u5230\u6700\u5927\u6B21\u6570\uFF09", { sessionKey });
+        break;
+      }
+      const intervalSeconds = autoPrompt.intervalSeconds;
+      let interrupted = false;
+      for (let s = 0; s < intervalSeconds; s++) {
+        await sleep(1e3);
+        if (state.queue.length > 0) {
+          interrupted = true;
+          break;
+        }
+      }
+      if (interrupted) continue;
+      const autoPromptController = new AbortController();
+      const monitor = setInterval(() => {
+        if (state.queue.length > 0) autoPromptController.abort();
+      }, 200);
       try {
-        await processMessage(item.ctx, item.deps, controller.signal);
+        const result = await runOneAutoPromptIteration(
+          autoPromptCtx,
+          autoPromptIteration + 1,
+          autoPromptController.signal
+        );
+        autoPromptIteration++;
+        if (result.isIdle) {
+          idleCount++;
+          if (idleCount >= autoPrompt.idleThreshold) {
+            autoPromptCtx.deps.log("info", "\u81EA\u52A8\u63D0\u793A\u5FAA\u73AF\u7ED3\u675F\uFF08\u68C0\u6D4B\u5230\u7A7A\u95F2\uFF09", {
+              sessionKey,
+              iteration: autoPromptIteration,
+              idleCount
+            });
+            break;
+          }
+        } else {
+          idleCount = 0;
+        }
       } catch (err) {
-        item.deps.log("error", "\u7FA4\u804A\u961F\u5217\u6D88\u606F\u5904\u7406\u5931\u8D25", {
+        if (err instanceof Error && err.name === "AbortError") {
+          continue;
+        }
+        autoPromptCtx.deps.log("error", "\u81EA\u52A8\u63D0\u793A\u8FED\u4EE3\u5F02\u5E38", {
           sessionKey,
           error: err instanceof Error ? err.message : String(err)
         });
+        break;
       } finally {
-        state.controller = null;
+        clearInterval(monitor);
       }
     }
   } finally {
@@ -114261,7 +114357,7 @@ async function drainLoop(sessionKey, state) {
   }
 }
 async function processMessage(ctx, deps, signal) {
-  await handleChat(ctx, deps, signal);
+  return handleChat(ctx, deps, signal);
 }
 async function abortServerSession(sessionKey, deps) {
   const { client, log, directory } = deps;