opencode-feishu 0.7.3 → 0.7.5

package/dist/index.js

@@ -99266,12 +99266,58 @@ async function forkSession(client, oldSessionId, sessionKey, directory) {
   }
   return { id: resp.data.id, title };
 }
+async function createFreshSession(client, sessionKey, directory) {
+  const query = directory ? { directory } : void 0;
+  const title = generateSessionTitle(sessionKey);
+  const resp = await client.session.create({ query, body: { title } });
+  if (!resp?.data?.id) {
+    const err = resp?.error;
+    throw new Error(
+      `\u521B\u5EFA\u65B0\u4F1A\u8BDD\u5931\u8D25: ${err ? JSON.stringify(err) : "unknown"}`
+    );
+  }
+  return { id: resp.data.id, title: resp.data.title };
+}
+async function forkOrCreateSession(client, oldSessionId, sessionKey, directory, log) {
+  try {
+    return await forkSession(client, oldSessionId, sessionKey, directory);
+  } catch (forkErr) {
+    log?.("warn", "Fork \u5931\u8D25\uFF0C\u56DE\u9000\u5230\u521B\u5EFA\u65B0\u4F1A\u8BDD", {
+      oldSessionId,
+      sessionKey,
+      error: forkErr instanceof Error ? forkErr.message : String(forkErr)
+    });
+    return await createFreshSession(client, 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;
+var forkAttempts = /* @__PURE__ */ new Map();
+var forkAttemptTimeouts = /* @__PURE__ */ new Map();
+var MAX_FORK_ATTEMPTS = 2;
+var FORK_ATTEMPTS_TTL_MS = 36e5;
+function clearForkAttempts(sessionKey) {
+  forkAttempts.delete(sessionKey);
+  const timer = forkAttemptTimeouts.get(sessionKey);
+  if (timer) {
+    clearTimeout(timer);
+    forkAttemptTimeouts.delete(sessionKey);
+  }
+}
+function setForkAttempts(sessionKey, count) {
+  forkAttempts.set(sessionKey, count);
+  const existing = forkAttemptTimeouts.get(sessionKey);
+  if (existing) clearTimeout(existing);
+  const timeoutId = setTimeout(() => {
+    forkAttempts.delete(sessionKey);
+    forkAttemptTimeouts.delete(sessionKey);
+  }, FORK_ATTEMPTS_TTL_MS);
+  forkAttemptTimeouts.set(sessionKey, timeoutId);
+}
 function getSessionError(sessionId) {
   return sessionErrors.get(sessionId);
 }
@@ -99315,6 +99361,10 @@ function isModelError(errMsg, rawError) {
   if (rawError && typeof rawError === "object") {
     const e = rawError;
     const fields = [e.type, e.name, e.message].filter(Boolean).map(String);
+    if (e.data && typeof e.data === "object" && "message" in e.data) {
+      const dataMsg = e.data.message;
+      if (dataMsg) fields.push(String(dataMsg));
+    }
     return fields.some((f) => f.includes("ModelNotFound") || f.includes("ProviderModelNotFound"));
   }
   return false;
@@ -99353,11 +99403,17 @@ async function handleEvent(event, deps) {
         errMsg = error;
       } else if (error && typeof error === "object") {
         const e = error;
-        errMsg = String(e.message ?? e.type ?? e.name ?? "An unexpected error occurred");
+        const rawDataMsg = e.data && typeof e.data === "object" && "message" in e.data ? e.data.message : void 0;
+        const dataMsg = rawDataMsg != null ? String(rawDataMsg) : void 0;
+        errMsg = String(e.message ?? dataMsg ?? 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) };
+      const safeErrorFields = error && typeof error === "object" ? {
+        type: error.type,
+        name: error.name,
+        dataMessage: error.data?.message
+      } : { raw: String(error) };
       deps.log("warn", "\u6536\u5230 session.error \u4E8B\u4EF6", {
         sessionId,
         error: safeErrorFields,
@@ -99367,21 +99423,28 @@ async function handleEvent(event, deps) {
       if (isModelError(errMsg, props.error)) {
         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 attempts = forkAttempts.get(sessionKey) ?? 0;
+          if (attempts >= MAX_FORK_ATTEMPTS) {
+            deps.log("warn", "\u5DF2\u8FBE fork \u4E0A\u9650\uFF0C\u653E\u5F03\u6062\u590D", { sessionKey, attempts });
+          } else {
+            setForkAttempts(sessionKey, attempts + 1);
+            try {
+              const newSession = await forkOrCreateSession(deps.client, sessionId, sessionKey, deps.directory, deps.log);
+              setCachedSession(sessionKey, newSession);
+              deps.log("warn", "\u6A21\u578B\u4E0D\u517C\u5BB9\uFF0C\u5DF2\u6062\u590D\u4F1A\u8BDD", {
+                oldSessionId: sessionId,
+                newSessionId: newSession.id,
+                sessionKey,
+                forkAttempt: attempts + 1
+              });
+              migratePending(sessionId, newSession.id);
+            } catch (recoverErr) {
+              deps.log("error", "\u4F1A\u8BDD\u6062\u590D\u5931\u8D25", {
+                sessionId,
+                sessionKey,
+                error: recoverErr instanceof Error ? recoverErr.message : String(recoverErr)
+              });
+            }
           }
         }
       }
@@ -99467,6 +99530,7 @@ async function handleChat(ctx, deps) {
       body: { parts }
     });
     const finalText = await pollForResponse(client, session.id, { timeout, pollInterval, stablePolls, query });
+    clearForkAttempts(sessionKey);
     await replyOrUpdate(feishuClient, chatId, placeholderId, finalText || "\u26A0\uFE0F \u54CD\u5E94\u8D85\u65F6");
     const { autoPrompt } = config;
     if (autoPrompt.enabled && shouldReply) {
@@ -99512,7 +99576,7 @@ async function handleChat(ctx, deps) {
       sessionKey: sessionKey.replace(/-[^-]+$/, "-***"),
       chatType,
       error: thrownError,
-      ...sessionError ? { sessionError } : {}
+      ...sessionError ? { sessionError } : { sseRaceMiss: true }
     });
     const msg = "\u274C " + errorMessage;
     await replyOrUpdate(feishuClient, chatId, placeholderId, msg);