koishi-plugin-image-prompt 2.0.4 → 2.1.1

package/lib/index.d.ts

@@ -76,6 +76,30 @@ export declare function renderAgentInstructions(template: string, vars: Record<s
  * 这里压成一行、去掉 markdown 记号和包裹引号、限长，让它永远是「对用户说的一句话」。
  */
 export declare function cleanAskMessage(raw: any, max?: number): string;
+/**
+ * 从用户的回答里判断他要不要润色提示词。
+ * 默认 false —— 用户的原话原封不动交给绘图模型才是对的默认值。
+ */
+export declare function parsePolishIntent(text: string): boolean;
+/** 从消息内容里解析 @ 到的人。type="all"（@全体成员）和 @机器人自己 会被跳过 */
+export declare function extractAtIds(content: string, selfId?: string): {
+    id: string;
+    name: string;
+}[];
+/**
+ * 拼头像地址。优先级：自定义模板 > 适配器直接给的 > 平台内置规则。
+ * 拼不出来返回空字符串（调用方再决定是问适配器还是放弃）。
+ */
+export declare function buildAvatarUrl(input: {
+    userId: string;
+    platform?: string;
+    selfId?: string;
+    appId?: string;
+    /** 发送者自己的头像（适配器已经在消息里带过来了） */
+    authorAvatar?: string;
+    template?: string;
+    size?: number;
+}): string;
 /**
  * 图库容量裁剪：超出容量时淘汰最旧的（按 time 升序），只保留每个组最近 capacity 条
  */
@@ -206,6 +230,7 @@ interface CommandConfig {
     referenceGroups?: ReferenceGroup[];
     aiSelector?: AISelectorConfig;
     agent?: AgentConfig;
+    avatar?: AvatarConfig;
     showPrompt?: boolean;
     promptMaxLength?: number;
     appendUserInput?: boolean;
@@ -317,6 +342,23 @@ interface AgentConfig {
     historyTurns: number;
     /** 把每一轮的工具调用打到日志里，方便排查 */
     debugLog: boolean;
+    /** 用户没给任何参考图时，开画前先问一句「要不要参考图」 */
+    askIfNoReference: boolean;
+    /** 开画前先问一句「要不要润色提示词」（默认不润色，原话直出） */
+    askBeforePolish: boolean;
+}
+/** 头像参考图配置 */
+interface AvatarConfig {
+    /** 总开关：能不能拿用户头像当参考图 */
+    enabled: boolean;
+    /** 用户 @ 了谁，就自动把那个人的头像作为参考图（@ 本身就是明确指定） */
+    autoAt: boolean;
+    /** 用户没发图也没 @ 人时，自动拿他自己的头像当参考图 */
+    autoSelf: boolean;
+    /** 头像尺寸（边长像素） */
+    size: number;
+    /** 自定义头像地址模板，留空用内置规则。占位符：{userId} {platform} {selfId} {appId} {size} */
+    urlTemplate: string;
 }
 /** agent 参考图登记表里的一条 */
 export interface RefEntry {
@@ -324,7 +366,7 @@ export interface RefEntry {
     url: string;
     description: string;
     group: string;
-    source: 'gallery' | 'user' | 'cmd';
+    source: 'gallery' | 'user' | 'cmd' | 'avatar';
 }
 /** 交给 AI 挑选的候选图片 */
 interface CandidateImage {

package/lib/index.js

@@ -33,12 +33,14 @@ __export(src_exports, {
   Config: () => Config,
   apply: () => apply,
   buildAgentTools: () => buildAgentTools,
+  buildAvatarUrl: () => buildAvatarUrl,
   buildMarkdownImage: () => buildMarkdownImage,
   buildPromptBlock: () => buildPromptBlock,
   buildPromptEcho: () => buildPromptEcho,
   cleanAskMessage: () => cleanAskMessage,
   computeRetryDelay: () => computeRetryDelay,
   describeSelectorError: () => describeSelectorError,
+  extractAtIds: () => extractAtIds,
   extractJsonObject: () => extractJsonObject,
   extractResponseText: () => extractResponseText,
   extractServerMessage: () => extractServerMessage,
@@ -50,6 +52,7 @@ __export(src_exports, {
   mergePrompt: () => mergePrompt,
   name: () => name,
   parseJsonToolCall: () => parseJsonToolCall,
+  parsePolishIntent: () => parsePolishIntent,
   parseRetryAfterHeader: () => parseRetryAfterHeader,
   pickAgentMessage: () => pickAgentMessage,
   previewJson: () => previewJson,
@@ -226,7 +229,7 @@ function resolveReferences(refs, registry) {
   }
   return { ids, unknown };
 }
-var AGENT_TOOL_NAMES = ["gallery_search", "ask_user", "draw"];
+var AGENT_TOOL_NAMES = ["gallery_search", "ask_user", "get_avatar", "draw"];
 function buildAgentTools() {
   return [
     {
@@ -258,6 +261,20 @@ function buildAgentTools() {
         }
       }
     },
+    {
+      type: "function",
+      function: {
+        name: "get_avatar",
+        description: "\u53D6\u5934\u50CF\u5F53\u53C2\u8003\u56FE\uFF0C\u8FD4\u56DE\u5B83\u7684\u7F16\u53F7\u3002**\u53EA\u80FD\u53D6\u4E24\u79CD\u4EBA\u7684\u5934\u50CF**\uFF1A\u53D1\u6307\u4EE4\u7684\u4EBA\u81EA\u5DF1\uFF08userId \u7559\u7A7A/\u5199 me\uFF09\uFF0C\u6216\u4ED6\u8FD9\u6B21\u6D88\u606F\u91CC\u660E\u786E @ \u5230\u7684\u4EBA\uFF08\u586B\u4E0A\u4E0B\u6587\u300C\u53EF\u53D6\u5934\u50CF\u7684\u4EBA\u300D\u91CC\u5217\u51FA\u7684 id/\u540D\u5B57\uFF09\u3002\u5176\u5B83 id \u4E00\u5F8B\u4F1A\u88AB\u62D2\u7EDD\u3002",
+        parameters: {
+          type: "object",
+          properties: {
+            userId: { type: "string", description: "\u7559\u7A7A\u6216\u5199 me/self/\u6211 = \u53D1\u6307\u4EE4\u7684\u4EBA\u81EA\u5DF1\uFF1B\u4E5F\u53EF\u4EE5\u586B\u4E0A\u4E0B\u6587\u91CC\u300C\u53EF\u53D6\u5934\u50CF\u7684\u4EBA\u300D\u5217\u51FA\u7684 id \u6216\u6635\u79F0\uFF08\u5373\u88AB @ \u7684\u4EBA\uFF09\u3002**\u4E0D\u8981\u81EA\u5DF1\u731C id**" }
+          },
+          required: []
+        }
+      }
+    },
     {
       type: "function",
       function: {
@@ -266,8 +283,8 @@ function buildAgentTools() {
         parameters: {
           type: "object",
           properties: {
-            // 提示词要短：宁可朴素，也不要堆术语写成几百字的「专业」prompt
-            prompt: { type: "string", description: "\u7ED8\u56FE\u63D0\u793A\u8BCD\u3002\u8BF4\u4EBA\u8BDD\u3001\u5199\u7B80\u77ED\u5C31\u884C\uFF0C\u4E2D\u6587\u5373\u53EF\uFF08\u7ED8\u56FE\u6A21\u578B\u542C\u5F97\u61C2\u4E2D\u6587\uFF09\uFF1B\u4E0D\u8981\u628A\u7528\u6237\u7684\u8BDD\u6269\u5199\u6210\u51E0\u767E\u5B57\uFF0C\u4E5F\u4E0D\u8981\u5806\u780C\u98CE\u683C/\u6750\u8D28/\u5149\u7EBF\u672F\u8BED\u3002\u753B\u9762\u4E0A\u5FC5\u987B\u51FA\u73B0\u7684\u6587\u5B57\u8981\u539F\u6837\u5199\u8FDB\u53BB" },
+            // 提示词要短；用户没说要润色就原封不动用他的原话
+            prompt: { type: "string", description: "\u7ED8\u56FE\u63D0\u793A\u8BCD\u3002**\u9ED8\u8BA4\u539F\u5C01\u4E0D\u52A8\u7528\u7528\u6237\u7684\u8BDD**\uFF1A\u7B80\u77ED\u3001\u8BF4\u4EBA\u8BDD\uFF0C\u4E0D\u8981\u6269\u5199\u6210\u51E0\u767E\u5B57\uFF0C\u4E0D\u8981\u8865\u753B\u98CE/\u5149\u7EBF/\u6750\u8D28\u672F\u8BED\uFF0C\u4E0D\u8981\u7FFB\u6210\u82F1\u6587\uFF1B\u53EA\u6709\u7528\u6237\u8BF4\u8FC7\u300C\u5E2E\u6211\u6DA6\u8272 / \u4F18\u5316\u4E00\u4E0B\u300D\u624D\u52A0\u5DE5\u3002\u4E2D\u6587\u5373\u53EF\uFF08\u7ED8\u56FE\u6A21\u578B\u542C\u5F97\u61C2\u4E2D\u6587\uFF09\u3002\u753B\u9762\u4E0A\u5FC5\u987B\u51FA\u73B0\u7684\u6587\u5B57\u8981\u539F\u6837\u5199\u8FDB\u53BB" },
             references: {
               type: "array",
               items: { type: "string" },
@@ -346,6 +363,53 @@ function cleanAskMessage(raw, max = 200) {
   if (text.length > max) text = text.slice(0, max) + "\u2026";
   return text;
 }
+function parsePolishIntent(text) {
+  const t = String(text || "");
+  if (!t) return false;
+  if (/不(用|要|必)?(润色|优化|加工|改)|别(润色|优化|加工)|原样|原封不动|直接画|不用了/.test(t)) return false;
+  return /润色|优化一下|加工|丰富|扩写|细化|详细[一点些]|写(得)?(更)?(完整|详细)|帮我(写|改)/.test(t);
+}
+function extractAtIds(content, selfId) {
+  if (!content) return [];
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const el of import_koishi.h.select(content, "at")) {
+    const id = String(el.attrs.id ?? el.attrs.user ?? "").trim();
+    if (!id || id === selfId) continue;
+    if (String(el.attrs.type || "") === "all") continue;
+    if (seen.has(id)) continue;
+    seen.add(id);
+    out.push({ id, name: String(el.attrs.name || el.attrs.nick || "").trim() });
+  }
+  return out;
+}
+function buildAvatarUrl(input) {
+  const userId = String(input?.userId || "").trim();
+  if (!userId) return "";
+  const size = Number(input.size) > 0 ? Number(input.size) : 640;
+  const platform = String(input.platform || "");
+  const appId = String(input.appId || "");
+  if (input.template) {
+    return String(input.template).replace(/\{(\w+)\}/g, (_m, key) => {
+      const vars = {
+        userId,
+        platform,
+        size: String(size),
+        selfId: String(input.selfId || ""),
+        appId
+      };
+      return vars[key] ?? "";
+    });
+  }
+  if (input.authorAvatar) return String(input.authorAvatar);
+  if (appId && (platform === "qq" || platform === "qqguild")) {
+    return `https://q.qlogo.cn/qqapp/${appId}/${userId}/${size}`;
+  }
+  if (/^(qq|onebot|red|qqguild)$/.test(platform) && /^\d{5,12}$/.test(userId)) {
+    return `https://q1.qlogo.cn/g?b=qq&nk=${userId}&s=${size}`;
+  }
+  return "";
+}
 function trimGallery(records, capacity) {
   const limit = capacity > 0 ? capacity : 50;
   const byGroup = /* @__PURE__ */ new Map();
@@ -721,6 +785,9 @@ var DEFAULT_AGENT_INSTRUCTIONS = `\u4F60\u662F QQ \u7FA4\u91CC\u7684\u7ED8\u56FE
 - gallery_search\uFF1A\u6309\u5173\u952E\u8BCD\u641C\u7D22\u53C2\u8003\u56FE\u5E93\u3002**\u6D89\u53CA\u5177\u4F53\u89D2\u8272/\u7ACB\u7ED8\u65F6\u5FC5\u987B\u5148\u641C\u4E00\u6B21**\u3002
   \u591A\u4E2A\u5173\u952E\u8BCD\u7528\u7A7A\u683C\u5206\u9694\uFF08\u5982\u300C\u767D\u53D1 \u7ACB\u7ED8\u300D\uFF09\uFF0C\u5168\u90E8\u547D\u4E2D\u7684\u6392\u5728\u6700\u524D\uFF1B\u641C\u4E0D\u5230\u5C31\u6362\u4E2A\u8BCD\u518D\u641C\u3002
 - ask_user\uFF1A\u628A\u95EE\u9898\u53D1\u7ED9\u7528\u6237**\u5E76\u7B49\u4ED6\u56DE\u590D**\uFF08\u4ED6\u53D1\u7684\u56FE\u4E5F\u4F1A\u4E00\u8D77\u5E26\u56DE\u6765\uFF09\u3002
+- get_avatar\uFF1A\u53D6\u5934\u50CF\u5F53\u53C2\u8003\u56FE\u3002**\u53EA\u80FD\u53D6\u4E24\u79CD\u4EBA**\uFF1A\u53D1\u6307\u4EE4\u7684\u4EBA\u81EA\u5DF1\uFF08userId \u7559\u7A7A\u6216\u5199 me\uFF09\uFF0C
+  \u4EE5\u53CA\u4ED6\u8FD9\u6B21\u6D88\u606F\u91CC\u660E\u786E @ \u5230\u7684\u4EBA\uFF08\u586B\u4E0A\u4E0B\u6587\u300C\u53EF\u53D6\u5934\u50CF\u7684\u4EBA\u300D\u91CC\u5217\u51FA\u7684 id \u6216\u6635\u79F0\uFF09\u3002
+  \u5176\u5B83\u4EFB\u4F55 id \u90FD\u4F1A\u88AB\u62D2\u7EDD\uFF0C\u4E0D\u8981\u731C\u3002
 - draw\uFF1A\u771F\u6B63\u5F00\u59CB\u753B\u3002\u628A prompt \u548C\u6311\u4E2D\u7684\u53C2\u8003\u56FE\u7F16\u53F7\u4EA4\u8FDB\u53BB\uFF0C\u753B\u597D\u4F1A\u81EA\u52A8\u53D1\u5230\u7FA4\u91CC\u3002
 
 \u5DE5\u4F5C\u89C4\u5219\uFF1A
@@ -735,25 +802,43 @@ var DEFAULT_AGENT_INSTRUCTIONS = `\u4F60\u662F QQ \u7FA4\u91CC\u7684\u7ED8\u56FE
 4. \u753B\u9762\u4E0A\u8981\u51FA\u73B0\u6587\u5B57\uFF08\u53F0\u8BCD\u3001\u6807\u9898\u3001\u62DB\u724C\u3001\u5B57\u5E55\uFF09\u65F6\uFF0C\u628A\u6587\u5B57\u539F\u6837\u5199\u8FDB prompt\uFF0C\u5E76\u8BF4\u660E\u300C\u8FD9\u4E9B\u5B57\u5FC5\u987B\u539F\u6837\u51FA\u73B0\uFF0C\u4E0D\u80FD\u53D8\u5F62\u6216\u81EA\u521B\u5B57\u5F62\u300D\u3002
 5. draw \u8FD4\u56DE ok=false \u65F6\uFF0C\u770B error \u51B3\u5B9A\uFF1A\u80FD\u6539\u7684\uFF08\u63D0\u793A\u8BCD\u95EE\u9898\uFF09\u5C31\u6362\u4E2A\u5199\u6CD5\u91CD\u8BD5\uFF0C\u6539\u4E0D\u4E86\u7684\uFF08\u9650\u6D41/\u914D\u989D\uFF09\u5C31\u5982\u5B9E\u544A\u8BC9\u7528\u6237\u3002
 6. \u6D41\u7A0B\u7ED3\u675F\u540E\u7528\u4E2D\u6587\u56DE\u4E00\u53E5\u7B80\u77ED\u7684\u7ED3\u679C\u8BF4\u660E\uFF08\u4E0D\u8981\u590D\u8FF0 prompt\uFF0C\u4E0D\u8981\u5199\u5C0F\u4F5C\u6587\uFF0C\u4E0D\u8981\u518D\u95EE\u300C\u8FD8\u8981\u6211\u505A\u4EC0\u4E48\u300D\uFF09\u3002
-7. \u56FE\u7247\u7F16\u53F7\uFF1Agallery_search \u7ED3\u679C\u91CC\u7684 id\u3001\u7528\u6237\u53D1\u7684\u56FE\uFF08user1\u3001user2\u2026\uFF09\u3001\u6307\u4EE4\u9ED8\u8BA4\u56FE\uFF08cmd1\u2026\uFF09\u90FD\u53EF\u4EE5\u76F4\u63A5\u5199\u8FDB draw \u7684 references\u3002
-   \u53EA\u586B\u4F60\u786E\u8BA4\u5B58\u5728\u7684\u7F16\u53F7\uFF0C**\u7EDD\u5BF9\u4E0D\u8981\u7F16\u9020 id**\u3002
-8. \u3010prompt \u8981\u77ED\uFF0C\u8981\u8BF4\u4EBA\u8BDD\u3011**\u4E0D\u8981**\u628A\u7528\u6237\u7684\u8BDD\u6269\u5199\u6210\u51E0\u767E\u5B57\u7684\u300C\u4E13\u4E1A\u300D\u63D0\u793A\u8BCD\uFF1A
+7. \u56FE\u7247\u7F16\u53F7\uFF1Agallery_search \u7ED3\u679C\u91CC\u7684 id\u3001\u7528\u6237\u968F\u6D88\u606F\u53D1\u7684\u56FE\u3001\u5934\u50CF\u3001\u6307\u4EE4\u9ED8\u8BA4\u56FE\u90FD\u53EF\u4EE5\u76F4\u63A5\u5199\u8FDB draw \u7684 references\u3002
+   \u53EA\u586B\u4E0A\u4E0B\u6587\u91CC**\u660E\u786E\u5217\u51FA\u8FC7**\u7684\u7F16\u53F7\uFF0C**\u7EDD\u5BF9\u4E0D\u8981\u7F16\u9020 id**\u3002
+   - \u7528\u6237\u968F\u6D88\u606F\u53D1\u7684\u56FE\u4F1A\u81EA\u52A8\u5E26\u4E0A\uFF0C\u4E0D\u7528\u4F60\u518D\u586B\uFF1B
+   - \u4ED6 @ \u4E86\u8C01\uFF0C\u90A3\u4E2A\u4EBA\u7684\u5934\u50CF\u4E5F\u4F1A\u81EA\u52A8\u5E26\u4E0A\u3002
+8. \u3010\u6CA1\u6307\u5B9A\u53C2\u8003\u56FE\u65F6\u5148\u95EE\u4E00\u53E5\u3011\u7528\u6237\u8FD9\u6B21\u6CA1\u53D1\u56FE\u3001\u6CA1 @ \u4EBA\u3001\u6307\u4EE4\u672C\u8EAB\u4E5F\u6CA1\u6709\u9ED8\u8BA4\u53C2\u8003\u56FE\uFF0C\u4F60\u4E5F\u641C\u4E0D\u5230\u5408\u9002\u7684\u7ACB\u7ED8\u65F6\uFF0C
+   **\u4E0D\u8981\u76F4\u63A5 draw**\u3002\u5148\u7528 ask_user \u95EE\u4E00\u53E5\u8981\u4E0D\u8981\u53C2\u8003\u56FE\uFF0C\u5E76\u7ED9\u51FA\u9009\u9879\uFF08\u4F8B\u5982\u300C\u7528\u4F60\u81EA\u5DF1\u7684\u5934\u50CF / \u7528 @\u67D0\u67D0 \u7684\u5934\u50CF /
+   \u6211\u5E2E\u4F60\u4ECE\u56FE\u5E93\u627E\u4E00\u5F20 / \u4E0D\u7528\u53C2\u8003\u76F4\u63A5\u753B\u300D\uFF09\u3002\u7528\u6237\u8BF4\u300C\u4E0D\u7528 / \u968F\u4FBF / \u76F4\u63A5\u753B\u300D\u5C31\u7ACB\u523B\u5F00\u753B\uFF0C**\u4E0D\u8981\u95EE\u7B2C\u4E8C\u6B21**\u3002
+9. \u3010\u5934\u50CF\u53EA\u80FD\u53D6\u300C\u6211\u300D\u548C\u300C\u88AB @ \u7684\u4EBA\u300D\u3011
+   - \u7528\u6237\u8BF4\u300C\u753B\u6211\u300D\u300C\u7528\u6211\u7684\u5F62\u8C61\u300D\u300C\u6211\u7684\u5934\u50CF\u300D\u2192 get_avatar \u7684 userId **\u7559\u7A7A**\uFF0C\u53D6\u4ED6\u81EA\u5DF1\u7684\u5934\u50CF\uFF1B
+   - \u7528\u6237 @ \u4E86\u8C01 \u2192 \u90A3\u4E2A\u4EBA\u7684\u5934\u50CF\u5DF2\u7ECF\u81EA\u52A8\u5E26\u4E0A\u4E86\uFF08\u4E0A\u4E0B\u6587\u91CC\u4F1A\u5217\u51FA\u7F16\u53F7\uFF09\uFF0C\u76F4\u63A5\u7528\u90A3\u4E2A\u7F16\u53F7\u5373\u53EF\uFF0C
+     \u9700\u8981\u65F6\u4E5F\u53EF\u4EE5\u628A\u4ED6\u7684 id \u6216\u6635\u79F0\u586B\u8FDB get_avatar \u518D\u53D6\u4E00\u6B21\uFF1B
+   - **\u9664\u6B64\u4E4B\u5916\u6CA1\u6709\u7B2C\u4E09\u79CD\u4EBA**\u3002\u6CA1 @ \u522B\u4EBA\u65F6\u7EDD\u4E0D\u8BB8\u53D6\u522B\u4EBA\u7684\u5934\u50CF\uFF0C\u4E5F\u4E0D\u8981\u81EA\u5DF1\u7F16 userId
+     \uFF08\u7F16\u51FA\u6765\u7684 id \u4F1A\u62FF\u5230\u5B8C\u5168\u4E0D\u76F8\u5E72\u7684\u4EBA\u7684\u5934\u50CF\uFF0C\u8FD9\u662F\u4E25\u91CD\u9519\u8BEF\uFF09\u3002
+10. \u3010\u9ED8\u8BA4\u4E0D\u6DA6\u8272\uFF0C\u7528\u6237\u70B9\u5934\u624D\u6DA6\u8272\u3011\u628A\u7528\u6237\u7684\u8BDD**\u539F\u5C01\u4E0D\u52A8**\u4EA4\u7ED9\u7ED8\u56FE\u6A21\u578B\u5C31\u662F\u6700\u597D\u7684\u9ED8\u8BA4\u503C\uFF1A
+   - **\u4E0D\u8981**\u4E3B\u52A8\u6269\u5199\u3001\u4E0D\u8981\u8865\u753B\u98CE/\u5149\u7EBF/\u6750\u8D28/\u955C\u5934\u3001\u4E0D\u8981\u7FFB\u6210\u82F1\u6587\u3001\u4E0D\u8981\u52A0\u300Cmasterpiece\u300D\u8FD9\u7C7B\u8BCD\uFF1B
+   - \u7528\u6237\u660E\u786E\u8BF4\u300C\u5E2E\u6211\u6DA6\u8272 / \u4F18\u5316\u4E00\u4E0B / \u5199\u8BE6\u7EC6\u70B9\u300D\u65F6\uFF0C\u4F60\u624D\u628A\u63D0\u793A\u8BCD\u5199\u5F97\u66F4\u5B8C\u6574\uFF1B
+   - draw \u5DE5\u5177\u8FD4\u56DE asked=true \u65F6\u770B\u5B83\u7ED9\u7684 polish \u5B57\u6BB5\uFF1Apolish=true \u624D\u6DA6\u8272\uFF0Cfalse \u6216\u6CA1\u7ED9\u5C31**\u4E00\u4E2A\u5B57\u90FD\u522B\u6539**\uFF1B
    - \u7528\u6237\u7528\u4E2D\u6587\u63D0\u7684\u9700\u6C42\uFF0Cprompt \u5C31\u5199\u4E2D\u6587\uFF08\u7ED8\u56FE\u6A21\u578B\u542C\u5F97\u61C2\u4E2D\u6587\uFF0C\u7406\u89E3\u529B\u4E5F\u591F\u7528\uFF09\uFF1B
-   - \u522B\u4E3A\u4E86\u663E\u5F97\u4E13\u4E1A\u5C31\u53BB\u5806\u98CE\u683C / \u6750\u8D28 / \u5149\u7EBF / \u955C\u5934\u672F\u8BED\uFF0C\u66F4\u522B\u523B\u610F\u7FFB\u6210\u82F1\u6587\uFF1B
    - \u53EA\u4FDD\u7559\u7528\u6237\u771F\u6B63\u8BF4\u8FC7\u7684\u5185\u5BB9 + \u753B\u9762\u5FC5\u987B\u6709\u7684\u8981\u7D20\uFF0C**\u4E0D\u8981\u66FF\u4ED6\u8111\u8865\u7EC6\u8282**\uFF1B
    - \u63D0\u793A\u8BCD\u8D8A\u957F\uFF0C\u5404\u8981\u7D20\u4E92\u76F8\u7A00\u91CA\uFF0C\u51FA\u56FE\u53CD\u800C\u8D8A\u8D70\u6837\u3002\u4E00\u4E24\u53E5\u8BDD\u80FD\u628A\u753B\u9762\u8BF4\u6E05\u5C31\u591F\u4E86\u3002
 
 \u5982\u679C\u4F60\u6240\u5728\u7684\u63A5\u53E3\u4E0D\u652F\u6301\u51FD\u6570\u8C03\u7528\uFF0C\u5C31**\u53EA\u8F93\u51FA\u4E00\u884C JSON** \u6765\u8C03\u7528\u5DE5\u5177\uFF0C\u4F8B\u5982\uFF1A
 {"tool":"gallery_search","args":{"keyword":"\u767D\u53D1 \u7ACB\u7ED8"}}
 {"tool":"ask_user","args":{"question":"\u60F3\u8981\u4EC0\u4E48\u753B\u98CE\uFF1F"}}
+{"tool":"get_avatar","args":{"userId":""}}\uFF08\u7559\u7A7A = \u53D1\u6307\u4EE4\u7684\u4EBA\u81EA\u5DF1\uFF1B\u4E5F\u53EF\u4EE5\u586B\u88AB @ \u7684\u4EBA\u7684 id\uFF0C\u4E0D\u8BB8\u81EA\u5DF1\u7F16\uFF09
 {"tool":"draw","args":{"prompt":"...","references":["ref1","user1"]}}
 \u4E0D\u60F3\u8C03\u7528\u5DE5\u5177\u65F6\uFF0C\u6B63\u5E38\u8F93\u51FA\u7ED9\u7528\u6237\u770B\u7684\u4E2D\u6587\u5373\u53EF\u3002`;
-var AGENT_CONFIRM_RULE_ON = `**\u5FC5\u987B\u5148 ask_user**\uFF1A\u7528\u4E00\u53E5\u8BDD\u544A\u8BC9\u7528\u6237\u300C\u8FD9\u6B21\u4F1A\u53C2\u8003\u54EA\u51E0\u5F20\u56FE + \u5927\u81F4\u753B\u6210\u4EC0\u4E48\u6837\u300D\uFF0C\u7528\u6237\u70B9\u5934\u540E\u624D\u80FD\u8C03\u7528 draw\u3002
+var AGENT_CONFIRM_RULE_ON = `**\u5FC5\u987B\u5148 ask_user**\uFF1A\u7528\u4E00\u53E5\u8BDD\u544A\u8BC9\u7528\u6237\u300C\u8FD9\u6B21\u4F1A\u53C2\u8003\u54EA\u51E0\u5F20\u56FE + \u5927\u81F4\u753B\u6210\u4EC0\u4E48\u6837\u300D\uFF0C
+\u5E76\u987A\u5E26\u95EE\u4E00\u53E5\u300C\u63D0\u793A\u8BCD\u8981\u4E0D\u8981\u6211\u5E2E\u4F60\u6DA6\u8272\uFF08\u9ED8\u8BA4\u76F4\u63A5\u7528\u4F60\u7684\u539F\u8BDD\uFF09\u300D\uFF0C\u7528\u6237\u70B9\u5934\u540E\u624D\u80FD\u8C03\u7528 draw\u3002
+- \u7528\u6237\u8BF4\u300C\u6DA6\u8272 / \u4F18\u5316 / \u4E30\u5BCC\u4E00\u4E0B\u300D\u2192 \u4F60\u518D\u628A\u63D0\u793A\u8BCD\u5199\u5F97\u66F4\u5B8C\u6574\uFF1B
+- \u7528\u6237\u8BF4\u300C\u76F4\u63A5\u753B / \u4E0D\u7528 / \u539F\u6837\u300D\u6216\u6CA1\u63D0\u8FD9\u4EF6\u4E8B \u2192 **\u539F\u5C01\u4E0D\u52A8\u7528\u4ED6\u7684\u539F\u8BDD**\uFF0C\u4E00\u4E2A\u5B57\u90FD\u522B\u6DA6\u8272\u3002
 \u7528\u6237\u56DE\u590D\u4E86\u5426\u5B9A\u6216\u63D0\u51FA\u4FEE\u6539\u610F\u89C1\uFF0C\u5C31\u6309\u4ED6\u8BF4\u7684\u6539\uFF0C\u518D\u786E\u8BA4\u4E00\u6B21\u6216\u76F4\u63A5\u753B\uFF08\u4ED6\u8BF4\u300C\u76F4\u63A5\u753B\u300D\u5C31\u4E0D\u7528\u518D\u95EE\uFF09\u3002`;
 var AGENT_CONFIRM_RULE_OFF = `\u7528\u6237\u9700\u6C42\u5DF2\u7ECF\u660E\u786E\u7684\uFF0C\u76F4\u63A5\u8C03\u7528 draw\uFF0C\u4E0D\u7528\u591A\u95EE\u4E00\u53E5\u3002\u53EA\u6709\u771F\u7684\u7F3A\u5173\u952E\u4FE1\u606F\u624D ask_user\u3002`;
 var AGENT_JSON_FALLBACK_RULE = `\uFF08\u6CE8\u610F\uFF1A\u5F53\u524D\u63A5\u53E3\u4E0D\u652F\u6301\u51FD\u6570\u8C03\u7528\uFF09\u8BF7\u4F60**\u53EA\u7528\u4E00\u884C JSON** \u6765\u8C03\u7528\u5DE5\u5177\uFF0C\u4E0D\u8981\u8F93\u51FA\u522B\u7684\u5185\u5BB9\uFF1A
 {"tool":"gallery_search","args":{"keyword":"\u767D\u53D1 \u7ACB\u7ED8"}}
 {"tool":"ask_user","args":{"question":"\u60F3\u8981\u4EC0\u4E48\u753B\u98CE\uFF1F"}}
+{"tool":"get_avatar","args":{"userId":""}}\uFF08\u7559\u7A7A = \u53D1\u6307\u4EE4\u7684\u4EBA\u81EA\u5DF1\uFF1B\u4E5F\u53EF\u4EE5\u586B\u88AB @ \u7684\u4EBA\u7684 id\uFF0C\u4E0D\u8BB8\u81EA\u5DF1\u7F16\uFF09
 {"tool":"draw","args":{"prompt":"...","references":["ref1","ref2"]}}
 \u4E0D\u9700\u8981\u8C03\u7528\u5DE5\u5177\u65F6\uFF0C\u6B63\u5E38\u8F93\u51FA\u7ED9\u7528\u6237\u770B\u7684\u4E2D\u6587\u5373\u53EF\u3002`;
 var defaultCommands = [
@@ -1299,9 +1384,20 @@ var Config = import_koishi.Schema.intersect([
       model: import_koishi.Schema.string().description("agent \u4E13\u7528\u7684\u6A21\u578B\uFF08\u7559\u7A7A\u5219\u7528\u300CAI \u6A21\u578B\u63A5\u53E3\u300D\u91CC\u7684\u6A21\u578B\uFF09\u3002**\u9700\u8981\u652F\u6301 function calling**\uFF1B\u4E0D\u652F\u6301\u65F6\u63D2\u4EF6\u4F1A\u81EA\u52A8\u6539\u7528\u300C\u4E00\u884C JSON\u300D\u534F\u8BAE"),
       baseUrl: import_koishi.Schema.string().role("link").description("agent \u4E13\u7528\u63A5\u53E3\u5730\u5740\uFF08\u7559\u7A7A\u5219\u590D\u7528\u300CAI \u6A21\u578B\u63A5\u53E3\u300D\u7684\u5730\u5740\uFF09"),
       apiKey: import_koishi.Schema.string().role("secret").description("agent \u4E13\u7528\u5BC6\u94A5\uFF08\u7559\u7A7A\u5219\u590D\u7528\u300CAI \u6A21\u578B\u63A5\u53E3\u300D\u7684\u5BC6\u94A5\uFF09"),
-      instructions: import_koishi.Schema.string().role("textarea", { rows: [16, 8] }).default(DEFAULT_AGENT_INSTRUCTIONS).description("\u9A71\u52A8 agent \u884C\u4E3A\u7684\u7CFB\u7EDF\u63D0\u793A\u8BCD\uFF08\u53EA\u5199\u300C\u6709\u54EA\u4E9B\u5DE5\u5177 + \u4EC0\u4E48\u65F6\u5019\u7528\u300D\uFF0C\u522B\u5199\u6B7B\u6D41\u7A0B\uFF09\u3002\u53EF\u7528\u5360\u4F4D\u7B26\uFF1A{confirmRule} \u5F00\u753B\u786E\u8BA4\u89C4\u5219\u3001{command} \u6307\u4EE4\u540D\u3001{prompt} \u6307\u4EE4\u63D0\u793A\u8BCD\u3001{userInput} \u7528\u6237\u9644\u52A0\u9700\u6C42\u3001{imageCount} \u7528\u6237\u968F\u6D88\u606F\u53D1\u7684\u56FE\u6570\u91CF\u3001{refCount} \u53EF\u68C0\u7D22\u7684\u53C2\u8003\u56FE\u6570\u91CF\u3002\u6307\u4EE4\u540D/\u63D0\u793A\u8BCD\u7B49\u4E0A\u4E0B\u6587\u4F1A\u81EA\u52A8\u9644\u5728\u63D0\u793A\u8BCD\u672B\u5C3E\uFF0C\u4E0D\u7528\u81EA\u5DF1\u5F15\u7528")
+      instructions: import_koishi.Schema.string().role("textarea", { rows: [16, 8] }).default(DEFAULT_AGENT_INSTRUCTIONS).description("\u9A71\u52A8 agent \u884C\u4E3A\u7684\u7CFB\u7EDF\u63D0\u793A\u8BCD\uFF08\u53EA\u5199\u300C\u6709\u54EA\u4E9B\u5DE5\u5177 + \u4EC0\u4E48\u65F6\u5019\u7528\u300D\uFF0C\u522B\u5199\u6B7B\u6D41\u7A0B\uFF09\u3002\u53EF\u7528\u5360\u4F4D\u7B26\uFF1A{confirmRule} \u5F00\u753B\u786E\u8BA4\u89C4\u5219\u3001{command} \u6307\u4EE4\u540D\u3001{prompt} \u6307\u4EE4\u63D0\u793A\u8BCD\u3001{userInput} \u7528\u6237\u9644\u52A0\u9700\u6C42\u3001{imageCount} \u7528\u6237\u968F\u6D88\u606F\u53D1\u7684\u56FE\u6570\u91CF\u3001{refCount} \u53EF\u68C0\u7D22\u7684\u53C2\u8003\u56FE\u6570\u91CF\u3002\u6307\u4EE4\u540D/\u63D0\u793A\u8BCD\u7B49\u4E0A\u4E0B\u6587\u4F1A\u81EA\u52A8\u9644\u5728\u63D0\u793A\u8BCD\u672B\u5C3E\uFF0C\u4E0D\u7528\u81EA\u5DF1\u5F15\u7528"),
+      askIfNoReference: import_koishi.Schema.boolean().default(true).description("\u7528\u6237\u8FD9\u6B21\u65E2\u6CA1\u53D1\u56FE\u3001\u4E5F\u6CA1 @ \u4EBA\u3001\u6307\u4EE4\u672C\u8EAB\u4E5F\u6CA1\u6709\u9ED8\u8BA4\u53C2\u8003\u56FE\u65F6\uFF0C\u5F00\u753B\u524D\u5148\u95EE\u4E00\u53E5\u300C\u8981\u4E0D\u8981\u53C2\u8003\u56FE\u300D\uFF08\u53EF\u4EE5\u7528\u4ED6\u81EA\u5DF1\u7684\u5934\u50CF / @ \u522B\u4EBA\u7684\u5934\u50CF\uFF09\u3002\u8FD9\u6761\u662F\u63D2\u4EF6\u515C\u5E95\u6267\u884C\u7684\uFF0C\u6A21\u578B\u81EA\u5DF1\u5148\u95EE\u8FC7\u5C31\u4E0D\u518D\u95EE"),
+      askBeforePolish: import_koishi.Schema.boolean().default(true).description("\u5F00\u753B\u524D\u5148\u95EE\u7528\u6237\u300C\u63D0\u793A\u8BCD\u8981\u4E0D\u8981\u6211\u5E2E\u4F60\u6DA6\u8272\u300D\u3002**\u9ED8\u8BA4\u662F\u539F\u5C01\u4E0D\u52A8\u628A\u7528\u6237\u7684\u539F\u8BDD\u4EA4\u7ED9\u7ED8\u56FE\u6A21\u578B**\uFF0C\u53EA\u6709\u7528\u6237\u8BF4\u300C\u6DA6\u8272 / \u4F18\u5316\u300D\u624D\u52A0\u5DE5\u3002\u8FD9\u6761\u540C\u6837\u662F\u63D2\u4EF6\u515C\u5E95\uFF0C\u6A21\u578B\u81EA\u5DF1\u5148\u95EE\u8FC7\u5C31\u4E0D\u518D\u95EE")
     }).collapse().description("Agent \u914D\u7F6E\uFF08\u6307\u4EE4\u8F83\u957F\uFF0C\u5DF2\u6298\u53E0\uFF09")
   }).description("Agent \u6A21\u5F0F"),
+  import_koishi.Schema.object({
+    avatar: import_koishi.Schema.object({
+      enabled: import_koishi.Schema.boolean().default(true).description("\u5F00\u542F\u5934\u50CF\u53C2\u8003\u56FE\uFF1A\u53EF\u4EE5\u628A\u7FA4\u53CB\u7684\u5934\u50CF\u5F53\u53C2\u8003\u56FE\u6765\u753B"),
+      autoAt: import_koishi.Schema.boolean().default(true).description("\u7528\u6237 @ \u4E86\u8C01\uFF0C\u5C31\u81EA\u52A8\u628A\u90A3\u4E2A\u4EBA\u7684\u5934\u50CF\u4F5C\u4E3A\u53C2\u8003\u56FE\uFF08@ \u672C\u8EAB\u5C31\u662F\u660E\u786E\u7684\u6307\u5B9A\uFF09"),
+      autoSelf: import_koishi.Schema.boolean().default(false).description("\u7528\u6237\u6CA1\u53D1\u56FE\u4E5F\u6CA1 @ \u4EBA\u65F6\uFF0C\u81EA\u52A8\u62FF\u4ED6\u81EA\u5DF1\u7684\u5934\u50CF\u5F53\u53C2\u8003\u56FE\u3002\u5173\u6389\u4E5F\u6CA1\u5173\u7CFB\uFF0C\u300C\u7528\u6211\u7684\u5934\u50CF\u753B\u300D\u8FD9\u7C7B\u9700\u6C42 agent \u4F1A\u81EA\u5DF1\u8C03\u7528 get_avatar"),
+      size: import_koishi.Schema.number().default(640).min(64).max(1024).step(64).description("\u5934\u50CF\u8FB9\u957F\uFF08\u50CF\u7D20\uFF09"),
+      urlTemplate: import_koishi.Schema.string().default("").description("\u81EA\u5B9A\u4E49\u5934\u50CF\u5730\u5740\u6A21\u677F\uFF0C\u7559\u7A7A\u7528\u5185\u7F6E\u89C4\u5219\u3002\u5360\u4F4D\u7B26\uFF1A{userId} \u7528\u6237 id\u3001{platform} \u5E73\u53F0\u3001{selfId} \u673A\u5668\u4EBA id\u3001{appId} \u673A\u5668\u4EBA appid\u3001{size} \u5C3A\u5BF8")
+    }).description("\u5934\u50CF\u53C2\u8003\u56FE")
+  }).description("\u5934\u50CF\u53C2\u8003\u56FE"),
   import_koishi.Schema.object({
     appendUserInput: import_koishi.Schema.boolean().default(true).description("\u628A\u7528\u6237\u968F\u6307\u4EE4\u53D1\u7684\u9644\u52A0\u9700\u6C42\u5E76\u5165\u7ED8\u56FE\u63D0\u793A\u8BCD\uFF08\u4F8B\u5982\u300C\u624B\u529E\u5316 xxx \u5728\u5077\u5403\u767D\u996D\u88AB\u53D1\u73B0\u7684\u8868\u60C5\u300D\uFF09"),
     promptOptimize: import_koishi.Schema.union([
@@ -1470,6 +1566,8 @@ function apply(ctx, config) {
           needimages: "\u8BF7\u63D0\u4F9B\u81F3\u5C11\u4E00\u5F20\u56FE\u7247",
           agentfailed: "\u7ED8\u56FE\u52A9\u624B\u8FD9\u6B21\u6CA1\u8DD1\u8D77\u6765\uFF08{0}\uFF09\u3002\u53EF\u4EE5\u5148\u5173\u6389\u300CAgent \u6A21\u5F0F\u300D\u7167\u5E38\u753B\u56FE\uFF0C\u6216\u6362\u4E00\u4E2A\u652F\u6301\u5DE5\u5177\u8C03\u7528\u7684\u6A21\u578B\u3002",
           agentnoresult: "\u8FD9\u6B21\u6CA1\u80FD\u7406\u51FA\u4E2A\u7ED3\u679C\u6765\uFF0C\u9EBB\u70E6\u518D\u8BF4\u4E00\u6B21\u4F60\u60F3\u753B\u4EC0\u4E48\uFF5E",
+          askreference: "\u8FD9\u6B21\u6CA1\u6709\u6307\u5B9A\u53C2\u8003\u56FE\u3002\u8981\u53C2\u8003\u56FE\u7247\u5417\uFF1F\u53EF\u4EE5\u76F4\u63A5\u53D1\u56FE\u3001@ \u4E00\u4E2A\u4EBA\u7528\u4ED6\u7684\u5934\u50CF\uFF0C\u6216\u8005\u8BF4\u300C\u7528\u6211\u7684\u5934\u50CF\u300D\uFF1B\u4E0D\u9700\u8981\u5C31\u56DE\u300C\u76F4\u63A5\u753B\u300D\u3002\n\u53E6\u5916\uFF0C\u63D0\u793A\u8BCD\u8981\u6211\u5E2E\u4F60\u6DA6\u8272\u4E00\u4E0B\u5417\uFF1F\u9ED8\u8BA4\u76F4\u63A5\u7528\u4F60\u7684\u539F\u8BDD\u3002",
+          askpolish: "\u8FD9\u6B21\u76F4\u63A5\u6309\u4F60\u7684\u539F\u8BDD\u5F00\u753B\u3002\u8981\u6211\u5148\u5E2E\u4F60\u6DA6\u8272\u4E00\u4E0B\u63D0\u793A\u8BCD\u5417\uFF1F\u56DE\u300C\u6DA6\u8272\u300D\u6211\u52A0\u5DE5\u4E00\u4E0B\uFF0C\u56DE\u300C\u76F4\u63A5\u753B\u300D\u5C31\u539F\u6837\u4EA4\u7ED9\u7ED8\u56FE\u6A21\u578B\u3002",
           optimizefailed: "\uFF08\u63D0\u793A\u8BCD\u878D\u5408\u5931\u8D25\uFF0C\u5DF2\u6539\u4E3A\u8FFD\u52A0\u6A21\u5F0F\uFF09",
           bgstart: "\u5DF2\u5F00\u59CB\u540E\u53F0\u7ED8\u56FE\uFF08{0} \u5F20\u56FE\uFF09\uFF0C\u753B\u597D\u540E\u4F1A\u5728\u8FD9\u91CC\u901A\u77E5\u4F60...",
           bgqueue: "\uFF08\u5F53\u524D\u6709 {0} \u4E2A\u4EFB\u52A1\u5728\u6392\u961F\uFF09",
@@ -1538,7 +1636,43 @@ function apply(ctx, config) {
       for (const item of pool) register("gallery", item.url, item.description, item.group);
       const baseIds = (defaultImageUrls || []).filter(Boolean).map((url) => register("cmd", url, "", "\u6307\u4EE4\u9ED8\u8BA4\u56FE"));
       const userIds = extractImagesFromSession(session).map((url) => register("user", url, "", "\u7528\u6237\u53D1\u9001"));
-      logInfo2(`[${cmdConfig.name}] agent \u542F\u52A8\uFF1A\u53EF\u641C\u7D22\u53C2\u8003\u56FE ${pool.length} \u5F20\uFF0C\u9ED8\u8BA4\u56FE ${baseIds.length} \u5F20\uFF0C\u7528\u6237\u968F\u6D88\u606F\u53D1\u7684\u56FE ${userIds.length} \u5F20`);
+      const avatarCfg = config.avatar || {};
+      const avatarOn = avatarCfg.enabled !== false;
+      const atTargets = avatarOn ? collectAtTargets(session) : [];
+      let selfAvatarId = "";
+      const atAvatarIds = [];
+      const atAvatarById = /* @__PURE__ */ new Map();
+      const avatarAllowed = /* @__PURE__ */ new Map();
+      avatarAllowed.set(session.userId, "\u53D1\u6307\u4EE4\u7684\u4EBA\u81EA\u5DF1");
+      for (const t of atTargets) if (t.id) avatarAllowed.set(t.id, t.name || t.id);
+      const resolveAvatarUser = (raw) => {
+        const text = String(raw || "").trim();
+        if (!text || text === session.userId || /^(me|self|自己|我|本人|我的头像|我自己)$/i.test(text)) {
+          return session.userId;
+        }
+        if (avatarAllowed.has(text)) return text;
+        const lower = text.toLowerCase();
+        for (const [id, name2] of avatarAllowed) {
+          if (name2 && (name2 === text || name2.toLowerCase() === lower)) return id;
+        }
+        return "";
+      };
+      if (avatarOn) {
+        const selfUrl = await fetchAvatarUrl(session, session.userId);
+        if (selfUrl) {
+          selfAvatarId = register("avatar", selfUrl, "\u53D1\u6307\u4EE4\u7684\u4EBA\u7684\u5934\u50CF", "\u5934\u50CF");
+        }
+        if (avatarCfg.autoAt !== false) {
+          for (const target of atTargets) {
+            const url = await fetchAvatarUrl(session, target.id);
+            if (!url) continue;
+            const id = register("avatar", url, `${target.name || target.id} \u7684\u5934\u50CF`, "\u5934\u50CF");
+            if (!atAvatarIds.includes(id)) atAvatarIds.push(id);
+            atAvatarById.set(target.id, id);
+          }
+        }
+      }
+      logInfo2(`[${cmdConfig.name}] agent \u542F\u52A8\uFF1A\u53EF\u641C\u7D22\u53C2\u8003\u56FE ${pool.length} \u5F20\uFF0C\u9ED8\u8BA4\u56FE ${baseIds.length} \u5F20\uFF0C\u7528\u6237\u968F\u6D88\u606F\u53D1\u7684\u56FE ${userIds.length} \u5F20\uFF0C\u5934\u50CF ${atAvatarIds.length + (selfAvatarId ? 1 : 0)} \u5F20`);
       const historyKey = agentHistoryKey(session);
       const history = historyTurns > 0 ? (agentHistories.get(historyKey) || []).slice() : [];
       const newHistory = [];
@@ -1547,7 +1681,14 @@ function apply(ctx, config) {
       };
       remember({ role: "user", content: userInputText || "\uFF08\u7528\u6237\u6CA1\u6709\u9644\u52A0\u8BF4\u660E\uFF09" });
       const messages = [
-        { role: "system", content: buildAgentSystemPrompt(cmdConfig, userInputText, userIds.length, pool.length, baseIds, agentCfg) },
+        { role: "system", content: buildAgentSystemPrompt(cmdConfig, userInputText, pool.length, {
+          userIds,
+          baseIds,
+          atAvatarIds,
+          selfAvatarId,
+          atTargets,
+          selfUserId: session.userId
+        }, agentCfg, avatarAllowed) },
         ...history,
         { role: "user", content: userInputText ? userInputText : "\uFF08\u7528\u6237\u6CA1\u6709\u9644\u52A0\u8BF4\u660E\uFF0C\u8BF7\u6309\u6307\u4EE4\u81EA\u5E26\u7684\u63D0\u793A\u8BCD\u6765\uFF09" }
       ];
@@ -1557,6 +1698,8 @@ function apply(ctx, config) {
       let finalText = "";
       let drew = false;
       let failed = "";
+      let askedOnce = false;
+      let drawAsked = false;
       for (let iteration = 0; iteration < maxIterations; iteration++) {
         if (!isActive || !ctx.scope.isActive) break;
         const res = await requestAgentChat(messages, toolsSupported ? tools : void 0);
@@ -1607,10 +1750,12 @@ ${output}` }
             return toolGallerySearch(args);
           case "ask_user":
             return toolAskUser(args);
+          case "get_avatar":
+            return toolGetAvatar(args);
           case "draw":
             return toolDraw(args);
           default:
-            return JSON.stringify({ ok: false, error: `\u6CA1\u6709\u53EB\u300C${name2}\u300D\u7684\u5DE5\u5177\uFF0C\u53EF\u7528\u7684\u662F gallery_search / ask_user / draw` });
+            return JSON.stringify({ ok: false, error: `\u6CA1\u6709\u53EB\u300C${name2}\u300D\u7684\u5DE5\u5177\uFF0C\u53EF\u7528\u7684\u662F gallery_search / ask_user / get_avatar / draw` });
         }
       }
       function toolGallerySearch(args) {
@@ -1639,9 +1784,36 @@ ${output}` }
           }))
         });
       }
+      async function toolGetAvatar(args) {
+        if (!avatarOn) return JSON.stringify({ ok: false, error: "\u5934\u50CF\u53C2\u8003\u56FE\u529F\u80FD\u5DF2\u5173\u95ED" });
+        const raw = String(args?.userId ?? args?.id ?? args?.user ?? "").trim();
+        const userId = resolveAvatarUser(raw);
+        if (!userId) {
+          const options = [...avatarAllowed.entries()].map(([id2, name2]) => ({ userId: id2, who: name2 }));
+          return JSON.stringify({
+            ok: false,
+            error: `\u4E0D\u8BA4\u8BC6\u300C${raw}\u300D\u3002\u5934\u50CF\u53EA\u80FD\u53D6\u300C\u53D1\u6307\u4EE4\u7684\u4EBA\u81EA\u5DF1\u300D\u548C\u300C\u4ED6\u8FD9\u6B21 @ \u5230\u7684\u4EBA\u300D\uFF0C\u4E0D\u80FD\u81EA\u5DF1\u7F16 id`,
+            available: options,
+            note: `\u8981\u753B\u7684\u5982\u679C\u662F\u53D1\u6307\u4EE4\u7684\u4EBA\u81EA\u5DF1\uFF0C\u628A userId \u7559\u7A7A\u518D\u8C03\u4E00\u6B21\uFF1B\u5982\u679C\u662F\u522B\u4EBA\uFF0C\u8BA9\u4ED6 @ \u90A3\u4E2A\u4EBA\u518D\u53D1\u4E00\u6B21\u6307\u4EE4\u3002\u73B0\u5728\u53EF\u53D6\uFF1A${options.map((o) => o.who).join("\u3001")}`
+          });
+        }
+        const isSelf = userId === session.userId;
+        const who = avatarAllowed.get(userId) || (isSelf ? "\u53D1\u6307\u4EE4\u7684\u4EBA\u81EA\u5DF1" : userId);
+        const cached = isSelf ? selfAvatarId : atAvatarById.get(userId);
+        if (cached) return JSON.stringify({ ok: true, id: cached, userId, note: `${who}\u7684\u5934\u50CF` });
+        const url = await fetchAvatarUrl(session, userId);
+        if (!url) {
+          return JSON.stringify({ ok: false, error: `\u6CA1\u53D6\u5230\u300C${who}\u300D\u7684\u5934\u50CF\uFF08\u8FD9\u4E2A\u5E73\u53F0\u53EF\u80FD\u4E0D\u63D0\u4F9B\u5934\u50CF\u5730\u5740\uFF09` });
+        }
+        const id = register("avatar", url, `${who}\u7684\u5934\u50CF`, "\u5934\u50CF");
+        if (isSelf) selfAvatarId = id;
+        else atAvatarById.set(userId, id);
+        return JSON.stringify({ ok: true, id, userId, note: `${who}\u7684\u5934\u50CF` });
+      }
       async function toolAskUser(args) {
         const question = cleanAskMessage(args?.question ?? args?.text ?? args?.message);
         if (!question) return JSON.stringify({ ok: false, error: "question \u4E0D\u80FD\u4E3A\u7A7A" });
+        askedOnce = true;
         try {
           await sendNotice(session, question);
         } catch (error) {
@@ -1666,10 +1838,43 @@ ${output}` }
         const ids = images.map((url) => register("user", url, "", "\u7528\u6237\u53D1\u9001"));
         remember({ role: "user", content: text || (ids.length ? `\uFF08\u7528\u6237\u53D1\u4E86 ${ids.length} \u5F20\u56FE\u7247\uFF09` : "\uFF08\u7528\u6237\u4EC0\u4E48\u90FD\u6CA1\u8BF4\uFF09") });
         logInfo2(`agent \u63D0\u95EE\u300C${question}\u300D-> \u7528\u6237\u56DE\u590D: ${text || "\uFF08\u65E0\u6587\u5B57\uFF09"}\uFF0C\u56FE\u7247 ${ids.length} \u5F20`);
+        const avatars = [];
+        if (avatarOn) {
+          if (avatarCfg.autoAt !== false) {
+            for (const target of extractAtIds(String(answer || ""), session.selfId)) {
+              if (!target.id) continue;
+              if (!avatarAllowed.has(target.id)) avatarAllowed.set(target.id, target.name || target.id);
+              const who = avatarAllowed.get(target.id) || target.id;
+              const cached = atAvatarById.get(target.id);
+              if (cached) {
+                if (!avatars.some((a) => a.id === cached)) avatars.push({ id: cached, note: `${who} \u7684\u5934\u50CF` });
+                continue;
+              }
+              const url = await fetchAvatarUrl(session, target.id);
+              if (!url) continue;
+              const id = register("avatar", url, `${who} \u7684\u5934\u50CF`, "\u5934\u50CF");
+              atAvatarById.set(target.id, id);
+              if (!atAvatarIds.includes(id)) atAvatarIds.push(id);
+              avatars.push({ id, note: `${who} \u7684\u5934\u50CF` });
+            }
+          }
+          if (/头像|我的形象|画我|我自己/.test(text) && !avatars.some((a) => a.id === selfAvatarId)) {
+            let id = selfAvatarId;
+            if (!id) {
+              const url = await fetchAvatarUrl(session, session.userId);
+              if (url) {
+                id = register("avatar", url, "\u53D1\u6307\u4EE4\u7684\u4EBA\u7684\u5934\u50CF", "\u5934\u50CF");
+                selfAvatarId = id;
+              }
+            }
+            if (id) avatars.push({ id, note: "\u53D1\u6307\u4EE4\u7684\u4EBA\u81EA\u5DF1\u7684\u5934\u50CF" });
+          }
+        }
         return JSON.stringify({
           ok: true,
           text,
-          images: ids.map((id, i) => ({ id, note: `\u7528\u6237\u8FD9\u6B21\u53D1\u7684\u7B2C ${i + 1} \u5F20\u56FE` }))
+          images: ids.map((id, i) => ({ id, note: `\u7528\u6237\u8FD9\u6B21\u53D1\u7684\u7B2C ${i + 1} \u5F20\u56FE` })),
+          ...avatars.length ? { avatars } : {}
         });
       }
       async function toolDraw(args) {
@@ -1682,9 +1887,35 @@ ${output}` }
           if (id && !wanted.includes(id)) wanted.push(id);
         };
         baseIds.forEach(pushId);
+        userIds.forEach(pushId);
+        atAvatarIds.forEach(pushId);
+        if (avatarOn && avatarCfg.autoSelf) pushId(selfAvatarId);
         ids.forEach(pushId);
         const capped = wanted.slice(0, maxSelect);
         const imageUrls = capped.map((id) => registry.get(id)?.url).filter(Boolean);
+        const needRef = !capped.length && agentCfg.askIfNoReference !== false;
+        const needPolish = agentCfg.askBeforePolish !== false;
+        if (!drawAsked && !askedOnce && (needRef || needPolish)) {
+          drawAsked = true;
+          const asked = await toolAskUser({
+            question: needRef ? session.text("image-prompt.messages.askreference") : session.text("image-prompt.messages.askpolish")
+          });
+          let parsed = {};
+          try {
+            parsed = JSON.parse(asked);
+          } catch {
+            parsed = {};
+          }
+          const polish = parsed.ok ? parsePolishIntent(parsed.text) : false;
+          return JSON.stringify({
+            ok: false,
+            asked: true,
+            polish,
+            ...parsed.images?.length ? { newImages: parsed.images } : {},
+            ...parsed.avatars?.length ? { newAvatars: parsed.avatars } : {},
+            note: polish ? "\u5DF2\u7ECF\u66FF\u4F60\u95EE\u8FC7\u7528\u6237\u4E86\uFF1A\u4ED6\u8BF4\u8981\u6DA6\u8272\uFF0C\u53EF\u4EE5\u628A\u63D0\u793A\u8BCD\u5199\u5F97\u66F4\u5B8C\u6574\u3002\u4ED6\u7ED9\u4E86\u56FE/\u5934\u50CF\u4E5F\u8981\u5199\u8FDB references\u3002\u91CD\u65B0\u8C03\u7528 draw \u5F00\u753B\uFF0C\u4E0D\u8981\u518D\u95EE\u7B2C\u4E8C\u6B21" : "\u5DF2\u7ECF\u66FF\u4F60\u95EE\u8FC7\u7528\u6237\u4E86\uFF1A\u63D0\u793A\u8BCD**\u539F\u5C01\u4E0D\u52A8\u7528\u4ED6\u7684\u539F\u8BDD**\uFF0C\u4E0D\u8981\u6DA6\u8272\u3001\u4E0D\u8981\u6269\u5199\u3001\u4E0D\u8981\u7FFB\u8BD1\u3002\u4ED6\u7ED9\u4E86\u56FE/\u5934\u50CF\u5C31\u5199\u8FDB references\u3002\u91CD\u65B0\u8C03\u7528 draw \u5F00\u753B\uFF0C\u4E0D\u8981\u518D\u95EE\u7B2C\u4E8C\u6B21"
+          });
+        }
         const finalPrompt = args?.negative_prompt ? `${prompt}
 
 Negative prompt: ${String(args.negative_prompt).trim()}` : prompt;
@@ -1701,12 +1932,12 @@ Negative prompt: ${String(args.negative_prompt).trim()}` : prompt;
         });
       }
     }
-    function buildAgentSystemPrompt(cmdConfig, userInputText, imageCount, refCount, baseIds, agentCfg) {
+    function buildAgentSystemPrompt(cmdConfig, userInputText, refCount, refs, agentCfg, avatarAllowed) {
       const instructions = renderAgentInstructions(agentCfg.instructions || DEFAULT_AGENT_INSTRUCTIONS, {
         command: cmdConfig.name || "",
         prompt: cmdConfig.prompt || "",
         userInput: userInputText || "",
-        imageCount,
+        imageCount: refs.userIds.length,
         refCount,
         confirmRule: agentCfg.confirmBeforeDraw !== false ? AGENT_CONFIRM_RULE_ON : AGENT_CONFIRM_RULE_OFF
       });
@@ -1716,12 +1947,33 @@ Negative prompt: ${String(args.negative_prompt).trim()}` : prompt;
         `- \u7ED8\u56FE\u6307\u4EE4\uFF1A${cmdConfig.name}`,
         `- \u6307\u4EE4\u81EA\u5E26\u7684\u63D0\u793A\u8BCD\uFF1A${cmdConfig.prompt || "\uFF08\u7A7A\uFF0C\u8FD9\u662F\u81EA\u5B9A\u4E49\u6307\u4EE4\uFF09"}`,
         `- \u7528\u6237\u8FD9\u6B21\u8BF4\u7684\u8BDD\uFF1A${userInputText || "\uFF08\u7528\u6237\u6CA1\u8BF4\u8BDD\uFF09"}`,
-        `- \u7528\u6237\u968F\u6D88\u606F\u53D1\u7684\u56FE\uFF1A${imageCount} \u5F20${imageCount ? "\uFF08\u7F16\u53F7\u89C1\u4E0B\u65B9\uFF0C\u53EF\u4EE5\u76F4\u63A5\u5199\u8FDB draw \u7684 references\uFF09" : ""}`,
+        `- \u7528\u6237\u968F\u6D88\u606F\u53D1\u7684\u56FE\uFF1A${refs.userIds.length ? `${refs.userIds.join("\u3001")}\uFF08\u5DF2\u81EA\u52A8\u5E26\u4E0A\uFF0C\u4E0D\u7528\u518D\u586B\uFF09` : "0 \u5F20"}`,
         `- \u56FE\u5E93\u91CC\u53EF\u4EE5\u641C\u5230\u7684\u53C2\u8003\u56FE\uFF1A${refCount} \u5F20`
       ];
-      if (baseIds.length) lines.push(`- \u6307\u4EE4\u9ED8\u8BA4\u53C2\u8003\u56FE\uFF08\u5DF2\u81EA\u52A8\u5E26\u4E0A\uFF0C\u4E0D\u7528\u518D\u586B\uFF09\uFF1A${baseIds.join("\u3001")}`);
+      if (refs.baseIds.length) lines.push(`- \u6307\u4EE4\u9ED8\u8BA4\u53C2\u8003\u56FE\uFF08\u5DF2\u81EA\u52A8\u5E26\u4E0A\uFF0C\u4E0D\u7528\u518D\u586B\uFF09\uFF1A${refs.baseIds.join("\u3001")}`);
       if (cmdConfig.custom) lines.push("- \u8FD9\u662F\u81EA\u5B9A\u4E49\u6307\u4EE4\uFF1A\u7528\u6237\u6CA1\u8BF4\u6E05\u695A\u8981\u753B\u4EC0\u4E48\u65F6\uFF0C\u5148\u7528 ask_user \u95EE\u4E00\u53E5");
-      return instructions + lines.join("\n");
+      const avatarLines = ["", "## \u53EF\u53D6\u5934\u50CF\u7684\u4EBA\uFF08get_avatar \u53EA\u8BA4\u8FD9\u4E9B\uFF09"];
+      if (refs.selfAvatarId) {
+        avatarLines.push(`- \u53D1\u6307\u4EE4\u7684\u4EBA\u81EA\u5DF1\uFF1A\u7F16\u53F7 ${refs.selfAvatarId}\uFF08\u4ED6\u60F3\u753B\u300C\u6211\u300D\u65F6\u7528\u8FD9\u4E2A\u7F16\u53F7\uFF0C\u6216 get_avatar \u7684 userId \u7559\u7A7A\u518D\u53D6\u4E00\u6B21\uFF09`);
+      } else {
+        avatarLines.push("- \u53D1\u6307\u4EE4\u7684\u4EBA\u81EA\u5DF1\uFF1Aget_avatar \u7684 userId **\u7559\u7A7A**\u5373\u53EF\uFF08\u8FD9\u8F6E\u8FD8\u6CA1\u63D0\u524D\u53D6\uFF0C\u53D6\u4E86\u624D\u6709\u7F16\u53F7\uFF09");
+      }
+      if (refs.atAvatarIds.length) {
+        const pairs = refs.atTargets.map((t, i) => `${refs.atAvatarIds[i] || "?"}=${t.name || t.id}`).join("\u3001");
+        avatarLines.push(`- \u88AB @ \u7684\u4EBA\uFF08\u5DF2\u81EA\u52A8\u5E26\u4E0A\uFF0C\u4E0D\u7528\u518D\u586B\uFF09\uFF1A${pairs}`);
+      } else if (refs.atTargets.length) {
+        avatarLines.push(`- \u88AB @ \u7684\u4EBA\uFF1A${refs.atTargets.map((t) => `${t.name || t.id}\uFF08id=${t.id}\uFF09`).join("\u3001")}\uFF0C\u8FD8\u6CA1\u53D6\u5230\u5934\u50CF\uFF0C\u9700\u8981\u5C31\u7528 get_avatar \u586B\u4ED6\u7684 id \u518D\u8BD5`);
+      }
+      const others = [...(avatarAllowed || /* @__PURE__ */ new Map()).entries()].filter(([id]) => id !== refs.selfUserId && !refs.atTargets.some((t) => t.id === id));
+      if (others.length) {
+        avatarLines.push(`- \u540E\u7EED\u5BF9\u8BDD\u91CC\u53C8 @ \u5230\u7684\uFF1A${others.map(([id, name2]) => `${name2}\uFF08id=${id}\uFF09`).join("\u3001")}`);
+      }
+      if (refs.atTargets.length || others.length) {
+        avatarLines.push("- \u4E0A\u9762\u8FD9\u4E9B\u4EBA\u4E4B\u5916\u7684 id **\u4E00\u5F8B\u4F1A\u88AB\u62D2\u7EDD**\uFF0C\u4E0D\u8981\u4ECE\u56FE\u5E93\u63CF\u8FF0\u3001\u5386\u53F2\u6D88\u606F\u6216\u4EFB\u4F55\u522B\u5904\u6284\u4E00\u4E2A id \u5F53\u5934\u50CF\u7528");
+      } else {
+        avatarLines.push("- \u8FD9\u6B21\u6CA1\u6709 @ \u4EFB\u4F55\u4EBA\uFF0C\u6240\u4EE5**\u53EA\u80FD\u53D6\u53D1\u6307\u4EE4\u8005\u81EA\u5DF1\u7684\u5934\u50CF**\uFF08userId \u7559\u7A7A\uFF09\u3002\u4E0D\u8981\u586B\u4EFB\u4F55 id");
+      }
+      return instructions + lines.join("\n") + avatarLines.join("\n");
     }
     async function requestAgentChat(messages, tools) {
       const agentCfg = config.agent || {};
@@ -1870,6 +2122,19 @@ ${echo}` : echo);
         promptText = mode === "rewrite" && await optimizePromptText("", text) || text;
       }
       const images = [...defaultImageUrls || [], ...extractImagesFromSession(session)];
+      const avatarCfg = config.avatar || {};
+      if (avatarCfg.enabled !== false) {
+        if (avatarCfg.autoAt !== false) {
+          for (const target of collectAtTargets(session)) {
+            const url = await fetchAvatarUrl(session, target.id);
+            if (url) images.push(url);
+          }
+        }
+        if (avatarCfg.autoSelf && !images.length) {
+          const url = await fetchAvatarUrl(session, session.userId);
+          if (url) images.push(url);
+        }
+      }
       const remaining = Math.max(0, maxImages - images.length);
       if (remaining > 0) {
         const [msgId] = await session.send(
@@ -2288,6 +2553,33 @@ ${lines.join("\n")}`]);
       if (!content) return "";
       return import_koishi.h.select(content, "text").map((el) => el.attrs.content || "").join(" ").trim();
     }
+    function collectAtTargets(session) {
+      const raw = String(session?.content || session.stripped?.content || "");
+      return extractAtIds(raw, session.selfId);
+    }
+    async function fetchAvatarUrl(session, userId) {
+      if (!userId) return "";
+      const cfg = config.avatar || {};
+      const own = userId === session.userId;
+      const url = buildAvatarUrl({
+        userId,
+        platform: session.platform,
+        selfId: session.selfId,
+        appId: session?.bot?.config?.id,
+        authorAvatar: own ? String(session?.author?.avatar || "") : "",
+        template: cfg.urlTemplate,
+        size: Number(cfg.size) > 0 ? Number(cfg.size) : 640
+      });
+      if (url) return url;
+      try {
+        const member = session.guildId ? await session.bot?.getGuildMember?.(session.guildId, userId) : null;
+        const got = member?.avatar || member?.user?.avatar;
+        if (got) return String(got);
+      } catch (error) {
+        logInfo2(`\u5411\u9002\u914D\u5668\u7D22\u53D6\u5934\u50CF\u5931\u8D25: ${error}`);
+      }
+      return "";
+    }
     function extractImagesFromSession(session) {
       const images = [];
       const currentImages = extractImagesFromMessage(session.stripped.content);
@@ -2453,12 +2745,14 @@ ${lines.join("\n")}`]);
   Config,
   apply,
   buildAgentTools,
+  buildAvatarUrl,
   buildMarkdownImage,
   buildPromptBlock,
   buildPromptEcho,
   cleanAskMessage,
   computeRetryDelay,
   describeSelectorError,
+  extractAtIds,
   extractJsonObject,
   extractResponseText,
   extractServerMessage,
@@ -2470,6 +2764,7 @@ ${lines.join("\n")}`]);
   mergePrompt,
   name,
   parseJsonToolCall,
+  parsePolishIntent,
   parseRetryAfterHeader,
   pickAgentMessage,
   previewJson,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-image-prompt",
   "description": "多功能 AI 图像处理插件：Agent 模式把「查不查图库 / 要不要追问 / 什么时候开画」全交给模型自己决定，支持手办化、Coser 化、Minecraft 化等 47 种风格与自定义提示词",
-  "version": "2.0.4",
+  "version": "2.1.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [