@vibe-lark/larkpal 0.1.67 → 0.1.69

package/dist/main.mjs

@@ -3724,6 +3724,8 @@ function summarizeString(value) {
 *
 * 路由：
 *   POST   /api/chat/stream          — SSE 流式对话
+*   POST   /api/chat/runs/:runId/cancel — 取消运行中的 Web Chat run
+*   POST   /api/chat/sessions/:id/cancel-active-run — 取消会话中的 active run
 *   GET    /api/chat/history          — 分页获取会话历史
 *   GET    /api/chat/sessions         — 列出当前用户的所有会话
 *   POST   /api/chat/sessions         — 创建新会话
@@ -3754,6 +3756,9 @@ function getActiveChatRun(sessionId) {
 	const run = chatRunsBySession.get(sessionId);
 	return run?.status === "running" ? run : void 0;
 }
+function findChatRunByRunId(runId) {
+	for (const run of chatRunsBySession.values()) if (run.runId === runId) return run;
+}
 function serializeChatRun(run) {
 	const idleSeconds = Math.max(0, Math.floor((Date.now() - run.lastEventAt) / 1e3));
 	return {
@@ -3918,6 +3923,60 @@ async function markRunTerminal(run, messageStore, status, params) {
 	await appendRunStatusMessage(run, messageStore);
 	return true;
 }
+async function cleanupTerminalRunProcess(run, processManager, reason) {
+	if (run.status === "running") return;
+	const processInfo = processManager.getProcessInfo(run.sessionId);
+	const adapterBusy = processManager.isSessionBusy?.(run.sessionId) ?? processInfo?.status === "running";
+	run.adapterBusy = adapterBusy;
+	run.processStatus = processInfo?.status;
+	if (adapterBusy || processInfo?.status !== "running" && processInfo?.status !== "starting") return;
+	try {
+		await processManager.stopProcess(run.sessionId);
+		run.processStatus = processManager.getProcessInfo(run.sessionId)?.status ?? "stopped";
+		log$30.info("[stream] terminal run 已清理 runtime process", {
+			sessionId: run.sessionId,
+			runId: run.runId,
+			reason,
+			processStatus: processInfo.status
+		});
+	} catch (err) {
+		log$30.error("[stream] terminal run 清理 runtime process 失败", {
+			sessionId: run.sessionId,
+			runId: run.runId,
+			reason,
+			processStatus: processInfo.status,
+			error: err instanceof Error ? err.message : String(err)
+		});
+	}
+}
+async function cancelChatRun(run, messageStore, processManager) {
+	if (run.status !== "running") return {
+		cancelled: false,
+		run: serializeChatRun(run)
+	};
+	const processInfo = processManager.getProcessInfo(run.sessionId);
+	run.adapterBusy = processManager.isSessionBusy?.(run.sessionId) ?? processInfo?.status === "running";
+	run.processStatus = processInfo?.status;
+	await processManager.stopProcess(run.sessionId);
+	const stoppedInfo = processManager.getProcessInfo(run.sessionId);
+	run.adapterBusy = processManager.isSessionBusy?.(run.sessionId) ?? false;
+	run.processStatus = stoppedInfo?.status ?? "stopped";
+	const marked = await markRunTerminal(run, messageStore, "cancelled", {
+		finalStatus: "user_cancelled",
+		error: "Chat run cancelled by user"
+	});
+	if (marked) {
+		broadcastRunEvent(run, "cancelled", {
+			runId: run.runId,
+			sessionId: run.sessionId
+		});
+		endRunClients(run);
+	}
+	return {
+		cancelled: marked,
+		run: serializeChatRun(run)
+	};
+}
 async function reconcileRunWithAdapter(run, messageStore, processManager) {
 	if (run.status !== "running") return;
 	const processInfo = processManager.getProcessInfo(run.sessionId);
@@ -4002,6 +4061,8 @@ function buildRuntimeEventMessageMetadata(event, runtimeConfig) {
 *
 * 路由：
 *   POST /api/chat/stream      — SSE 流式对话
+*   POST /api/chat/runs/:runId/cancel — 取消运行中的 Web Chat run
+*   POST /api/chat/sessions/:id/cancel-active-run — 取消会话中的 active run
 *   GET  /api/chat/history      — 分页获取会话历史
 *   GET  /api/chat/sessions     — 列出当前用户的所有会话
 *   POST /api/chat/sessions     — 创建新会话
@@ -4162,6 +4223,7 @@ function createChatRouter(config) {
 		}, 15e3);
 		const handleBlockedEvent = (event) => {
 			const sanitized = sanitizeBlockedEvent(event);
+			if (run.status !== "running") return;
 			recordRunEvent(run, "blocked", { toolName: sanitized.name });
 			log$30.warn("[stream] Agent blocked event", { ...sanitized });
 			if (runtimeConfig.requestContext) logChatAudit(buildAuditEvent(runtimeConfig.requestContext, sanitized.type, {
@@ -4193,6 +4255,7 @@ function createChatRouter(config) {
 			broadcastRunEvent(run, "blocked", { event: sanitized });
 		};
 		const handleRuntimeEvent = (event) => {
+			if (run.status !== "running") return;
 			const dedupeKey = getRuntimeEventDedupeKey(event);
 			if (dedupeKey) {
 				if (run.seenRuntimeEventIds.has(dedupeKey)) {
@@ -4234,15 +4297,18 @@ function createChatRouter(config) {
 		};
 		const callbacks = {
 			onTextDelta: (text) => {
+				if (run.status !== "running") return;
 				recordRunEvent(run, "text-delta");
 				run.text += text;
 				broadcastRunEvent(run, "text-delta", { text });
 			},
 			onThinkingDelta: (text) => {
+				if (run.status !== "running") return;
 				recordRunEvent(run, "thinking-delta");
 				broadcastRunEvent(run, "thinking-delta", { text });
 			},
 			onToolUseStart: (toolName, toolInput) => {
+				if (run.status !== "running") return;
 				recordRunEvent(run, "tool-use-start", { toolName });
 				if (runtimeConfig.requestContext) logChatAudit(buildAuditEvent(runtimeConfig.requestContext, "tool_call_started", {
 					toolName,
@@ -4271,6 +4337,7 @@ function createChatRouter(config) {
 				});
 			},
 			onToolResult: (toolUseId, result) => {
+				if (run.status !== "running") return;
 				recordRunEvent(run, "tool-result");
 				const resultSummary = summarizeForAudit(result);
 				if (runtimeConfig.requestContext) logChatAudit(buildAuditEvent(runtimeConfig.requestContext, "tool_call_finished", {
@@ -4302,6 +4369,7 @@ function createChatRouter(config) {
 				});
 			},
 			onToolProgress: (toolName, elapsedSeconds) => {
+				if (run.status !== "running") return;
 				recordRunEvent(run, "tool-progress", { toolName });
 				broadcastRunEvent(run, "tool-progress", {
 					toolName,
@@ -4309,15 +4377,18 @@ function createChatRouter(config) {
 				});
 			},
 			onTurnEnd: (stopReason) => {
+				if (run.status !== "running") return;
 				recordRunEvent(run, "turn-end");
 				if (runtimeConfig.requestContext) logChatAudit(buildAuditEvent(runtimeConfig.requestContext, "turn_finished", { metadata: { stopReason } }));
 				broadcastRunEvent(run, "turn-end", { stopReason });
 			},
 			onResult: async (result) => {
+				if (run.status !== "running") return;
 				recordRunEvent(run, "result");
 				const finalText = run.text.trim() ? run.text : result.result || "";
 				run.text = finalText;
 				await markRunTerminal(run, messageStore, result.isError ? "failed" : "completed", { finalStatus: result.subtype });
+				await cleanupTerminalRunProcess(run, processManager, "result");
 				await queueRunMessage(run, messageStore, {
 					sessionId,
 					role: "assistant",
@@ -4368,6 +4439,7 @@ function createChatRouter(config) {
 				}));
 			},
 			onError: async (error) => {
+				if (run.status !== "running") return;
 				recordRunEvent(run, "error");
 				log$30.error("[stream] Runtime 执行出错", {
 					sessionId,
@@ -4402,6 +4474,7 @@ function createChatRouter(config) {
 					finalStatus: "error",
 					error: error.message
 				});
+				await cleanupTerminalRunProcess(run, processManager, "error");
 				broadcastRunEvent(run, "error", {
 					runId: run.runId,
 					message: error.message
@@ -4417,6 +4490,7 @@ function createChatRouter(config) {
 				});
 			},
 			onVerifierResult: (result) => {
+				if (run.status !== "running") return;
 				recordRunEvent(run, "verifier-result");
 				const resultSummary = summarizeForAudit(result);
 				if (runtimeConfig.requestContext) logChatAudit(buildAuditEvent(runtimeConfig.requestContext, "verifier_result", {
@@ -4473,13 +4547,14 @@ function createChatRouter(config) {
 					finalStatus: "error",
 					error: errorMessage
 				});
+				await cleanupTerminalRunProcess(run, processManager, "missing-result");
 				broadcastRunEvent(run, "error", {
 					runId: run.runId,
 					message: errorMessage
 				});
 				clearInterval(heartbeatTimer);
 				endRunClients(run);
-			}
+			} else await cleanupTerminalRunProcess(run, processManager, "execute-returned");
 		} catch (err) {
 			const errorMessage = err instanceof Error ? err.message : String(err);
 			log$30.error("[stream] executePrompt 异常", {
@@ -4490,6 +4565,84 @@ function createChatRouter(config) {
 			if (run.status === "running") await callbacks.onError?.(err instanceof Error ? err : new Error(errorMessage));
 		}
 	});
+	router.post("/api/chat/runs/:runId/cancel", chatAuthMiddleware, async (req, res) => {
+		const chatUser = res.locals.chatUser;
+		const runId = String(req.params.runId);
+		const run = findChatRunByRunId(runId);
+		if (!run) {
+			res.json({
+				success: true,
+				cancelled: false,
+				run: null
+			});
+			return;
+		}
+		if (!isRunVisibleToUser(run, {
+			tenantKey: chatUser.tenantKey,
+			openId: chatUser.openId
+		})) {
+			res.status(403).json({ error: "Forbidden" });
+			return;
+		}
+		try {
+			const result = await cancelChatRun(run, messageStore, processManager);
+			res.json({
+				success: true,
+				...result
+			});
+		} catch (err) {
+			const errorMessage = err instanceof Error ? err.message : String(err);
+			log$30.error("[runs] 取消 run 失败", {
+				runId,
+				sessionId: run.sessionId,
+				error: errorMessage
+			});
+			res.status(500).json({
+				error: "Failed to cancel chat run",
+				run: serializeChatRun(run)
+			});
+		}
+	});
+	router.post("/api/chat/sessions/:id/cancel-active-run", chatAuthMiddleware, async (req, res) => {
+		const chatUser = res.locals.chatUser;
+		const sessionId = String(req.params.id);
+		const run = chatRunsBySession.get(sessionId);
+		if (!run) {
+			res.json({
+				success: true,
+				cancelled: false,
+				sessionId,
+				run: null
+			});
+			return;
+		}
+		if (!isRunVisibleToUser(run, {
+			tenantKey: chatUser.tenantKey,
+			openId: chatUser.openId
+		})) {
+			res.status(403).json({ error: "Forbidden" });
+			return;
+		}
+		try {
+			const result = await cancelChatRun(run, messageStore, processManager);
+			res.json({
+				success: true,
+				sessionId,
+				...result
+			});
+		} catch (err) {
+			const errorMessage = err instanceof Error ? err.message : String(err);
+			log$30.error("[sessions] 取消 active run 失败", {
+				sessionId,
+				runId: run.runId,
+				error: errorMessage
+			});
+			res.status(500).json({
+				error: "Failed to cancel active chat run",
+				run: serializeChatRun(run)
+			});
+		}
+	});
 	router.get("/api/chat/history", chatAuthMiddleware, async (req, res) => {
 		const chatUser = res.locals.chatUser;
 		const sessionId = req.query.session_id;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibe-lark/larkpal",
-  "version": "0.1.67",
+  "version": "0.1.69",
   "description": "LarkPal - Lark/Feishu bot service",
   "type": "module",
   "main": "./dist/main.mjs",
@@ -21,22 +21,9 @@
     "registry": "https://registry.npmjs.org",
     "access": "public"
   },
-  "packageManager": "pnpm@10.32.1",
   "engines": {
     "node": ">=22"
   },
-  "scripts": {
-    "start": "node --env-file=.env bin/larkpal.js",
-    "build": "tsdown",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "lint": "eslint src/",
-    "lint:fix": "eslint src/ --fix",
-    "sit:larkpal-agent": "node scripts/sit/larkpal-agent-0.1.9-sit.mjs",
-    "typecheck": "tsc --noEmit",
-    "format": "prettier --write src/**/*.ts",
-    "format:check": "prettier --check src/**/*.ts"
-  },
   "dependencies": {
     "@larksuiteoapi/node-sdk": "^1.60.0",
     "@modelcontextprotocol/sdk": "^1.29.0",
@@ -69,5 +56,17 @@
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.32.1",
     "vitest": "^4.1.1"
+  },
+  "scripts": {
+    "start": "node --env-file=.env bin/larkpal.js",
+    "build": "tsdown",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "lint": "eslint src/",
+    "lint:fix": "eslint src/ --fix",
+    "sit:larkpal-agent": "node scripts/sit/larkpal-agent-0.1.9-sit.mjs",
+    "typecheck": "tsc --noEmit",
+    "format": "prettier --write src/**/*.ts",
+    "format:check": "prettier --check src/**/*.ts"
   }
-}
+}