koishi-plugin-dify-ai 0.1.6 → 0.1.7

package/lib/index.js

@@ -165,7 +165,8 @@ var uploadSchema = import_koishi.Schema.union([
     mode: import_koishi.Schema.const("on").required(),
     maxCount: import_koishi.Schema.natural().default(0).description("数量上限，0 不限"),
     maxSizeMb: import_koishi.Schema.natural().default(0).description("单文件大小上限 MB，0 不限")
-  }).default({ mode: "on", maxCount: 0, maxSizeMb: 0 }).description("开启")
+  }).default({ mode: "on", maxCount: 0, maxSizeMb: 0 }).description("开启"),
+  import_koishi.Schema.boolean().description("旧版开关")
 ]);
 var Config = import_koishi.Schema.intersect([
   import_koishi.Schema.object({
@@ -316,14 +317,14 @@ function toVariable(entry) {
   }
   if (entry.source === "meta") {
     if (entry.key === "none") return null;
-    return { field, source: { type: "meta", key: entry.key || "triggerType" } };
+    return { field, source: { type: "meta", key: entry.key } };
   }
   if (entry.source === "history") {
     const limit = Number(entry.limit);
     return { field, source: { type: "history", ...limit > 0 ? { limit } : {} } };
   }
   if (entry.key === "none" || entry.key === "history") return null;
-  return { field, source: { type: "session", key: entry.key || "content" } };
+  return { field, source: { type: "session", key: entry.key } };
 }
 __name(toVariable, "toVariable");
 function resolveUploadConfig(config) {
@@ -333,34 +334,29 @@ function resolveUploadConfig(config) {
   if (config.uploadFiles?.mode === "off") return { enabled: false, maxCount: 0, maxMb: 0 };
   return {
     enabled: true,
-    maxCount: Math.max(0, Number(config.uploadFiles?.maxCount) || 0),
-    maxMb: Math.max(0, Number(config.uploadFiles?.maxSizeMb) || 0)
+    maxCount: Number(config.uploadFiles?.maxCount) || 0,
+    maxMb: Number(config.uploadFiles?.maxSizeMb) || 0
   };
 }
 __name(resolveUploadConfig, "resolveUploadConfig");
 function resolveQuoteConfig(config) {
-  if (config.quote?.mode === "off") return { enabled: false, minElapsedSeconds: 0 };
-  if (config.quote?.mode === "on") {
-    return { enabled: true, minElapsedSeconds: Math.max(0, Number(config.quote.minElapsedSeconds) || 0) };
+  const quote = config.quote;
+  const isDefaultQuote = !quote || quote.mode === "on" && !(Number(quote.minElapsedSeconds) > 0);
+  if (typeof config.quoteTrigger === "boolean" && isDefaultQuote) {
+    return { enabled: config.quoteTrigger, minElapsedSeconds: 0 };
   }
-  if (config.quoteTrigger === false) return { enabled: false, minElapsedSeconds: 0 };
-  return { enabled: true, minElapsedSeconds: 0 };
+  if (quote?.mode === "off") return { enabled: false, minElapsedSeconds: 0 };
+  return { enabled: true, minElapsedSeconds: Number(quote?.minElapsedSeconds) || 0 };
 }
 __name(resolveQuoteConfig, "resolveQuoteConfig");
 function toCooldown(entry) {
   if (entry?.mode === "fixed") {
-    const seconds = Number(entry.seconds);
-    return seconds > 0 ? { mode: "fixed", ms: seconds * 1e3 } : null;
+    return { mode: "fixed", ms: Number(entry.seconds) * 1e3 };
   }
   if (entry?.mode === "sliding") {
     const minSeconds = Number(entry.minSeconds);
     const maxSeconds = Number(entry.maxSeconds);
-    if (!(minSeconds > 0) || !(maxSeconds > 0)) return null;
-    return {
-      mode: "sliding",
-      minMs: minSeconds * 1e3,
-      maxMs: Math.max(minSeconds, maxSeconds) * 1e3
-    };
+    return { mode: "sliding", minMs: minSeconds * 1e3, maxMs: Math.max(minSeconds, maxSeconds) * 1e3 };
   }
   return null;
 }
@@ -371,12 +367,16 @@ function normalizeConfig(config) {
     if (app.name?.trim() && !apps.has(app.name)) apps.set(app.name, app);
   }
   const rules = [];
+  const seenNames = /* @__PURE__ */ new Set();
   for (const entry of config.rules ?? []) {
     if (!entry.name?.trim() || entry.enabled === false) continue;
+    const name2 = entry.name.trim();
+    if (seenNames.has(name2)) continue;
+    seenNames.add(name2);
     const conditions = (entry.conditions ?? []).filter((condition) => condition != null).map(toCondition).filter((condition) => condition != null);
     const variables = (entry.variables ?? []).filter((variable) => variable != null).map(toVariable).filter((variable) => variable != null);
     rules.push({
-      name: entry.name.trim(),
+      name: name2,
       enabled: true,
       priority: Number(entry.priority) || 0,
       app: entry.app?.trim() ?? "",
@@ -449,9 +449,6 @@ var DifyClient = class {
   getAppInfo() {
     return this.request("GET", "/info");
   }
-  getParameters() {
-    return this.request("GET", "/parameters");
-  }
   /** chat / agent-chat / advanced-chat（conversation_id 传空串表示新建会话） */
   runChat(body) {
     return this.request("POST", "/chat-messages", body);
@@ -500,6 +497,7 @@ __name(createDifyClient, "createDifyClient");
 // src/utils/session-text.ts
 var import_crypto = require("crypto");
 var import_koishi2 = require("koishi");
+var IMAGE_HASH_LENGTH = 8;
 function parseTextSafe(content) {
   if (!content) return "";
   try {
@@ -519,7 +517,7 @@ __name(extractText, "extractText");
 var IMAGE_PLACEHOLDER = "[图片]";
 function imagePlaceholder(url) {
   if (!url) return IMAGE_PLACEHOLDER;
-  return `[image:${(0, import_crypto.createHash)("sha1").update(url).digest("hex").slice(0, 8)}]`;
+  return `[image:${(0, import_crypto.createHash)("sha1").update(url).digest("hex").slice(0, IMAGE_HASH_LENGTH)}]`;
 }
 __name(imagePlaceholder, "imagePlaceholder");
 function annotateDroppedPlaceholders(text, droppedUrls) {
@@ -531,20 +529,23 @@ function annotateDroppedPlaceholders(text, droppedUrls) {
   return result;
 }
 __name(annotateDroppedPlaceholders, "annotateDroppedPlaceholders");
-function extractTextWithPlaceholders(session) {
-  const elements = session.elements?.length ? session.elements : (() => {
-    try {
-      return import_koishi2.h.parse(session.content ?? "");
-    } catch {
-      return [];
-    }
-  })();
+function elementsOf(session) {
+  if (session.elements?.length) return session.elements;
+  try {
+    return import_koishi2.h.parse(session.content ?? "");
+  } catch {
+    return [];
+  }
+}
+__name(elementsOf, "elementsOf");
+function extractTextWithPlaceholders(session, options = {}) {
   const parts = [];
-  for (const element of elements) {
+  for (const element of elementsOf(session)) {
     if (element.type === "text") {
       const text = element.attrs?.["content"] ?? "";
       if (text) parts.push(text);
     } else if (element.type === "at") {
+      if (options.excludeBotAt && element.attrs?.["id"] === session.selfId) continue;
       const name2 = element.attrs?.["name"] ?? element.attrs?.["id"];
       if (name2) parts.push(`@${name2}`);
     } else if (element.type === "img" || element.type === "image") {
@@ -554,6 +555,16 @@ function extractTextWithPlaceholders(session) {
   return parts.join(" ").replace(/\s+/g, " ").trim();
 }
 __name(extractTextWithPlaceholders, "extractTextWithPlaceholders");
+function extractImageUrls(session) {
+  const urls = [];
+  for (const element of elementsOf(session)) {
+    if (element.type !== "img" && element.type !== "image") continue;
+    const source = element.attrs?.["url"] ?? element.attrs?.["src"];
+    if (typeof source === "string" && source) urls.push(source);
+  }
+  return urls;
+}
+__name(extractImageUrls, "extractImageUrls");
 
 // src/history.ts
 var HISTORY_CAPACITY_MULTIPLIER = 2;
@@ -575,7 +586,7 @@ function formatHistoryEntries(entries) {
 }
 __name(formatHistoryEntries, "formatHistoryEntries");
 function formatHistoryBrief(entries) {
-  return entries.map((entry) => entry.messageId ? `[msg:${entry.messageId}] ${entry.content}` : entry.content).join("\n");
+  return entries.map((entry) => entry.messageId ? `[msg:${entry.messageId}] ${entry.contentText}` : entry.contentText).join("\n");
 }
 __name(formatHistoryBrief, "formatHistoryBrief");
 function buildQuote(session) {
@@ -592,12 +603,15 @@ __name(buildQuote, "buildQuote");
 function buildHistoryEntry(session, role = "user") {
   const content = extractTextWithPlaceholders(session);
   if (!content) return null;
+  const imageUrls = extractImageUrls(session);
   return {
     role,
     userId: role === "assistant" ? session.selfId : session.userId ?? "未知用户",
-    username: role === "assistant" ? "你自己的发言" : session.username || session.userId || "用户",
+    username: role === "assistant" ? "你自己的发言" : session.username || session.userId,
     messageId: session.messageId,
     content,
+    contentText: extractTextWithPlaceholders(session, { excludeBotAt: true }),
+    ...imageUrls.length ? { imageUrls } : {},
     timestamp: session.timestamp ?? Date.now(),
     quote: role === "user" ? buildQuote(session) : void 0
   };
@@ -635,41 +649,49 @@ function hasAt(session, id) {
   return session.elements?.some((element) => element.type === "at" && element.attrs?.["id"] === id) ?? false;
 }
 __name(hasAt, "hasAt");
+var NON_TEXT_PREFIX = new RegExp(`^(?:@\\S+|\\[image:[0-9a-f]{${IMAGE_HASH_LENGTH}}\\]|\\[图片\\]|\\s)*`);
+function stripPrefixKeyword(verbatim, keyword) {
+  const prefix = NON_TEXT_PREFIX.exec(verbatim)?.[0] ?? "";
+  const rest = verbatim.slice(prefix.length);
+  if (!rest.startsWith(keyword)) return null;
+  return (prefix + rest.slice(keyword.length)).trim();
+}
+__name(stripPrefixKeyword, "stripPrefixKeyword");
 function evaluateCondition(condition, session) {
   const text = extractText(session);
-  const verbatim = extractTextWithPlaceholders(session);
+  const verbatim = extractTextWithPlaceholders(session, { excludeBotAt: true });
   switch (condition.type) {
     case "keyword-prefix": {
       const keyword = condition.keywords.find((k) => k && text.startsWith(k));
       if (!keyword) return null;
-      const rest = text.slice(keyword.length).trim();
-      return { type: "keyword-prefix", queryText: rest || verbatim };
+      const rest = verbatim.startsWith(keyword) ? verbatim.slice(keyword.length).trim() : stripPrefixKeyword(verbatim, keyword) ?? text.slice(keyword.length).trim();
+      return { type: "keyword-prefix", contentText: rest || verbatim };
     }
     case "keyword-contains": {
       const keyword = condition.keywords.find((k) => k && text.includes(k));
       if (!keyword) return null;
-      return { type: "keyword-contains", queryText: verbatim };
+      return { type: "keyword-contains", contentText: verbatim };
     }
     case "at-bot": {
       const botId = session.bot?.userId;
       if (!botId) return null;
       if (!session.stripped?.atSelf && !hasAt(session, botId)) return null;
-      return { type: "at-bot", queryText: verbatim };
+      return { type: "at-bot", contentText: verbatim };
     }
     case "at-user": {
       const isAtAnyUser = condition.userIds.some((id) => hasAt(session, id));
       if (!isAtAnyUser) return null;
-      return { type: "at-user", queryText: verbatim };
+      return { type: "at-user", contentText: verbatim };
     }
     case "quote-bot": {
       const botId = session.bot?.userId;
       if (!botId || session.quote?.user?.id !== botId) return null;
-      return { type: "quote-bot", queryText: verbatim };
+      return { type: "quote-bot", contentText: verbatim };
     }
     case "quote-user": {
       const author = session.quote?.user?.id;
       if (!author || !condition.userIds.includes(author)) return null;
-      return { type: "quote-user", queryText: verbatim };
+      return { type: "quote-user", contentText: verbatim };
     }
     default:
       return null;
@@ -808,13 +830,7 @@ var RuleScheduler = class {
   }
   entries = [];
   sync(rules) {
-    const previous = new Map(this.entries.map((entry) => [entry.rule.name, entry.nextRunAt]));
-    const nextEntries = [];
-    for (const rule of rules) {
-      const nextRunAt = previous.get(rule.name) ?? this.computeNextRun(rule);
-      if (nextRunAt != null) nextEntries.push({ rule, nextRunAt });
-    }
-    this.entries = nextEntries;
+    this.entries = rules.map((rule) => ({ rule, nextRunAt: this.computeNextRun(rule) })).filter((entry) => entry.nextRunAt != null);
   }
   tick() {
     const now = Date.now();
@@ -864,8 +880,9 @@ var RuleScheduler = class {
 
 // src/trigger/cooldown.ts
 var BUFFER_CAPACITY = 1024;
+var DENSITY_LANE_PREFIX = "density:";
 function densityLane(index) {
-  return `density:${index}`;
+  return `${DENSITY_LANE_PREFIX}${index}`;
 }
 __name(densityLane, "densityLane");
 function laneKeyOf(ruleName, lane) {
@@ -896,30 +913,33 @@ var TriggerCooldown = class {
     });
   }
   isCooling(channelKey, ruleName, lane, now) {
-    const state = this.lanesOf(channelKey).get(laneKeyOf(ruleName, lane));
+    const state = this.channels.get(channelKey)?.get(laneKeyOf(ruleName, lane));
     return state != null && now < state.deadline;
   }
-  /** 滑动窗口顺延：截止时间顺延到「now + 最小窗口」，不超过「触发时刻 + 最大窗口」 */
-  extend(channelKey, ruleName, lane, now) {
-    if (this.setting?.mode !== "sliding") return;
-    const state = this.lanesOf(channelKey).get(laneKeyOf(ruleName, lane));
-    if (!state) return;
+  /** 滑动窗口顺延：截止推到「now + 最小窗口」，不超过「触发时刻 + 最大窗口」 */
+  slide(state, setting, now) {
     state.deadline = Math.min(
-      Math.max(state.deadline, now + this.setting.minMs),
-      state.fireAt + this.setting.maxMs
+      Math.max(state.deadline, now + setting.minMs),
+      state.fireAt + setting.maxMs
     );
   }
-  /** 该频道所有密度通道由一条过路消息顺延（密度冷却期内的消息积攒驱动窗口滑动） */
+  /** 滑动窗口顺延：已到期的通道不复活 */
+  extend(channelKey, ruleName, lane, now) {
+    const setting = this.setting;
+    if (setting?.mode !== "sliding") return;
+    const state = this.channels.get(channelKey)?.get(laneKeyOf(ruleName, lane));
+    if (!state || now >= state.deadline) return;
+    this.slide(state, setting, now);
+  }
+  /** 该频道所有密度通道由一条过路消息顺延（密度冷却期内的消息积攒驱动窗口滑动）；已到期的不复活 */
   extendDensityLanes(channelKey, now) {
-    if (this.setting?.mode !== "sliding") return;
+    const setting = this.setting;
+    if (setting?.mode !== "sliding") return;
     const lanes = this.channels.get(channelKey);
     if (!lanes) return;
     for (const [key, state] of lanes) {
-      if (!key.includes("\ndensity:")) continue;
-      state.deadline = Math.min(
-        Math.max(state.deadline, now + this.setting.minMs),
-        state.fireAt + this.setting.maxMs
-      );
+      if (!key.includes("\ndensity:") || now >= state.deadline) continue;
+      this.slide(state, setting, now);
     }
   }
   /** 冷却期内缓存一条命中消息（仅消息通道） */
@@ -931,22 +951,24 @@ var TriggerCooldown = class {
       state.buffer.splice(0, state.buffer.length - BUFFER_CAPACITY);
     }
   }
-  /** 到期扫描：取走全部到期通道（连缓冲一并交出），由调用方决定是否重新登记 */
-  collectExpired(now) {
+  /** 到期扫描：取走到期通道（连缓冲一并交出），由调用方决定是否重新登记；限定频道时只扫该频道 */
+  collectExpired(now, channelKey) {
     const expired = [];
-    for (const [channelKey, lanes] of this.channels) {
-      for (const [key, state] of lanes) {
+    const targets = channelKey ? [[channelKey, this.channels.get(channelKey)]] : this.channels;
+    for (const [key, lanes] of targets) {
+      if (!lanes) continue;
+      for (const [laneKey, state] of lanes) {
         if (now < state.deadline) continue;
-        const separator = key.indexOf("\n");
-        lanes.delete(key);
+        const separator = laneKey.indexOf("\n");
+        lanes.delete(laneKey);
         expired.push({
-          channelKey,
-          ruleName: key.slice(0, separator),
-          lane: key.slice(separator + 1),
+          channelKey: key,
+          ruleName: laneKey.slice(0, separator),
+          lane: laneKey.slice(separator + 1),
           buffer: state.buffer
         });
       }
-      if (!lanes.size) this.channels.delete(channelKey);
+      if (!lanes.size) this.channels.delete(key);
     }
     return expired;
   }
@@ -962,6 +984,29 @@ var TriggerCooldown = class {
 
 // src/trigger/engine.ts
 var SCHEDULER_TICK_MS = 1e3;
+function collectImageUrls(entries) {
+  return entries.flatMap((entry) => entry?.role === "user" ? entry.imageUrls ?? [] : []);
+}
+__name(collectImageUrls, "collectImageUrls");
+function sessionIdentityOf(session) {
+  return {
+    platform: session.platform,
+    selfId: session.selfId,
+    channelId: session.channelId,
+    guildId: session.guildId ?? session.channelId,
+    userId: session.userId
+  };
+}
+__name(sessionIdentityOf, "sessionIdentityOf");
+function poolIdentityOf(channel) {
+  return {
+    platform: channel.platform,
+    selfId: channel.selfId,
+    channelId: channel.channelId,
+    guildId: channel.guildId
+  };
+}
+__name(poolIdentityOf, "poolIdentityOf");
 var TriggerEngine = class {
   constructor(ctx, runner, history, rules, cooldown) {
     this.ctx = ctx;
@@ -998,6 +1043,7 @@ var TriggerEngine = class {
     if (this.ctx.bots[session.uid]) return next();
     if (!session.channelId) return next();
     const channelKey = channelKeyOf(session.platform, session.channelId);
+    this.tickCooldown(channelKey);
     const entry = buildHistoryEntry(session);
     if (entry) {
       this.history.recordEntry(channelKey, entry);
@@ -1013,13 +1059,14 @@ var TriggerEngine = class {
       }
     }
     return next(async (nextMiddleware) => {
+      this.tickCooldown(channelKey);
       const matched = this.matchRule(session);
       if (!matched) return nextMiddleware();
       if (this.cooldown.isCooling(channelKey, matched.rule.name, "message", Date.now())) {
         this.cooldown.bufferMessage(channelKey, matched.rule.name, {
           session,
           entry,
-          contentText: matched.condition.queryText
+          contentText: matched.condition.contentText
         });
         this.cooldown.extend(channelKey, matched.rule.name, "message", Date.now());
         return;
@@ -1050,31 +1097,24 @@ var TriggerEngine = class {
     this.beginCooldown(channelKeyOf(session.platform, session.channelId), rule.name, "message");
     this.run({
       session,
-      platform: session.platform,
-      selfId: session.selfId,
-      channelId: session.channelId,
-      guildId: session.guildId ?? session.channelId,
-      userId: session.userId,
+      ...sessionIdentityOf(session),
       triggerType: condition.type,
       rule,
       // query 为该条消息的统一格式单行；纯 @ / 纯引用等无文本消息 entry 为空，由请求器占位兜底
       queryText: entry ? formatHistoryEntry(entry) : "",
-      contentText: condition.queryText
+      contentText: condition.contentText
     });
   }
   fireDensity(fire, session) {
     this.beginCooldown(channelKeyOf(session.platform, session.channelId), fire.rule.name, densityLane(fire.conditionIndex));
     this.run({
       session,
-      platform: session.platform,
-      selfId: session.selfId,
-      channelId: session.channelId,
-      guildId: session.guildId ?? session.channelId,
-      userId: session.userId,
+      ...sessionIdentityOf(session),
       triggerType: "density",
       rule: fire.rule,
       queryText: formatHistoryEntries(fire.entries),
-      contentText: formatHistoryBrief(fire.entries)
+      contentText: formatHistoryBrief(fire.entries),
+      imageUrls: collectImageUrls(fire.entries)
     });
   }
   /** 冷却到期：把缓冲内的触发消息合并为一次触发，session 取首条（供投递与文件上传） */
@@ -1085,29 +1125,37 @@ var TriggerEngine = class {
     this.beginCooldown(channelKeyOf(first.session.platform, first.session.channelId), rule.name, "message");
     this.run({
       session: first.session,
-      platform: first.session.platform,
-      selfId: first.session.selfId,
-      channelId: first.session.channelId,
-      guildId: first.session.guildId ?? first.session.channelId,
-      userId: first.session.userId,
+      ...sessionIdentityOf(first.session),
       triggerType: "merged",
       rule,
       queryText,
-      contentText
+      contentText,
+      // 补齐缓冲内非首条消息的图片（首条由 session 元素提取，重复由上传入口去重）
+      imageUrls: collectImageUrls(buffer.map((item) => item.entry))
     });
   }
   /** 密度冷却到期复查达标：无当前消息，用池身份构造上下文（投递同定时路径） */
-  fireDensityExpiry(rule, conditionIndex, channel) {
+  fireDensityExpiry(rule, conditionIndex, channel, now) {
     this.beginCooldown(channelKeyOf(channel.platform, channel.channelId), rule.name, densityLane(conditionIndex));
+    const condition = rule.conditions[conditionIndex];
+    const windowMs = condition.type === "density" ? condition.densityWindowSeconds * 1e3 : 0;
+    let userId;
+    for (let i = channel.entries.length - 1; i >= 0; i--) {
+      const item = channel.entries[i];
+      if (item.role === "user" && now - item.timestamp <= windowMs) {
+        userId = item.userId;
+        break;
+      }
+    }
     this.run({
-      platform: channel.platform,
-      selfId: channel.selfId,
-      channelId: channel.channelId,
-      guildId: channel.guildId,
+      ...poolIdentityOf(channel),
+      userId,
       triggerType: "density",
       rule,
       queryText: formatHistoryEntries(channel.entries),
-      contentText: formatHistoryBrief(channel.entries)
+      contentText: formatHistoryBrief(channel.entries),
+      imageUrls: collectImageUrls(channel.entries),
+      isDirect: channel.isDirect
     });
   }
   /**
@@ -1117,22 +1165,21 @@ var TriggerEngine = class {
   fireSchedule(rule) {
     for (const channel of this.pool.takeSchedule(rule)) {
       this.run({
-        platform: channel.platform,
-        selfId: channel.selfId,
-        channelId: channel.channelId,
-        guildId: channel.guildId,
+        ...poolIdentityOf(channel),
         triggerType: "schedule",
         rule,
         queryText: formatHistoryEntries(channel.entries),
-        contentText: formatHistoryBrief(channel.entries)
+        contentText: formatHistoryBrief(channel.entries),
+        imageUrls: collectImageUrls(channel.entries),
+        isDirect: channel.isDirect
       });
     }
   }
-  /** 每秒扫描冷却到期：消息通道合并触发，密度通道复查池 */
-  tickCooldown() {
+  /** 扫描冷却到期（带频道只扫该频道，消息路径用；每秒 interval 全量扫描）：消息通道合并触发，密度通道复查池 */
+  tickCooldown(channelKey) {
     if (!this.cooldown.enabled) return;
     const now = Date.now();
-    for (const expired of this.cooldown.collectExpired(now)) {
+    for (const expired of this.cooldown.collectExpired(now, channelKey)) {
       this.onCooldownExpired(expired, now);
     }
   }
@@ -1143,11 +1190,11 @@ var TriggerEngine = class {
       if (expired.buffer.length) this.fireMerged(rule, expired.buffer);
       return;
     }
-    const index = Number(expired.lane.slice("density:".length));
+    const index = Number(expired.lane.slice(DENSITY_LANE_PREFIX.length));
     const condition = rule.conditions[index];
     if (condition?.type !== "density") return;
     const channel = this.pool.takeDensityChannel(rule, condition, expired.channelKey, now);
-    if (channel) this.fireDensityExpiry(rule, index, channel);
+    if (channel) this.fireDensityExpiry(rule, index, channel, now);
   }
 };
 
@@ -1239,11 +1286,26 @@ function extractFileCandidates(session) {
   return candidates;
 }
 __name(extractFileCandidates, "extractFileCandidates");
+function percentDecodeBytes(input) {
+  const bytes = [];
+  for (let i = 0; i < input.length; i++) {
+    const char = input[i];
+    if (char === "%" && /^[0-9a-fA-F]{2}$/.test(input.slice(i + 1, i + 3))) {
+      bytes.push(parseInt(input.slice(i + 1, i + 3), 16));
+      i += 2;
+    } else {
+      bytes.push(char.charCodeAt(0) & 255);
+    }
+  }
+  return Buffer.from(bytes);
+}
+__name(percentDecodeBytes, "percentDecodeBytes");
 function parseDataUrl(source) {
-  const match = source.match(/^data:([^;]+);base64,(.+)$/);
+  const match = source.match(/^data:([^;,]*)((?:;[^;,]*)*)?,(.+)$/);
   if (!match) return null;
-  const mimeType = match[1];
-  const buffer = Buffer.from(match[2], "base64");
+  const mimeType = match[1] || "application/octet-stream";
+  const isBase64 = /(?:^|;)base64/.test(match[2] ?? "");
+  const buffer = isBase64 ? Buffer.from(match[3], "base64") : percentDecodeBytes(match[3]);
   return { buffer, fileName: `file.${guessExtension(mimeType)}`, mimeType };
 }
 __name(parseDataUrl, "parseDataUrl");
@@ -1317,19 +1379,28 @@ async function uploadOne(ctx, client, candidate, difyUser, limit) {
   }
 }
 __name(uploadOne, "uploadOne");
-async function uploadMessageFiles(ctx, client, session, difyUser, limit) {
-  const candidates = extractFileCandidates(session);
-  const limited = limit.maxCount > 0 ? candidates.slice(0, limit.maxCount) : candidates;
-  const dropped = candidates.slice(limited.length).map((candidate) => candidate.source);
+async function uploadCandidates(ctx, client, candidates, difyUser, limit) {
+  const seen = /* @__PURE__ */ new Set();
+  const unique = candidates.filter((candidate) => {
+    if (seen.has(candidate.source)) return false;
+    seen.add(candidate.source);
+    return true;
+  });
+  const limited = limit.maxCount > 0 ? unique.slice(0, limit.maxCount) : unique;
+  const dropped = [];
+  const markDropped = /* @__PURE__ */ __name((source) => {
+    if (!dropped.includes(source)) dropped.push(source);
+  }, "markDropped");
+  unique.slice(limited.length).forEach((candidate) => markDropped(candidate.source));
   const files = [];
   for (const candidate of limited) {
     const uploaded = await uploadOne(ctx, client, candidate, difyUser, limit);
     if (uploaded) files.push(uploaded);
-    else dropped.push(candidate.source);
+    else markDropped(candidate.source);
   }
   return { files, dropped };
 }
-__name(uploadMessageFiles, "uploadMessageFiles");
+__name(uploadCandidates, "uploadCandidates");
 
 // src/requester/variables.ts
 function resolveSessionField(key, fireCtx, now) {
@@ -1358,7 +1429,7 @@ function resolveSessionField(key, fireCtx, now) {
     case "timestamp":
       return now;
     case "isDirect":
-      return session?.isDirect ?? false;
+      return session?.isDirect ?? fireCtx.isDirect ?? false;
     default:
       return "";
   }
@@ -1440,7 +1511,7 @@ ${line}` : line;
 __name(splitText, "splitText");
 function renderReply(input) {
   const messages = [];
-  const segments = splitText(input.text, input.config.maxSegmentLength ?? 0);
+  const segments = splitText(input.text, input.config.maxSegmentLength);
   segments.forEach((segment, index) => {
     const elements = [];
     if (index === 0 && input.quoteMessageId) {
@@ -1496,6 +1567,7 @@ function extractTextOutputs(outputs) {
 __name(extractTextOutputs, "extractTextOutputs");
 function parseWorkflowResponse(response) {
   const data = response.data;
+  if (!data) throw new DifyApiError("workflow 响应缺少 data", 200);
   if (data.error) throw new DifyApiError(data.error, 200);
   if (data.status && !SUCCESS_STATUSES.includes(data.status)) {
     throw new DifyApiError(`workflow ${data.status}`, 200);
@@ -1538,11 +1610,13 @@ var RequestRunner = class {
       uploadedFiles: []
     };
     const upload = resolveUploadConfig(this.config);
-    if (upload.enabled && fireCtx.session) {
-      const { files, dropped } = await uploadMessageFiles(
+    if (upload.enabled) {
+      const sessionCandidates = fireCtx.session ? extractFileCandidates(fireCtx.session) : [];
+      const urlCandidates = (fireCtx.imageUrls ?? []).filter((url) => !sessionCandidates.some((candidate) => candidate.source === url)).map((url) => ({ source: url, type: "image" }));
+      const { files, dropped } = await uploadCandidates(
         this.ctx,
         client,
-        fireCtx.session,
+        [...sessionCandidates, ...urlCandidates],
         requestCtx.difyUser,
         { maxCount: upload.maxCount, maxSizeMb: upload.maxMb }
       );
@@ -1566,17 +1640,20 @@ var RequestRunner = class {
       this.ctx.logger.warn("规则 %s 的请求未返回任何内容", rule.name);
       return;
     }
-    const quote = resolveQuoteConfig(this.config);
-    const elapsedSeconds = (Date.now() - startedAt) / 1e3;
-    const shouldQuote = quote.enabled && elapsedSeconds >= quote.minElapsedSeconds && isMessageTrigger(fireCtx.triggerType);
     const messages = renderReply({
       text: reply.text,
       files: reply.files,
-      quoteMessageId: shouldQuote ? fireCtx.session?.messageId : void 0,
+      quoteMessageId: this.shouldQuoteReply(fireCtx, startedAt) ? fireCtx.session?.messageId : void 0,
       config: this.config
     });
     await this.deliver(fireCtx, messages);
   }
+  /** 引用判定：开关开启、回复耗时达到阈值、且由消息触发（定时与密度没有单一触发消息） */
+  shouldQuoteReply(fireCtx, startedAt) {
+    const quote = resolveQuoteConfig(this.config);
+    if (!quote.enabled) return false;
+    return (Date.now() - startedAt) / 1e3 >= quote.minElapsedSeconds && isMessageTrigger(fireCtx.triggerType);
+  }
   /** 按应用类型分流：workflow/completion 无会话，chat 系续接 conversation_id */
   async dispatch(app, client, fireCtx, requestCtx) {
     const base = {
@@ -1614,7 +1691,8 @@ var RequestRunner = class {
       }
       return;
     }
-    const bot = Object.values(this.ctx.bots).find((b) => b.platform === fireCtx.platform);
+    const bots = Object.values(this.ctx.bots);
+    const bot = bots.find((b) => b.platform === fireCtx.platform && b.selfId === fireCtx.selfId) ?? bots.find((b) => b.platform === fireCtx.platform);
     if (!bot) {
       this.ctx.logger.warn("平台 %s 上没有可用 bot，无法发送主动消息", fireCtx.platform);
       return;
@@ -1636,7 +1714,7 @@ var ConversationStore = class {
   }
   /** 粒度归一：bindingKey 与 difyUser 共用，保证两者始终对齐 */
   resolveScopeDimension(rule, fireCtx) {
-    if (fireCtx.session?.isDirect || rule.conversationScope === "per-user") return "user";
+    if (this.isDirectOf(fireCtx) || rule.conversationScope === "per-user") return "user";
     switch (rule.conversationScope) {
       case "global":
         return "global";
@@ -1646,13 +1724,17 @@ var ConversationStore = class {
         return "guild";
     }
   }
+  /** 私聊判定：有 session 读 session，无 session 的主动触发读池透传的标记 */
+  isDirectOf(fireCtx) {
+    return fireCtx.session?.isDirect ?? fireCtx.isDirect ?? false;
+  }
   /** bindingKey = 应用 ID + 粒度 + 平台身份 */
   computeBindingKey(appId, rule, fireCtx) {
     const base = `${appId}:${fireCtx.platform}:${fireCtx.selfId}`;
     switch (this.resolveScopeDimension(rule, fireCtx)) {
       // 群内按「群+用户」区分；私聊用 private 段占位
       case "user":
-        return fireCtx.session?.isDirect ? `${base}:private:${fireCtx.userId ?? fireCtx.channelId}` : `${base}:user:${fireCtx.guildId ?? fireCtx.channelId}:${fireCtx.userId ?? fireCtx.channelId}`;
+        return this.isDirectOf(fireCtx) ? `${base}:private:${fireCtx.userId ?? fireCtx.channelId}` : `${base}:user:${fireCtx.guildId ?? fireCtx.channelId}:${fireCtx.userId ?? fireCtx.channelId}`;
       case "guild":
         return `${base}:guild:${fireCtx.guildId ?? fireCtx.channelId}`;
       case "channel":
@@ -1669,7 +1751,7 @@ var ConversationStore = class {
   computeDifyUser(rule, fireCtx) {
     switch (this.resolveScopeDimension(rule, fireCtx)) {
       case "user":
-        return fireCtx.session?.isDirect ? `koishi:${fireCtx.platform}:private:${fireCtx.userId ?? fireCtx.channelId}` : `koishi:${fireCtx.platform}:${fireCtx.guildId ?? fireCtx.channelId}:${fireCtx.userId ?? fireCtx.channelId}`;
+        return this.isDirectOf(fireCtx) ? `koishi:${fireCtx.platform}:private:${fireCtx.userId ?? fireCtx.channelId}` : `koishi:${fireCtx.platform}:${fireCtx.guildId ?? fireCtx.channelId}:${fireCtx.userId ?? fireCtx.channelId}`;
       case "guild":
         return `koishi:${fireCtx.platform}:${fireCtx.guildId ?? fireCtx.channelId}`;
       case "channel":
@@ -1709,16 +1791,25 @@ var ConversationStore = class {
   /**
    * 重置匹配的绑定：本地删行 + 尽力删除 Dify 侧会话（失败仅记录）。
    * 表已无 guildKey 列，按频道匹配时全表读回后解析 bindingKey 过滤（行数量级很小）。
+   * 覆盖 guild / user（群内）/ channel 段与私聊执行时的 private 段；
+   * global 段跨频道，不随单频道重置。
    */
   async resetWhere(filter) {
     const rows = await this.ctx.database.get("dify_conversation", {});
+    const splitKey = /* @__PURE__ */ __name((key) => {
+      const separator = key.indexOf(":");
+      return separator < 0 ? [key, ""] : [key.slice(0, separator), key.slice(separator + 1)];
+    }, "splitKey");
+    const [guildPlatform, guildId] = splitKey(filter.guildKey ?? "");
+    const [channelPlatform, channelId] = splitKey(filter.channelKey ?? "");
     const matched = rows.filter((row) => {
       if (filter.bindingKey) return row.bindingKey === filter.bindingKey;
       const { platform, scope, ids } = this.parseBindingKey(row.bindingKey);
-      const [guildPlatform, guildId] = (filter.guildKey ?? "").split(":");
       if (platform !== guildPlatform) return false;
       if (scope === "guild") return ids[0] === guildId;
       if (scope === "user") return ids.length === 2 ? ids[0] === guildId : false;
+      if (scope === "channel") return platform === channelPlatform && ids[0] === channelId;
+      if (scope === "private") return filter.isDirect === true && ids[0] === filter.userId;
       return false;
     });
     let reset = 0;
@@ -1761,8 +1852,12 @@ __name(defineTables, "defineTables");
 // src/commands/misc.ts
 function registerMiscCommands(parent, conversationStore) {
   parent.subcommand(".conv.reset", { authority: 3 }).action(async ({ session }) => {
-    const guildKey = guildKeyOf(session.platform, session.guildId, session.channelId);
-    const reset = await conversationStore.resetWhere({ guildKey });
+    const reset = await conversationStore.resetWhere({
+      guildKey: guildKeyOf(session.platform, session.guildId, session.channelId),
+      channelKey: channelKeyOf(session.platform, session.channelId),
+      isDirect: session.isDirect,
+      userId: session.userId
+    });
     if (!reset) return session.text("dify-ai.commands.conv-empty");
     return session.text("dify-ai.commands.conv-reset", [reset]);
   });
@@ -1772,6 +1867,7 @@ __name(registerMiscCommands, "registerMiscCommands");
 // src/index.ts
 var name = "dify-ai";
 var inject = { required: ["database"] };
+var PROBE_TIMEOUT_MS = 1e4;
 function apply(ctx, config) {
   ctx.i18n.define("zh-CN", zh_CN_default);
   ctx.i18n.define("en-US", en_US_default);
@@ -1782,18 +1878,20 @@ function apply(ctx, config) {
   const conversationStore = new ConversationStore(ctx, apps);
   const runner = new RequestRunner(ctx, config, conversationStore, history, apps, appTypes);
   const engine = new TriggerEngine(ctx, runner, history, rules, cooldown);
-  ctx.on("ready", async () => {
-    await probeAppTypes(ctx, config, apps, appTypes);
+  ctx.on("ready", () => {
     engine.start();
+    void probeAppTypes(ctx, apps, appTypes);
   });
   const admin = ctx.command("dify", { authority: 3 });
   registerMiscCommands(admin, conversationStore);
 }
 __name(apply, "apply");
-async function probeAppTypes(ctx, config, apps, appTypes) {
+async function probeAppTypes(ctx, apps, appTypes) {
+  const autoApps = [...apps.values()].filter((app) => app.appType === "auto");
+  if (!autoApps.length) return;
   await Promise.all(
-    [...apps.values()].filter((app) => app.appType === "auto").map(async (app) => {
-      const client = createDifyClient(ctx, app, config.requestTimeout);
+    autoApps.map(async (app) => {
+      const client = createDifyClient(ctx, app, PROBE_TIMEOUT_MS);
       if (!client) return;
       try {
         const info = await client.getAppInfo();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-dify-ai",
   "description": "Invoke Dify apps (chatflow / workflow / completion) in Koishi with triggers and conversation bindings",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "author": "PinkElysia",
   "license": "MIT",
   "homepage": "https://github.com/PinkElysiaDev/dify-ai-plugin-for-Koishi#readme",