opencode-feishu 0.7.1 → 0.7.3

package/dist/index.js

@@ -99269,6 +99269,32 @@ async function forkSession(client, oldSessionId, sessionKey, directory) {
 
 // src/handler/event.ts
 var pendingBySession = /* @__PURE__ */ new Map();
+var sessionErrors = /* @__PURE__ */ new Map();
+var sessionErrorTimeouts = /* @__PURE__ */ new Map();
+var SESSION_ERROR_TTL_MS = 3e4;
+function getSessionError(sessionId) {
+  return sessionErrors.get(sessionId);
+}
+function clearSessionError(sessionId) {
+  const timer = sessionErrorTimeouts.get(sessionId);
+  if (timer) {
+    clearTimeout(timer);
+    sessionErrorTimeouts.delete(sessionId);
+  }
+  sessionErrors.delete(sessionId);
+}
+function setSessionError(sessionId, errMsg) {
+  const existing = sessionErrorTimeouts.get(sessionId);
+  if (existing) {
+    clearTimeout(existing);
+  }
+  sessionErrors.set(sessionId, errMsg);
+  const timeoutId = setTimeout(() => {
+    sessionErrors.delete(sessionId);
+    sessionErrorTimeouts.delete(sessionId);
+  }, SESSION_ERROR_TTL_MS);
+  sessionErrorTimeouts.set(sessionId, timeoutId);
+}
 function registerPending(sessionId, payload) {
   pendingBySession.set(sessionId, { ...payload, textBuffer: "" });
 }
@@ -99282,8 +99308,16 @@ function migratePending(oldSessionId, newSessionId) {
     pendingBySession.set(newSessionId, payload);
   }
 }
-function isModelError(errMsg) {
-  return errMsg.includes("ModelNotFound") || errMsg.includes("ProviderModelNotFound");
+function isModelError(errMsg, rawError) {
+  if (errMsg.includes("ModelNotFound") || errMsg.includes("ProviderModelNotFound")) {
+    return true;
+  }
+  if (rawError && typeof rawError === "object") {
+    const e = rawError;
+    const fields = [e.type, e.name, e.message].filter(Boolean).map(String);
+    return fields.some((f) => f.includes("ModelNotFound") || f.includes("ProviderModelNotFound"));
+  }
+  return false;
 }
 async function handleEvent(event, deps) {
   switch (event.type) {
@@ -99313,8 +99347,24 @@ async function handleEvent(event, deps) {
       const props = event.properties;
       const sessionId = props.sessionID;
       if (!sessionId) break;
-      const errMsg = props.error?.message ?? String(props.error);
-      if (isModelError(errMsg)) {
+      const error = props.error;
+      let errMsg;
+      if (typeof error === "string") {
+        errMsg = error;
+      } else if (error && typeof error === "object") {
+        const e = error;
+        errMsg = String(e.message ?? e.type ?? e.name ?? "An unexpected error occurred");
+      } else {
+        errMsg = String(error);
+      }
+      const safeErrorFields = error && typeof error === "object" ? { type: error.type, name: error.name } : { raw: String(error) };
+      deps.log("warn", "\u6536\u5230 session.error \u4E8B\u4EF6", {
+        sessionId,
+        error: safeErrorFields,
+        extractedMsg: errMsg
+      });
+      setSessionError(sessionId, errMsg);
+      if (isModelError(errMsg, props.error)) {
         const sessionKey = invalidateCachedSession(sessionId);
         if (sessionKey) {
           try {
@@ -99335,12 +99385,6 @@ async function handleEvent(event, deps) {
           }
         }
       }
-      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;
     }
   }
@@ -99354,6 +99398,7 @@ function extractPartText(part) {
 }
 
 // src/handler/chat.ts
+var SSE_RACE_WAIT_MS = 100;
 var activeAutoPrompts = /* @__PURE__ */ new Map();
 async function handleChat(ctx, deps) {
   const { content, chatId, chatType, senderId, shouldReply, messageType, rawContent, messageId } = ctx;
@@ -99370,6 +99415,15 @@ async function handleChat(ctx, deps) {
   const session = await getOrCreateSession(client, sessionKey, directory);
   const parts = await buildPromptParts(feishuClient, messageId, messageType, rawContent, content, chatType, senderId, log);
   if (!parts.length) return;
+  log("info", "\u6536\u5230\u7528\u6237\u6D88\u606F", {
+    sessionKey,
+    sessionId: session.id,
+    chatType,
+    senderId,
+    messageType,
+    shouldReply,
+    parts
+  });
   if (!shouldReply) {
     try {
       await client.session.prompt({
@@ -99448,10 +99502,19 @@ async function handleChat(ctx, deps) {
       }
     }
   } catch (err) {
+    await new Promise((r) => setTimeout(r, SSE_RACE_WAIT_MS));
+    const sessionError = getSessionError(session.id);
+    clearSessionError(session.id);
+    const thrownError = err instanceof Error ? err.message : String(err);
+    const errorMessage = sessionError || thrownError;
     log("error", "\u5BF9\u8BDD\u5904\u7406\u5931\u8D25", {
-      error: err instanceof Error ? err.message : String(err)
+      sessionId: session.id,
+      sessionKey: sessionKey.replace(/-[^-]+$/, "-***"),
+      chatType,
+      error: thrownError,
+      ...sessionError ? { sessionError } : {}
     });
-    const msg = "\u274C " + (err instanceof Error ? err.message : String(err));
+    const msg = "\u274C " + errorMessage;
     await replyOrUpdate(feishuClient, chatId, placeholderId, msg);
   } finally {
     done = true;