@vibe-lark/larkpal 0.1.59 → 0.1.60

package/dist/main.mjs

@@ -3421,6 +3421,7 @@ function summarizeString(value) {
 */
 const log$29 = larkLogger("chat/stream");
 const chatRunsBySession = /* @__PURE__ */ new Map();
+const DEFAULT_STALE_RUN_IDLE_MS = 1800 * 1e3;
 /** 统一写 SSE 格式数据到响应流 */
 function sendSSE(res, event, data) {
 	const payload = typeof data === "string" ? data : JSON.stringify(data);
@@ -3444,6 +3445,7 @@ function getActiveChatRun(sessionId) {
 	return run?.status === "running" ? run : void 0;
 }
 function serializeChatRun(run) {
+	const idleSeconds = Math.max(0, Math.floor((Date.now() - run.lastEventAt) / 1e3));
 	return {
 		runId: run.runId,
 		sessionId: run.sessionId,
@@ -3456,9 +3458,23 @@ function serializeChatRun(run) {
 		finalStatus: run.finalStatus,
 		error: run.error,
 		textLength: run.text.length,
-		finalText: run.status === "running" ? void 0 : run.text || void 0
+		finalText: run.status === "running" ? void 0 : run.text || void 0,
+		lastEventAt: run.lastEventAt,
+		lastEventType: run.lastEventType,
+		lastToolName: run.lastToolName,
+		idleSeconds,
+		adapterBusy: run.adapterBusy,
+		staleReason: run.staleReason
 	};
 }
+function getRuntimeEventDedupeKey(event) {
+	const record = event;
+	const eventId = record.eventId;
+	if (typeof eventId === "string" && eventId.length > 0) return eventId;
+	const runId = typeof record.runId === "string" ? record.runId : void 0;
+	const seq = typeof record.seq === "number" || typeof record.seq === "string" ? String(record.seq) : void 0;
+	return runId && seq ? `${runId}:${seq}` : void 0;
+}
 function isRunVisibleToUser(run, params) {
 	return run.tenantKey === params.tenantKey && run.openId === params.openId;
 }
@@ -3475,6 +3491,17 @@ function addRunClient(req, res, run) {
 function sendRunStatus(res, run) {
 	sendSSE(res, "run-status", serializeChatRun(run));
 }
+function getStaleRunIdleMs() {
+	const raw = process.env.LARKPAL_CHAT_RUN_STALE_IDLE_MS;
+	if (!raw) return DEFAULT_STALE_RUN_IDLE_MS;
+	const parsed = Number.parseInt(raw, 10);
+	return Number.isFinite(parsed) && parsed > 0 ? parsed : DEFAULT_STALE_RUN_IDLE_MS;
+}
+function recordRunEvent(run, eventType, params) {
+	run.lastEventAt = Date.now();
+	run.lastEventType = eventType;
+	if (params?.toolName) run.lastToolName = params.toolName;
+}
 function extractRuntimeEventFinalText(event) {
 	const direct = event.finalText;
 	if (typeof direct === "string" && direct.trim()) return direct;
@@ -3522,6 +3549,71 @@ function queueRunMessage(run, messageStore, message, label) {
 	});
 	return run.persistQueue;
 }
+function appendRunStatusMessage(run, messageStore) {
+	return queueRunMessage(run, messageStore, {
+		sessionId: run.sessionId,
+		role: "tool",
+		content: JSON.stringify({
+			runtimeEventType: "run-status",
+			run: serializeChatRun(run)
+		}),
+		channel: "web",
+		metadata: {
+			runId: run.runId,
+			requestId: run.requestId,
+			traceId: run.traceId,
+			scenarioId: run.scenarioId,
+			runtimeEventType: "run-status",
+			finalStatus: run.finalStatus,
+			errorMessage: run.error,
+			staleReason: run.staleReason
+		}
+	}, "[stream] 保存 run status 消息失败");
+}
+async function markRunTerminal(run, messageStore, status, params) {
+	if (run.status !== "running") return false;
+	run.status = status;
+	run.completedAt = Date.now();
+	run.finalStatus = params.finalStatus;
+	run.error = params.error;
+	run.staleReason = params.staleReason;
+	recordRunEvent(run, `run-${status}`);
+	broadcastRunStatus(run);
+	await appendRunStatusMessage(run, messageStore);
+	return true;
+}
+async function reconcileRunWithAdapter(run, messageStore, processManager) {
+	if (run.status !== "running") return;
+	const processInfo = processManager.getProcessInfo(run.sessionId);
+	const adapterBusy = processManager.isSessionBusy?.(run.sessionId) ?? processInfo?.status === "running";
+	run.adapterBusy = adapterBusy;
+	const idleMs = Date.now() - run.lastEventAt;
+	let staleReason;
+	if (!adapterBusy) staleReason = processInfo ? `runtime process is ${processInfo.status}` : "runtime adapter reports session is not busy";
+	else if (idleMs >= getStaleRunIdleMs()) staleReason = `run idle for ${Math.floor(idleMs / 1e3)}s`;
+	if (!staleReason) return;
+	const error = `Chat run became stale: ${staleReason}`;
+	log$29.warn("[stream] activeRun 与 runtime 状态不一致，标记为 stale", {
+		sessionId: run.sessionId,
+		runId: run.runId,
+		staleReason,
+		idleMs,
+		adapterBusy,
+		processStatus: processInfo?.status
+	});
+	if (await markRunTerminal(run, messageStore, "failed", {
+		finalStatus: "stale",
+		error,
+		staleReason
+	})) {
+		broadcastRunEvent(run, "error", {
+			runId: run.runId,
+			message: error,
+			staleReason
+		});
+		endRunClients(run);
+	}
+}
 function buildRuntimeEventMessageMetadata(event, runtimeConfig) {
 	return {
 		runtimeEventType: event.type,
@@ -3663,37 +3755,10 @@ function createChatRouter(config) {
 			text: "",
 			clients: /* @__PURE__ */ new Set(),
 			runtimeConfig,
-			persistQueue: Promise.resolve()
-		};
-		const appendRunStatusMessage = () => {
-			return queueRunMessage(run, messageStore, {
-				sessionId,
-				role: "tool",
-				content: JSON.stringify({
-					runtimeEventType: "run-status",
-					run: serializeChatRun(run)
-				}),
-				channel: "web",
-				metadata: {
-					runId: run.runId,
-					requestId,
-					traceId,
-					scenarioId,
-					runtimeEventType: "run-status",
-					finalStatus: run.finalStatus,
-					errorMessage: run.error
-				}
-			}, "[stream] 保存 run status 消息失败");
-		};
-		const markRunTerminal = async (status, params) => {
-			if (run.status !== "running") return false;
-			run.status = status;
-			run.completedAt = Date.now();
-			run.finalStatus = params.finalStatus;
-			run.error = params.error;
-			broadcastRunStatus(run);
-			await appendRunStatusMessage();
-			return true;
+			persistQueue: Promise.resolve(),
+			seenRuntimeEventIds: /* @__PURE__ */ new Set(),
+			lastEventAt: Date.now(),
+			lastEventType: "run-started"
 		};
 		try {
 			await messageStore.appendMessage({
@@ -3722,7 +3787,7 @@ function createChatRouter(config) {
 			return;
 		}
 		chatRunsBySession.set(sessionId, run);
-		appendRunStatusMessage();
+		appendRunStatusMessage(run, messageStore);
 		prepareSSE(res);
 		addRunClient(req, res, run);
 		sendSSE(res, "session", { sessionId });
@@ -3736,6 +3801,7 @@ function createChatRouter(config) {
 		}, 15e3);
 		const handleBlockedEvent = (event) => {
 			const sanitized = sanitizeBlockedEvent(event);
+			recordRunEvent(run, "blocked", { toolName: sanitized.name });
 			log$29.warn("[stream] Agent blocked event", { ...sanitized });
 			if (runtimeConfig.requestContext) logChatAudit(buildAuditEvent(runtimeConfig.requestContext, sanitized.type, {
 				toolName: sanitized.name,
@@ -3766,7 +3832,21 @@ function createChatRouter(config) {
 			broadcastRunEvent(run, "blocked", { event: sanitized });
 		};
 		const handleRuntimeEvent = (event) => {
+			const dedupeKey = getRuntimeEventDedupeKey(event);
+			if (dedupeKey) {
+				if (run.seenRuntimeEventIds.has(dedupeKey)) {
+					log$29.debug("[stream] 跳过重复 runtime event", {
+						sessionId,
+						runId: run.runId,
+						eventId: dedupeKey,
+						eventType: event.type
+					});
+					return;
+				}
+				run.seenRuntimeEventIds.add(dedupeKey);
+			}
 			const eventSummary = summarizeForAudit(event);
+			recordRunEvent(run, event.type, { toolName: event.capabilityId });
 			const runtimeFinalText = extractRuntimeEventFinalText(event);
 			if (runtimeFinalText && !run.text.trim()) run.text = runtimeFinalText;
 			if (runtimeConfig.requestContext) logChatAudit(buildAuditEvent(runtimeConfig.requestContext, "runtime_event", {
@@ -3793,13 +3873,16 @@ function createChatRouter(config) {
 		};
 		const callbacks = {
 			onTextDelta: (text) => {
+				recordRunEvent(run, "text-delta");
 				run.text += text;
 				broadcastRunEvent(run, "text-delta", { text });
 			},
 			onThinkingDelta: (text) => {
+				recordRunEvent(run, "thinking-delta");
 				broadcastRunEvent(run, "thinking-delta", { text });
 			},
 			onToolUseStart: (toolName, toolInput) => {
+				recordRunEvent(run, "tool-use-start", { toolName });
 				if (runtimeConfig.requestContext) logChatAudit(buildAuditEvent(runtimeConfig.requestContext, "tool_call_started", {
 					toolName,
 					inputSummary: summarizeForAudit(toolInput)
@@ -3827,6 +3910,7 @@ function createChatRouter(config) {
 				});
 			},
 			onToolResult: (toolUseId, result) => {
+				recordRunEvent(run, "tool-result");
 				const resultSummary = summarizeForAudit(result);
 				if (runtimeConfig.requestContext) logChatAudit(buildAuditEvent(runtimeConfig.requestContext, "tool_call_finished", {
 					toolCallId: toolUseId,
@@ -3857,19 +3941,22 @@ function createChatRouter(config) {
 				});
 			},
 			onToolProgress: (toolName, elapsedSeconds) => {
+				recordRunEvent(run, "tool-progress", { toolName });
 				broadcastRunEvent(run, "tool-progress", {
 					toolName,
 					elapsedSeconds
 				});
 			},
 			onTurnEnd: (stopReason) => {
+				recordRunEvent(run, "turn-end");
 				if (runtimeConfig.requestContext) logChatAudit(buildAuditEvent(runtimeConfig.requestContext, "turn_finished", { metadata: { stopReason } }));
 				broadcastRunEvent(run, "turn-end", { stopReason });
 			},
 			onResult: async (result) => {
+				recordRunEvent(run, "result");
 				const finalText = run.text.trim() ? run.text : result.result || "";
 				run.text = finalText;
-				await markRunTerminal(result.isError ? "failed" : "completed", { finalStatus: result.subtype });
+				await markRunTerminal(run, messageStore, result.isError ? "failed" : "completed", { finalStatus: result.subtype });
 				await queueRunMessage(run, messageStore, {
 					sessionId,
 					role: "assistant",
@@ -3920,6 +4007,7 @@ function createChatRouter(config) {
 				}));
 			},
 			onError: async (error) => {
+				recordRunEvent(run, "error");
 				log$29.error("[stream] Runtime 执行出错", {
 					sessionId,
 					runId: run.runId,
@@ -3949,7 +4037,7 @@ function createChatRouter(config) {
 						requestId
 					}
 				}));
-				await markRunTerminal("failed", {
+				await markRunTerminal(run, messageStore, "failed", {
 					finalStatus: "error",
 					error: error.message
 				});
@@ -3968,6 +4056,7 @@ function createChatRouter(config) {
 				});
 			},
 			onVerifierResult: (result) => {
+				recordRunEvent(run, "verifier-result");
 				const resultSummary = summarizeForAudit(result);
 				if (runtimeConfig.requestContext) logChatAudit(buildAuditEvent(runtimeConfig.requestContext, "verifier_result", {
 					resultSummary,
@@ -4019,7 +4108,7 @@ function createChatRouter(config) {
 					sessionId,
 					runId: run.runId
 				});
-				await markRunTerminal("failed", {
+				await markRunTerminal(run, messageStore, "failed", {
 					finalStatus: "error",
 					error: errorMessage
 				});
@@ -4065,6 +4154,7 @@ function createChatRouter(config) {
 				tenantKey: chatUser.tenantKey,
 				openId: chatUser.openId
 			}) ? run : void 0;
+			if (visibleRun) await reconcileRunWithAdapter(visibleRun, messageStore, processManager);
 			res.json({
 				messages: result.messages,
 				nextCursor: result.nextCursor,
@@ -4100,6 +4190,7 @@ function createChatRouter(config) {
 			});
 			return;
 		}
+		await reconcileRunWithAdapter(run, messageStore, processManager);
 		const serialized = serializeChatRun(run);
 		res.json({
 			sessionId,
@@ -6569,6 +6660,7 @@ const PERSONA_FILE = join(homedir(), ".claude", "CLAUDE.md");
 function createStatusRouter(config) {
 	const router = express.Router();
 	const sessionsDir = getWorkspaceChatsRoot(config?.workspaceRoot ?? resolveWorkspaceRoot("/workspace"));
+	const processManager = config?.processManager;
 	router.get("/sessions", async (req, res) => {
 		logger$2.info("list sessions request", {
 			method: req.method,
@@ -6669,14 +6761,18 @@ function createStatusRouter(config) {
 		try {
 			const uptimeSeconds = process.uptime();
 			const memory = process.memoryUsage();
+			const processes = processManager?.getAllProcessInfo().map((processInfo) => {
+				return serializeRuntimeProcess(processInfo, processManager);
+			}) ?? [];
 			const statusData = {
 				uptime: uptimeSeconds,
-				processes: [],
+				processes,
 				memory
 			};
 			logger$2.info("get status response", {
 				uptime: uptimeSeconds,
-				memoryRss: memory.rss
+				memoryRss: memory.rss,
+				processCount: processes.length
 			});
 			res.json(statusData);
 		} catch (err) {
@@ -6720,6 +6816,14 @@ function createStatusRouter(config) {
 	});
 	return router;
 }
+function serializeRuntimeProcess(processInfo, processManager) {
+	return {
+		...processInfo,
+		startedAt: processInfo.startedAt.toISOString(),
+		lastActiveAt: processInfo.lastActiveAt.toISOString(),
+		busy: processManager.isSessionBusy?.(processInfo.sessionId) ?? processInfo.status === "running"
+	};
+}
 //#endregion
 //#region src/gateway/server.ts
 const logger$1 = larkLogger("gateway");
@@ -6783,7 +6887,10 @@ function registerRoutes(app, processManager, scheduledTaskManager, appCredential
 		app.put("/api/scheduled-tasks/:id", notImplemented);
 		app.delete("/api/scheduled-tasks/:id", notImplemented);
 	}
-	app.use("/api", createStatusRouter({ workspaceRoot }));
+	app.use("/api", createStatusRouter({
+		workspaceRoot,
+		processManager
+	}));
 	app.use("/hooks", createHooksRouter());
 	app.use("/api/mcp", createMcpCallbackRouter());
 	app.use(createChatAuthRouter());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibe-lark/larkpal",
-  "version": "0.1.59",
+  "version": "0.1.60",
   "description": "LarkPal - Lark/Feishu bot service",
   "type": "module",
   "main": "./dist/main.mjs",
@@ -50,7 +50,7 @@
     "zod": "^4.3.6"
   },
   "optionalDependencies": {
-    "@vibe-lark/larkpal-agent": "^0.2.8"
+    "@vibe-lark/larkpal-agent": "^0.2.12"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",