koishi-plugin-imgdraw-selfuse 0.0.8 → 0.1.1

package/lib/index.d.ts

@@ -16,7 +16,41 @@ interface BlacklistEntry {
     id: string;
     createdAt: Date;
 }
-export declare const Config: Schema<Schemastery.ObjectS<{
+export declare const BaseConfig: Schema<Schemastery.ObjectS<{
+    debug: Schema<boolean, boolean>;
+    apiStrategy: Schema<"sequence" | "roundrobin", "sequence" | "roundrobin">;
+    timeout: Schema<number, number>;
+    rateLimit: Schema<number, number>;
+    imgWaitTime: Schema<number, number>;
+    model: Schema<string, string>;
+    txt2imgModel: Schema<string, string>;
+    img2imgModel: Schema<string, string>;
+    maxImages: Schema<number, number>;
+    enableImgCompress: Schema<boolean, boolean>;
+    imgMaxWidth: Schema<number, number>;
+    imgMaxHeight: Schema<number, number>;
+    imgQuality: Schema<number, number>;
+    imgMaxFileSize: Schema<number, number>;
+    enableImg2ImgBase64: Schema<boolean, boolean>;
+    apiList: Schema<Schemastery.ObjectS<{
+        enable: Schema<boolean, boolean>;
+        apiKey: Schema<string, string>;
+        baseUrl: Schema<string, string>;
+    }>[], Schemastery.ObjectT<{
+        enable: Schema<boolean, boolean>;
+        apiKey: Schema<string, string>;
+        baseUrl: Schema<string, string>;
+    }>[]>;
+    enableTxt2Img: Schema<boolean, boolean>;
+    enableImg2Img: Schema<boolean, boolean>;
+    command: Schema<string, string>;
+    aliases: Schema<string[], string[]>;
+    img2imgCommand: Schema<string, string>;
+    img2imgAliases: Schema<string[], string[]>;
+    txt2imgPrompt: Schema<string, string>;
+    img2imgPrompt: Schema<string, string>;
+    blacklistAdmins: Schema<string[], string[]>;
+}>, Schemastery.ObjectT<{
     debug: Schema<boolean, boolean>;
     apiStrategy: Schema<"sequence" | "roundrobin", "sequence" | "roundrobin">;
     timeout: Schema<number, number>;
@@ -31,6 +65,7 @@ export declare const Config: Schema<Schemastery.ObjectS<{
     imgMaxHeight: Schema<number, number>;
     imgQuality: Schema<number, number>;
     imgMaxFileSize: Schema<number, number>;
+    enableImg2ImgBase64: Schema<boolean, boolean>;
     apiList: Schema<Schemastery.ObjectS<{
         enable: Schema<boolean, boolean>;
         apiKey: Schema<string, string>;
@@ -49,6 +84,39 @@ export declare const Config: Schema<Schemastery.ObjectS<{
     txt2imgPrompt: Schema<string, string>;
     img2imgPrompt: Schema<string, string>;
     blacklistAdmins: Schema<string[], string[]>;
+}>>;
+export declare const PresetConfig: Schema<Schemastery.ObjectS<{
+    enablePresets: Schema<boolean, boolean>;
+    presets: Schema<Schemastery.ObjectS<{
+        enable: Schema<boolean, boolean>;
+        text: Schema<string, string>;
+        command: Schema<string, string>;
+        keyword: Schema<string, string>;
+        enableKeywordMatch: Schema<boolean, boolean>;
+    }>[], Schemastery.ObjectT<{
+        enable: Schema<boolean, boolean>;
+        text: Schema<string, string>;
+        command: Schema<string, string>;
+        keyword: Schema<string, string>;
+        enableKeywordMatch: Schema<boolean, boolean>;
+    }>[]>;
+}>, Schemastery.ObjectT<{
+    enablePresets: Schema<boolean, boolean>;
+    presets: Schema<Schemastery.ObjectS<{
+        enable: Schema<boolean, boolean>;
+        text: Schema<string, string>;
+        command: Schema<string, string>;
+        keyword: Schema<string, string>;
+        enableKeywordMatch: Schema<boolean, boolean>;
+    }>[], Schemastery.ObjectT<{
+        enable: Schema<boolean, boolean>;
+        text: Schema<string, string>;
+        command: Schema<string, string>;
+        keyword: Schema<string, string>;
+        enableKeywordMatch: Schema<boolean, boolean>;
+    }>[]>;
+}>>;
+export declare const MessageConfig: Schema<Schemastery.ObjectS<{
     messages: Schema<Schemastery.ObjectS<{
         generating: Schema<string, string>;
         waitImage: Schema<string, string>;
@@ -101,6 +169,59 @@ export declare const Config: Schema<Schemastery.ObjectS<{
         blacklistListTitle: Schema<string, string>;
     }>>;
 }>, Schemastery.ObjectT<{
+    messages: Schema<Schemastery.ObjectS<{
+        generating: Schema<string, string>;
+        waitImage: Schema<string, string>;
+        timeout: Schema<string, string>;
+        empty: Schema<string, string>;
+        noApi: Schema<string, string>;
+        fail: Schema<string, string>;
+        modelTextOnly: Schema<string, string>;
+        needAssets: Schema<string, string>;
+        txt2imgDisabled: Schema<string, string>;
+        img2imgDisabled: Schema<string, string>;
+        rateLimit: Schema<string, string>;
+        alreadyWaiting: Schema<string, string>;
+        multiImageReceived: Schema<string, string>;
+        multiImageLimit: Schema<string, string>;
+        noImageReceived: Schema<string, string>;
+        blacklisted: Schema<string, string>;
+        noPermission: Schema<string, string>;
+        blacklistAddSuccess: Schema<string, string>;
+        blacklistRemoveSuccess: Schema<string, string>;
+        blacklistAddFail: Schema<string, string>;
+        blacklistRemoveFail: Schema<string, string>;
+        invalidUserId: Schema<string, string>;
+        blacklistListEmpty: Schema<string, string>;
+        blacklistListTitle: Schema<string, string>;
+    }>, Schemastery.ObjectT<{
+        generating: Schema<string, string>;
+        waitImage: Schema<string, string>;
+        timeout: Schema<string, string>;
+        empty: Schema<string, string>;
+        noApi: Schema<string, string>;
+        fail: Schema<string, string>;
+        modelTextOnly: Schema<string, string>;
+        needAssets: Schema<string, string>;
+        txt2imgDisabled: Schema<string, string>;
+        img2imgDisabled: Schema<string, string>;
+        rateLimit: Schema<string, string>;
+        alreadyWaiting: Schema<string, string>;
+        multiImageReceived: Schema<string, string>;
+        multiImageLimit: Schema<string, string>;
+        noImageReceived: Schema<string, string>;
+        blacklisted: Schema<string, string>;
+        noPermission: Schema<string, string>;
+        blacklistAddSuccess: Schema<string, string>;
+        blacklistRemoveSuccess: Schema<string, string>;
+        blacklistAddFail: Schema<string, string>;
+        blacklistRemoveFail: Schema<string, string>;
+        invalidUserId: Schema<string, string>;
+        blacklistListEmpty: Schema<string, string>;
+        blacklistListTitle: Schema<string, string>;
+    }>>;
+}>>;
+export declare const Config: Schema<Schemastery.ObjectS<{
     debug: Schema<boolean, boolean>;
     apiStrategy: Schema<"sequence" | "roundrobin", "sequence" | "roundrobin">;
     timeout: Schema<number, number>;
@@ -115,6 +236,7 @@ export declare const Config: Schema<Schemastery.ObjectS<{
     imgMaxHeight: Schema<number, number>;
     imgQuality: Schema<number, number>;
     imgMaxFileSize: Schema<number, number>;
+    enableImg2ImgBase64: Schema<boolean, boolean>;
     apiList: Schema<Schemastery.ObjectS<{
         enable: Schema<boolean, boolean>;
         apiKey: Schema<string, string>;
@@ -133,6 +255,22 @@ export declare const Config: Schema<Schemastery.ObjectS<{
     txt2imgPrompt: Schema<string, string>;
     img2imgPrompt: Schema<string, string>;
     blacklistAdmins: Schema<string[], string[]>;
+}> | Schemastery.ObjectS<{
+    enablePresets: Schema<boolean, boolean>;
+    presets: Schema<Schemastery.ObjectS<{
+        enable: Schema<boolean, boolean>;
+        text: Schema<string, string>;
+        command: Schema<string, string>;
+        keyword: Schema<string, string>;
+        enableKeywordMatch: Schema<boolean, boolean>;
+    }>[], Schemastery.ObjectT<{
+        enable: Schema<boolean, boolean>;
+        text: Schema<string, string>;
+        command: Schema<string, string>;
+        keyword: Schema<string, string>;
+        enableKeywordMatch: Schema<boolean, boolean>;
+    }>[]>;
+}> | Schemastery.ObjectS<{
     messages: Schema<Schemastery.ObjectS<{
         generating: Schema<string, string>;
         waitImage: Schema<string, string>;
@@ -184,7 +322,73 @@ export declare const Config: Schema<Schemastery.ObjectS<{
         blacklistListEmpty: Schema<string, string>;
         blacklistListTitle: Schema<string, string>;
     }>>;
-}>>;
+}>, {
+    debug: boolean;
+    apiStrategy: "sequence" | "roundrobin";
+    timeout: number;
+    rateLimit: number;
+    imgWaitTime: number;
+    model: string;
+    txt2imgModel: string;
+    img2imgModel: string;
+    maxImages: number;
+    enableImgCompress: boolean;
+    imgMaxWidth: number;
+    imgMaxHeight: number;
+    imgQuality: number;
+    imgMaxFileSize: number;
+    enableImg2ImgBase64: boolean;
+    apiList: Schemastery.ObjectT<{
+        enable: Schema<boolean, boolean>;
+        apiKey: Schema<string, string>;
+        baseUrl: Schema<string, string>;
+    }>[];
+    enableTxt2Img: boolean;
+    enableImg2Img: boolean;
+    command: string;
+    aliases: string[];
+    img2imgCommand: string;
+    img2imgAliases: string[];
+    txt2imgPrompt: string;
+    img2imgPrompt: string;
+    blacklistAdmins: string[];
+} & import("cosmokit", { with: { "resolution-mode": "import" } }).Dict & {
+    enablePresets: boolean;
+    presets: Schemastery.ObjectT<{
+        enable: Schema<boolean, boolean>;
+        text: Schema<string, string>;
+        command: Schema<string, string>;
+        keyword: Schema<string, string>;
+        enableKeywordMatch: Schema<boolean, boolean>;
+    }>[];
+} & {
+    messages: Schemastery.ObjectT<{
+        generating: Schema<string, string>;
+        waitImage: Schema<string, string>;
+        timeout: Schema<string, string>;
+        empty: Schema<string, string>;
+        noApi: Schema<string, string>;
+        fail: Schema<string, string>;
+        modelTextOnly: Schema<string, string>;
+        needAssets: Schema<string, string>;
+        txt2imgDisabled: Schema<string, string>;
+        img2imgDisabled: Schema<string, string>;
+        rateLimit: Schema<string, string>;
+        alreadyWaiting: Schema<string, string>;
+        multiImageReceived: Schema<string, string>;
+        multiImageLimit: Schema<string, string>;
+        noImageReceived: Schema<string, string>;
+        blacklisted: Schema<string, string>;
+        noPermission: Schema<string, string>;
+        blacklistAddSuccess: Schema<string, string>;
+        blacklistRemoveSuccess: Schema<string, string>;
+        blacklistAddFail: Schema<string, string>;
+        blacklistRemoveFail: Schema<string, string>;
+        invalidUserId: Schema<string, string>;
+        blacklistListEmpty: Schema<string, string>;
+        blacklistListTitle: Schema<string, string>;
+    }>;
+}>;
 export type Config = any;
 export declare function apply(ctx: Context, cfg: any): Promise<void>;
 export {};

package/lib/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Config = exports.inject = exports.name = void 0;
+exports.Config = exports.MessageConfig = exports.PresetConfig = exports.BaseConfig = exports.inject = exports.name = void 0;
 exports.apply = apply;
 const koishi_1 = require("koishi");
 const axios_1 = __importDefault(require("axios"));
@@ -24,8 +24,16 @@ exports.inject = {
     optional: ['assets'],
 };
 const logger = new koishi_1.Logger('ai-image');
-// ==================== 配置 Schema ====================
-exports.Config = koishi_1.Schema.object({
+// ==================== 预置提示词单项配置 ====================
+const PresetItem = koishi_1.Schema.object({
+    enable: koishi_1.Schema.boolean().default(true).description('启用此预置提示词'),
+    text: koishi_1.Schema.string().default('').description('预置提示词文本（将自动添加到 prompt 前）'),
+    command: koishi_1.Schema.string().default('').description('触发指令（如 draw0，留空则自动生成 drawN）'),
+    keyword: koishi_1.Schema.string().default('').description('匹配关键词（如 猫娘，留空则不启用关键词匹配）'),
+    enableKeywordMatch: koishi_1.Schema.boolean().default(false).description('启用关键词匹配（用户 prompt 包含关键词时自动添加）'),
+}).description('预置提示词配置项');
+// ==================== 独立大类 1：AI 绘图插件配置 ====================
+exports.BaseConfig = koishi_1.Schema.object({
     debug: koishi_1.Schema.boolean().default(false).description('开启调试模式，输出完整请求日志'),
     apiStrategy: koishi_1.Schema.union([
         koishi_1.Schema.const('sequence').description('顺序模式'),
@@ -38,13 +46,16 @@ exports.Config = koishi_1.Schema.object({
     txt2imgModel: koishi_1.Schema.string().default('').description('文生图专用模型，留空则使用通用模型'),
     img2imgModel: koishi_1.Schema.string().default('').description('图生图专用模型，留空则使用通用模型'),
     maxImages: koishi_1.Schema.number().default(5).description('图生图最大支持图片数量'),
-    // ==================== 新增：图片压缩配置 ====================
+    // ==================== 图片压缩配置 ====================
     enableImgCompress: koishi_1.Schema.boolean().default(true).description('启用图生图图片压缩（推荐开启，可防止大图超时）'),
     imgMaxWidth: koishi_1.Schema.number().default(1536).description('图片压缩最大宽度（像素）'),
     imgMaxHeight: koishi_1.Schema.number().default(1536).description('图片压缩最大高度（像素）'),
     imgQuality: koishi_1.Schema.number().default(85).description('JPEG 压缩质量 1-100（越高越清晰，建议 80-90）'),
     imgMaxFileSize: koishi_1.Schema.number().default(3).description('图片最大体积（MB），超过会进一步压缩'),
     // ==========================================================
+    // ==================== 图生图 base64 转换开关 ====================
+    enableImg2ImgBase64: koishi_1.Schema.boolean().default(true).description('图生图将图片转换为 base64（关闭则直接传 URL，部分 API 不需要 base64）'),
+    // ==========================================================
     apiList: koishi_1.Schema.array(koishi_1.Schema.object({
         enable: koishi_1.Schema.boolean().default(true).description('启用此 API'),
         apiKey: koishi_1.Schema.string().description('API Key'),
@@ -52,13 +63,21 @@ exports.Config = koishi_1.Schema.object({
     })).default([]).description('API 配置列表（支持多账号负载）'),
     enableTxt2Img: koishi_1.Schema.boolean().default(true).description('启用文生图'),
     enableImg2Img: koishi_1.Schema.boolean().default(true).description('启用图生图'),
-    command: koishi_1.Schema.string().default('draw').description('文生图指令'),
+    command: koishi_1.Schema.string().default('draw').description('文生图主指令'),
     aliases: koishi_1.Schema.array(String).default([]).description('文生图指令别名'),
     img2imgCommand: koishi_1.Schema.string().default('imgdraw').description('图生图指令'),
     img2imgAliases: koishi_1.Schema.array(String).default([]).description('图生图指令别名'),
     txt2imgPrompt: koishi_1.Schema.string().default('请严格遵循我的要求生成一张图片，不要询问或添加额外说明，直接输出图片。你可以使用联网功能获取最新的数据或信息。要求：{prompt}').description('文生图提示词模板'),
     img2imgPrompt: koishi_1.Schema.string().default('图片链接：{url} 请严格根据以下指令对提供的图片进行编辑或重绘，不要询问，直接输出结果。你可以使用联网功能获取最新的数据或信息。\n指令：{prompt}').description('图生图提示词模板'),
     blacklistAdmins: koishi_1.Schema.array(String).default([]).description('允许管理黑名单的 QQ 号列表'),
+}).description('AI 绘图插件配置');
+// ==================== 独立大类 2：预置提示词配置 ====================
+exports.PresetConfig = koishi_1.Schema.object({
+    enablePresets: koishi_1.Schema.boolean().default(false).description('启用预置提示词功能（仅用于文生图）'),
+    presets: koishi_1.Schema.array(PresetItem).default([]).description('预置提示词列表（可添加多个，支持指令触发和关键词匹配）'),
+}).description('预置提示词配置');
+// ==================== 独立大类 3：提示文案配置 ====================
+exports.MessageConfig = koishi_1.Schema.object({
     messages: koishi_1.Schema.object({
         generating: koishi_1.Schema.string().default('⏳ 生成中...'),
         waitImage: koishi_1.Schema.string().default('请在60秒内发送需要编辑的图片'),
@@ -85,7 +104,13 @@ exports.Config = koishi_1.Schema.object({
         blacklistListEmpty: koishi_1.Schema.string().default('✅ 当前黑名单为空'),
         blacklistListTitle: koishi_1.Schema.string().default('📋 当前黑名单：'),
     }).description('提示文案配置'),
-}).description('AI 绘图插件配置');
+}).description('提示文案配置');
+// ==================== 组合配置（三个并列大类）====================
+exports.Config = koishi_1.Schema.intersect([
+    exports.BaseConfig,
+    exports.PresetConfig,
+    exports.MessageConfig,
+]);
 // ==================== 主函数 ====================
 async function apply(ctx, cfg) {
     const debug = cfg.debug;
@@ -173,7 +198,7 @@ async function apply(ctx, cfg) {
             return markdownMatch[1];
         return null;
     }
-    // ==================== 新增：图片压缩函数 ====================
+    // ==================== 图片压缩函数 ====================
     async function compressImage(buffer) {
         if (!sharp || !cfg.enableImgCompress) {
             return buffer;
@@ -232,23 +257,36 @@ async function apply(ctx, cfg) {
         }
     }
     // ==========================================================
-    // ==================== 修改：URL 转 base64（带压缩）====================
-    async function urlToBase64(url) {
+    // ==================== 修改：URL 转 base64（支持开关）====================
+    /**
+     * 处理图片 URL，根据配置决定返回 base64 还是原始 URL
+     * @param url 图片 URL
+     * @param forceBase64 强制使用 base64（覆盖全局配置）
+     */
+    async function processImageUrl(url, forceBase64) {
         if (!url)
             return null;
+        // 如果已经是 base64，检查是否需要压缩
         if (url.startsWith('data:image/')) {
-            // 如果已经是 base64，检查是否需要压缩
             if (cfg.enableImgCompress && sharp) {
                 return await compressBase64Image(url);
             }
             return url;
         }
+        // 判断是否转换为 base64
+        const needBase64 = forceBase64 !== undefined ? forceBase64 : cfg.enableImg2ImgBase64;
+        if (!needBase64) {
+            // 直接返回 URL（不转换 base64）
+            if (debug)
+                logger.info('图生图使用原始 URL:', url.slice(0, 100));
+            return url;
+        }
+        // 转换为 base64
         try {
             const res = await axios_1.default.get(url, {
                 responseType: 'arraybuffer',
                 timeout: 30000,
             });
-            // 压缩图片
             const compressed = await compressImage(Buffer.from(res.data));
             return `data:image/jpeg;base64,${compressed.toString('base64')}`;
         }
@@ -257,6 +295,7 @@ async function apply(ctx, cfg) {
             throw new Error('图片下载失败，请检查 selfUrl 是否可访问');
         }
     }
+    // ==========================================================
     // 统一发送图片函数
     async function sendImage(session, imgUrl) {
         const trimmed = imgUrl.trim();
@@ -401,6 +440,68 @@ async function apply(ctx, cfg) {
         }
         return { success, fail };
     }
+    // ==================== 预置提示词处理函数 ====================
+    /**
+     * 获取所有启用的预置提示词配置
+     */
+    function getEnabledPresets() {
+        if (!cfg.enablePresets || !cfg.presets)
+            return [];
+        return cfg.presets.filter((p) => p.enable && p.text);
+    }
+    /**
+     * 根据指令名查找匹配的预置提示词
+     * @param cmd 指令名，如 "draw0"
+     */
+    function findPresetByCommand(cmd) {
+        const presets = getEnabledPresets();
+        for (const preset of presets) {
+            const presetCmd = preset.command?.trim();
+            if (presetCmd && presetCmd === cmd) {
+                return preset;
+            }
+        }
+        return null;
+    }
+    /**
+     * 根据用户 prompt 关键词匹配预置提示词
+     * @param prompt 用户输入的 prompt
+     */
+    function findPresetsByKeyword(prompt) {
+        const presets = getEnabledPresets();
+        const matched = [];
+        if (!prompt)
+            return matched;
+        const lowerPrompt = prompt.toLowerCase();
+        for (const preset of presets) {
+            if (preset.enableKeywordMatch && preset.keyword) {
+                const keywords = preset.keyword.split(/[,，|\/\s]+/).map((k) => k.trim().toLowerCase()).filter(Boolean);
+                for (const kw of keywords) {
+                    if (lowerPrompt.includes(kw)) {
+                        matched.push(preset);
+                        break;
+                    }
+                }
+            }
+        }
+        return matched;
+    }
+    /**
+     * 拼接预置提示词和用户 prompt
+     * @param prompt 用户输入的原始 prompt
+     * @param presets 要应用的预置提示词列表
+     */
+    function buildPromptWithPresets(prompt, presets) {
+        if (!presets || presets.length === 0)
+            return prompt;
+        const presetTexts = presets.map((p) => p.text.trim()).filter(Boolean);
+        if (presetTexts.length === 0)
+            return prompt;
+        const combinedPreset = presetTexts.join('，');
+        // 预置提示词放在前面，用户 prompt 在后面
+        return `${combinedPreset}，${prompt}`;
+    }
+    // ==========================================================
     // ==================== 核心生成函数 ====================
     async function generate(session, prompt, imageUrl, modelOverride) {
         if (!checkRateLimit()) {
@@ -417,14 +518,14 @@ async function apply(ctx, cfg) {
         const model = modelOverride || cfg.model;
         let content;
         if (imageUrl) {
-            const base64Url = await urlToBase64(imageUrl);
-            if (!base64Url) {
-                await safeSend(session, cfg.messages.fail + '（图片转换失败）');
+            const processedUrl = await processImageUrl(imageUrl);
+            if (!processedUrl) {
+                await safeSend(session, cfg.messages.fail + '（图片处理失败）');
                 return;
             }
             content = [
                 { type: 'text', text: prompt },
-                { type: 'image_url', image_url: { url: base64Url } },
+                { type: 'image_url', image_url: { url: processedUrl } },
             ];
         }
         else {
@@ -483,14 +584,14 @@ async function apply(ctx, cfg) {
         }
         const model = modelOverride || cfg.model;
         const finalPrompt = prompt.replace('{url}', imageUrls.join(', '));
-        const base64Urls = (await Promise.all(imageUrls.map(url => urlToBase64(url)))).filter((url) => url !== null);
-        if (base64Urls.length === 0) {
-            await safeSend(session, cfg.messages.fail + '（图片转换失败）');
+        const processedUrls = (await Promise.all(imageUrls.map(url => processImageUrl(url)))).filter((url) => url !== null);
+        if (processedUrls.length === 0) {
+            await safeSend(session, cfg.messages.fail + '（图片处理失败）');
             return;
         }
         const content = [
             { type: 'text', text: finalPrompt },
-            ...base64Urls.map(url => ({ type: 'image_url', image_url: { url } })),
+            ...processedUrls.map(url => ({ type: 'image_url', image_url: { url } })),
         ];
         const body = {
             model,
@@ -577,30 +678,90 @@ async function apply(ctx, cfg) {
         }
         return cleanHtmlTags(textParts.join(' '));
     }
+    // ==================== 新增：文生图核心逻辑（支持预置提示词）====================
+    async function doTxt2Img(session, rawPrompt, explicitPresets) {
+        if (!session)
+            return;
+        if (await isBlacklisted(session.userId)) {
+            await safeSend(session, cfg.messages.blacklisted);
+            return;
+        }
+        if (!cfg.enableTxt2Img) {
+            await safeSend(session, cfg.messages.txt2imgDisabled);
+            return;
+        }
+        let prompt = cleanHtmlTags(rawPrompt || '');
+        if (!prompt) {
+            await safeSend(session, cfg.messages.empty);
+            return;
+        }
+        // 处理预置提示词
+        const appliedPresets = [];
+        // 1. 显式指定的预置提示词（通过指令触发）
+        if (explicitPresets && explicitPresets.length > 0) {
+            appliedPresets.push(...explicitPresets);
+        }
+        // 2. 关键词匹配（仅在未通过指令触发时，或允许叠加时）
+        if (cfg.enablePresets) {
+            const keywordPresets = findPresetsByKeyword(prompt);
+            for (const kp of keywordPresets) {
+                // 避免重复添加
+                if (!appliedPresets.some((p) => p.text === kp.text)) {
+                    appliedPresets.push(kp);
+                }
+            }
+        }
+        // 拼接预置提示词
+        if (appliedPresets.length > 0) {
+            prompt = buildPromptWithPresets(prompt, appliedPresets);
+            if (debug) {
+                logger.info(`应用预置提示词: ${appliedPresets.map((p) => p.command || 'keyword').join(', ')}`);
+                logger.info(`最终 prompt: ${prompt.slice(0, 200)}...`);
+            }
+        }
+        await safeSend(session, cfg.messages.generating);
+        const finalPrompt = cfg.txt2imgPrompt.replace('{prompt}', prompt);
+        const model = cfg.txt2imgModel || cfg.model;
+        await generate(session, finalPrompt, undefined, model);
+    }
+    // ==========================================================
     // ==================== 命令注册 ====================
+    // 主文生图指令
     const cmd = ctx.command(`${cfg.command} <raw:text>`, 'draw');
     cfg.aliases.forEach((alias) => cmd.alias(alias));
     cmd.action(async ({ session }, raw) => {
         try {
-            if (!session)
-                return;
-            if (await isBlacklisted(session.userId))
-                return safeSend(session, cfg.messages.blacklisted);
-            if (!cfg.enableTxt2Img)
-                return safeSend(session, cfg.messages.txt2imgDisabled);
-            const prompt = cleanHtmlTags(raw || '');
-            if (!prompt)
-                return safeSend(session, cfg.messages.empty);
-            await safeSend(session, cfg.messages.generating);
-            const finalPrompt = cfg.txt2imgPrompt.replace('{prompt}', prompt);
-            const model = cfg.txt2imgModel || cfg.model;
-            await generate(session, finalPrompt, undefined, model);
+            await doTxt2Img(session, raw);
         }
         catch (e) {
             logger.error('文生图命令异常', e);
             await safeSend(session, cfg.messages.fail);
         }
     });
+    // ==================== 新增：预置提示词指令注册 ====================
+    if (cfg.enablePresets && cfg.presets) {
+        const presets = getEnabledPresets();
+        for (let i = 0; i < presets.length; i++) {
+            const preset = presets[i];
+            const presetCmd = preset.command?.trim() || `draw${i}`;
+            // 注册指令
+            const pCmd = ctx.command(`${presetCmd} <raw:text>`, `使用预置提示词: ${preset.text.slice(0, 20)}...`);
+            pCmd.action(async ({ session }, raw) => {
+                try {
+                    if (debug)
+                        logger.info(`预置指令触发: ${presetCmd}, 预置文本: ${preset.text.slice(0, 50)}`);
+                    await doTxt2Img(session, raw, [preset]);
+                }
+                catch (e) {
+                    logger.error(`预置指令 ${presetCmd} 异常`, e);
+                    await safeSend(session, cfg.messages.fail);
+                }
+            });
+            if (debug)
+                logger.info(`注册预置提示词指令: ${presetCmd}`);
+        }
+    }
+    // ==========================================================
     // ==================== 修改：图生图命令支持合并消息 ====================
     const imgCmd = ctx.command(`${cfg.img2imgCommand} <raw:text>`, 'imgdraw');
     cfg.img2imgAliases.forEach((alias) => imgCmd.alias(alias));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-imgdraw-selfuse",
-  "description": "修改自ai-image的画图插件,支持openai兼容api,增加base64转换以适配GPTimg2，支持发送合并消息图生图",
-  "version": "0.0.8",
+  "description": "修改自ai-image的画图插件,支持openai兼容api,增加base64转换自由开启，增加图文合并消息图生图，增加预置提示词",
+  "version": "0.1.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [