@vibe-lark/larkpal 0.1.68 → 0.1.70

package/dist/main.mjs

@@ -3011,7 +3011,7 @@ function wrapLarkpalAgentAdapter(adapter) {
 			return adapter.name;
 		},
 		executePrompt(config, callbacks) {
-			return adapter.executePrompt(normalizeLarkpalAgentConfig(config), callbacks);
+			return adapter.executePrompt(config, callbacks);
 		},
 		stopProcess(sessionId) {
 			return adapter.stopProcess(sessionId);
@@ -3030,59 +3030,6 @@ function wrapLarkpalAgentAdapter(adapter) {
 		}
 	};
 }
-function normalizeLarkpalAgentConfig(config) {
-	if (!Array.isArray(config.prompt)) return config;
-	const textParts = [];
-	const imageArtifacts = [];
-	const imageLines = [];
-	config.prompt.forEach((block, index) => {
-		if (block.type === "text") {
-			if (block.text.trim()) textParts.push(block.text);
-			return;
-		}
-		if (block.type !== "image") return;
-		const artifact = toAgentImageArtifact(block, index);
-		const label = artifact?.assetId ?? block.fileKey ?? `image_${index + 1}`;
-		if (artifact) imageArtifacts.push(artifact);
-		imageLines.push(artifact ? `- ${label}: ${artifact.path} (${artifact.mimeType})` : `- ${label}: inline image omitted from text prompt (${block.source.media_type})`);
-	});
-	if (imageLines.length === 0) return config;
-	const prompt = [
-		textParts.join("\n\n").trim(),
-		"[Images]",
-		...imageLines,
-		"The user is asking about these image attachments. Use visual or file tools to inspect the image pixels when needed; do not infer image content from the file name alone."
-	].filter(Boolean).join("\n");
-	return {
-		...config,
-		prompt,
-		sourceArtifacts: mergeSourceArtifacts(config.sourceArtifacts, imageArtifacts),
-		metadata: {
-			...config.metadata,
-			inboundImageCount: imageLines.length,
-			visualAllowedDirs: [config.cwd]
-		}
-	};
-}
-function toAgentImageArtifact(block, index) {
-	if (!block.filePath) return null;
-	return {
-		type: "image_asset",
-		assetId: block.fileKey ?? `inbound_image_${index + 1}`,
-		path: block.filePath,
-		mimeType: block.source.media_type.split(";", 1)[0] || "image/png",
-		metadata: {
-			source: "feishu-message",
-			fileKey: block.fileKey
-		}
-	};
-}
-function mergeSourceArtifacts(existing, imageArtifacts) {
-	if (imageArtifacts.length === 0) return existing;
-	if (existing === void 0) return imageArtifacts;
-	if (Array.isArray(existing)) return [...existing, ...imageArtifacts];
-	return [existing, ...imageArtifacts];
-}
 function getArtifactId(artifact) {
 	const artifactId = typeof artifact.artifactId === "string" ? artifact.artifactId.trim() : "";
 	if (artifactId.startsWith("art_")) return artifactId;
@@ -3724,6 +3671,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 +3703,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 {
@@ -3944,6 +3896,34 @@ async function cleanupTerminalRunProcess(run, processManager, reason) {
 		});
 	}
 }
+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);
@@ -4028,6 +4008,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     — 创建新会话
@@ -4188,6 +4170,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, {
@@ -4219,6 +4202,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)) {
@@ -4260,15 +4244,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,
@@ -4297,6 +4284,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", {
@@ -4328,6 +4316,7 @@ function createChatRouter(config) {
 				});
 			},
 			onToolProgress: (toolName, elapsedSeconds) => {
+				if (run.status !== "running") return;
 				recordRunEvent(run, "tool-progress", { toolName });
 				broadcastRunEvent(run, "tool-progress", {
 					toolName,
@@ -4335,11 +4324,13 @@ 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;
@@ -4395,6 +4386,7 @@ function createChatRouter(config) {
 				}));
 			},
 			onError: async (error) => {
+				if (run.status !== "running") return;
 				recordRunEvent(run, "error");
 				log$30.error("[stream] Runtime 执行出错", {
 					sessionId,
@@ -4445,6 +4437,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", {
@@ -4519,6 +4512,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;
@@ -8997,6 +9068,7 @@ function getUserFacingErrorMessage(error) {
 const log$21 = larkLogger("card/cc-stream-bridge");
 const CC_INTERNAL_PLACEHOLDER = "No response requested.";
 const CLAUDE_INVALID_PARAMETER_PATTERN = /API Error:\s*400\b.*parameter specified in the request is not valid/i;
+const TOOL_PROGRESS_CARD_REFRESH_INTERVAL_MS = 15e3;
 function buildClaudeCodeUserFacingError(errorMessage, hasImages) {
 	if (hasImages && CLAUDE_INVALID_PARAMETER_PATTERN.test(errorMessage)) return createUserFacingError([
 		"当前运行时无法处理这条图片消息。",
@@ -9020,6 +9092,8 @@ var CCStreamBridge = class {
 	activeTools = /* @__PURE__ */ new Map();
 	/** 最近一次 toolUseStart 的工具名（用于 toolResult 时查找） */
 	lastToolName = null;
+	/** 最近一次由 tool_progress 推动卡片刷新的时间 */
+	lastToolProgressCardRefreshAt = 0;
 	controller;
 	options;
 	constructor(controller, options) {
@@ -9108,13 +9182,18 @@ var CCStreamBridge = class {
 		});
 		this.controller.onToolPayload({ text: `✅ ${displayName} 完成` });
 	}
-	/** 工具执行进度 → 记录日志 */
+	/** 工具执行进度 → 节流刷新卡片，避免长工具执行期间卡片长时间无可见更新 */
 	onToolProgress(toolName, elapsedSeconds) {
+		const displayName = getToolDisplayName(toolName);
 		log$21.debug("toolProgress 事件", {
 			toolName,
-			displayName: getToolDisplayName(toolName),
+			displayName,
 			elapsedSeconds
 		});
+		const now = Date.now();
+		if (now - this.lastToolProgressCardRefreshAt < TOOL_PROGRESS_CARD_REFRESH_INTERVAL_MS) return;
+		this.lastToolProgressCardRefreshAt = now;
+		this.controller.onToolPayload({ text: `${displayName} running for ${Math.max(0, Math.floor(elapsedSeconds))}s` });
 	}
 	/** 轮次结束 → 仅在 end_turn 时标记完成 + 触发 onIdle */
 	onTurnEnd(stopReason) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibe-lark/larkpal",
-  "version": "0.1.68",
+  "version": "0.1.70",
   "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"
   }
-}
+}