@vibe-lark/larkpal 0.1.80 → 0.1.82

package/dist/main.mjs

@@ -22,7 +22,6 @@ import { pipeline } from "node:stream/promises";
 import { PassThrough, Readable, Transform } from "node:stream";
 import express, { Router } from "express";
 import Busboy from "busboy";
-import { EventEmitter as EventEmitter$1 } from "events";
 import cron from "node-cron";
 import * as Lark from "@larksuiteoapi/node-sdk";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
@@ -894,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;
 			}
@@ -942,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);
@@ -1757,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);
@@ -4779,6 +4778,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);
@@ -4874,6 +4881,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 流式对话 + 历史查询路由
 *
@@ -5194,10 +5206,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)
 				}));
@@ -5215,11 +5228,13 @@ function createChatRouter(config) {
 						traceId,
 						scenarioId,
 						runtimeEventType: "tool-use-start",
+						toolCallId: toolUseId,
 						toolName
 					}
 				}, "[stream] 保存 tool 消息失败");
 				broadcastRunEvent(run, "tool-use-start", {
 					toolName,
+					toolUseId,
 					input: toolInput
 				});
 			},
@@ -5229,7 +5244,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,
@@ -5267,12 +5283,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",
@@ -5298,8 +5308,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;
@@ -7794,13 +7810,17 @@ const sessionNoReplyFlags = /* @__PURE__ */ new Map();
 /** TTL: 30 分钟 */
 const TTL_MS = 1800 * 1e3;
 /** 定期清理过期的 pending requests（每 5 分钟检查一次） */
-setInterval(() => {
+function cleanupExpiredPendingRequests() {
 	const now = Date.now();
 	let cleaned = 0;
 	for (const [id, req] of pendingRequests) if (now - req.createdAt > TTL_MS) {
 		pendingRequests.delete(id);
 		cleaned++;
 	}
+	return cleaned;
+}
+setInterval(() => {
+	const cleaned = cleanupExpiredPendingRequests();
 	if (cleaned > 0) logger$4.info("TTL cleanup completed", {
 		cleaned,
 		remaining: pendingRequests.size
@@ -7811,7 +7831,7 @@ setInterval(() => {
 * 事件名: `callback:${sessionId}`，payload 为 PendingMcpRequest。
 * 用于 dispatch-cc 订阅并在收到 ask_user/request_permission 回调时发送飞书卡片。
 */
-const onMcpCallback = new EventEmitter$1();
+const onMcpCallback = new EventEmitter();
 onMcpCallback.setMaxListeners(100);
 /**
 * 将 result 存入对应的 pending request
@@ -7943,6 +7963,25 @@ function createMcpCallbackRouter() {
 			requestId
 		});
 	});
+	router.get("/pending", (req, res) => {
+		const sessionId = typeof req.query.session_id === "string" ? req.query.session_id : typeof req.query.sessionId === "string" ? req.query.sessionId : void 0;
+		const cleaned = cleanupExpiredPendingRequests();
+		const now = Date.now();
+		const requests = [...pendingRequests.values()].filter((pending) => pending.result === void 0).filter((pending) => !sessionId || pending.sessionId === sessionId).map((pending) => ({
+			requestId: pending.requestId,
+			tool: pending.tool,
+			sessionId: pending.sessionId,
+			params: pending.params,
+			createdAt: pending.createdAt,
+			waitingMs: now - pending.createdAt
+		}));
+		logger$4.debug("pending requests listed", {
+			sessionId,
+			count: requests.length,
+			cleaned
+		});
+		res.json({ requests });
+	});
 	router.get("/resolve/:requestId", (req, res) => {
 		const requestId = req.params.requestId;
 		logger$4.debug("resolve poll", { requestId });

package/package.json

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