@vibe-lark/larkpal 0.1.60 → 0.1.62

package/dist/main.mjs

@@ -2785,7 +2785,85 @@ async function createLarkpalAgentAdapter() {
 		});
 	}
 	else log$30.warn("未配置 LARKPAL_AGENT_MCP_SERVER_URL，Agent 无远程工具可用");
-	return adapter;
+	return wrapLarkpalAgentAdapter(adapter);
+}
+function wrapLarkpalAgentAdapter(adapter) {
+	return {
+		get name() {
+			return adapter.name;
+		},
+		executePrompt(config, callbacks) {
+			return adapter.executePrompt(normalizeLarkpalAgentConfig(config), callbacks);
+		},
+		stopProcess(sessionId) {
+			return adapter.stopProcess(sessionId);
+		},
+		stopAll() {
+			return adapter.stopAll();
+		},
+		getProcessInfo(sessionId) {
+			return adapter.getProcessInfo(sessionId);
+		},
+		getAllProcessInfo() {
+			return adapter.getAllProcessInfo();
+		},
+		isSessionBusy(sessionId) {
+			return adapter.isSessionBusy?.(sessionId) ?? false;
+		}
+	};
+}
+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];
 }
 //#endregion
 //#region src/routing/session-router.ts
@@ -3463,7 +3541,7 @@ function serializeChatRun(run) {
 		lastEventType: run.lastEventType,
 		lastToolName: run.lastToolName,
 		idleSeconds,
-		adapterBusy: run.adapterBusy,
+		adapterBusy: run.status === "running" ? run.adapterBusy : false,
 		staleReason: run.staleReason
 	};
 }
@@ -3577,6 +3655,7 @@ async function markRunTerminal(run, messageStore, status, params) {
 	run.finalStatus = params.finalStatus;
 	run.error = params.error;
 	run.staleReason = params.staleReason;
+	run.adapterBusy = false;
 	recordRunEvent(run, `run-${status}`);
 	broadcastRunStatus(run);
 	await appendRunStatusMessage(run, messageStore);
@@ -10876,26 +10955,6 @@ async function sendCardByCardId(params) {
 		chatId: response?.data?.chat_id ?? ""
 	};
 }
-/**
-* Close (or open) the streaming mode on a CardKit card.
-*
-* Must be called after streaming is complete to restore normal card
-* behaviour (forwarding, interaction callbacks, etc.).
-*/
-async function setCardStreamingMode(params) {
-	const { cfg, cardId, streamingMode, sequence, accountId } = params;
-	logCardKitResponse({
-		resp: await resolveLarkSdk(cfg, accountId).cardkit.v1.card.settings({
-			data: {
-				settings: JSON.stringify({ streaming_mode: streamingMode }),
-				sequence
-			},
-			path: { card_id: cardId }
-		}),
-		api: "card.settings",
-		context: `seq=${sequence}, streaming_mode=${streamingMode}`
-	});
-}
 //#endregion
 //#region src/card/reply-dispatcher-types.ts
 const TERMINAL_PHASES = new Set([
@@ -11881,7 +11940,7 @@ var StreamingCardController = class StreamingCardController {
 					footer: this.deps.resolvedFooter,
 					footerMetrics
 				});
-				if (errorEffectiveCardId) await this.closeStreamingAndUpdate(errorEffectiveCardId, errorCard, "onError");
+				if (errorEffectiveCardId) await this.updateStreamingCard(errorEffectiveCardId, errorCard, "onError");
 				else await updateCardFeishu({
 					cfg: this.deps.cfg,
 					messageId: this.cardKit.cardMessageId,
@@ -11949,20 +12008,6 @@ var StreamingCardController = class StreamingCardController {
 				const FINAL_UPDATE_RETRY_DELAY_MS = 2e3;
 				for (let attempt = 1; attempt <= MAX_FINAL_UPDATE_RETRIES; attempt++) try {
 					if (idleEffectiveCardId) {
-						const seqBeforeClose = this.cardKit.cardKitSequence;
-						this.cardKit.cardKitSequence += 1;
-						log$16.info("onIdle: closing streaming mode", {
-							attempt,
-							seqBefore: seqBeforeClose,
-							seqAfter: this.cardKit.cardKitSequence
-						});
-						await setCardStreamingMode({
-							cfg: this.deps.cfg,
-							cardId: idleEffectiveCardId,
-							streamingMode: false,
-							sequence: this.cardKit.cardKitSequence,
-							accountId: this.deps.accountId
-						});
 						const seqBeforeUpdate = this.cardKit.cardKitSequence;
 						this.cardKit.cardKitSequence += 1;
 						log$16.info("onIdle: updating final card", {
@@ -12047,7 +12092,7 @@ var StreamingCardController = class StreamingCardController {
 					footer: this.deps.resolvedFooter,
 					footerMetrics
 				});
-				await this.closeStreamingAndUpdate(effectiveCardId, abortCardContent, "abortCard");
+				await this.updateStreamingCard(effectiveCardId, abortCardContent, "abortCard");
 				log$16.info("abortCard completed", { effectiveCardId });
 			} else if (this.cardKit.cardMessageId) {
 				const abortCard = buildCardContent("complete", {
@@ -12085,20 +12130,6 @@ var StreamingCardController = class StreamingCardController {
 			if (this.cardCreationPromise) await this.cardCreationPromise;
 			const effectiveCardId = this.cardKit.cardKitCardId ?? this.cardKit.originalCardKitCardId;
 			if (effectiveCardId) {
-				const seqBeforeClose = this.cardKit.cardKitSequence;
-				this.cardKit.cardKitSequence += 1;
-				log$16.info("replaceWithClarificationCard: closing streaming mode", {
-					cardId: effectiveCardId,
-					seqBefore: seqBeforeClose,
-					seqAfter: this.cardKit.cardKitSequence
-				});
-				await setCardStreamingMode({
-					cfg: this.deps.cfg,
-					cardId: effectiveCardId,
-					streamingMode: false,
-					sequence: this.cardKit.cardKitSequence,
-					accountId: this.deps.accountId
-				});
 				const seqBeforeUpdate = this.cardKit.cardKitSequence;
 				this.cardKit.cardKitSequence += 1;
 				await updateCardKitCard({
@@ -12145,10 +12176,10 @@ var StreamingCardController = class StreamingCardController {
 		}
 	}
 	/**
-	* 强制关闭 streaming 状态（兜底方法）。
+	* 强制终态化 streaming 卡片（兜底方法）。
 	*
-	* 当进程已退出且卡片可能因 API 调用失败仍停留在 streaming 状态时，
-	* 由 session-control-handler 调用，强制调用 closeStreaming + updateCard。
+	* 当进程已退出且卡片可能因 API 调用失败仍停留在中间态时，
+	* 由 session-control-handler 调用，直接更新卡片内容并保留 streaming mode。
 	* 即使已经是 terminal phase 也会尝试执行 API 调用。
 	*/
 	async forceCloseStreaming() {
@@ -12157,7 +12188,7 @@ var StreamingCardController = class StreamingCardController {
 			log$16.warn("forceCloseStreaming: no card to close");
 			return;
 		}
-		log$16.info("forceCloseStreaming: 强制终态化卡片", {
+		log$16.info("forceCloseStreaming: 强制终态化 streaming 卡片", {
 			cardId: effectiveCardId,
 			messageId: this.cardKit.cardMessageId,
 			phase: this.phase
@@ -12185,14 +12216,6 @@ var StreamingCardController = class StreamingCardController {
 				showUndoButton: false
 			});
 			if (effectiveCardId) {
-				this.cardKit.cardKitSequence += 1;
-				await setCardStreamingMode({
-					cfg: this.deps.cfg,
-					cardId: effectiveCardId,
-					streamingMode: false,
-					sequence: this.cardKit.cardKitSequence,
-					accountId: this.deps.accountId
-				});
 				this.cardKit.cardKitSequence += 1;
 				await updateCardKitCard({
 					cfg: this.deps.cfg,
@@ -12506,22 +12529,9 @@ var StreamingCardController = class StreamingCardController {
 		this.onEnterTerminalPhase();
 	}
 	/**
-	* Close streaming mode then update card content (shared by onError and abortCard).
+	* Update terminal card content while keeping CardKit streaming mode enabled.
 	*/
-	async closeStreamingAndUpdate(cardId, card, label) {
-		const seqBeforeClose = this.cardKit.cardKitSequence;
-		this.cardKit.cardKitSequence += 1;
-		log$16.info(`${label}: closing streaming mode`, {
-			seqBefore: seqBeforeClose,
-			seqAfter: this.cardKit.cardKitSequence
-		});
-		await setCardStreamingMode({
-			cfg: this.deps.cfg,
-			cardId,
-			streamingMode: false,
-			sequence: this.cardKit.cardKitSequence,
-			accountId: this.deps.accountId
-		});
+	async updateStreamingCard(cardId, card, label) {
 		const seqBeforeUpdate = this.cardKit.cardKitSequence;
 		this.cardKit.cardKitSequence += 1;
 		log$16.info(`${label}: updating card`, {
@@ -13478,6 +13488,8 @@ async function dispatchToCC(params) {
 			const base64Data = buffer.toString("base64");
 			imageBlocks.push({
 				type: "image",
+				filePath: imgFilePath,
+				fileKey: imgRes.fileKey,
 				source: {
 					type: "base64",
 					media_type: mediaType,

package/package.json

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