@vibe-lark/larkpal 0.1.69 → 0.1.71

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;
@@ -7268,6 +7215,7 @@ function createStatusRouter(config) {
 	const router = express.Router();
 	const sessionsDir = getWorkspaceChatsRoot(config?.workspaceRoot ?? resolveWorkspaceRoot("/workspace"));
 	const processManager = config?.processManager;
+	const messageStore = config?.messageStore;
 	router.get("/sessions", async (req, res) => {
 		logger$2.info("list sessions request", {
 			method: req.method,
@@ -7368,12 +7316,14 @@ function createStatusRouter(config) {
 		try {
 			const uptimeSeconds = process.uptime();
 			const memory = process.memoryUsage();
-			const processes = processManager?.getAllProcessInfo().map((processInfo) => {
-				return serializeRuntimeProcess(processInfo, processManager);
-			}) ?? [];
+			const { processes, diagnostics } = processManager ? await serializeRuntimeProcesses(processManager, messageStore) : {
+				processes: [],
+				diagnostics: []
+			};
 			const statusData = {
 				uptime: uptimeSeconds,
 				processes,
+				diagnostics,
 				memory
 			};
 			logger$2.info("get status response", {
@@ -7423,6 +7373,48 @@ function createStatusRouter(config) {
 	});
 	return router;
 }
+async function serializeRuntimeProcesses(processManager, messageStore) {
+	const processes = [];
+	const diagnostics = [];
+	for (const processInfo of processManager.getAllProcessInfo()) {
+		const busy = processManager.isSessionBusy?.(processInfo.sessionId) ?? processInfo.status === "running";
+		const terminalRunStatus = messageStore ? await getLatestTerminalRunStatus(messageStore, processInfo.sessionId) : null;
+		if (terminalRunStatus && !busy && (processInfo.status === "running" || processInfo.status === "starting")) {
+			try {
+				await processManager.stopProcess(processInfo.sessionId);
+				logger$2.warn("status reconcile cleaned terminal non-busy process", {
+					sessionId: processInfo.sessionId,
+					processStatus: processInfo.status,
+					runStatus: terminalRunStatus.status,
+					finalStatus: terminalRunStatus.finalStatus
+				});
+			} catch (err) {
+				logger$2.error("status reconcile failed to stop terminal non-busy process", {
+					sessionId: processInfo.sessionId,
+					processStatus: processInfo.status,
+					runStatus: terminalRunStatus.status,
+					finalStatus: terminalRunStatus.finalStatus,
+					error: err instanceof Error ? err.message : String(err)
+				});
+			}
+			diagnostics.push({
+				sessionId: processInfo.sessionId,
+				reasonCode: "TERMINAL_RUN_PROCESS_STALE",
+				reason: "Runtime process still appeared running after a persisted terminal chat run-status.",
+				runStatus: terminalRunStatus.status,
+				finalStatus: terminalRunStatus.finalStatus,
+				processStatus: processInfo.status,
+				busy
+			});
+			continue;
+		}
+		processes.push(serializeRuntimeProcess(processInfo, processManager));
+	}
+	return {
+		processes,
+		diagnostics
+	};
+}
 function serializeRuntimeProcess(processInfo, processManager) {
 	return {
 		...processInfo,
@@ -7431,6 +7423,31 @@ function serializeRuntimeProcess(processInfo, processManager) {
 		busy: processManager.isSessionBusy?.(processInfo.sessionId) ?? processInfo.status === "running"
 	};
 }
+async function getLatestTerminalRunStatus(messageStore, sessionId) {
+	const history = await messageStore.getMessages(sessionId, { limit: 1e3 });
+	for (const message of [...history.messages].reverse()) {
+		if (message.metadata?.runtimeEventType !== "run-status") continue;
+		const parsed = parseRunStatusContent(message.content);
+		const status = parsed?.status ?? (typeof message.metadata.status === "string" ? message.metadata.status : void 0);
+		const finalStatus = parsed?.finalStatus ?? message.metadata.finalStatus;
+		if (status && status !== "running") return {
+			status,
+			finalStatus: typeof finalStatus === "string" ? finalStatus : void 0
+		};
+	}
+	return null;
+}
+function parseRunStatusContent(content) {
+	try {
+		const parsed = JSON.parse(content);
+		return {
+			status: typeof parsed.run?.status === "string" ? parsed.run.status : void 0,
+			finalStatus: typeof parsed.run?.finalStatus === "string" ? parsed.run.finalStatus : void 0
+		};
+	} catch {
+		return null;
+	}
+}
 //#endregion
 //#region src/gateway/server.ts
 const logger$1 = larkLogger("gateway");
@@ -7496,7 +7513,8 @@ function registerRoutes(app, processManager, scheduledTaskManager, appCredential
 	}
 	app.use("/api", createStatusRouter({
 		workspaceRoot,
-		processManager
+		processManager,
+		messageStore
 	}));
 	app.use("/hooks", createHooksRouter());
 	app.use("/api/mcp", createMcpCallbackRouter());
@@ -9121,6 +9139,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([
 		"当前运行时无法处理这条图片消息。",
@@ -9144,6 +9163,8 @@ var CCStreamBridge = class {
 	activeTools = /* @__PURE__ */ new Map();
 	/** 最近一次 toolUseStart 的工具名（用于 toolResult 时查找） */
 	lastToolName = null;
+	/** 最近一次由 tool_progress 推动卡片刷新的时间 */
+	lastToolProgressCardRefreshAt = 0;
 	controller;
 	options;
 	constructor(controller, options) {
@@ -9232,13 +9253,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.69",
+  "version": "0.1.71",
   "description": "LarkPal - Lark/Feishu bot service",
   "type": "module",
   "main": "./dist/main.mjs",