opencode-feishu 0.6.1 → 0.7.1

package/dist/index.js

@@ -99176,76 +99176,27 @@ async function updateMessage(client, messageId, text2) {
   }
 }
 
-// src/handler/event.ts
-var pendingBySession = /* @__PURE__ */ new Map();
-var sessionErrors = /* @__PURE__ */ new Map();
-function trackSessionError(sessionId, error) {
-  if (error.includes("ModelNotFound") || error.includes("ProviderModelNotFound")) {
-    sessionErrors.set(sessionId, error);
+// src/session.ts
+var SESSION_KEY_PREFIX = "feishu";
+var TITLE_PREFIX = "Feishu";
+var sessionCache = /* @__PURE__ */ new Map();
+var sessionIdToKeyCache = /* @__PURE__ */ new Map();
+function setCachedSession(sessionKey, session) {
+  const oldSession = sessionCache.get(sessionKey);
+  if (oldSession && oldSession.id !== session.id) {
+    sessionIdToKeyCache.delete(oldSession.id);
   }
+  sessionCache.set(sessionKey, session);
+  sessionIdToKeyCache.set(session.id, sessionKey);
 }
-function consumeSessionError(sessionId) {
-  const err = sessionErrors.get(sessionId);
-  if (err) sessionErrors.delete(sessionId);
-  return err;
-}
-function registerPending(sessionId, payload) {
-  pendingBySession.set(sessionId, { ...payload, textBuffer: "" });
-}
-function unregisterPending(sessionId) {
-  pendingBySession.delete(sessionId);
-}
-async function handleEvent(event) {
-  switch (event.type) {
-    case "message.part.updated": {
-      const part = event.properties.part;
-      if (!part) break;
-      const sessionId = part.sessionID;
-      if (!sessionId) break;
-      const payload = pendingBySession.get(sessionId);
-      if (!payload) break;
-      const delta = event.properties.delta;
-      if (delta) {
-        payload.textBuffer += delta;
-      } else {
-        const fullText = extractPartText(part);
-        if (fullText) {
-          payload.textBuffer = fullText;
-        }
-      }
-      if (payload.textBuffer) {
-        const res = await updateMessage(payload.feishuClient, payload.placeholderId, payload.textBuffer.trim());
-        if (!res.ok) ;
-      }
-      break;
-    }
-    case "session.error": {
-      const props = event.properties;
-      const sessionId = props.sessionID;
-      if (!sessionId) break;
-      const errMsg = props.error?.message ?? String(props.error);
-      trackSessionError(sessionId, errMsg);
-      const payload = pendingBySession.get(sessionId);
-      if (!payload) break;
-      const updateRes = await updateMessage(payload.feishuClient, payload.placeholderId, `\u274C \u4F1A\u8BDD\u9519\u8BEF: ${errMsg}`);
-      if (!updateRes.ok) {
-        await sendTextMessage(payload.feishuClient, payload.chatId, `\u274C \u4F1A\u8BDD\u9519\u8BEF: ${errMsg}`);
-      }
-      break;
-    }
+function invalidateCachedSession(sessionId) {
+  const sessionKey = sessionIdToKeyCache.get(sessionId);
+  if (sessionKey) {
+    sessionCache.delete(sessionKey);
+    sessionIdToKeyCache.delete(sessionId);
   }
+  return sessionKey;
 }
-function extractPartText(part) {
-  if (part.type === "text") return part.text ?? "";
-  if (part.type === "reasoning" && part.text) return `\u{1F914} \u601D\u8003: ${part.text}
-
-`;
-  return "";
-}
-
-// src/session.ts
-var SESSION_KEY_PREFIX = "feishu";
-var TITLE_PREFIX = "Feishu";
 function buildSessionKey(chatType, id) {
   return `${SESSION_KEY_PREFIX}-${chatType}-${id}`;
 }
@@ -99253,6 +99204,8 @@ function generateSessionTitle(sessionKey) {
   return `${TITLE_PREFIX}-${sessionKey}-${Date.now()}`;
 }
 async function getOrCreateSession(client, sessionKey, directory) {
+  const cached = sessionCache.get(sessionKey);
+  if (cached) return cached;
   const titlePrefix = `${TITLE_PREFIX}-${sessionKey}-`;
   const query = directory ? { directory } : void 0;
   const { data: sessions } = await client.session.list({ query });
@@ -99267,7 +99220,11 @@ async function getOrCreateSession(client, sessionKey, directory) {
         return cb - ca;
       });
       const best = candidates[0];
-      if (best?.id) return { id: best.id, title: best.title };
+      if (best?.id) {
+        const session2 = { id: best.id, title: best.title };
+        setCachedSession(sessionKey, session2);
+        return session2;
+      }
     }
   }
   const title = generateSessionTitle(sessionKey);
@@ -99278,7 +99235,9 @@ async function getOrCreateSession(client, sessionKey, directory) {
       `\u521B\u5EFA OpenCode \u4F1A\u8BDD\u5931\u8D25: ${err ? JSON.stringify(err) : "unknown"}`
     );
   }
-  return { id: createResp.data.id, title: createResp.data.title };
+  const session = { id: createResp.data.id, title: createResp.data.title };
+  setCachedSession(sessionKey, session);
+  return session;
 }
 async function forkSession(client, oldSessionId, sessionKey, directory) {
   const query = directory ? { directory } : void 0;
@@ -99308,6 +99267,92 @@ async function forkSession(client, oldSessionId, sessionKey, directory) {
   return { id: resp.data.id, title };
 }
 
+// src/handler/event.ts
+var pendingBySession = /* @__PURE__ */ new Map();
+function registerPending(sessionId, payload) {
+  pendingBySession.set(sessionId, { ...payload, textBuffer: "" });
+}
+function unregisterPending(sessionId) {
+  pendingBySession.delete(sessionId);
+}
+function migratePending(oldSessionId, newSessionId) {
+  const payload = pendingBySession.get(oldSessionId);
+  if (payload) {
+    pendingBySession.delete(oldSessionId);
+    pendingBySession.set(newSessionId, payload);
+  }
+}
+function isModelError(errMsg) {
+  return errMsg.includes("ModelNotFound") || errMsg.includes("ProviderModelNotFound");
+}
+async function handleEvent(event, deps) {
+  switch (event.type) {
+    case "message.part.updated": {
+      const part = event.properties.part;
+      if (!part) break;
+      const sessionId = part.sessionID;
+      if (!sessionId) break;
+      const payload = pendingBySession.get(sessionId);
+      if (!payload) break;
+      const delta = event.properties.delta;
+      if (delta) {
+        payload.textBuffer += delta;
+      } else {
+        const fullText = extractPartText(part);
+        if (fullText) {
+          payload.textBuffer = fullText;
+        }
+      }
+      if (payload.textBuffer) {
+        const res = await updateMessage(payload.feishuClient, payload.placeholderId, payload.textBuffer.trim());
+        if (!res.ok) ;
+      }
+      break;
+    }
+    case "session.error": {
+      const props = event.properties;
+      const sessionId = props.sessionID;
+      if (!sessionId) break;
+      const errMsg = props.error?.message ?? String(props.error);
+      if (isModelError(errMsg)) {
+        const sessionKey = invalidateCachedSession(sessionId);
+        if (sessionKey) {
+          try {
+            const newSession = await forkSession(deps.client, sessionId, sessionKey, deps.directory);
+            setCachedSession(sessionKey, newSession);
+            deps.log("warn", "\u6A21\u578B\u4E0D\u517C\u5BB9\uFF0C\u5DF2\u4E3B\u52A8 fork \u4F1A\u8BDD", {
+              oldSessionId: sessionId,
+              newSessionId: newSession.id,
+              sessionKey
+            });
+            migratePending(sessionId, newSession.id);
+          } catch (forkErr) {
+            deps.log("error", "\u4E3B\u52A8 fork \u5931\u8D25", {
+              sessionId,
+              sessionKey,
+              error: forkErr instanceof Error ? forkErr.message : String(forkErr)
+            });
+          }
+        }
+      }
+      const payload = pendingBySession.get(sessionId);
+      if (!payload) break;
+      const updateRes = await updateMessage(payload.feishuClient, payload.placeholderId, `\u274C \u4F1A\u8BDD\u9519\u8BEF: ${errMsg}`);
+      if (!updateRes.ok) {
+        await sendTextMessage(payload.feishuClient, payload.chatId, `\u274C \u4F1A\u8BDD\u9519\u8BEF: ${errMsg}`);
+      }
+      break;
+    }
+  }
+}
+function extractPartText(part) {
+  if (part.type === "text") return part.text ?? "";
+  if (part.type === "reasoning" && part.text) return `\u{1F914} \u601D\u8003: ${part.text}
+
+`;
+  return "";
+}
+
 // src/handler/chat.ts
 var activeAutoPrompts = /* @__PURE__ */ new Map();
 async function handleChat(ctx, deps) {
@@ -99322,18 +99367,14 @@ async function handleChat(ctx, deps) {
     activeAutoPrompts.delete(sessionKey);
     log("info", "\u7528\u6237\u4ECB\u5165\uFF0C\u81EA\u52A8\u63D0\u793A\u5DF2\u4E2D\u65AD", { sessionKey });
   }
-  let session = await getOrCreateSession(client, sessionKey, directory);
+  const session = await getOrCreateSession(client, sessionKey, directory);
   const parts = await buildPromptParts(feishuClient, messageId, messageType, rawContent, content, chatType, senderId, log);
   if (!parts.length) return;
   if (!shouldReply) {
     try {
-      session = await promptWithForkRecovery({
-        client,
-        session,
-        sessionKey,
-        directory,
+      await client.session.prompt({
+        path: { id: session.id },
         query,
-        log,
         body: { parts, noReply: true }
       });
     } catch (err) {
@@ -99349,7 +99390,6 @@ async function handleChat(ctx, deps) {
   const stablePolls = config.stablePolls;
   let placeholderId = "";
   let done = false;
-  let oldSessionId = session.id;
   const timer = thinkingDelay > 0 ? setTimeout(async () => {
     if (done) return;
     try {
@@ -99367,21 +99407,11 @@ async function handleChat(ctx, deps) {
     }
   }, thinkingDelay) : null;
   try {
-    session = await promptWithForkRecovery({
-      client,
-      session,
-      sessionKey,
-      directory,
+    await client.session.prompt({
+      path: { id: session.id },
       query,
-      log,
       body: { parts }
     });
-    if (session.id !== oldSessionId) {
-      unregisterPending(oldSessionId);
-      if (placeholderId) {
-        registerPending(session.id, { chatId, placeholderId, feishuClient });
-      }
-    }
     const finalText = await pollForResponse(client, session.id, { timeout, pollInterval, stablePolls, query });
     await replyOrUpdate(feishuClient, chatId, placeholderId, finalText || "\u26A0\uFE0F \u54CD\u5E94\u8D85\u65F6");
     const { autoPrompt } = config;
@@ -99427,7 +99457,6 @@ async function handleChat(ctx, deps) {
     done = true;
     if (timer) clearTimeout(timer);
     unregisterPending(session.id);
-    if (session.id !== oldSessionId) unregisterPending(oldSessionId);
   }
 }
 async function buildPromptParts(feishuClient, messageId, messageType, rawContent, textContent, chatType, senderId, log) {
@@ -99499,26 +99528,6 @@ function abortableSleep(ms, signal) {
     signal.addEventListener("abort", onAbort, { once: true });
   });
 }
-function isModelNotFoundError(err, sessionId) {
-  const msg = err instanceof Error ? err.message : String(err);
-  const tracked = consumeSessionError(sessionId);
-  if (msg.includes("ProviderModelNotFound") || msg.includes("ModelNotFound")) return true;
-  return !!tracked;
-}
-async function promptWithForkRecovery(opts) {
-  const { client, sessionKey, directory, query, log, body } = opts;
-  let { session } = opts;
-  const doPrompt = (s) => client.session.prompt({ path: { id: s.id }, query, body });
-  try {
-    await doPrompt(session);
-  } catch (err) {
-    if (!isModelNotFoundError(err, session.id)) throw err;
-    log("warn", "\u4F1A\u8BDD\u6A21\u578B\u4E0D\u517C\u5BB9\uFF0Cfork \u65E7\u4F1A\u8BDD\u91CD\u8BD5", { oldSessionId: session.id });
-    session = await forkSession(client, session.id, sessionKey, directory);
-    await doPrompt(session);
-  }
-  return session;
-}
 function extractLastAssistantText(messages) {
   const assistant = messages.filter((m) => m.info?.role === "assistant").pop();
   const parts = assistant?.parts ?? [];
@@ -99721,7 +99730,7 @@ var FeishuPlugin = async (ctx) => {
   const hooks = {
     event: async ({ event }) => {
       if (!gateway) return;
-      await handleEvent(event);
+      await handleEvent(event, { client, log, directory: resolvedConfig.directory });
     }
   };
   return hooks;