@vibe-lark/larkpal 0.1.81 → 0.1.83

package/dist/main.mjs

@@ -893,7 +893,7 @@ var CCStreamParser = class extends EventEmitter {
 						displayName: getToolDisplayName(block.name),
 						toolUseId: block.id
 					});
-					this.emit("toolUseStart", block.name, block.input ?? {});
+					this.emit("toolUseStart", block.name, block.input ?? {}, block.id);
 				}
 				break;
 			}
@@ -941,7 +941,7 @@ var CCStreamParser = class extends EventEmitter {
 					displayName: getToolDisplayName(block.name),
 					toolUseId: block.id
 				});
-				this.emit("toolUseStart", block.name, block.input ?? {});
+				this.emit("toolUseStart", block.name, block.input ?? {}, block.id);
 			}
 		}
 		this.emit("assistant", msg);
@@ -1756,8 +1756,8 @@ var SessionProcessManager = class {
 			}
 			getCallbacks()?.onThinkingDelta?.(text);
 		});
-		parser.on("toolUseStart", (toolName, toolInput) => {
-			getCallbacks()?.onToolUseStart?.(toolName, toolInput);
+		parser.on("toolUseStart", (toolName, toolInput, toolUseId) => {
+			getCallbacks()?.onToolUseStart?.(toolName, toolInput, toolUseId);
 		});
 		parser.on("toolResult", (toolUseId, result) => {
 			getCallbacks()?.onToolResult?.(toolUseId, result);
@@ -4473,10 +4473,13 @@ async function reconcileRunWithAdapter(run, messageStore, processManager) {
 	} else if (idleMs >= getStaleRunIdleMs()) staleReason = `run idle for ${Math.floor(idleMs / 1e3)}s`;
 	if (!staleReason) return;
 	let cleanupRequired = false;
-	if (!adapterBusy && (processInfo?.status === "running" || processInfo?.status === "starting")) {
+	if (processInfo?.status === "running" || processInfo?.status === "starting") {
 		cleanupRequired = true;
 		try {
 			await processManager.stopProcess(run.sessionId);
+			const stoppedInfo = processManager.getProcessInfo(run.sessionId);
+			run.adapterBusy = processManager.isSessionBusy?.(run.sessionId) ?? false;
+			run.processStatus = stoppedInfo?.status ?? "stopped";
 			log$30.warn("[stream] stale run 已触发 runtime process 清理", {
 				sessionId: run.sessionId,
 				runId: run.runId,
@@ -4516,6 +4519,16 @@ async function reconcileRunWithAdapter(run, messageStore, processManager) {
 		endRunClients(run);
 	}
 }
+async function reconcileActiveChatRuns(messageStore, processManager, sessionIds) {
+	const targetSessionIds = sessionIds ? new Set(sessionIds) : void 0;
+	const tasks = [];
+	for (const run of chatRunsBySession.values()) {
+		if (run.status !== "running") continue;
+		if (targetSessionIds && !targetSessionIds.has(run.sessionId)) continue;
+		tasks.push(reconcileRunWithAdapter(run, messageStore, processManager));
+	}
+	await Promise.all(tasks);
+}
 function buildRuntimeEventMessageMetadata(event, runtimeConfig) {
 	return {
 		runtimeEventType: event.type,
@@ -4778,6 +4791,14 @@ function normalizeRuntimeResult(result) {
 		error
 	};
 }
+function shouldTreatUnknownToolErrorAsRecovered(run, normalizedResult, result) {
+	if (!normalizedResult.isError || normalizedResult.finalStatus !== "error_during_execution") return false;
+	if (!run.unknownToolCallCount || run.lastToolError !== void 0) return false;
+	if (!run.lastToolName || run.lastToolName === run.lastUnknownToolName) return false;
+	const terminalText = normalizeWhitespace(result.result || "");
+	if (terminalText && /\bNo such tool available\b/i.test(terminalText)) return false;
+	return Boolean(run.text.trim() || terminalText);
+}
 function buildRuntimeErrorSummary(subtype, result) {
 	const message = normalizeWhitespace(result || `Runtime execution failed: ${subtype}`);
 	const httpStatus = extractHttpStatus(message);
@@ -4873,6 +4894,11 @@ function readBooleanField(value, key) {
 	const field = value[key];
 	return typeof field === "boolean" ? field : void 0;
 }
+function isUnknownToolResult(result) {
+	const summary = readStringField(result, "resultSummary") ?? "";
+	const content = readStringField(result, "content") ?? "";
+	return /\bNo such tool available\b/i.test(`${summary}\n${content}`);
+}
 /**
 * 创建 Chat 流式对话 + 历史查询路由
 *
@@ -5193,10 +5219,11 @@ function createChatRouter(config) {
 				recordRunEvent(run, "thinking-delta");
 				broadcastRunEvent(run, "thinking-delta", { text });
 			},
-			onToolUseStart: (toolName, toolInput) => {
+			onToolUseStart: (toolName, toolInput, toolUseId) => {
 				if (run.status !== "running") return;
 				recordRunEvent(run, "tool-use-start", { toolName });
 				if (runtimeConfig.requestContext) logChatAudit(buildAuditEvent(runtimeConfig.requestContext, "tool_call_started", {
+					toolCallId: toolUseId,
 					toolName,
 					inputSummary: summarizeForAudit(toolInput)
 				}));
@@ -5214,11 +5241,13 @@ function createChatRouter(config) {
 						traceId,
 						scenarioId,
 						runtimeEventType: "tool-use-start",
+						toolCallId: toolUseId,
 						toolName
 					}
 				}, "[stream] 保存 tool 消息失败");
 				broadcastRunEvent(run, "tool-use-start", {
 					toolName,
+					toolUseId,
 					input: toolInput
 				});
 			},
@@ -5228,7 +5257,8 @@ function createChatRouter(config) {
 				const resultSummary = summarizeForAudit(result);
 				const toolName = readStringField(result, "toolName") || run.lastToolName;
 				const isError = readBooleanField(result, "isError");
-				if (isError) run.lastToolError = resultSummary;
+				if (isError && !isUnknownToolResult(result)) run.lastToolError = resultSummary;
+				else if (!isError) run.lastToolError = void 0;
 				if (runtimeConfig.requestContext) logChatAudit(buildAuditEvent(runtimeConfig.requestContext, "tool_call_finished", {
 					toolCallId: toolUseId,
 					toolName,
@@ -5266,12 +5296,6 @@ function createChatRouter(config) {
 				if (run.status !== "running") return;
 				run.unknownToolCallCount = (run.unknownToolCallCount ?? 0) + 1;
 				run.lastUnknownToolName = toolName;
-				run.lastToolError = {
-					isError: true,
-					reasonCode: "UNKNOWN_TOOL_CALL",
-					toolName,
-					toolCallId: toolUseId
-				};
 				recordRunEvent(run, "unknown-tool-use", { toolName });
 				broadcastRunEvent(run, "runtime-event", {
 					type: "unknown-tool-use",
@@ -5297,8 +5321,14 @@ function createChatRouter(config) {
 			onResult: async (result) => {
 				if (run.status !== "running") return;
 				recordRunEvent(run, "result");
-				const normalizedResult = normalizeRuntimeResult(result);
+				let normalizedResult = normalizeRuntimeResult(result);
 				const partialText = run.text.trim() ? run.text : void 0;
+				if (shouldTreatUnknownToolErrorAsRecovered(run, normalizedResult, result)) normalizedResult = {
+					status: "completed",
+					finalStatus: "completed_with_warnings",
+					isError: false,
+					finalText: partialText || result.result
+				};
 				const finalText = normalizedResult.isError ? normalizedResult.finalText || partialText || "" : partialText || normalizedResult.finalText || "";
 				run.text = finalText;
 				run.runtimeError = normalizedResult.error;
@@ -8486,6 +8516,7 @@ function createStatusRouter(config) {
 	const sessionsDir = getWorkspaceChatsRoot(config?.workspaceRoot ?? resolveWorkspaceRoot("/workspace"));
 	const processManager = config?.processManager;
 	const messageStore = config?.messageStore;
+	const reconcileActiveRuns = config?.reconcileActiveRuns;
 	router.get("/sessions", async (req, res) => {
 		logger$2.info("list sessions request", {
 			method: req.method,
@@ -8586,7 +8617,7 @@ function createStatusRouter(config) {
 		try {
 			const uptimeSeconds = process.uptime();
 			const memory = process.memoryUsage();
-			const { processes, diagnostics } = processManager ? await serializeRuntimeProcesses(processManager, messageStore) : {
+			const { processes, diagnostics } = processManager ? await serializeRuntimeProcesses(processManager, messageStore, reconcileActiveRuns) : {
 				processes: [],
 				diagnostics: []
 			};
@@ -8643,9 +8674,11 @@ function createStatusRouter(config) {
 	});
 	return router;
 }
-async function serializeRuntimeProcesses(processManager, messageStore) {
+async function serializeRuntimeProcesses(processManager, messageStore, reconcileActiveRuns) {
 	const processes = [];
 	const diagnostics = [];
+	const processSnapshot = processManager.getAllProcessInfo();
+	if (reconcileActiveRuns) await reconcileActiveRuns(processSnapshot.map((processInfo) => processInfo.sessionId));
 	for (const processInfo of processManager.getAllProcessInfo()) {
 		const busy = processManager.isSessionBusy?.(processInfo.sessionId) ?? processInfo.status === "running";
 		const terminalRunStatus = messageStore ? await getLatestTerminalRunStatus(messageStore, processInfo.sessionId) : null;
@@ -8678,6 +8711,7 @@ async function serializeRuntimeProcesses(processManager, messageStore) {
 			});
 			continue;
 		}
+		if (terminalRunStatus && !busy && (processInfo.status === "stopped" || processInfo.status === "crashed" || processInfo.status === "stopping")) continue;
 		processes.push(serializeRuntimeProcess(processInfo, processManager));
 	}
 	return {
@@ -8784,7 +8818,8 @@ function registerRoutes(app, processManager, scheduledTaskManager, appCredential
 	app.use("/api", createStatusRouter({
 		workspaceRoot,
 		processManager,
-		messageStore
+		messageStore,
+		reconcileActiveRuns: processManager && messageStore ? (sessionIds) => reconcileActiveChatRuns(messageStore, processManager, sessionIds) : void 0
 	}));
 	app.use("/hooks", createHooksRouter());
 	app.use("/api/mcp", createMcpCallbackRouter());

package/package.json

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