@vibe-lark/larkpal 0.1.19 → 0.1.20

package/dist/main.mjs

@@ -6973,6 +6973,13 @@ const THROTTLE_CONSTANTS = {
 * mutex-guarded flushing, and reflush-on-conflict. Contains no
 * business logic — the actual flush work is provided via a callback.
 */
+/** flush 超时保护：单次 flush API 调用最大允许时间（超过后释放锁，允许后续 flush 继续） */
+const FLUSH_TIMEOUT_MS = 15e3;
+var FlushTimeoutError = class extends Error {
+	constructor() {
+		super("flush timeout");
+	}
+};
 var FlushController = class {
 	flushInProgress = false;
 	flushResolvers = [];
@@ -7004,6 +7011,9 @@ var FlushController = class {
 	*
 	* If a flush is already in progress, marks needsReflush so a
 	* follow-up flush fires immediately after the current one completes.
+	* 
+	* 包含超时保护：如果单次 flush 超过 FLUSH_TIMEOUT_MS，强制释放锁并触发 reflush，
+	* 防止飞书 API 偶发慢响应导致卡片长时间无法更新。
 	*/
 	async flush() {
 		if (!this.cardMessageReady() || this.flushInProgress || this.isCompleted) {
@@ -7014,8 +7024,19 @@ var FlushController = class {
 		this.needsReflush = false;
 		this.lastUpdateTime = Date.now();
 		try {
-			await this.doFlush();
+			let timeoutTimer;
+			const timeoutPromise = new Promise((_, reject) => {
+				timeoutTimer = setTimeout(() => reject(new FlushTimeoutError()), FLUSH_TIMEOUT_MS);
+			});
+			try {
+				await Promise.race([this.doFlush(), timeoutPromise]);
+			} finally {
+				clearTimeout(timeoutTimer);
+			}
 			this.lastUpdateTime = Date.now();
+		} catch (err) {
+			if (!(err instanceof FlushTimeoutError)) throw err;
+			this.needsReflush = true;
 		} finally {
 			this.flushInProgress = false;
 			const resolvers = this.flushResolvers;
@@ -7409,6 +7430,21 @@ var UnavailableGuard = class {
 	}
 };
 //#endregion
+//#region src/card/active-card-store.ts
+const store = /* @__PURE__ */ new Map();
+/** 注册活跃的 card controller（每条消息调度时） */
+function registerActiveCard(sessionId, controller) {
+	store.set(sessionId, controller);
+}
+/** 注销（controller 进入终态后调用） */
+function unregisterActiveCard(sessionId) {
+	store.delete(sessionId);
+}
+/** 获取当前活跃的 card controller */
+function getActiveCard(sessionId) {
+	return store.get(sessionId);
+}
+//#endregion
 //#region src/card/streaming-card-controller.ts
 /**
 * Copyright (c) 2026 ByteDance Ltd. and/or its affiliates
@@ -7712,6 +7748,7 @@ var StreamingCardController = class StreamingCardController {
 		this.flush.complete();
 		this.disposeShutdownHook?.();
 		this.disposeShutdownHook = null;
+		unregisterActiveCard(this.deps.sessionKey);
 		if (this.phase === "terminated" || this.phase === "creation_failed") clearToolUseTraceRun(this.deps.sessionKey);
 	}
 	markToolUseActivity() {
@@ -7889,21 +7926,6 @@ var StreamingCardController = class StreamingCardController {
 		const idleEffectiveCardId = this.cardKit.cardKitCardId ?? this.cardKit.originalCardKitCardId;
 		try {
 			if (this.cardKit.cardMessageId) {
-				if (idleEffectiveCardId) {
-					const seqBeforeClose = this.cardKit.cardKitSequence;
-					this.cardKit.cardKitSequence += 1;
-					log$13.info("onIdle: closing streaming mode", {
-						seqBefore: seqBeforeClose,
-						seqAfter: this.cardKit.cardKitSequence
-					});
-					await setCardStreamingMode({
-						cfg: this.deps.cfg,
-						cardId: idleEffectiveCardId,
-						streamingMode: false,
-						sequence: this.cardKit.cardKitSequence,
-						accountId: this.deps.accountId
-					});
-				}
 				const isNoReplyLeak = !this.text.completedText && SILENT_REPLY_TOKEN.startsWith(this.text.accumulatedText.trim());
 				const displayText = this.text.completedText || (isNoReplyLeak ? "" : this.text.accumulatedText) || "Done.";
 				if (!this.text.completedText && !this.text.accumulatedText) log$13.warn("reply completed without visible text, using empty-reply fallback");
@@ -7941,33 +7963,65 @@ var StreamingCardController = class StreamingCardController {
 					isAborted: this._userAborted,
 					stepTitles: idleToolUseDisplay?.steps?.map((s) => s.title)
 				});
-				if (idleEffectiveCardId) {
-					const seqBeforeUpdate = this.cardKit.cardKitSequence;
-					this.cardKit.cardKitSequence += 1;
-					log$13.info("onIdle: updating final card", {
-						seqBefore: seqBeforeUpdate,
-						seqAfter: this.cardKit.cardKitSequence
-					});
-					await updateCardKitCard({
+				const MAX_FINAL_UPDATE_RETRIES = 3;
+				const FINAL_UPDATE_RETRY_DELAY_MS = 2e3;
+				for (let attempt = 1; attempt <= MAX_FINAL_UPDATE_RETRIES; attempt++) try {
+					if (idleEffectiveCardId) {
+						const seqBeforeClose = this.cardKit.cardKitSequence;
+						this.cardKit.cardKitSequence += 1;
+						log$13.info("onIdle: closing streaming mode", {
+							attempt,
+							seqBefore: seqBeforeClose,
+							seqAfter: this.cardKit.cardKitSequence
+						});
+						await setCardStreamingMode({
+							cfg: this.deps.cfg,
+							cardId: idleEffectiveCardId,
+							streamingMode: false,
+							sequence: this.cardKit.cardKitSequence,
+							accountId: this.deps.accountId
+						});
+						const seqBeforeUpdate = this.cardKit.cardKitSequence;
+						this.cardKit.cardKitSequence += 1;
+						log$13.info("onIdle: updating final card", {
+							attempt,
+							seqBefore: seqBeforeUpdate,
+							seqAfter: this.cardKit.cardKitSequence
+						});
+						await updateCardKitCard({
+							cfg: this.deps.cfg,
+							cardId: idleEffectiveCardId,
+							card: toCardKit2(completeCard),
+							sequence: this.cardKit.cardKitSequence,
+							accountId: this.deps.accountId
+						});
+					} else await updateCardFeishu({
 						cfg: this.deps.cfg,
-						cardId: idleEffectiveCardId,
-						card: toCardKit2(completeCard),
-						sequence: this.cardKit.cardKitSequence,
+						messageId: this.cardKit.cardMessageId,
+						card: completeCard,
 						accountId: this.deps.accountId
 					});
-				} else await updateCardFeishu({
-					cfg: this.deps.cfg,
-					messageId: this.cardKit.cardMessageId,
-					card: completeCard,
-					accountId: this.deps.accountId
-				});
-				log$13.info("reply completed, card finalized", {
-					elapsedMs: this.elapsed(),
-					isCardKit: !!idleEffectiveCardId
-				});
+					log$13.info("reply completed, card finalized", {
+						elapsedMs: this.elapsed(),
+						isCardKit: !!idleEffectiveCardId,
+						attempt
+					});
+					break;
+				} catch (retryErr) {
+					log$13.warn("final card update attempt failed", {
+						attempt,
+						maxRetries: MAX_FINAL_UPDATE_RETRIES,
+						error: String(retryErr)
+					});
+					if (attempt < MAX_FINAL_UPDATE_RETRIES) await new Promise((resolve) => setTimeout(resolve, FINAL_UPDATE_RETRY_DELAY_MS * attempt));
+					else log$13.error("final card update exhausted all retries, card may remain in streaming state", {
+						cardId: idleEffectiveCardId,
+						messageId: this.cardKit.cardMessageId
+					});
+				}
 			}
 		} catch (err) {
-			log$13.warn("final card update failed", { error: String(err) });
+			log$13.error("final card update failed (outer)", { error: String(err) });
 		} finally {
 			clearToolUseTraceRun(this.deps.sessionKey);
 		}
@@ -8041,6 +8095,78 @@ var StreamingCardController = class StreamingCardController {
 			clearToolUseTraceRun(this.deps.sessionKey);
 		}
 	}
+	/**
+	* 强制关闭 streaming 状态（兜底方法）。
+	*
+	* 当进程已退出且卡片可能因 API 调用失败仍停留在 streaming 状态时，
+	* 由 session-control-handler 调用，强制调用 closeStreaming + updateCard。
+	* 即使已经是 terminal phase 也会尝试执行 API 调用。
+	*/
+	async forceCloseStreaming() {
+		const effectiveCardId = this.cardKit.cardKitCardId ?? this.cardKit.originalCardKitCardId;
+		if (!effectiveCardId && !this.cardKit.cardMessageId) {
+			log$13.warn("forceCloseStreaming: no card to close");
+			return;
+		}
+		log$13.info("forceCloseStreaming: 强制终态化卡片", {
+			cardId: effectiveCardId,
+			messageId: this.cardKit.cardMessageId,
+			phase: this.phase
+		});
+		this._userAborted = true;
+		try {
+			const displayText = this.text.accumulatedText || this.text.completedText || "Done.";
+			const idleToolUseDisplay = this.computeToolUseDisplay();
+			const terminalContent = prepareTerminalCardContent({
+				text: displayText,
+				reasoningText: this.reasoning.accumulatedReasoningText || void 0
+			}, this.imageResolver);
+			const completeCard = buildCardContent("complete", {
+				text: terminalContent.text,
+				reasoningText: terminalContent.reasoningText,
+				reasoningElapsedMs: this.reasoning.reasoningElapsedMs || void 0,
+				toolUseSteps: idleToolUseDisplay?.steps,
+				toolUseTitleSuffix: this.computeToolUseTitleSuffix(idleToolUseDisplay),
+				toolUseElapsedMs: this.visibleToolUseElapsedMs,
+				showToolUse: this.deps.toolUseDisplay.showToolUse,
+				elapsedMs: this.elapsed(),
+				isAborted: true,
+				footer: this.deps.resolvedFooter,
+				sessionId: this.deps.sessionKey,
+				showUndoButton: false
+			});
+			if (effectiveCardId) {
+				this.cardKit.cardKitSequence += 1;
+				await setCardStreamingMode({
+					cfg: this.deps.cfg,
+					cardId: effectiveCardId,
+					streamingMode: false,
+					sequence: this.cardKit.cardKitSequence,
+					accountId: this.deps.accountId
+				});
+				this.cardKit.cardKitSequence += 1;
+				await updateCardKitCard({
+					cfg: this.deps.cfg,
+					cardId: effectiveCardId,
+					card: toCardKit2(completeCard),
+					sequence: this.cardKit.cardKitSequence,
+					accountId: this.deps.accountId
+				});
+			} else if (this.cardKit.cardMessageId) await updateCardFeishu({
+				cfg: this.deps.cfg,
+				messageId: this.cardKit.cardMessageId,
+				card: completeCard,
+				accountId: this.deps.accountId
+			});
+			log$13.info("forceCloseStreaming: 卡片已强制终态化");
+			if (!this.isTerminalPhase) this.finalizeCard("forceCloseStreaming", "abort");
+		} catch (err) {
+			log$13.error("forceCloseStreaming failed", { error: String(err) });
+		} finally {
+			unregisterActiveCard(this.deps.sessionKey);
+			clearToolUseTraceRun(this.deps.sessionKey);
+		}
+	}
 	async ensureCardCreated() {
 		if (this.guard.shouldSkip("ensureCardCreated.precheck")) return;
 		if (this.cardKit.cardMessageId || this.phase === "creation_failed" || this.isTerminalPhase) return;
@@ -8805,6 +8931,7 @@ async function dispatchToCC(params) {
 		placeholderMessageId: params.placeholderMessageId
 	};
 	const cardController = new StreamingCardController(cardDeps);
+	registerActiveCard(route.sessionId, cardController);
 	log$11.info("StreamingCardController 已创建", {
 		sessionId: route.sessionId,
 		chatId,
@@ -8987,6 +9114,7 @@ async function dispatchTeammateEval(params) {
 				model: false
 			}
 		});
+		registerActiveCard(teammateSessionKey, cardController);
 		bridge = new CCStreamBridge(cardController, {
 			autoCompleteOnTurnEnd: true,
 			sessionKey: teammateSessionKey
@@ -11884,6 +12012,15 @@ async function handleAbortSession(params) {
 			sessionId,
 			status: proc?.status
 		});
+		const activeCard = getActiveCard(sessionId);
+		if (activeCard) {
+			log.info("abort_session: 进程已退出但卡片仍在活跃状态，强制终态化", { sessionId });
+			activeCard.forceCloseStreaming();
+			return { toast: {
+				type: "success",
+				content: "任务已结束，正在更新卡片"
+			} };
+		}
 		return { toast: {
 			type: "info",
 			content: "当前没有正在执行的任务"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibe-lark/larkpal",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "description": "LarkPal - Lark/Feishu bot service",
   "type": "module",
   "main": "./dist/main.mjs",