koishi-plugin-aka-ai-generator 0.2.1 → 0.2.3

package/lib/index.js

@@ -671,14 +671,31 @@ function apply(ctx, config) {
     return map;
   }
   __name(buildModelMappingIndex, "buildModelMappingIndex");
-  function parseStyleCommandModifiers(argv) {
-    const rawArgs = [...argv.args || []].map((arg) => typeof arg === "string" ? arg.trim() : "").filter(Boolean);
-    if (!rawArgs.length && !argv.rest) return {};
+  function parseStyleCommandModifiers(argv, imgParam) {
+    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: [] };
     const flagCandidates = [];
     let index = 0;
-    while (index < rawArgs.length) {
-      const token = rawArgs[index];
+    while (index < argsList.length) {
+      const token = argsList[index];
       if (!token) {
         index++;
         continue;
@@ -686,15 +703,22 @@ function apply(ctx, config) {
       const lower = token.toLowerCase();
       if (lower.startsWith("-prompt:")) {
         const promptHead = token.substring(token.indexOf(":") + 1);
-        const restTokens = rawArgs.slice(index + 1);
+        const restTokens = argsList.slice(index + 1);
         modifiers.customPromptSuffix = [promptHead, ...restTokens].join(" ").trim();
         break;
       }
       if (lower === "-add") {
         index++;
         const additionTokens = [];
-        while (index < rawArgs.length && !rawArgs[index].startsWith("-")) {
-          additionTokens.push(rawArgs[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) {
@@ -1029,9 +1053,9 @@ function apply(ctx, config) {
     return await providerInstance.generateImages(prompt, imageUrls, numImages);
   }
   __name(requestProviderImages, "requestProviderImages");
-  async function processImageWithTimeout(session, img, prompt, styleName, requestContext) {
+  async function processImageWithTimeout(session, img, prompt, styleName, requestContext, displayInfo) {
     return Promise.race([
-      processImage(session, img, prompt, styleName, requestContext),
+      processImage(session, img, prompt, styleName, requestContext, displayInfo),
       new Promise(
         (_, reject) => setTimeout(() => reject(new Error("命令执行超时")), config.commandTimeout * 1e3)
       )
@@ -1043,7 +1067,7 @@ function apply(ctx, config) {
     });
   }
   __name(processImageWithTimeout, "processImageWithTimeout");
-  async function processImage(session, img, prompt, styleName, requestContext) {
+  async function processImage(session, img, prompt, styleName, requestContext, displayInfo) {
     const userId = session.userId;
     if (activeTasks.has(userId)) {
       return "您有一个图像处理任务正在进行中，请等待完成";
@@ -1067,7 +1091,21 @@ function apply(ctx, config) {
       provider: providerType,
       modelId: providerModelId
     });
-    await session.send(`开始处理图片（${styleName}）...`);
+    let statusMessage = `开始处理图片（${styleName}）`;
+    const infoParts = [];
+    if (displayInfo?.customAdditions && displayInfo.customAdditions.length > 0) {
+      infoParts.push(`自定义内容：${displayInfo.customAdditions.join("；")}`);
+    }
+    if (displayInfo?.modelId) {
+      const modelDesc = displayInfo.modelDescription || displayInfo.modelId;
+      infoParts.push(`使用模型：${modelDesc}`);
+    }
+    if (infoParts.length > 0) {
+      statusMessage += `
+${infoParts.join("\n")}`;
+    }
+    statusMessage += "...";
+    await session.send(statusMessage);
     try {
       activeTasks.set(userId, "processing");
       const images = await requestProviderImages(prompt, imageUrl, imageCount, requestContext);
@@ -1104,7 +1142,7 @@ function apply(ctx, config) {
           if (!limitCheck.allowed) {
             return limitCheck.message;
           }
-          const modifiers = parseStyleCommandModifiers(argv);
+          const modifiers = parseStyleCommandModifiers(argv, img);
           const promptSegments = [style.prompt];
           if (modifiers.modelMapping?.promptSuffix) {
             promptSegments.push(modifiers.modelMapping.promptSuffix);
@@ -1125,12 +1163,15 @@ function apply(ctx, config) {
           if (modifiers.modelMapping?.modelId) {
             requestContext.modelId = modifiers.modelMapping.modelId;
           }
-          if (modifiers.modelMapping?.description) {
-            await session.send(`已启用 ${modifiers.modelMapping.description} 配置`);
-          } else if (modifiers.modelMapping?.suffix) {
-            await session.send(`已启用后缀「-${modifiers.modelMapping.suffix}」配置`);
+          const displayInfo = {};
+          if (modifiers.customAdditions && modifiers.customAdditions.length > 0) {
+            displayInfo.customAdditions = modifiers.customAdditions;
+          }
+          if (modifiers.modelMapping?.modelId) {
+            displayInfo.modelId = modifiers.modelMapping.modelId;
+            displayInfo.modelDescription = modifiers.modelMapping.description || modifiers.modelMapping.suffix || modifiers.modelMapping.modelId;
           }
-          return processImageWithTimeout(session, img, mergedPrompt, style.commandName, requestContext);
+          return processImageWithTimeout(session, img, mergedPrompt, style.commandName, requestContext, displayInfo);
         });
         logger.info(`已注册命令: ${style.commandName}`);
       }

package/package.json

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