koishi-plugin-media-luna 0.0.23 → 0.0.25

package/lib/plugins/koishi-commands/config.d.ts

@@ -11,6 +11,10 @@ export interface KoishiCommandsConfig {
     strictTagMatch: boolean;
     /** 确认超时时间（秒） */
     confirmTimeout: number;
+    /** 收集模式超时时间（秒） */
+    collectTimeout: number;
+    /** 直接触发所需的最小图片数量 */
+    directTriggerImageCount: number;
 }
 /** 默认配置 */
 export declare const defaultKoishiCommandsConfig: KoishiCommandsConfig;

package/lib/plugins/koishi-commands/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/plugins/koishi-commands/config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAE9C,oBAAoB;AACpB,MAAM,WAAW,oBAAoB;IACnC,eAAe;IACf,OAAO,EAAE,OAAO,CAAA;IAChB,eAAe;IACf,cAAc,EAAE,MAAM,CAAA;IACtB,eAAe;IACf,aAAa,EAAE,MAAM,CAAA;IACrB,8BAA8B;IAC9B,cAAc,EAAE,OAAO,CAAA;IACvB,gBAAgB;IAChB,cAAc,EAAE,MAAM,CAAA;CACvB;AAED,WAAW;AACX,eAAO,MAAM,2BAA2B,EAAE,oBAMzC,CAAA;AAED,aAAa;AACb,eAAO,MAAM,0BAA0B,EAAE,WAAW,EAoCnD,CAAA"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/plugins/koishi-commands/config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAE9C,oBAAoB;AACpB,MAAM,WAAW,oBAAoB;IACnC,eAAe;IACf,OAAO,EAAE,OAAO,CAAA;IAChB,eAAe;IACf,cAAc,EAAE,MAAM,CAAA;IACtB,eAAe;IACf,aAAa,EAAE,MAAM,CAAA;IACrB,8BAA8B;IAC9B,cAAc,EAAE,OAAO,CAAA;IACvB,gBAAgB;IAChB,cAAc,EAAE,MAAM,CAAA;IACtB,kBAAkB;IAClB,cAAc,EAAE,MAAM,CAAA;IACtB,oBAAoB;IACpB,uBAAuB,EAAE,MAAM,CAAA;CAChC;AAED,WAAW;AACX,eAAO,MAAM,2BAA2B,EAAE,oBAQzC,CAAA;AAED,aAAa;AACb,eAAO,MAAM,0BAA0B,EAAE,WAAW,EAkDnD,CAAA"}

package/lib/plugins/koishi-commands/config.js

@@ -8,7 +8,9 @@ exports.defaultKoishiCommandsConfig = {
     presetsCommand: 'presets',
     presetCommand: 'preset',
     strictTagMatch: true,
-    confirmTimeout: 30
+    confirmTimeout: 30,
+    collectTimeout: 120,
+    directTriggerImageCount: 2
 };
 /** 配置字段定义 */
 exports.koishiCommandsConfigFields = [
@@ -46,6 +48,20 @@ exports.koishiCommandsConfigFields = [
         type: 'number',
         default: 30,
         description: '用户确认操作的超时时间'
+    },
+    {
+        key: 'collectTimeout',
+        label: '收集超时（秒）',
+        type: 'number',
+        default: 120,
+        description: '收集模式下等待用户输入的超时时间'
+    },
+    {
+        key: 'directTriggerImageCount',
+        label: '直接触发图片数',
+        type: 'number',
+        default: 2,
+        description: '图片数量达到此值时直接触发生成，否则进入收集模式'
     }
 ];
 //# sourceMappingURL=config.js.map

package/lib/plugins/koishi-commands/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/plugins/koishi-commands/config.ts"],"names":[],"mappings":";AAAA,cAAc;;;AAkBd,WAAW;AACE,QAAA,2BAA2B,GAAyB;IAC/D,OAAO,EAAE,IAAI;IACb,cAAc,EAAE,SAAS;IACzB,aAAa,EAAE,QAAQ;IACvB,cAAc,EAAE,IAAI;IACpB,cAAc,EAAE,EAAE;CACnB,CAAA;AAED,aAAa;AACA,QAAA,0BAA0B,GAAkB;IACvD;QACE,GAAG,EAAE,SAAS;QACd,KAAK,EAAE,MAAM;QACb,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,2BAA2B;KACzC;IACD;QACE,GAAG,EAAE,gBAAgB;QACrB,KAAK,EAAE,QAAQ;QACf,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,SAAS;QAClB,WAAW,EAAE,aAAa;KAC3B;IACD;QACE,GAAG,EAAE,eAAe;QACpB,KAAK,EAAE,QAAQ;QACf,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,QAAQ;QACjB,WAAW,EAAE,aAAa;KAC3B;IACD;QACE,GAAG,EAAE,gBAAgB;QACrB,KAAK,EAAE,QAAQ;QACf,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,+BAA+B;KAC7C;IACD;QACE,GAAG,EAAE,gBAAgB;QACrB,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,EAAE;QACX,WAAW,EAAE,aAAa;KAC3B;CACF,CAAA"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/plugins/koishi-commands/config.ts"],"names":[],"mappings":";AAAA,cAAc;;;AAsBd,WAAW;AACE,QAAA,2BAA2B,GAAyB;IAC/D,OAAO,EAAE,IAAI;IACb,cAAc,EAAE,SAAS;IACzB,aAAa,EAAE,QAAQ;IACvB,cAAc,EAAE,IAAI;IACpB,cAAc,EAAE,EAAE;IAClB,cAAc,EAAE,GAAG;IACnB,uBAAuB,EAAE,CAAC;CAC3B,CAAA;AAED,aAAa;AACA,QAAA,0BAA0B,GAAkB;IACvD;QACE,GAAG,EAAE,SAAS;QACd,KAAK,EAAE,MAAM;QACb,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,2BAA2B;KACzC;IACD;QACE,GAAG,EAAE,gBAAgB;QACrB,KAAK,EAAE,QAAQ;QACf,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,SAAS;QAClB,WAAW,EAAE,aAAa;KAC3B;IACD;QACE,GAAG,EAAE,eAAe;QACpB,KAAK,EAAE,QAAQ;QACf,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,QAAQ;QACjB,WAAW,EAAE,aAAa;KAC3B;IACD;QACE,GAAG,EAAE,gBAAgB;QACrB,KAAK,EAAE,QAAQ;QACf,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,+BAA+B;KAC7C;IACD;QACE,GAAG,EAAE,gBAAgB;QACrB,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,EAAE;QACX,WAAW,EAAE,aAAa;KAC3B;IACD;QACE,GAAG,EAAE,gBAAgB;QACrB,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,GAAG;QACZ,WAAW,EAAE,kBAAkB;KAChC;IACD;QACE,GAAG,EAAE,yBAAyB;QAC9B,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,CAAC;QACV,WAAW,EAAE,0BAA0B;KACxC;CACF,CAAA"}

package/lib/plugins/koishi-commands/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/koishi-commands/index.ts"],"names":[],"mappings":";AAiBA,wBAwDE;AAkbF,YAAY,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/koishi-commands/index.ts"],"names":[],"mappings":";AAyBA,wBA0DE;AA8qBF,YAAY,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA"}

package/lib/plugins/koishi-commands/index.js

@@ -1,6 +1,6 @@
 "use strict";
 // Koishi 指令插件入口
-// 注册渠道名指令，预设名作为可选参数
+// 注册渠道名指令，支持收集模式
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("../../core");
 const config_1 = require("./config");
@@ -19,17 +19,19 @@ exports.default = (0, core_1.definePlugin)({
     async onLoad(pluginCtx) {
         const ctx = pluginCtx.ctx;
         const config = pluginCtx.getConfig();
-        if (!config.enabled) {
-            pluginCtx.logger.info('Koishi commands disabled');
-            return;
-        }
+        // 注意：即使全局 enabled=false，也需要加载插件
+        // 因为渠道级配置可能覆盖启用了某些渠道
+        // 具体的启用判断在 refreshGenerateCommands 中进行
         // 保存 mediaLuna 引用，避免在事件处理器中重复访问 ctx.mediaLuna 触发警告
         let mediaLunaRef = null;
         // 等待 mediaLuna 服务就绪后注册指令
         ctx.on('ready', async () => {
             mediaLunaRef = ctx.mediaLuna;
             await refreshGenerateCommands(pluginCtx, config, mediaLunaRef);
-            registerPresetCommands(pluginCtx, config, mediaLunaRef);
+            // 预设查询指令使用全局配置（传 null 表示不看渠道覆盖）
+            if (mediaLunaRef.isPluginEnabledForChannel('koishi-commands', null)) {
+                registerPresetCommands(pluginCtx, config, mediaLunaRef);
+            }
         });
         // 监听渠道变化，动态刷新指令
         ctx.on('mediaLuna/channel-updated', async () => {
@@ -100,6 +102,12 @@ async function refreshGenerateCommands(pluginCtx, config, mediaLuna) {
             }
             channelCommandDisposables.delete(channel.id);
         }
+        // 检查渠道级配置是否禁用了 koishi-commands
+        // 使用 MediaLuna 服务的统一方法：全局配置 + 渠道覆盖
+        if (!mediaLuna.isPluginEnabledForChannel('koishi-commands', channel)) {
+            pluginCtx.logger.debug(`Channel ${channel.name}: koishi-commands disabled, skipping`);
+            continue;
+        }
         // 注册渠道指令
         const dispose = registerChannelCommand(ctx, mediaLuna, channel, presets, config, pluginCtx.logger);
         channelCommandDisposables.set(channel.id, dispose);
@@ -119,49 +127,305 @@ function registerChannelCommand(ctx, mediaLuna, channel, presets, config, logger
         .option('image', '-i <url:string> 输入图片URL')
         .usage(`用法: ${channel.name} [预设名] <提示词>\n可用预设: ${presets.map((p) => p.name).join(', ') || '无'}`)
         .action(async ({ session, options }, ...rest) => {
-        // rest 是所有参数的数组
-        // 对于 /draw anime xxx，rest = ['anime', 'xxx']
-        // 对于 /draw xxx，rest = ['xxx']
-        let presetName;
-        let promptParts = rest;
-        if (rest.length > 0) {
-            const firstWord = rest[0]?.toLowerCase();
-            // 检查首词是否是预设名
-            if (firstWord && presetNamesLower.has(firstWord)) {
-                presetName = presetNameMap.get(firstWord);
-                promptParts = rest.slice(1);
+        // 初始化收集状态（预设名稍后解析）
+        const state = {
+            files: [],
+            processedUrls: new Set(),
+            prompts: [],
+            presetName: undefined
+        };
+        // 创建提取器
+        const extractor = new MessageExtractor(ctx, logger, state);
+        // 从当前消息提取所有内容（图片、at、引用、文本）
+        const messageText = await extractor.extractAll(session);
+        // 合并命令行参数和消息文本
+        // rest 是 Koishi 解析的命令行参数，messageText 是消息元素中的文本
+        // 优先使用 rest（因为更准确），如果 rest 为空则使用 messageText
+        const allText = rest.length > 0 ? rest.join(' ') : messageText;
+        if (allText.trim()) {
+            state.prompts.push(allText.trim());
+        }
+        // 如果命令行指定了图片 URL，也获取
+        if (options?.image) {
+            await extractor.fetchImage(options.image, 'input');
+        }
+        // 判断是否直接触发
+        if (state.files.length >= config.directTriggerImageCount) {
+            // 图片数量足够，直接生成
+            return executeGenerateWithPresetCheck(ctx, session, channel, state, presetNamesLower, presetNameMap, config, mediaLuna);
+        }
+        // 进入收集模式
+        return enterCollectMode(ctx, session, channel, state, presetNamesLower, presetNameMap, config, mediaLuna, logger);
+    });
+    logger.debug(`Registered command: ${channel.name} (${presets.length} presets available)`);
+    return () => channelCmd.dispose();
+}
+/**
+ * 消息内容提取器
+ * 统一处理图片、at、引用消息等元素的提取
+ */
+class MessageExtractor {
+    ctx;
+    logger;
+    state;
+    constructor(ctx, logger, state) {
+        this.ctx = ctx;
+        this.logger = logger;
+        this.state = state;
+    }
+    /**
+     * 从 Session 提取所有内容（图片、at、引用、文本）
+     */
+    async extractAll(session) {
+        if (!session?.elements)
+            return '';
+        // 提取媒体内容
+        await this.extractMedia(session);
+        // 提取文本
+        return this.extractText(session.elements);
+    }
+    /**
+     * 从 Session 只提取媒体内容（图片、at、引用），不提取文本
+     * 用于第一次提取，因为文本中可能包含预设名需要单独处理
+     */
+    async extractMedia(session) {
+        if (!session?.elements)
+            return;
+        // 提取图片
+        await this.extractImages(session.elements);
+        // 提取 at 用户头像
+        await this.extractAtAvatars(session);
+        // 提取引用消息中的图片
+        await this.extractFromQuote(session.elements);
+    }
+    /**
+     * 从元素数组中提取图片
+     */
+    async extractImages(elements) {
+        const imageElements = koishi_1.h.select(elements, 'img,image');
+        for (const img of imageElements) {
+            await this.fetchImage(img.attrs?.src || img.attrs?.url, 'input');
+        }
+    }
+    /**
+     * 从 Session 中提取 at 用户的头像
+     */
+    async extractAtAvatars(session) {
+        if (!session.elements)
+            return;
+        const atElements = koishi_1.h.select(session.elements, 'at');
+        for (const at of atElements) {
+            const userId = at.attrs?.id;
+            if (userId && session.bot) {
+                try {
+                    const user = await session.bot.getUser(userId);
+                    const avatarUrl = user?.avatar;
+                    if (avatarUrl) {
+                        await this.fetchImage(avatarUrl, `avatar_${userId}`);
+                        this.logger.debug('Extracted avatar for user %s', userId);
+                    }
+                }
+                catch (e) {
+                    this.logger.warn('Failed to get user info for %s: %s', userId, e);
+                }
+            }
+        }
+    }
+    /**
+     * 从引用消息中提取图片
+     */
+    async extractFromQuote(elements) {
+        const quoteElements = koishi_1.h.select(elements, 'quote');
+        for (const quote of quoteElements) {
+            if (quote.children && quote.children.length > 0) {
+                const quoteImages = koishi_1.h.select(quote.children, 'img,image');
+                for (const img of quoteImages) {
+                    await this.fetchImage(img.attrs?.src || img.attrs?.url, 'quote');
+                }
             }
         }
-        const actualPrompt = promptParts.join(' ');
-        // 严格标签匹配检查
-        if (config.strictTagMatch && presetName) {
-            const presetService = mediaLuna?.presets;
-            if (presetService) {
-                const presetData = await presetService.getByName(presetName);
-                if (presetData) {
-                    const channelTags = channel.tags || [];
-                    const presetTags = presetData.tags || [];
-                    const hasMatch = channelTags.length === 0 ||
-                        presetTags.some((t) => channelTags.includes(t));
-                    if (!hasMatch) {
-                        await session?.send(`该模型类别不支持预设「${presetName}」，输入"确认"继续，输入其他取消`);
-                        const confirmInput = await session?.prompt(config.confirmTimeout * 1000);
-                        if (confirmInput?.trim() !== '确认') {
-                            return '已取消';
-                        }
+    }
+    /**
+     * 从元素数组中提取文本
+     */
+    extractText(elements) {
+        const textElements = koishi_1.h.select(elements, 'text');
+        return textElements.map(el => el.attrs?.content || '').join('').trim();
+    }
+    /**
+     * 获取图片并添加到 state
+     */
+    async fetchImage(url, prefix) {
+        if (!url || this.state.processedUrls.has(url))
+            return false;
+        this.state.processedUrls.add(url);
+        try {
+            const response = await this.ctx.http.get(url, { responseType: 'arraybuffer' });
+            const buffer = Buffer.from(response);
+            const arrayBuffer = buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
+            this.state.files.push({
+                data: arrayBuffer,
+                mime: 'image/png',
+                filename: `${prefix}_${this.state.files.length}.png`
+            });
+            return true;
+        }
+        catch (e) {
+            this.logger.warn('Failed to fetch image from %s: %s', prefix, e);
+            return false;
+        }
+    }
+    /**
+     * 添加文本到提示词
+     */
+    addPrompt(text) {
+        if (text && !['开始', 'go', 'start', '取消', 'cancel'].includes(text.toLowerCase())) {
+            this.state.prompts.push(text);
+        }
+    }
+}
+/**
+ * 解析预设名并执行生成
+ * 从 prompts 的第一个词判断是否为预设名
+ */
+async function executeGenerateWithPresetCheck(ctx, session, channel, state, presetNamesLower, presetNameMap, config, mediaLuna) {
+    // 合并所有提示词
+    const fullPrompt = state.prompts.join(' ').trim();
+    const words = fullPrompt.split(/\s+/);
+    let presetName;
+    let actualPrompt = fullPrompt;
+    // 检查第一个词是否是预设名
+    if (words.length > 0 && words[0]) {
+        const firstWord = words[0].toLowerCase();
+        if (presetNamesLower.has(firstWord)) {
+            presetName = presetNameMap.get(firstWord);
+            actualPrompt = words.slice(1).join(' ');
+        }
+    }
+    // 严格标签匹配检查
+    if (config.strictTagMatch && presetName) {
+        const presetService = mediaLuna?.presets;
+        if (presetService) {
+            const presetData = await presetService.getByName(presetName);
+            if (presetData) {
+                const channelTags = channel.tags || [];
+                const presetTags = presetData.tags || [];
+                const hasMatch = channelTags.length === 0 ||
+                    presetTags.some((t) => channelTags.includes(t));
+                if (!hasMatch) {
+                    await session?.send(`该模型类别不支持预设「${presetName}」，输入"确认"继续，输入其他取消`);
+                    const confirmInput = await session?.prompt(config.confirmTimeout * 1000);
+                    if (confirmInput?.trim() !== '确认') {
+                        return '已取消';
                     }
                 }
             }
         }
-        return executeGenerate(ctx, session, {
-            channelName: channel.name,
-            presetName,
-            prompt: actualPrompt,
-            imageUrl: options?.image
-        });
+    }
+    // 构建生成摘要信息
+    const summaryParts = [];
+    if (presetName) {
+        summaryParts.push(`预设: ${presetName}`);
+    }
+    else {
+        summaryParts.push('无预设');
+    }
+    summaryParts.push(`提示词: ${actualPrompt.length} 字`);
+    summaryParts.push(`图片: ${state.files.length} 张`);
+    const summaryMsg = `开始生成 | ${summaryParts.join(' | ')}`;
+    // 执行生成
+    return executeGenerate(ctx, session, {
+        channelName: channel.name,
+        presetName,
+        prompt: actualPrompt,
+        files: state.files,
+        summaryMsg
     });
-    logger.debug(`Registered command: ${channel.name} (${presets.length} presets available)`);
-    return () => channelCmd.dispose();
+}
+/**
+ * 进入收集模式
+ * 使用中间件捕获完整消息（包括图片）
+ */
+async function enterCollectMode(ctx, session, channel, state, presetNamesLower, presetNameMap, config, mediaLuna, logger) {
+    if (!session) {
+        return '会话不可用';
+    }
+    // 发送收集模式提示
+    const hintMsgIds = await session.send(`已进入收集模式，请继续发送图片/@用户/文字\n发送「开始」触发生成，发送「取消」退出\n当前已收集: ${state.files.length} 张图片`);
+    const timeoutMs = config.collectTimeout * 1000;
+    const extractor = new MessageExtractor(ctx, logger, state);
+    // 使用 Promise 来等待收集完成
+    return new Promise((resolve) => {
+        let disposed = false;
+        // 超时处理
+        const timeoutHandle = setTimeout(async () => {
+            if (disposed)
+                return;
+            disposed = true;
+            disposeMiddleware();
+            await deleteMessages(session, hintMsgIds);
+            resolve('收集超时，已取消');
+        }, timeoutMs);
+        // 注册中间件来捕获消息
+        const disposeMiddleware = ctx.middleware(async (sess, next) => {
+            // 只处理同一用户、同一频道的消息
+            if (disposed)
+                return next();
+            if (sess.userId !== session.userId)
+                return next();
+            if (sess.channelId !== session.channelId)
+                return next();
+            // 提取文本
+            const textContent = extractor.extractText(sess.elements || []).toLowerCase();
+            // 检查触发词
+            if (textContent === '开始' || textContent === 'go' || textContent === 'start') {
+                if (disposed)
+                    return;
+                disposed = true;
+                clearTimeout(timeoutHandle);
+                disposeMiddleware();
+                await deleteMessages(session, hintMsgIds);
+                // 检查是否有内容可生成
+                if (state.files.length === 0 && state.prompts.length === 0) {
+                    resolve('没有可生成的内容');
+                    return;
+                }
+                // 开始生成（带预设检查）
+                const result = await executeGenerateWithPresetCheck(ctx, session, channel, state, presetNamesLower, presetNameMap, config, mediaLuna);
+                resolve(result);
+                return;
+            }
+            if (textContent === '取消' || textContent === 'cancel') {
+                if (disposed)
+                    return;
+                disposed = true;
+                clearTimeout(timeoutHandle);
+                disposeMiddleware();
+                await deleteMessages(session, hintMsgIds);
+                resolve('已取消');
+                return;
+            }
+            // 从消息中提取所有内容
+            const text = await extractor.extractAll(sess);
+            extractor.addPrompt(text);
+            // 不传递给下一个中间件，阻止其他指令处理
+        }, true); // true 表示优先级高
+    });
+}
+/**
+ * 删除消息
+ */
+async function deleteMessages(session, msgIds) {
+    if (!msgIds || msgIds.length === 0)
+        return;
+    for (const msgId of msgIds) {
+        try {
+            await session.bot?.deleteMessage(session.channelId, msgId);
+        }
+        catch (e) {
+            // 忽略删除失败（可能没有权限或消息已删除）
+        }
+    }
 }
 /**
  * 注册预设查询指令
@@ -297,101 +561,31 @@ async function executeGenerate(ctx, session, options) {
     const logger = ctx.logger('media-luna/commands');
     // 获取用户 ID
     const uid = session?.user?.id;
-    // 处理输入文件
-    const files = [];
-    const processedUrls = new Set(); // 用于去重
-    // 从消息中提取图片（使用 Koishi 元素选择器）
-    if (session?.elements) {
-        const imageElements = koishi_1.h.select(session.elements, 'img,image');
-        for (const img of imageElements) {
-            const src = img.attrs?.src || img.attrs?.url;
-            if (src && !processedUrls.has(src)) {
-                processedUrls.add(src);
-                try {
-                    const response = await ctx.http.get(src, { responseType: 'arraybuffer' });
-                    const buffer = Buffer.from(response);
-                    const arrayBuffer = buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
-                    files.push({
-                        data: arrayBuffer,
-                        mime: 'image/png',
-                        filename: `input_${files.length}.png`
-                    });
-                }
-                catch (e) {
-                    logger.warn('Failed to fetch image from message: %s', e);
-                }
-            }
-        }
-        // 从消息中提取 at 元素，获取被 at 用户的头像
-        const atElements = koishi_1.h.select(session.elements, 'at');
-        for (const at of atElements) {
-            const userId = at.attrs?.id;
-            if (userId && session.bot) {
-                try {
-                    // 尝试获取用户信息
-                    const user = await session.bot.getUser(userId);
-                    const avatarUrl = user?.avatar;
-                    if (avatarUrl && !processedUrls.has(avatarUrl)) {
-                        processedUrls.add(avatarUrl);
-                        try {
-                            const response = await ctx.http.get(avatarUrl, { responseType: 'arraybuffer' });
-                            const buffer = Buffer.from(response);
-                            const arrayBuffer = buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
-                            files.push({
-                                data: arrayBuffer,
-                                mime: 'image/png',
-                                filename: `avatar_${userId}.png`
-                            });
-                            logger.debug('Extracted avatar for user %s', userId);
-                        }
-                        catch (e) {
-                            logger.warn('Failed to fetch avatar for user %s: %s', userId, e);
-                        }
-                    }
-                }
-                catch (e) {
-                    logger.warn('Failed to get user info for %s: %s', userId, e);
-                }
-            }
-        }
-    }
-    // 如果命令行指定了图片 URL，也获取（去重）
-    if (options.imageUrl && !processedUrls.has(options.imageUrl)) {
-        processedUrls.add(options.imageUrl);
-        try {
-            const response = await ctx.http.get(options.imageUrl, { responseType: 'arraybuffer' });
-            const buffer = Buffer.from(response);
-            const arrayBuffer = buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
-            files.push({
-                data: arrayBuffer,
-                mime: 'image/png',
-                filename: `input_${files.length}.png`
-            });
-        }
-        catch (e) {
-            logger.warn('Failed to fetch input image: %s', e);
-        }
-    }
-    // 清理 prompt 中的图片标签，只保留文本
-    let cleanPrompt = options.prompt;
-    if (session?.elements) {
-        const textElements = koishi_1.h.select(session.elements, 'text');
-        cleanPrompt = textElements.map(el => el.attrs?.content || '').join('').trim();
-    }
-    // 发送"正在生成中"提示
-    await session?.send('正在生成中...');
+    // 发送摘要和"正在生成中"提示
+    const statusMsg = options.summaryMsg
+        ? `${options.summaryMsg}\n正在生成中...`
+        : '正在生成中...';
+    const generatingMsgIds = await session?.send(statusMsg);
     try {
         const result = await ctx.mediaLuna.generateByName({
             channelName: options.channelName,
             presetName: options.presetName,
-            prompt: cleanPrompt,
-            files,
+            prompt: options.prompt,
+            files: options.files,
             session,
             uid
         });
+        // 撤销"正在生成中"消息
+        if (session && generatingMsgIds) {
+            await deleteMessages(session, generatingMsgIds);
+        }
         return formatResult(result);
     }
     catch (error) {
+        // 撤销"正在生成中"消息
+        if (session && generatingMsgIds) {
+            await deleteMessages(session, generatingMsgIds);
+        }
         logger.error('Generate failed: %s', error);
         return `生成失败: ${error instanceof Error ? error.message : '未知错误'}`;
     }
@@ -400,15 +594,24 @@ async function executeGenerate(ctx, session, options) {
  * 格式化生成结果
  */
 function formatResult(result) {
+    const messages = [];
+    // 添加生成前提示（来自中间件，如 billing 预扣费）
+    if (result.hints?.before && result.hints.before.length > 0) {
+        messages.push(result.hints.before.join('\n'));
+    }
+    // 添加生成后提示（来自中间件，如 billing 结算）
+    if (result.hints?.after && result.hints.after.length > 0) {
+        messages.push(result.hints.after.join('\n'));
+    }
     if (!result.success) {
-        // TODO: 支持自定义错误消息模板
-        return `生成失败: ${result.error || '未知错误'}`;
+        messages.push(`生成失败: ${result.error || '未知错误'}`);
+        return messages.join('\n');
     }
     if (!result.output || result.output.length === 0) {
-        return '生成完成，但没有输出';
+        messages.push('生成完成，但没有输出');
+        return messages.join('\n');
     }
     // 构建输出消息
-    const messages = [];
     for (const asset of result.output) {
         if (asset.kind === 'image' && asset.url) {
             messages.push(`<image url="${asset.url}"/>`);
@@ -420,7 +623,6 @@ function formatResult(result) {
             messages.push(`<video url="${asset.url}"/>`);
         }
     }
-    // TODO: 添加成功消息模板支持（如消费 {cost}{currency}，余额 {balance}）
     return messages.join('\n');
 }
 //# sourceMappingURL=index.js.map