koishi-plugin-chatluna 1.4.2 → 1.4.4

package/lib/index.cjs

@@ -78,9 +78,9 @@ __export(index_exports, {
   usage: () => usage
 });
 module.exports = __toCommonJS(index_exports);
-var import_koishi27 = require("koishi");
+var import_koishi26 = require("koishi");
 var import_chat2 = require("koishi-plugin-chatluna/services/chat");
-var import_koishi28 = require("koishi-plugin-chatluna/utils/koishi");
+var import_koishi27 = require("koishi-plugin-chatluna/utils/koishi");
 var import_logger7 = require("koishi-plugin-chatluna/utils/logger");
 var request = __toESM(require("koishi-plugin-chatluna/utils/request"), 1);
 
@@ -3258,10 +3258,11 @@ function apply15(ctx, config, chain) {
 __name(apply15, "apply");
 
 // src/middlewares/chat/cooldown_time.ts
-var lastChatTime = 0;
+var lastChatTimes = /* @__PURE__ */ new Map();
 function apply16(ctx, config, chain) {
   chain.middleware("cooldown_time", async (session, context) => {
     const currentChatTime = Date.now();
+    const lastChatTime = lastChatTimes.get(session.channelId) ?? 0;
     if (currentChatTime - lastChatTime < config.msgCooldown * 1e3) {
       const waitTime = (config.msgCooldown * 1e3 - (currentChatTime - lastChatTime)) / 1e3;
       context.message = session.text(
@@ -3270,9 +3271,9 @@ function apply16(ctx, config, chain) {
       );
       return 1 /* STOP */;
     }
-    lastChatTime = currentChatTime;
+    lastChatTimes.set(session.channelId, currentChatTime);
     return 2 /* CONTINUE */;
-  }).after("allow_reply");
+  }).after("allow_reply").after("message_delay");
 }
 __name(apply16, "apply");
 
@@ -3315,7 +3316,7 @@ function apply17(ctx, config, chain) {
     queues.set(conversationId, queue);
     const tailTurn = queue.turns[queue.turns.length - 1];
     let turn;
-    if (tailTurn && tailTurn.state !== "processing" && tailTurn.userName === userName) {
+    if (tailTurn && tailTurn.state !== "processing") {
       turn = tailTurn;
       logger9.debug(
         `Joining turn for ${conversationId}, messageId: ${messageId}, user: ${userName}, total: ${turn.messages.length + 1}`
@@ -3324,7 +3325,6 @@ function apply17(ctx, config, chain) {
       const state = queue.turns.length === 0 && config.messageQueueDelay > 0 ? "collecting" : "waiting";
       turn = {
         messages: [],
-        userName,
         state
       };
       queue.turns.push(turn);
@@ -3501,11 +3501,18 @@ function mergeMessages(messages) {
   if (messages.length === 1) return messages[0];
   const base = messages[0];
   const mergedContent = [];
+  const multiUser = messages.some((msg) => msg.name !== base.name);
   for (const msg of messages) {
     const content = msg.content;
     if (mergedContent.length > 0) {
       mergedContent.push({ type: "text", text: "\n" });
     }
+    if (multiUser) {
+      mergedContent.push({
+        type: "text",
+        text: `${msg.name ?? "unknown"}: `
+      });
+    }
     if (typeof content === "string") {
       mergedContent.push({ type: "text", text: content });
     } else if (Array.isArray(content)) {
@@ -3542,7 +3549,6 @@ __name(createPendingMessage, "createPendingMessage");
 var import_koishi8 = require("koishi");
 var import_string6 = require("koishi-plugin-chatluna/utils/string");
 var import_types5 = require("koishi-plugin-chatluna/llm-core/platform/types");
-var import_koishi9 = require("koishi-plugin-chatluna/utils/koishi");
 var import_count_tokens3 = require("koishi-plugin-chatluna/llm-core/utils/count_tokens");
 var import_base64 = require("koishi-plugin-chatluna/utils/base64");
 
@@ -3583,7 +3589,6 @@ var SUPPORTED_AUDIO_MIME_TYPES = /* @__PURE__ */ new Set([
   "audio/aiff"
 ]);
 function apply18(ctx, config, chain) {
-  const forwardHistory = /* @__PURE__ */ new WeakMap();
   const fileSizes = /* @__PURE__ */ new WeakMap();
   const handledAudio = /* @__PURE__ */ new WeakSet();
   chain.middleware("read_chat_message", async (session, context) => {
@@ -3648,7 +3653,7 @@ function apply18(ctx, config, chain) {
     if (message == null || resolved == null) {
       return 2 /* CONTINUE */;
     }
-    const transformedMessage = await ctx.chatluna.messageTransformer.transform(
+    const msg = await ctx.chatluna.messageTransformer.transform(
       session,
       message,
       ctx.chatluna.conversation.pickModel(
@@ -3666,23 +3671,10 @@ function apply18(ctx, config, chain) {
         includeQuoteReply: config.includeQuoteReply
       }
     );
-    if (config.attachForwardMsgIdToContext) {
-      const state = forwardHistory.get(transformedMessage);
-      if (state?.hasForwardHistory) {
-        if (state.ids.length > 0) {
-          transformedMessage.additional_kwargs ??= {};
-          transformedMessage.additional_kwargs.forwardMessageIds = state.ids;
-        }
-        addMessageContent(
-          transformedMessage,
-          state.ids.length > 0 ? state.ids.map((id) => `<forward id="${id}"/>`).join("") : "<forward/>"
-        );
-      }
-    }
-    if (transformedMessage.content.length < 1 && (0, import_string6.getMessageContent)(transformedMessage.content).trim().length < 1) {
+    if (msg.content.length < 1 && (0, import_string6.getMessageContent)(msg.content).trim().length < 1) {
       return 1 /* STOP */;
     }
-    context.options.inputMessage = transformedMessage;
+    context.options.inputMessage = msg;
     return 2 /* CONTINUE */;
   }).after("resolve_conversation").before("message_delay");
   ctx.chatluna.messageTransformer.before(async (session, elements) => {
@@ -3709,17 +3701,17 @@ function apply18(ctx, config, chain) {
   );
   ctx.chatluna.messageTransformer.intercept(
     "forward",
-    async (session, element, message) => {
-      if (!config.attachForwardMsgIdToContext) return;
-      trackForwardId(forwardHistory, element, message);
+    async (session, el, msg) => {
+      if (config.attachForwardMsgIdToContext) addForward(msg, el);
     }
   );
   ctx.chatluna.messageTransformer.intercept(
     "message",
-    async (session, element, message) => {
-      if (!config.attachForwardMsgIdToContext) return;
-      if (!(0, import_koishi9.isForwardMessageElement)(element)) return;
-      trackForwardId(forwardHistory, element, message);
+    async (session, el, msg) => {
+      if (config.attachForwardMsgIdToContext && ["true", "1"].includes(String(el.attrs.forward))) {
+        addForward(msg, el);
+      }
+      return false;
     }
   );
   ctx.chatluna.messageTransformer.intercept(
@@ -4113,25 +4105,25 @@ function modelSupportsElement(ctx, model, type) {
   );
 }
 __name(modelSupportsElement, "modelSupportsElement");
+function addForward(message, element) {
+  const id = element.attrs.id?.toString();
+  if (!id) {
+    addMessageContent(message, "<forward/>");
+    return;
+  }
+  message.additional_kwargs ??= {};
+  const ids = message.additional_kwargs.forwardMessageIds ??= [];
+  if (ids.includes(id)) return;
+  ids.push(id);
+  addMessageContent(message, (0, import_koishi8.h)("forward", { id }).toString());
+}
+__name(addForward, "addForward");
 function setElementUrl(element, url) {
   element.attrs["imageUrl"] = url;
   element.attrs["src"] = url;
   element.attrs["url"] = url;
 }
 __name(setElementUrl, "setElementUrl");
-function trackForwardId(history, element, message) {
-  const state = history.get(message) ?? {
-    ids: [],
-    hasForwardHistory: false
-  };
-  history.set(message, state);
-  state.hasForwardHistory = true;
-  const id = (0, import_koishi9.pickForwardMessageId)(element);
-  if (id && !state.ids.includes(id)) {
-    state.ids.push(id);
-  }
-}
-__name(trackForwardId, "trackForwardId");
 function appendQQAttachments(session, elements) {
   if (session.platform !== "qq") {
     return;
@@ -4216,7 +4208,7 @@ __name(renderMessage, "renderMessage");
 
 // src/middlewares/chat/rollback_chat.ts
 var import_string7 = require("koishi-plugin-chatluna/utils/string");
-var import_koishi10 = require("koishi-plugin-chatluna/utils/koishi");
+var import_koishi9 = require("koishi-plugin-chatluna/utils/koishi");
 var MAX_ROLLBACK_HOPS = 1e3;
 function apply20(ctx, config, chain) {
   chain.middleware("rollback_chat", async (session, context) => {
@@ -4288,7 +4280,7 @@ async function rollbackConversation(ctx, config, session, context, conversation,
       msg: session.text(".conversation_not_exist")
     };
   }
-  if (resolved.constraint.manageMode === "admin" && !await (0, import_koishi10.checkAdmin)(session)) {
+  if (resolved.constraint.manageMode === "admin" && !await (0, import_koishi9.checkAdmin)(session)) {
     return {
       status: 1 /* STOP */,
       msg: session.text(".conversation_not_exist")
@@ -4354,7 +4346,7 @@ async function rollbackConversation(ctx, config, session, context, conversation,
     const humanContent = await decodeMessageContent(humanMessage);
     inputMessage = await ctx.chatluna.messageTransformer.transform(
       session,
-      (0, import_koishi10.transformMessageContentToElements)(humanContent),
+      (0, import_koishi9.transformMessageContentToElements)(humanContent),
       ctx.chatluna.conversation.pickModel(resolved.constraint, current) ?? current.model,
       {
         content: "",
@@ -4386,7 +4378,7 @@ async function rollbackConversation(ctx, config, session, context, conversation,
 __name(rollbackConversation, "rollbackConversation");
 
 // src/middlewares/chat/stop_chat.ts
-var import_koishi11 = require("koishi-plugin-chatluna/utils/koishi");
+var import_koishi10 = require("koishi-plugin-chatluna/utils/koishi");
 function apply21(ctx, config, chain) {
   chain.middleware("stop_chat", async (session, context) => {
     const { command: command2 } = context;
@@ -4408,7 +4400,7 @@ function apply21(ctx, config, chain) {
       context.message = session.text(".no_active_chat");
       return 1 /* STOP */;
     }
-    if (resolved.constraint.manageMode === "admin" && !await (0, import_koishi11.checkAdmin)(session)) {
+    if (resolved.constraint.manageMode === "admin" && !await (0, import_koishi10.checkAdmin)(session)) {
       context.message = session.text(".stop_failed");
       return 1 /* STOP */;
     }
@@ -5588,10 +5580,10 @@ function apply39(ctx, config, chain) {
 __name(apply39, "apply");
 
 // src/middlewares/system/conversation_manage.ts
-var import_koishi12 = require("koishi");
+var import_koishi11 = require("koishi");
 var import_error8 = require("koishi-plugin-chatluna/utils/error");
 var import_pagination7 = require("koishi-plugin-chatluna/utils/pagination");
-var import_koishi13 = require("koishi-plugin-chatluna/utils/koishi");
+var import_koishi12 = require("koishi-plugin-chatluna/utils/koishi");
 var import_promises6 = __toESM(require("fs/promises"), 1);
 function apply40(ctx, config, chain) {
   function middleware2(name2, fn) {
@@ -5614,7 +5606,7 @@ function apply40(ctx, config, chain) {
       );
       return 1 /* STOP */;
     }
-    if (resolved.constraint.manageMode === "admin" && resolved.constraint.routeMode !== "personal" && !await (0, import_koishi13.checkAdmin)(session)) {
+    if (resolved.constraint.manageMode === "admin" && resolved.constraint.routeMode !== "personal" && !await (0, import_koishi12.checkAdmin)(session)) {
       context.message = session.text(
         "chatluna.conversation.messages.admin_required",
         [import_error8.ChatLunaErrorCode.CONVERSATION_ADMIN_REQUIRED]
@@ -5957,7 +5949,7 @@ function apply40(ctx, config, chain) {
       try {
         const buffer = await import_promises6.default.readFile(result.path);
         await session.send(
-          import_koishi12.h.file(buffer, "application/markdown", {
+          import_koishi11.h.file(buffer, "application/markdown", {
             title: result.conversation.title + ".md"
           })
         );
@@ -6719,106 +6711,106 @@ async function unbindConversation(ctx, conversationId) {
 __name(unbindConversation, "unbindConversation");
 
 // src/config.ts
-var import_koishi14 = require("koishi");
-var Config2 = import_koishi14.Schema.intersect([
-  import_koishi14.Schema.object({
-    botNames: import_koishi14.Schema.array(import_koishi14.Schema.string()).default(["香草"]),
-    isNickname: import_koishi14.Schema.boolean().default(true),
-    isNickNameWithContent: import_koishi14.Schema.boolean().default(false)
+var import_koishi13 = require("koishi");
+var Config2 = import_koishi13.Schema.intersect([
+  import_koishi13.Schema.object({
+    botNames: import_koishi13.Schema.array(import_koishi13.Schema.string()).default(["香草"]),
+    isNickname: import_koishi13.Schema.boolean().default(true),
+    isNickNameWithContent: import_koishi13.Schema.boolean().default(false)
   }),
-  import_koishi14.Schema.object({
-    allowPrivate: import_koishi14.Schema.boolean().default(true),
-    allowAtReply: import_koishi14.Schema.boolean().default(true),
-    allowQuoteReply: import_koishi14.Schema.boolean().default(false),
-    privateChatWithoutCommand: import_koishi14.Schema.boolean().default(true),
-    includeQuoteReply: import_koishi14.Schema.boolean().default(true),
-    randomReplyFrequency: import_koishi14.Schema.percent().min(0).max(1).step(0.01).default(0).computed(),
-    attachForwardMsgIdToContext: import_koishi14.Schema.boolean().default(false),
-    autoUpdateConversationModel: import_koishi14.Schema.boolean().default(false)
+  import_koishi13.Schema.object({
+    allowPrivate: import_koishi13.Schema.boolean().default(true),
+    allowAtReply: import_koishi13.Schema.boolean().default(true),
+    allowQuoteReply: import_koishi13.Schema.boolean().default(false),
+    privateChatWithoutCommand: import_koishi13.Schema.boolean().default(true),
+    includeQuoteReply: import_koishi13.Schema.boolean().default(true),
+    randomReplyFrequency: import_koishi13.Schema.percent().min(0).max(1).step(0.01).default(0).computed(),
+    attachForwardMsgIdToContext: import_koishi13.Schema.boolean().default(false),
+    autoUpdateConversationModel: import_koishi13.Schema.boolean().default(false)
   }),
-  import_koishi14.Schema.intersect([
-    import_koishi14.Schema.object({
-      isForwardMsg: import_koishi14.Schema.boolean().default(false)
+  import_koishi13.Schema.intersect([
+    import_koishi13.Schema.object({
+      isForwardMsg: import_koishi13.Schema.boolean().default(false)
     }),
-    import_koishi14.Schema.union([
-      import_koishi14.Schema.object({
-        isForwardMsg: import_koishi14.Schema.const(true).required(),
-        forwardMsgMinLength: import_koishi14.Schema.number().min(0).max(400).step(1).default(0)
+    import_koishi13.Schema.union([
+      import_koishi13.Schema.object({
+        isForwardMsg: import_koishi13.Schema.const(true).required(),
+        forwardMsgMinLength: import_koishi13.Schema.number().min(0).max(400).step(1).default(0)
       }),
-      import_koishi14.Schema.object({})
+      import_koishi13.Schema.object({})
     ])
   ]),
-  import_koishi14.Schema.intersect([
-    import_koishi14.Schema.object({
-      isReplyWithAt: import_koishi14.Schema.boolean().default(false)
+  import_koishi13.Schema.intersect([
+    import_koishi13.Schema.object({
+      isReplyWithAt: import_koishi13.Schema.boolean().default(false)
     }),
-    import_koishi14.Schema.union([
-      import_koishi14.Schema.object({
-        isReplyWithAt: import_koishi14.Schema.const(true).required(),
-        replyQuoteThreshold: import_koishi14.Schema.number().min(0).max(600).step(1).default(0)
+    import_koishi13.Schema.union([
+      import_koishi13.Schema.object({
+        isReplyWithAt: import_koishi13.Schema.const(true).required(),
+        replyQuoteThreshold: import_koishi13.Schema.number().min(0).max(600).step(1).default(0)
       }),
-      import_koishi14.Schema.object({})
+      import_koishi13.Schema.object({})
     ])
   ]),
-  import_koishi14.Schema.object({
-    sendThinkingMessage: import_koishi14.Schema.boolean().default(true),
-    sendThinkingMessageTimeout: import_koishi14.Schema.number().default(15e3),
-    msgCooldown: import_koishi14.Schema.number().min(0).max(3600).step(1).default(0),
-    messageQueue: import_koishi14.Schema.boolean().default(true),
-    messageQueueDelay: import_koishi14.Schema.number().min(0).max(60 * 30).default(0),
-    agentTaskAutoWakeup: import_koishi14.Schema.boolean().default(true),
-    showThoughtMessage: import_koishi14.Schema.boolean().default(false)
+  import_koishi13.Schema.object({
+    sendThinkingMessage: import_koishi13.Schema.boolean().default(true),
+    sendThinkingMessageTimeout: import_koishi13.Schema.number().default(15e3),
+    msgCooldown: import_koishi13.Schema.number().min(0).max(3600).step(1).default(0),
+    messageQueue: import_koishi13.Schema.boolean().default(true),
+    messageQueueDelay: import_koishi13.Schema.number().min(0).max(60 * 30).default(0),
+    agentTaskAutoWakeup: import_koishi13.Schema.boolean().default(true),
+    showThoughtMessage: import_koishi13.Schema.boolean().default(false)
   }),
-  import_koishi14.Schema.object({
-    outputMode: import_koishi14.Schema.dynamic("output-mode").default("text"),
-    splitMessage: import_koishi14.Schema.union([
-      import_koishi14.Schema.const("none"),
-      import_koishi14.Schema.const("punctuation"),
-      import_koishi14.Schema.const("paragraph")
+  import_koishi13.Schema.object({
+    outputMode: import_koishi13.Schema.dynamic("output-mode").default("text"),
+    splitMessage: import_koishi13.Schema.union([
+      import_koishi13.Schema.const("none"),
+      import_koishi13.Schema.const("punctuation"),
+      import_koishi13.Schema.const("paragraph")
     ]).default("none"),
-    censor: import_koishi14.Schema.boolean().default(false),
-    rawOnCensor: import_koishi14.Schema.boolean().default(false),
-    streamResponse: import_koishi14.Schema.boolean().default(false)
+    censor: import_koishi13.Schema.boolean().default(false),
+    rawOnCensor: import_koishi13.Schema.boolean().default(false),
+    streamResponse: import_koishi13.Schema.boolean().default(false)
   }),
-  import_koishi14.Schema.object({
-    blackList: import_koishi14.Schema.number().min(0).max(1).step(1).default(0).computed().default(0)
+  import_koishi13.Schema.object({
+    blackList: import_koishi13.Schema.number().min(0).max(1).step(1).default(0).computed().default(0)
   }),
-  import_koishi14.Schema.object({
-    infiniteContext: import_koishi14.Schema.boolean().default(true),
-    infiniteContextThreshold: import_koishi14.Schema.percent().min(0.5).max(0.95).step(0.01).default(0.85),
-    autoArchive: import_koishi14.Schema.boolean().default(false),
-    autoArchiveTimeout: import_koishi14.Schema.number().default(import_koishi14.Time.day * 10 / import_koishi14.Time.second).min(import_koishi14.Time.hour / import_koishi14.Time.second),
-    autoPurgeArchive: import_koishi14.Schema.boolean().default(false),
-    autoPurgeArchiveTimeout: import_koishi14.Schema.number().default(import_koishi14.Time.day * 30 / import_koishi14.Time.second).min(import_koishi14.Time.hour / import_koishi14.Time.second)
+  import_koishi13.Schema.object({
+    infiniteContext: import_koishi13.Schema.boolean().default(true),
+    infiniteContextThreshold: import_koishi13.Schema.percent().min(0.5).max(0.95).step(0.01).default(0.85),
+    autoArchive: import_koishi13.Schema.boolean().default(false),
+    autoArchiveTimeout: import_koishi13.Schema.number().default(import_koishi13.Time.day * 10 / import_koishi13.Time.second).min(import_koishi13.Time.hour / import_koishi13.Time.second),
+    autoPurgeArchive: import_koishi13.Schema.boolean().default(false),
+    autoPurgeArchiveTimeout: import_koishi13.Schema.number().default(import_koishi13.Time.day * 30 / import_koishi13.Time.second).min(import_koishi13.Time.hour / import_koishi13.Time.second)
   }),
-  import_koishi14.Schema.object({
-    defaultEmbeddings: import_koishi14.Schema.dynamic("embeddings").default("无"),
-    defaultVectorStore: import_koishi14.Schema.dynamic("vector-store").default("无")
+  import_koishi13.Schema.object({
+    defaultEmbeddings: import_koishi13.Schema.dynamic("embeddings").default("无"),
+    defaultVectorStore: import_koishi13.Schema.dynamic("vector-store").default("无")
   }),
-  import_koishi14.Schema.object({
-    defaultGroupRouteMode: import_koishi14.Schema.union([
-      import_koishi14.Schema.const("shared"),
-      import_koishi14.Schema.const("personal")
+  import_koishi13.Schema.object({
+    defaultGroupRouteMode: import_koishi13.Schema.union([
+      import_koishi13.Schema.const("shared"),
+      import_koishi13.Schema.const("personal")
     ]).default("shared"),
-    defaultChatMode: import_koishi14.Schema.dynamic("chat-mode").default("plugin"),
-    defaultModel: import_koishi14.Schema.dynamic("model").default("无"),
-    defaultPreset: import_koishi14.Schema.dynamic("preset").default("sydney"),
-    enablePresetKeywordTrigger: import_koishi14.Schema.boolean().default(true)
+    defaultChatMode: import_koishi13.Schema.dynamic("chat-mode").default("plugin"),
+    defaultModel: import_koishi13.Schema.dynamic("model").default("无"),
+    defaultPreset: import_koishi13.Schema.dynamic("preset").default("sydney"),
+    enablePresetKeywordTrigger: import_koishi13.Schema.boolean().default(true)
   }),
-  import_koishi14.Schema.object({
-    voiceSpeakId: import_koishi14.Schema.number().default(0),
-    isLog: import_koishi14.Schema.boolean().default(false)
+  import_koishi13.Schema.object({
+    voiceSpeakId: import_koishi13.Schema.number().default(0),
+    isLog: import_koishi13.Schema.boolean().default(false)
   }),
-  import_koishi14.Schema.intersect([
-    import_koishi14.Schema.object({
-      isProxy: import_koishi14.Schema.boolean().default(false)
+  import_koishi13.Schema.intersect([
+    import_koishi13.Schema.object({
+      isProxy: import_koishi13.Schema.boolean().default(false)
     }),
-    import_koishi14.Schema.union([
-      import_koishi14.Schema.object({
-        isProxy: import_koishi14.Schema.const(true).required(),
-        proxyAddress: import_koishi14.Schema.string().default("http://127.0.0.1:7897")
+    import_koishi13.Schema.union([
+      import_koishi13.Schema.object({
+        isProxy: import_koishi13.Schema.const(true).required(),
+        proxyAddress: import_koishi13.Schema.string().default("http://127.0.0.1:7897")
       }),
-      import_koishi14.Schema.object({})
+      import_koishi13.Schema.object({})
     ])
   ])
 ]).i18n({
@@ -6827,23 +6819,23 @@ var Config2 = import_koishi14.Schema.intersect([
 });
 
 // src/render/index.ts
-var import_koishi26 = require("koishi");
+var import_koishi25 = require("koishi");
 var import_error9 = require("koishi-plugin-chatluna/utils/error");
 
 // src/render/koishi-element.ts
-var import_koishi18 = require("koishi");
+var import_koishi17 = require("koishi");
 var import_koishi_plugin_chatluna9 = require("koishi-plugin-chatluna");
 var import_string11 = require("koishi-plugin-chatluna/utils/string");
-var import_koishi19 = require("koishi-plugin-chatluna/utils/koishi");
+var import_koishi18 = require("koishi-plugin-chatluna/utils/koishi");
 
 // src/render/base.ts
-var import_koishi17 = require("koishi");
+var import_koishi16 = require("koishi");
 var import_string10 = require("koishi-plugin-chatluna/utils/string");
 
 // src/render/split.ts
-var import_koishi15 = require("koishi");
+var import_koishi14 = require("koishi");
 var import_string9 = require("koishi-plugin-chatluna/utils/string");
-var import_koishi16 = require("koishi-plugin-chatluna/utils/koishi");
+var import_koishi15 = require("koishi-plugin-chatluna/utils/koishi");
 
 // src/render/sentence.ts
 var import_grapheme = require("unicode-segmenter/grapheme");
@@ -7123,16 +7115,16 @@ var MessageElementSplitter = class {
   writeText(text) {
     if (!text) return [];
     this.buf += text;
-    const result = (0, import_koishi16.parseElements)(this.buf, true);
+    const result = (0, import_koishi15.parseElements)(this.buf, true);
     this.buf = result.rest;
     return result.elements;
   }
   flush() {
     if (!this.buf.trim()) return [];
     try {
-      return (0, import_koishi16.parseElements)(this.buf);
+      return (0, import_koishi15.parseElements)(this.buf);
     } catch {
-      return [import_koishi15.h.text(this.buf)];
+      return [import_koishi14.h.text(this.buf)];
     } finally {
       this.buf = "";
     }
@@ -7227,7 +7219,7 @@ var BufferedRenderStreamSession = class {
       const elements = await this.renderText(part);
       result.push(
         ...this.options.split && this.options.split !== "none" ? elements.map(
-          (el) => el.type === "message" ? el : (0, import_koishi17.h)("message", el)
+          (el) => el.type === "message" ? el : (0, import_koishi16.h)("message", el)
         ) : elements
       );
     }
@@ -7245,7 +7237,7 @@ var KoishiElementRenderer = class extends Renderer {
     transformed = transformAndEscape(transformed);
     if (options.split && options.split !== "none") {
       transformed = transformed.map(
-        (element) => element.type === "message" ? element : (0, import_koishi18.h)("message", element)
+        (element) => element.type === "message" ? element : (0, import_koishi17.h)("message", element)
       );
     }
     return {
@@ -7262,7 +7254,7 @@ var KoishiElementRenderer = class extends Renderer {
   createStreamSession(options, plan) {
     return new KoishiElementStreamSession(options, plan);
   }
-  schema = import_koishi18.Schema.const("koishi-element").i18n({
+  schema = import_koishi17.Schema.const("koishi-element").i18n({
     "zh-CN": "将回复作为 koishi 消息元素进行渲染",
     "en-US": "Render as koishi message element template"
   });
@@ -7286,12 +7278,12 @@ var KoishiElementStreamSession = class {
     if (!text) return null;
     if (this.plan.mode === "edit") {
       this.text += text;
-      return transformAndEscape([import_koishi18.h.text(this.text + "●")]);
+      return transformAndEscape([import_koishi17.h.text(this.text + "●")]);
     }
     let elements = this.splitter.writeText(text);
     if (this.options.split && this.options.split !== "none") {
       elements = elements.map(
-        (el) => el.type === "message" ? el : (0, import_koishi18.h)("message", el)
+        (el) => el.type === "message" ? el : (0, import_koishi17.h)("message", el)
       );
     }
     return elements.length > 0 ? elements : null;
@@ -7299,12 +7291,12 @@ var KoishiElementStreamSession = class {
   flush() {
     if (this.plan.mode === "buffer") return null;
     if (this.plan.mode === "edit" && this.text.trim()) {
-      return transformAndEscape([import_koishi18.h.text(this.text)]);
+      return transformAndEscape([import_koishi17.h.text(this.text)]);
     }
     let elements = this.splitter.flush();
     if (this.options.split && this.options.split !== "none") {
       elements = elements.map(
-        (el) => el.type === "message" ? el : (0, import_koishi18.h)("message", el)
+        (el) => el.type === "message" ? el : (0, import_koishi17.h)("message", el)
       );
     }
     return elements.length > 0 ? elements : null;
@@ -7323,24 +7315,24 @@ function transformAndEscape(source) {
       return element;
     }
     try {
-      return (0, import_koishi19.parseElements)(element.attrs["content"]);
+      return (0, import_koishi18.parseElements)(element.attrs["content"]);
     } catch (e) {
       import_koishi_plugin_chatluna9.logger.error(e);
-      return [import_koishi18.h.text(element.attrs["content"])];
+      return [import_koishi17.h.text(element.attrs["content"])];
     }
   });
 }
 __name(transformAndEscape, "transformAndEscape");
 
 // src/render/mixed-voice.ts
-var import_koishi22 = require("koishi");
+var import_koishi21 = require("koishi");
 var import_koishi_plugin_chatluna10 = require("koishi-plugin-chatluna");
 var import_string13 = require("koishi-plugin-chatluna/utils/string");
 
 // src/render/text.ts
-var import_koishi20 = require("koishi");
+var import_koishi19 = require("koishi");
 var import_string12 = require("koishi-plugin-chatluna/utils/string");
-var import_koishi21 = require("koishi-plugin-chatluna/utils/koishi");
+var import_koishi20 = require("koishi-plugin-chatluna/utils/koishi");
 var TextRenderer = class extends Renderer {
   static {
     __name(this, "TextRenderer");
@@ -7349,8 +7341,8 @@ var TextRenderer = class extends Renderer {
     if (options.session != null && options.session.platform === "qq" && options.session.isDirect) {
       return {
         element: [
-          import_koishi20.h.text((0, import_string12.getMessageContent)(message.content)),
-          ...import_koishi20.h.parse("<markdown-qq></markdown-qq>")
+          import_koishi19.h.text((0, import_string12.getMessageContent)(message.content)),
+          ...import_koishi19.h.parse("<markdown-qq></markdown-qq>")
         ]
       };
     }
@@ -7363,16 +7355,16 @@ var TextRenderer = class extends Renderer {
       const element = transformed.shift();
       const content = element.attrs["content"];
       if (content) {
-        transformed.unshift(import_koishi20.h.text(content));
+        transformed.unshift(import_koishi19.h.text(content));
       } else {
         transformed.unshift(...element.children);
       }
     }
     if (options.split && options.split !== "none") {
       transformed = transformed.flatMap((element) => {
-        if (element.type !== "text") return (0, import_koishi20.h)("message", element);
+        if (element.type !== "text") return (0, import_koishi19.h)("message", element);
         return splitText2(element.attrs["content"], options.split).map(
-          (text) => (0, import_koishi20.h)("message", import_koishi20.h.text(text))
+          (text) => (0, import_koishi19.h)("message", import_koishi19.h.text(text))
         );
       });
     }
@@ -7390,7 +7382,7 @@ var TextRenderer = class extends Renderer {
   createStreamSession(options, plan) {
     return new TextStreamSession(options, plan);
   }
-  schema = import_koishi20.Schema.const("text").i18n({
+  schema = import_koishi19.Schema.const("text").i18n({
     "zh-CN": "将回复作为 markdown 进行渲染",
     "en-US": "Render as markdown"
   });
@@ -7411,7 +7403,7 @@ var TextStreamSession = class extends BufferedRenderStreamSession {
       const element = transformed.shift();
       const content = element.attrs["content"];
       if (content) {
-        transformed.unshift(import_koishi20.h.text(content));
+        transformed.unshift(import_koishi19.h.text(content));
       } else {
         transformed.unshift(...element.children);
       }
@@ -7422,7 +7414,7 @@ var TextStreamSession = class extends BufferedRenderStreamSession {
 function transformAndEscape2(source, platform = "sandbox") {
   return source.flatMap((element) => {
     if (element.type === "text") {
-      return (0, import_koishi21.transformToMarkdown)(element.attrs["content"], platform);
+      return (0, import_koishi20.transformToMarkdown)(element.attrs["content"], platform);
     }
     return element;
   });
@@ -7466,7 +7458,7 @@ var MixedVoiceRenderer = class extends Renderer {
   async renderText(messages, options) {
     let transformed = transformAndEscape2(messages);
     if (options.split && options.split !== "none") {
-      transformed = transformed.map((element) => (0, import_koishi22.h)("message", element));
+      transformed = transformed.map((element) => (0, import_koishi21.h)("message", element));
     }
     return {
       element: transformed
@@ -7500,7 +7492,7 @@ var MixedVoiceRenderer = class extends Renderer {
       )
     );
   }
-  schema = import_koishi22.Schema.const("mixed-voice").i18n({
+  schema = import_koishi21.Schema.const("mixed-voice").i18n({
     "zh-CN": "同时输出语音和文本",
     "en-US": "Output both voice and text"
   });
@@ -7520,7 +7512,7 @@ var MixedVoiceStreamSession = class extends BufferedRenderStreamSession {
       (0, import_string13.transformMessageContentToElements)(text)
     );
     if (this.options.split && this.options.split !== "none") {
-      result.push(...elements.map((el) => (0, import_koishi22.h)("message", el)));
+      result.push(...elements.map((el) => (0, import_koishi21.h)("message", el)));
     } else {
       result.push(...elements);
     }
@@ -7530,7 +7522,7 @@ var MixedVoiceStreamSession = class extends BufferedRenderStreamSession {
 };
 
 // src/render/pure-text.ts
-var import_koishi23 = require("koishi");
+var import_koishi22 = require("koishi");
 var import_koishi_plugin_markdown = require("koishi-plugin-markdown");
 var import_string14 = require("koishi-plugin-chatluna/utils/string");
 var import_he = __toESM(require("he"), 1);
@@ -7621,10 +7613,10 @@ var PureTextRenderer = class extends Renderer {
     if (options.split && options.split !== "none") {
       return {
         element: transformed.flatMap((element) => {
-          if (element.type !== "text") return (0, import_koishi23.h)("message", element);
+          if (element.type !== "text") return (0, import_koishi22.h)("message", element);
           const content = element.attrs["content"];
           return splitText2(content, options.split).map(
-            (text) => (0, import_koishi23.h)("message", import_koishi23.h.text(stripMarkdown(text)))
+            (text) => (0, import_koishi22.h)("message", import_koishi22.h.text(stripMarkdown(text)))
           );
         })
       };
@@ -7632,7 +7624,7 @@ var PureTextRenderer = class extends Renderer {
     return {
       element: transformed.map((element) => {
         if (element.type !== "text") return element;
-        return import_koishi23.h.text(stripMarkdown(element.attrs["content"]));
+        return import_koishi22.h.text(stripMarkdown(element.attrs["content"]));
       })
     };
   }
@@ -7646,7 +7638,7 @@ var PureTextRenderer = class extends Renderer {
   createStreamSession(options, plan) {
     return new PureTextStreamSession(options, plan);
   }
-  schema = import_koishi23.Schema.const("pure-text").i18n({
+  schema = import_koishi22.Schema.const("pure-text").i18n({
     "zh-CN": "将回复渲染为纯文本（去除 markdown 格式）",
     "en-US": "Render as pure text (remove markdown format)"
   });
@@ -7659,7 +7651,7 @@ var PureTextStreamSession = class extends BufferedRenderStreamSession {
     super(options, plan);
   }
   renderText(text) {
-    return [import_koishi23.h.text(stripMarkdown(text))];
+    return [import_koishi22.h.text(stripMarkdown(text))];
   }
 };
 function stripMarkdown(source) {
@@ -7668,7 +7660,7 @@ function stripMarkdown(source) {
 __name(stripMarkdown, "stripMarkdown");
 
 // src/render/raw.ts
-var import_koishi24 = require("koishi");
+var import_koishi23 = require("koishi");
 var import_string15 = require("koishi-plugin-chatluna/utils/string");
 var RawRenderer = class extends Renderer {
   static {
@@ -7677,7 +7669,7 @@ var RawRenderer = class extends Renderer {
   async render(message, options) {
     if (typeof message.content === "string") {
       return {
-        element: import_koishi24.h.text(message.content)
+        element: import_koishi23.h.text(message.content)
       };
     }
     return {
@@ -7694,7 +7686,7 @@ var RawRenderer = class extends Renderer {
   createStreamSession(options, plan) {
     return new RawStreamSession(options, plan);
   }
-  schema = import_koishi24.Schema.const("raw").i18n({
+  schema = import_koishi23.Schema.const("raw").i18n({
     "zh-CN": "原始输出",
     "en-US": "Raw text"
   });
@@ -7707,7 +7699,7 @@ var RawStreamSession = class extends BufferedRenderStreamSession {
     super(options, plan);
   }
   renderText(text) {
-    return [import_koishi24.h.text(text)];
+    return [import_koishi23.h.text(text)];
   }
 };
 
@@ -7750,7 +7742,6 @@ var ReplyStream = class {
   sentAdditional = false;
   closed = false;
   moderated;
-  pending = [];
   renderMessage;
   renderAdditional;
   async write(frame) {
@@ -7767,10 +7758,6 @@ var ReplyStream = class {
       return;
     }
     if (frame.type === "mark" && frame.instant) {
-      if (this.moderated) {
-        this.pending.push({ content: frame.content ?? frame.name });
-        return;
-      }
       await this.sendMessage(
         { content: frame.content ?? frame.name },
         "split"
@@ -7791,26 +7778,10 @@ var ReplyStream = class {
     if (frame != null) {
       await this.write(frame);
     }
-    if (this.moderated && this.finalMessage == null) return;
-    if (frame?.type === "done" && this.mode === "split" && !this.closed) {
-      return;
-    }
-    if (this.closed) {
-      if (frame?.type === "done") {
-        if (this.mode === "edit") {
-          await this.sendMessage(frame.message, "edit");
-        } else if (this.mode === "buffer" || this.firstChunk) {
-          await this.sendMessage(frame.message, "split");
-        }
-      }
-      return await this.finish();
-    }
+    if (frame?.type !== "done" && frame?.type !== "error") return;
+    if (this.closed) return;
     this.closed = true;
     await this.context.recallThinkingMessage?.();
-    for (const message of this.pending) {
-      await this.sendMessage(message, "split");
-    }
-    this.pending = [];
     if (this.mode === "buffer") {
       if (this.finalMessage != null) {
         await this.sendMessage(this.finalMessage, "split");
@@ -7865,7 +7836,7 @@ var ReplyStream = class {
     await this.context.send([elements]);
   }
   async censor(message) {
-    if (!this.moderated) return message;
+    if (!this.moderated || this.ctx.censor == null) return message;
     return await censorMessage(
       this.ctx,
       message,
@@ -7921,7 +7892,7 @@ var ReplyQueue = class {
 };
 
 // src/render/voice.ts
-var import_koishi25 = require("koishi");
+var import_koishi24 = require("koishi");
 var import_koishi_plugin_chatluna11 = require("koishi-plugin-chatluna");
 var import_string16 = require("koishi-plugin-chatluna/utils/string");
 var VoiceRenderer = class extends Renderer {
@@ -7941,7 +7912,7 @@ var VoiceRenderer = class extends Renderer {
       return {
         element: await Promise.all(
           splitMessages.map(
-            async (text) => (0, import_koishi25.h)("message", await this._renderToVoice(text, options))
+            async (text) => (0, import_koishi24.h)("message", await this._renderToVoice(text, options))
           )
         )
       };
@@ -7976,7 +7947,7 @@ var VoiceRenderer = class extends Renderer {
       )
     );
   }
-  schema = import_koishi25.Schema.const("voice").i18n({
+  schema = import_koishi24.Schema.const("voice").i18n({
     "zh-CN": "将回复渲染为语音",
     "en-US": "Render as voice"
   });
@@ -7992,7 +7963,7 @@ var VoiceStreamSession = class extends BufferedRenderStreamSession {
   }
   async renderText(text) {
     return [
-      this.options.split && this.options.split !== "none" ? (0, import_koishi25.h)("message", await this.render(text)) : await this.render(text)
+      this.options.split && this.options.split !== "none" ? (0, import_koishi24.h)("message", await this.render(text)) : await this.render(text)
     ];
   }
 };
@@ -8030,24 +8001,12 @@ var DefaultRenderer = class {
   renderers = {};
   async render(message, options = this.defaultOptions) {
     try {
-      const result = [];
       options = Object.assign({}, this.defaultOptions, options);
-      const currentRenderer = this.getRenderer(options.type);
-      const rawRenderer = options.type === "raw" ? currentRenderer : this.getRenderer("raw");
-      if (message.additionalReplyMessages) {
-        for (const msg of message.additionalReplyMessages) {
-          const elements = await rawRenderer.render(msg, options).then((r) => r.element);
-          result.push({
-            element: (0, import_koishi26.h)(
-              "message",
-              { forward: true },
-              Array.isArray(elements) ? elements : [elements]
-            )
-          });
-        }
-      }
-      result.push(await currentRenderer.render(message, options));
-      return result;
+      const result = await this.renderAdditionalMessages(message, options);
+      return [
+        ...result.map((element) => ({ element })),
+        await this.getRenderer(options.type).render(message, options)
+      ];
     } catch (e) {
       throw new import_error9.ChatLunaError(import_error9.ChatLunaErrorCode.RENDER_ERROR, e);
     }
@@ -8078,12 +8037,11 @@ var DefaultRenderer = class {
     const rawRenderer = this.getRenderer("raw");
     const result = [];
     for (const msg of message.additionalReplyMessages) {
-      const elements = await rawRenderer.render(msg, options).then((r) => r.element);
       result.push([
-        (0, import_koishi26.h)(
+        (0, import_koishi25.h)(
           "message",
           { forward: true },
-          Array.isArray(elements) ? elements : [elements]
+          (await rawRenderer.render(msg, options)).element
         )
       ]);
     }
@@ -8107,7 +8065,7 @@ var DefaultRenderer = class {
     }
     this.ctx.schema.set(
       "output-mode",
-      import_koishi26.Schema.union(this._getAllRendererScheme())
+      import_koishi25.Schema.union(this._getAllRendererScheme())
     );
   }
   _getAllRendererScheme() {
@@ -8167,7 +8125,7 @@ function setupEntryPoint(ctx, config, disposables) {
       setupMiddleware(ctx2);
     });
   }, "entryPointPlugin");
-  const entryPointDisposable = (0, import_koishi28.forkScopeToDisposable)(
+  const entryPointDisposable = (0, import_koishi27.forkScopeToDisposable)(
     ctx.plugin(
       {
         apply: entryPointPlugin,
@@ -8218,7 +8176,7 @@ function setupMiddleware(ctx) {
 __name(setupMiddleware, "setupMiddleware");
 function setupLogger(config) {
   if (config.isLog) {
-    (0, import_logger7.setLoggerLevel)(import_koishi27.Logger.DEBUG);
+    (0, import_logger7.setLoggerLevel)(import_koishi26.Logger.DEBUG);
   }
 }
 __name(setupLogger, "setupLogger");
@@ -8238,7 +8196,7 @@ function setupProxy(ctx, config) {
 }
 __name(setupProxy, "setupProxy");
 function setupServices(ctx, config, disposables) {
-  disposables.push((0, import_koishi28.forkScopeToDisposable)(ctx.plugin(import_chat2.ChatLunaService, config)));
+  disposables.push((0, import_koishi27.forkScopeToDisposable)(ctx.plugin(import_chat2.ChatLunaService, config)));
 }
 __name(setupServices, "setupServices");
 function setupPermissions(ctx, disposables) {
@@ -8309,7 +8267,7 @@ async function setupAutoArchive(ctx, config) {
   await execute();
   ctx.setInterval(async () => {
     await execute();
-  }, import_koishi27.Time.minute * 5);
+  }, import_koishi26.Time.minute * 5);
 }
 __name(setupAutoArchive, "setupAutoArchive");
 async function setupAutoPurgeArchive(ctx, config) {
@@ -8372,7 +8330,7 @@ async function setupAutoPurgeArchive(ctx, config) {
   await execute();
   ctx.setInterval(async () => {
     await execute();
-  }, import_koishi27.Time.minute * 10);
+  }, import_koishi26.Time.minute * 10);
 }
 __name(setupAutoPurgeArchive, "setupAutoPurgeArchive");
 async function dedupeConstraintNames(ctx) {