dsh-agent-toolkit 0.2.5 → 0.2.6

package/lib/client.js

@@ -68,14 +68,14 @@ window.__ModuleLoader__.load({
 		}
 		var delegate_card_module_css_default = {
 			"summary": "_8wQUq_summary",
-			"root": "_8wQUq_root",
-			"body": "_8wQUq_body",
-			"visuallyHidden": "_8wQUq_visuallyHidden",
+			"prompt": "_8wQUq_prompt",
 			"row": "_8wQUq_row",
 			"childLink": "_8wQUq_childLink",
-			"prompt": "_8wQUq_prompt",
+			"root": "_8wQUq_root",
+			"result": "_8wQUq_result",
 			"chip": "_8wQUq_chip",
-			"result": "_8wQUq_result"
+			"visuallyHidden": "_8wQUq_visuallyHidden",
+			"body": "_8wQUq_body"
 		};
 		//#endregion
 		//#region src/client/delegate/delegate-card.tsx
@@ -411,33 +411,33 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var agents_module_css_default = {
-			"toolGroupTitle": "KsfSLW_toolGroupTitle",
-			"actions": "KsfSLW_actions",
-			"createButton": "KsfSLW_createButton",
-			"toolMode": "KsfSLW_toolMode",
 			"hint": "KsfSLW_hint",
-			"editorPane": "KsfSLW_editorPane",
-			"error": "KsfSLW_error",
-			"dangerButton": "KsfSLW_dangerButton",
 			"listPane": "KsfSLW_listPane",
-			"toolGroupSet": "KsfSLW_toolGroupSet",
-			"select": "KsfSLW_select",
-			"textarea": "KsfSLW_textarea",
 			"agentRow": "KsfSLW_agentRow",
-			"builtinBadge": "KsfSLW_builtinBadge",
-			"field": "KsfSLW_field",
-			"agentName": "KsfSLW_agentName",
-			"agentDesc": "KsfSLW_agentDesc",
+			"agentRowActive": "KsfSLW_agentRowActive",
+			"createButton": "KsfSLW_createButton",
+			"editorPane": "KsfSLW_editorPane",
 			"editor": "KsfSLW_editor",
-			"block": "KsfSLW_block",
-			"input": "KsfSLW_input",
-			"readonlyId": "KsfSLW_readonlyId",
-			"toolGrid": "KsfSLW_toolGrid",
 			"blockTitle": "KsfSLW_blockTitle",
+			"toolGrid": "KsfSLW_toolGrid",
 			"split": "KsfSLW_split",
+			"actions": "KsfSLW_actions",
+			"dangerButton": "KsfSLW_dangerButton",
+			"toolGroupTitle": "KsfSLW_toolGroupTitle",
 			"toolCheck": "KsfSLW_toolCheck",
-			"agentRowActive": "KsfSLW_agentRowActive",
-			"dialog": "KsfSLW_dialog"
+			"readonlyId": "KsfSLW_readonlyId",
+			"select": "KsfSLW_select",
+			"toolMode": "KsfSLW_toolMode",
+			"field": "KsfSLW_field",
+			"toolGroupSet": "KsfSLW_toolGroupSet",
+			"error": "KsfSLW_error",
+			"agentDesc": "KsfSLW_agentDesc",
+			"agentName": "KsfSLW_agentName",
+			"builtinBadge": "KsfSLW_builtinBadge",
+			"textarea": "KsfSLW_textarea",
+			"dialog": "KsfSLW_dialog",
+			"block": "KsfSLW_block",
+			"input": "KsfSLW_input"
 		};
 		//#endregion
 		//#region src/client/agents/AgentEditor.tsx
@@ -951,24 +951,24 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var prompt_module_css_default = {
-			"tabActive": "VZk1fa_tabActive",
+			"tab": "VZk1fa_tab",
+			"field": "VZk1fa_field",
+			"textarea": "VZk1fa_textarea",
+			"error": "VZk1fa_error",
+			"layerRowActive": "VZk1fa_layerRowActive",
+			"layerOrder": "VZk1fa_layerOrder",
 			"listPane": "VZk1fa_listPane",
+			"dialog": "VZk1fa_dialog",
 			"editorPane": "VZk1fa_editorPane",
-			"layerName": "VZk1fa_layerName",
-			"actions": "VZk1fa_actions",
-			"hint": "VZk1fa_hint",
-			"layerOrder": "VZk1fa_layerOrder",
-			"readonlyTag": "VZk1fa_readonlyTag",
-			"tab": "VZk1fa_tab",
+			"editor": "VZk1fa_editor",
 			"split": "VZk1fa_split",
+			"actions": "VZk1fa_actions",
 			"layerRow": "VZk1fa_layerRow",
-			"textarea": "VZk1fa_textarea",
-			"editor": "VZk1fa_editor",
-			"dialog": "VZk1fa_dialog",
+			"readonlyTag": "VZk1fa_readonlyTag",
+			"tabActive": "VZk1fa_tabActive",
+			"layerName": "VZk1fa_layerName",
 			"tabs": "VZk1fa_tabs",
-			"error": "VZk1fa_error",
-			"layerRowActive": "VZk1fa_layerRowActive",
-			"field": "VZk1fa_field"
+			"hint": "VZk1fa_hint"
 		};
 		//#endregion
 		//#region src/client/prompt/PromptLayersModal.tsx
@@ -1310,8 +1310,8 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var entry_module_css_default = {
-			"rail": "QVHFVG_rail",
-			"trigger": "QVHFVG_trigger"
+			"trigger": "QVHFVG_trigger",
+			"rail": "QVHFVG_rail"
 		};
 		//#endregion
 		//#region ../usage/src/client/shared/entry.tsx
@@ -1453,12 +1453,12 @@ window.__ModuleLoader__.load({
 		}
 		var chart_module_css_default = {
 			"chartTheme": "_8LXSJW_chartTheme",
-			"swatchCached": "_8LXSJW_swatchCached",
+			"tooltipTotal": "_8LXSJW_tooltipTotal",
+			"legend": "_8LXSJW_legend",
 			"tooltipTitle": "_8LXSJW_tooltipTitle",
 			"swatchFresh": "_8LXSJW_swatchFresh",
-			"tooltip": "_8LXSJW_tooltip",
-			"tooltipTotal": "_8LXSJW_tooltipTotal",
-			"legend": "_8LXSJW_legend"
+			"swatchCached": "_8LXSJW_swatchCached",
+			"tooltip": "_8LXSJW_tooltip"
 		};
 		//#endregion
 		//#region \0dsh-css:D:\work\github\dsh\dsh-agent-toolkit\packages\usage\src\client\usage\ActivityHeatmap.module.css.mjs
@@ -1472,14 +1472,14 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var ActivityHeatmap_module_css_default = {
-			"grid": "hjrYrq_grid",
 			"level3": "hjrYrq_level3",
-			"level4": "hjrYrq_level4",
-			"months": "hjrYrq_months",
+			"level2": "hjrYrq_level2",
 			"level0": "hjrYrq_level0",
+			"grid": "hjrYrq_grid",
+			"level4": "hjrYrq_level4",
+			"level1": "hjrYrq_level1",
 			"week": "hjrYrq_week",
-			"level2": "hjrYrq_level2",
-			"level1": "hjrYrq_level1"
+			"months": "hjrYrq_months"
 		};
 		//#endregion
 		//#region ../usage/src/client/usage/ActivityHeatmap.tsx
@@ -52516,19 +52516,19 @@ ${te.current.stack}
 			document.head.appendChild(tag);
 		}
 		var UsageModal_module_css_default = {
-			"row": "MODeXa_row",
+			"compaction": "MODeXa_compaction",
+			"dateLabel": "MODeXa_dateLabel",
+			"tab": "MODeXa_tab",
+			"total": "MODeXa_total",
+			"tabActive": "MODeXa_tabActive",
+			"pagerButton": "MODeXa_pagerButton",
+			"pager": "MODeXa_pager",
 			"rowName": "MODeXa_rowName",
-			"rowCalls": "MODeXa_rowCalls",
 			"dialog": "MODeXa_dialog",
 			"sectionTitle": "MODeXa_sectionTitle",
-			"dateLabel": "MODeXa_dateLabel",
-			"pager": "MODeXa_pager",
-			"compaction": "MODeXa_compaction",
-			"pagerButton": "MODeXa_pagerButton",
 			"tabs": "MODeXa_tabs",
-			"total": "MODeXa_total",
-			"tab": "MODeXa_tab",
-			"tabActive": "MODeXa_tabActive"
+			"row": "MODeXa_row",
+			"rowCalls": "MODeXa_rowCalls"
 		};
 		//#endregion
 		//#region ../usage/src/client/usage/UsageModal.tsx
@@ -55153,29 +55153,29 @@ ${te.current.stack}
 			document.head.appendChild(tag);
 		}
 		var bots_module_css_default = {
-			"botRow": "vTbXga_botRow",
-			"channelBadge": "vTbXga_channelBadge",
-			"field": "vTbXga_field",
-			"select": "vTbXga_select",
-			"status": "vTbXga_status",
-			"group": "vTbXga_group",
-			"botName": "vTbXga_botName",
-			"textarea": "vTbXga_textarea",
-			"dialog": "vTbXga_dialog",
-			"input": "vTbXga_input",
+			"formActions": "vTbXga_formActions",
 			"steps": "vTbXga_steps",
-			"createButton": "vTbXga_createButton",
 			"tab": "vTbXga_tab",
-			"tabActive": "vTbXga_tabActive",
-			"hint": "vTbXga_hint",
-			"step": "vTbXga_step",
-			"stepSeparator": "vTbXga_stepSeparator",
+			"error": "vTbXga_error",
 			"tabs": "vTbXga_tabs",
+			"dialog": "vTbXga_dialog",
+			"step": "vTbXga_step",
 			"scanSection": "vTbXga_scanSection",
-			"error": "vTbXga_error",
+			"textarea": "vTbXga_textarea",
+			"createButton": "vTbXga_createButton",
+			"groupTitle": "vTbXga_groupTitle",
+			"stepSeparator": "vTbXga_stepSeparator",
+			"status": "vTbXga_status",
+			"hint": "vTbXga_hint",
+			"botRow": "vTbXga_botRow",
+			"channelBadge": "vTbXga_channelBadge",
+			"group": "vTbXga_group",
+			"tabActive": "vTbXga_tabActive",
 			"stepActive": "vTbXga_stepActive",
-			"formActions": "vTbXga_formActions",
-			"groupTitle": "vTbXga_groupTitle"
+			"botName": "vTbXga_botName",
+			"select": "vTbXga_select",
+			"input": "vTbXga_input",
+			"field": "vTbXga_field"
 		};
 		//#endregion
 		//#region src/client/bots/BotForm.tsx

package/lib/index.js

@@ -1698,6 +1698,22 @@ async function setupAgentScope(agentCtx, hooks, toolsScope) {
 }
 //#endregion
 //#region src/channels/feishu/api.ts
+/** 附件服务接受的图片媒体类型（与宿主 attachment v1 一致）。 */
+const IMAGE_MEDIA_TYPES = [
+	"image/png",
+	"image/jpeg",
+	"image/webp",
+	"image/gif"
+];
+/** 按魔数判定图片媒体类型；未知字节时回退响应头 content-type（限接受集合），否则 undefined。 */
+function sniffImageMediaType(data, contentType) {
+	if (data.length >= 4 && data[0] === 137 && data[1] === 80 && data[2] === 78 && data[3] === 71) return "image/png";
+	if (data.length >= 3 && data[0] === 255 && data[1] === 216 && data[2] === 255) return "image/jpeg";
+	if (data.length >= 4 && data[0] === 71 && data[1] === 73 && data[2] === 70 && data[3] === 56) return "image/gif";
+	if (data.length >= 12 && data[0] === 82 && data[1] === 73 && data[2] === 70 && data[3] === 70 && data[8] === 87 && data[9] === 69 && data[10] === 66 && data[11] === 80) return "image/webp";
+	const declared = typeof contentType === "string" ? contentType.split(";")[0].trim().toLowerCase() : "";
+	return IMAGE_MEDIA_TYPES.includes(declared) ? declared : void 0;
+}
 /** SDK 薄封装：tenant_access_token 由 SDK 自动管理；错误带 code/msg 上下文。 */
 function createFeishuApi(client) {
 	return {
@@ -1794,6 +1810,31 @@ function createFeishuApi(client) {
 				message_id: messageId,
 				reaction_id: reactionId
 			} });
+		},
+		async downloadImage(messageId, fileKey) {
+			const res = await client.im.messageResource.get({
+				params: { type: "image" },
+				path: {
+					message_id: messageId,
+					file_key: fileKey
+				}
+			});
+			const chunks = [];
+			await new Promise((resolve, reject) => {
+				const stream = res.getReadableStream();
+				stream.on("data", (chunk) => {
+					chunks.push(chunk);
+				});
+				stream.on("end", () => resolve());
+				stream.on("error", (error) => reject(error instanceof Error ? error : new Error(String(error))));
+			});
+			const data = new Uint8Array(Buffer.concat(chunks));
+			const mediaType = sniffImageMediaType(data, res.headers?.["content-type"]);
+			if (mediaType === void 0) throw new Error(`图片资源格式不受支持（file_key=${fileKey}，content-type=${String(res.headers?.["content-type"] ?? "未知")}）`);
+			return {
+				data,
+				mediaType
+			};
 		}
 	};
 }
@@ -1814,9 +1855,39 @@ function stripMentionPlaceholders(text) {
 //#endregion
 //#region src/channels/feishu/parse.ts
 /** im.message.receive_v1 事件解析：窄化为渠道无关的 ParsedMessage；message_id 去重。 */
+/** 从 post content（段落数组）抽取文本与图片 key；段落间以换行连接。 */
+function parsePostContent(content) {
+	const imageKeys = [];
+	const paragraphs = [];
+	try {
+		const parsed = JSON.parse(content);
+		const list = Array.isArray(parsed.content) ? parsed.content : [];
+		for (const paragraph of list) {
+			if (!Array.isArray(paragraph)) continue;
+			const parts = [];
+			for (const node of paragraph) {
+				if (node === null || typeof node !== "object") continue;
+				if (node.tag === "img") {
+					if (typeof node.image_key === "string" && node.image_key.length > 0) imageKeys.push(node.image_key);
+				} else if ((node.tag === "text" || node.tag === "a") && typeof node.text === "string") parts.push(node.text);
+			}
+			paragraphs.push(parts.join(""));
+		}
+	} catch {
+		return {
+			text: "",
+			imageKeys: []
+		};
+	}
+	return {
+		text: paragraphs.join("\n"),
+		imageKeys
+	};
+}
 /**
 * SDK handler 收到的 data 即事件体（README 示例 `data.message` 直接解构）；
-* 兼容包一层 { event } 的形态。过滤：机器人消息、非文本、群内未 @机器人、空文本。
+* 兼容包一层 { event } 的形态。过滤：机器人消息、非 text/post/image 类型、
+* 群内未 @机器人、无文本且无图片。
 */
 function parseMessageEvent(data) {
 	const wrapped = data;
@@ -1825,25 +1896,38 @@ function parseMessageEvent(data) {
 	const userId = event.sender.sender_id?.open_id;
 	const msg = event.message;
 	if (typeof userId !== "string" || msg === void 0) return null;
-	if (msg.message_type !== "text" || typeof msg.content !== "string") return null;
+	if (msg.message_type !== "text" && msg.message_type !== "post" && msg.message_type !== "image") return null;
+	if (typeof msg.content !== "string") return null;
 	if (typeof msg.message_id !== "string" || typeof msg.chat_id !== "string") return null;
 	if (msg.chat_type !== "p2p" && msg.chat_type !== "group") return null;
 	if (msg.chat_type === "group" && !(msg.mentions ?? []).some((m) => m.mentioned_type === "bot")) return null;
-	let text;
-	try {
+	let text = "";
+	let imageKeys = [];
+	if (msg.message_type === "text") try {
 		const parsed = JSON.parse(msg.content);
 		if (typeof parsed.text !== "string") return null;
 		text = stripMentionPlaceholders(parsed.text);
 	} catch {
 		return null;
 	}
-	if (text.length === 0) return null;
+	else if (msg.message_type === "post") {
+		const post = parsePostContent(msg.content);
+		text = stripMentionPlaceholders(post.text);
+		imageKeys = post.imageKeys;
+	} else try {
+		const parsed = JSON.parse(msg.content);
+		if (typeof parsed.image_key === "string" && parsed.image_key.length > 0) imageKeys.push(parsed.image_key);
+	} catch {
+		return null;
+	}
+	if (text.length === 0 && imageKeys.length === 0) return null;
 	return {
 		messageId: msg.message_id,
 		chatId: msg.chat_id,
 		chatType: msg.chat_type,
 		userId,
-		text
+		text,
+		imageKeys
 	};
 }
 /** message_id 去重（飞书会重推）；FIFO 容量淘汰。 */
@@ -2276,12 +2360,14 @@ const feishuChannel = {
 				const parsed = parseMessageEvent(data);
 				if (parsed === null || !dedup.check(parsed.messageId)) return;
 				const reply = new FeishuReplyHandle(api, parsed.chatId, tunables, log);
+				const loadImages = parsed.imageKeys.length > 0 ? async () => Promise.all(parsed.imageKeys.map(async (key) => api.downloadImage(parsed.messageId, key))) : void 0;
 				io.onMessage({
 					botId: bot.record.id,
 					chatId: parsed.chatId,
 					userId: parsed.userId,
 					messageId: parsed.messageId,
 					text: parsed.text,
+					...loadImages !== void 0 ? { loadImages } : {},
 					reply,
 					ackProcessing: makeAck(api, parsed.messageId, tunables.processingReactionEmoji)
 				});
@@ -2467,7 +2553,7 @@ var Outbound = class {
 };
 //#endregion
 //#region src/channels/inbound.ts
-/** 入站：指令分流 → 路由 → 单 in-flight 准入 → 表情回复 → followup 投递。 */
+/** 入站：指令分流 → 路由 → 单 in-flight 准入 → 表情回复 → 图片落附件库 → followup 投递。 */
 var Inbound = class {
 	deps;
 	constructor(deps) {
@@ -2509,11 +2595,23 @@ var Inbound = class {
 		}
 		rt.inflight = { ack: void 0 };
 		rt.inflight.ack = await msg.ackProcessing().catch(() => void 0) ?? void 0;
+		const imageRefs = [];
+		if (msg.loadImages !== void 0) {
+			const images = await msg.loadImages();
+			if (images.length > 0) {
+				const attachments = this.deps.attachments?.();
+				if (attachments === void 0) await msg.reply.notice("当前环境暂不支持图片消息（附件服务不可用），已按文字部分处理");
+				else imageRefs.push(...await attachments.saveImages(images));
+			}
+		}
 		const message = createUserMessage({
-			content: [{
+			content: [...msg.text.length > 0 ? [{
 				type: "text",
 				text: msg.text
-			}],
+			}] : [], ...imageRefs.map((ref) => ({
+				type: "image",
+				attachment: ref
+			}))],
 			source: { kind: "user" }
 		});
 		try {
@@ -2668,6 +2766,7 @@ var BotRuntime = class {
 			router: this.router,
 			bots: deps.bots,
 			maxErrorDetailChars: deps.maxErrorDetailChars,
+			...deps.attachments !== void 0 ? { attachments: deps.attachments } : {},
 			onError: (m) => deps.log.warn(m)
 		});
 		this.outbound = new Outbound(this.sessions, (m) => deps.log.warn(m), deps.maxErrorDetailChars);
@@ -3175,6 +3274,18 @@ function setupBots(ctx, config, deps) {
 		if (workspaceRegistry === void 0) throw new Error("workspaceRegistry 服务不可用");
 		await (await workspaceRegistry.create(cwd)).attachSession(SessionId(sessionId));
 	} };
+	const attachmentsOf = () => {
+		if (ctx.get("attachments", false) === void 0) return void 0;
+		return { async saveImages(inputs) {
+			const current = ctx.get("attachments", false);
+			if (current === void 0) throw new Error("attachments 服务不可用");
+			return current.saveImages(inputs.map(({ data, mediaType, name }) => ({
+				data,
+				mediaType,
+				...name !== void 0 ? { name } : {}
+			})));
+		} };
+	};
 	let botsTable;
 	let bindingsTable;
 	let runtime;
@@ -3209,6 +3320,7 @@ function setupBots(ctx, config, deps) {
 			channels,
 			tunables,
 			maxErrorDetailChars: config.errorDetailMaxChars,
+			attachments: attachmentsOf,
 			resolveSecret: async (ref) => (await ctx.credentials.resolve(credentialRef(ref)))?.value,
 			validateProject: (path) => existsSync(path),
 			log