koishi-plugin-aka-ai-generator 0.2.2 → 0.2.4

package/lib/index.d.ts

@@ -5,8 +5,6 @@ export interface ModelMappingConfig {
     suffix: string;
     modelId: string;
     provider?: ImageProvider;
-    promptSuffix?: string;
-    description?: string;
 }
 export interface StyleConfig {
     commandName: string;

package/lib/index.js

@@ -577,10 +577,8 @@ var Config = import_koishi.Schema.intersect([
         import_koishi.Schema.const("yunwu").description("云雾 Gemini 服务"),
         import_koishi.Schema.const("gptgod").description("GPTGod 服务")
       ]).description("可选：覆盖供应商"),
-      modelId: import_koishi.Schema.string().required().description("触发该后缀时使用的模型 ID"),
-      promptSuffix: import_koishi.Schema.string().role("textarea", { rows: 2 }).description("附加在风格 prompt 末尾的提示语"),
-      description: import_koishi.Schema.string().description("该后缀的说明，方便记忆")
-    })).role("table").default([]).description("根据 -后缀切换模型/供应商与附加 prompt"),
+      modelId: import_koishi.Schema.string().required().description("触发该后缀时使用的模型 ID")
+    })).role("table").default([]).description("根据 -后缀切换模型/供应商"),
     apiTimeout: import_koishi.Schema.number().default(120).description("API请求超时时间（秒）"),
     commandTimeout: import_koishi.Schema.number().default(180).description("命令执行总超时时间（秒）"),
     // 默认设置
@@ -672,15 +670,23 @@ function apply(ctx, config) {
   }
   __name(buildModelMappingIndex, "buildModelMappingIndex");
   function parseStyleCommandModifiers(argv, imgParam) {
-    const argsList = [...argv.args || []].map((arg) => typeof arg === "string" ? arg.trim() : "").filter(Boolean);
-    const restStr = typeof argv.rest === "string" ? argv.rest.trim() : "";
-    if (restStr) {
-      const restParts = restStr.split(/\s+/).filter(Boolean);
-      argsList.push(...restParts);
-    }
-    if (imgParam && typeof imgParam === "string" && !imgParam.startsWith("http") && !imgParam.startsWith("data:")) {
-      const imgParts = imgParam.split(/\s+/).filter(Boolean);
-      argsList.push(...imgParts);
+    const session = argv.session;
+    let rawText = "";
+    if (session?.content) {
+      const elements = import_koishi.h.parse(session.content);
+      rawText = import_koishi.h.select(elements, "text").map((e) => e.attrs.content).join(" ");
+    }
+    const argsList = rawText ? rawText.split(/\s+/).filter(Boolean) : [...argv.args || []].map((arg) => typeof arg === "string" ? arg.trim() : "").filter(Boolean);
+    if (!rawText) {
+      const restStr = typeof argv.rest === "string" ? argv.rest.trim() : "";
+      if (restStr) {
+        const restParts = restStr.split(/\s+/).filter(Boolean);
+        argsList.push(...restParts);
+      }
+      if (imgParam && typeof imgParam === "string" && !imgParam.startsWith("http") && !imgParam.startsWith("data:")) {
+        const imgParts = imgParam.split(/\s+/).filter(Boolean);
+        argsList.push(...imgParts);
+      }
     }
     if (!argsList.length) return {};
     const modifiers = { customAdditions: [] };
@@ -702,8 +708,15 @@ function apply(ctx, config) {
       if (lower === "-add") {
         index++;
         const additionTokens = [];
-        while (index < argsList.length && !argsList[index].startsWith("-")) {
-          additionTokens.push(argsList[index]);
+        while (index < argsList.length) {
+          const nextToken = argsList[index];
+          if (nextToken.startsWith("-")) {
+            const key = normalizeSuffix(nextToken);
+            if (key && modelMappingIndex.has(key)) break;
+            if (nextToken.toLowerCase().startsWith("-prompt:")) break;
+            if (nextToken.toLowerCase() === "-add") break;
+          }
+          additionTokens.push(nextToken);
           index++;
         }
         if (additionTokens.length) {
@@ -1129,16 +1142,13 @@ ${infoParts.join("\n")}`;
           }
           const modifiers = parseStyleCommandModifiers(argv, img);
           const promptSegments = [style.prompt];
-          if (modifiers.modelMapping?.promptSuffix) {
-            promptSegments.push(modifiers.modelMapping.promptSuffix);
-          }
           if (modifiers.customAdditions?.length) {
             promptSegments.push(...modifiers.customAdditions);
           }
           if (modifiers.customPromptSuffix) {
             promptSegments.push(modifiers.customPromptSuffix);
           }
-          const mergedPrompt = promptSegments.filter(Boolean).join("\n\n");
+          const mergedPrompt = promptSegments.filter(Boolean).join(" - ");
           const requestContext = {
             numImages: options?.num
           };
@@ -1154,7 +1164,7 @@ ${infoParts.join("\n")}`;
           }
           if (modifiers.modelMapping?.modelId) {
             displayInfo.modelId = modifiers.modelMapping.modelId;
-            displayInfo.modelDescription = modifiers.modelMapping.description || modifiers.modelMapping.suffix || modifiers.modelMapping.modelId;
+            displayInfo.modelDescription = modifiers.modelMapping.suffix || modifiers.modelMapping.modelId;
           }
           return processImageWithTimeout(session, img, mergedPrompt, style.commandName, requestContext, displayInfo);
         });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-aka-ai-generator",
   "description": "自用AI生成插件(GPTGod & Yunwu)",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [