larkway 0.3.38 → 0.3.39

package/README.md

@@ -8,7 +8,7 @@
 
 You @ the bot in a Feishu thread. It runs on your machine — reading your real codebase, executing commands, opening MRs — and posts the result back. You define what the agent knows and what it can do. Larkway just carries the messages.
 
-**Current release: v0.3.38**
+**Current release: v0.3.39**
 
 ---
 

package/README.zh.md

@@ -8,7 +8,7 @@
 
 你在飞书话题里 @ bot，它在你的机器上运行——读真实代码库、执行命令、开 MR——把结果贴回飞书。你定义 agent 知道什么、能做什么。Larkway 只负责传递消息。
 
-**当前版本：v0.3.38**
+**当前版本：v0.3.39**
 
 ---
 

package/dist/main.js

@@ -118525,7 +118525,10 @@ var SessionStore = class _SessionStore {
       lastActiveTs: record.lastActiveTs,
       ...record.senderOpenId !== void 0 ? { senderOpenId: record.senderOpenId } : {},
       ...record.rootText !== void 0 ? { rootText: record.rootText } : {},
-      ...record.chatId !== void 0 ? { chatId: record.chatId } : {}
+      ...record.chatId !== void 0 ? { chatId: record.chatId } : {},
+      // BL-38: only persist when > 0 — a 0/undefined counter is a clean thread,
+      // so passing consecutiveStuckCount: 0 naturally clears the field on reset.
+      ...record.consecutiveStuckCount ? { consecutiveStuckCount: record.consecutiveStuckCount } : {}
     };
     this.#map.set(key, stored);
     await this.#flush();
@@ -121946,6 +121949,13 @@ function derivePostIdempotencyKey(input) {
 var DEFAULT_CARDKIT_RESPONSE_SURFACE_TIMEOUT_MS = 20 * 60 * 1e3;
 var DEFAULT_CARDKIT_IDLE_TIMEOUT_MS = 3 * 60 * 1e3;
 var COT_BUBBLE_CREATE_BUDGET_MS = 3e3;
+var DEFAULT_STUCK_SESSION_RESET_AFTER = 3;
+function resolveStuckSessionResetAfter() {
+  const raw = process.env.LARKWAY_STUCK_SESSION_RESET_AFTER;
+  if (raw === void 0) return DEFAULT_STUCK_SESSION_RESET_AFTER;
+  const n = Number.parseInt(raw, 10);
+  return Number.isFinite(n) && n > 0 ? n : DEFAULT_STUCK_SESSION_RESET_AFTER;
+}
 function summarizeMentionPolicyRules(rules) {
   const counts = /* @__PURE__ */ new Map();
   for (const rule of rules) {
@@ -123092,34 +123102,6 @@ var BridgeHandler = class {
                 console.warn("[bridge.handler] taskHandleClaim hook failed (continuing):", err);
               }
             }
-            const now = Date.now();
-            if (sessionId !== void 0 && currentExisting === void 0) {
-              await this.deps.sessionStore.put({
-                threadId,
-                sessionId,
-                botId,
-                createdTs: now,
-                lastActiveTs: now,
-                senderOpenId,
-                ...isTopLevel ? { rootText: parsed.text.slice(0, 200), chatId: parsed.chatId } : {}
-              });
-            } else if (sessionId !== void 0 && currentExisting !== void 0) {
-              await this.deps.sessionStore.put({
-                threadId,
-                sessionId,
-                botId,
-                createdTs: currentExisting.createdTs,
-                lastActiveTs: now,
-                senderOpenId,
-                rootText: currentExisting.rootText,
-                chatId: currentExisting.chatId
-              });
-            } else if (currentExisting !== void 0 && sessionId === void 0) {
-              await this.deps.sessionStore.put({
-                ...currentExisting,
-                lastActiveTs: now
-              });
-            }
             const reportedStatus = reportedState?.status;
             const reportedError = reportedState?.error;
             const cardKitTimeoutFailure = interruptedByIdle && reportedStatus !== "ready" && reportedStatus !== "failed";
@@ -123149,10 +123131,53 @@ var BridgeHandler = class {
                 reason: failureReason
               });
             }
+            const stuckResetAfter = resolveStuckSessionResetAfter();
+            const prevStuckCount = currentExisting?.consecutiveStuckCount ?? 0;
+            const nextStuckCount = cardKitTimeoutFailure ? prevStuckCount + 1 : success ? 0 : prevStuckCount;
+            const stuckResetTriggered = cardKitTimeoutFailure && nextStuckCount >= stuckResetAfter;
+            const now = Date.now();
+            if (stuckResetTriggered) {
+              await this.deps.sessionStore.delete(threadId, botId);
+              console.info(
+                `[bridge.handler] BL-38 stuck-session reset: thread=${threadId} bot=${botId} consecutiveStuckCount=${nextStuckCount} (>= ${stuckResetAfter}) \u2014 dropped session record; next @ starts fresh`
+              );
+            } else if (sessionId !== void 0 && currentExisting === void 0) {
+              await this.deps.sessionStore.put({
+                threadId,
+                sessionId,
+                botId,
+                createdTs: now,
+                lastActiveTs: now,
+                senderOpenId,
+                // BL-38: a brand-new thread that idle-killed on its very first turn
+                // starts the counter at 1 (0 when clean; only persisted when > 0).
+                consecutiveStuckCount: nextStuckCount,
+                ...isTopLevel ? { rootText: parsed.text.slice(0, 200), chatId: parsed.chatId } : {}
+              });
+            } else if (sessionId !== void 0 && currentExisting !== void 0) {
+              await this.deps.sessionStore.put({
+                threadId,
+                sessionId,
+                botId,
+                createdTs: currentExisting.createdTs,
+                lastActiveTs: now,
+                senderOpenId,
+                rootText: currentExisting.rootText,
+                chatId: currentExisting.chatId,
+                // BL-38: +1 on an idle-stuck turn, 0 (cleared) on any clean turn.
+                consecutiveStuckCount: nextStuckCount
+              });
+            } else if (currentExisting !== void 0 && sessionId === void 0) {
+              await this.deps.sessionStore.put({
+                ...currentExisting,
+                lastActiveTs: now,
+                consecutiveStuckCount: nextStuckCount
+              });
+            }
             const fallbackAnswer = trustedAnswerText.trim() || cardKitProgress?.answerText.trim() || "";
             const noOutputFallback = "\u26A0\uFE0F \u672C\u8F6E agent \u6CA1\u6709\u4EA7\u51FA\u6B63\u6587\uFF0C\u4E5F\u6CA1\u6709\u5199\u5165\u6709\u6548\u72B6\u6001(state.json)\u3002\n" + (result.exitCode !== 0 ? `agent \u8FDB\u7A0B\u5F02\u5E38\u9000\u51FA(exit code ${result.exitCode})\u3002
 ` : "") + "\u4E0B\u4E00\u6B65\uFF1A\u6362\u4E2A\u8BF4\u6CD5\u91CD\u8BD5\uFF0C\u6216\u65B0\u5F00\u4E00\u4E2A\u8BDD\u9898\u7EE7\u7EED\uFF1B\u82E5\u53CD\u590D\u5982\u6B64\uFF0C\u8BF7\u8BA9\u7EF4\u62A4\u8005\u67E5\u770B\u8BE5 session \u65E5\u5FD7\u3002";
-            const cardBody = cardKitTimeoutFailure ? "\u26A0\uFE0F \u672C\u8F6E\u88AB\u4E2D\u65AD\uFF08\u957F\u65F6\u95F4\u65E0\u6D3B\u6027\uFF0C\u5224\u5B9A\u5361\u6B7B\uFF09\uFF0C\u672A\u5B8C\u6210\u3002\u8BF7\u91CD\u8BD5\u3002" : reportedState?.last_message ?? (fallbackAnswer ? fallbackAnswer : noOutputFallback);
+            const cardBody = stuckResetTriggered ? "\u26A0\uFE0F \u672C\u8F6E\u88AB\u4E2D\u65AD\uFF08\u957F\u65F6\u95F4\u65E0\u6D3B\u6027\uFF0C\u5224\u5B9A\u5361\u6B7B\uFF09\u3002\u8FDE\u7EED\u591A\u6B21\u5361\u6B7B\uFF0C\u5DF2\u91CD\u7F6E\u672C\u8BDD\u9898\u4E0A\u4E0B\u6587 \u2014\u2014 \u4E0B\u6B21 @ \u6211\u5C06\u5168\u65B0\u5F00\u59CB\uFF0C\u8BF7\u628A\u9700\u6C42\u91CD\u65B0\u8BF4\u4E00\u904D\u3002" : cardKitTimeoutFailure ? "\u26A0\uFE0F \u672C\u8F6E\u88AB\u4E2D\u65AD\uFF08\u957F\u65F6\u95F4\u65E0\u6D3B\u6027\uFF0C\u5224\u5B9A\u5361\u6B7B\uFF09\uFF0C\u672A\u5B8C\u6210\u3002\u8BF7\u91CD\u8BD5\u3002" : reportedState?.last_message ?? (fallbackAnswer ? fallbackAnswer : noOutputFallback);
             const noReportThisTurn = reportedState === null;
             const neutralTitle = noReportThisTurn && success && !failureReason ? "\u{1F4AC} \u5DF2\u56DE\u590D" : void 0;
             const baseCardPayload = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "larkway",
-  "version": "0.3.38",
+  "version": "0.3.39",
   "description": "Thin bridge: Feishu thread to local Claude Code CLI",
   "license": "MIT",
   "author": "Chuck Wu (chuckwu0)",