koishi-plugin-chatluna 1.1.3 → 1.1.4

package/lib/chains/chain.d.ts

@@ -43,7 +43,7 @@ export declare class ChainMiddleware {
     constructor(name: string, execute: ChainMiddlewareFunction, graph: ChatChainDependencyGraph);
     before<T extends keyof ChainMiddlewareName>(name: T): this;
     after<T extends keyof ChainMiddlewareName>(name: T): this;
-    run(session: Session, options: ChainMiddlewareContext): Promise<string | h[] | h[][] | ChainMiddlewareRunStatus>;
+    run(session: Session, options: ChainMiddlewareContext): Promise<string | h[] | ChainMiddlewareRunStatus | h[][]>;
 }
 export interface ChainMiddlewareContext {
     config: Config;

package/lib/index.cjs

@@ -72,9 +72,9 @@ __export(index_exports, {
   usage: () => usage
 });
 module.exports = __toCommonJS(index_exports);
-var import_koishi18 = require("koishi");
+var import_koishi20 = require("koishi");
 var import_chat2 = require("koishi-plugin-chatluna/services/chat");
-var import_koishi19 = require("koishi-plugin-chatluna/utils/koishi");
+var import_koishi21 = require("koishi-plugin-chatluna/utils/koishi");
 var import_logger9 = require("koishi-plugin-chatluna/utils/logger");
 var request = __toESM(require("koishi-plugin-chatluna/utils/request"), 1);
 
@@ -518,6 +518,7 @@ function apply(ctx, config, chain) {
 __name(apply, "apply");
 
 // src/commands/chat.ts
+var import_koishi2 = require("koishi");
 function apply2(ctx, config, chain) {
   ctx.command("chatluna", {
     authority: 1
@@ -532,8 +533,9 @@ function apply2(ctx, config, chain) {
     )) {
       return session.text(".invalid-render-type");
     }
+    const elements = import_koishi2.h.parse(message);
     await chain.receiveCommand(session, "", {
-      message,
+      message: elements,
       room_resolve: {
         name: options.room
       },
@@ -545,8 +547,9 @@ function apply2(ctx, config, chain) {
     });
   });
   ctx.command("chatluna.chat.rollback [message:text]").option("room", "-r <room:string>").option("i", "-i <i: string>").action(async ({ options, session }, message) => {
+    const elements = import_koishi2.h.parse(message);
     await chain.receiveCommand(session, "rollback", {
-      message,
+      message: elements,
       room_resolve: {
         name: options.room
       },
@@ -566,8 +569,9 @@ function apply2(ctx, config, chain) {
     });
   });
   ctx.command("chatluna.chat.voice <message:text>").option("room", "-r <room:string>").option("speaker", "-s <speakerId:number>", { authority: 1 }).action(async ({ options, session }, message) => {
+    const elements = import_koishi2.h.parse(message);
     await chain.receiveCommand(session, "", {
-      message,
+      message: elements,
       renderOptions: {
         split: config.splitMessage,
         type: "voice",
@@ -898,7 +902,7 @@ async function command(ctx, config) {
 __name(command, "command");
 
 // src/llm-core/chat/default.ts
-var import_koishi2 = require("koishi");
+var import_koishi3 = require("koishi");
 var import_koishi_plugin_chatluna = require("koishi-plugin-chatluna");
 var import_types = require("koishi-plugin-chatluna/llm-core/platform/types");
 
@@ -1045,7 +1049,10 @@ var ChatLunaPluginChain = class _ChatLunaPluginChain extends import_base2.ChatLu
         agent: await (0, import_agent.createReactAgent)({
           llm,
           tools,
-          prompt: this.prompt
+          prompt: this.prompt,
+          instructions: await this.preset().then((preset) => {
+            return preset.config.reActInstruction;
+          })
         }),
         tools,
         memory: void 0,
@@ -1268,17 +1275,17 @@ async function defaultFactory(ctx, service) {
 }
 __name(defaultFactory, "defaultFactory");
 function updateModels(ctx, service) {
-  ctx.schema.set("model", import_koishi2.Schema.union(getModelNames(service)));
+  ctx.schema.set("model", import_koishi3.Schema.union(getModelNames(service)));
 }
 __name(updateModels, "updateModels");
 function updateChatChains(ctx, service) {
-  ctx.schema.set("chat-mode", import_koishi2.Schema.union(getChatChainNames(service)));
+  ctx.schema.set("chat-mode", import_koishi3.Schema.union(getChatChainNames(service)));
 }
 __name(updateChatChains, "updateChatChains");
 function updateEmbeddings(ctx, service) {
   ctx.schema.set(
     "embeddings",
-    import_koishi2.Schema.union(getModelNames(service, import_types.ModelType.embeddings))
+    import_koishi3.Schema.union(getModelNames(service, import_types.ModelType.embeddings))
   );
 }
 __name(updateEmbeddings, "updateEmbeddings");
@@ -1288,13 +1295,13 @@ function getVectorStoreRetrieverNames(service) {
 __name(getVectorStoreRetrieverNames, "getVectorStoreRetrieverNames");
 function updateVectorStores(ctx, service) {
   const rawVectorStoreNames = getVectorStoreRetrieverNames(service);
-  const vectorStoreRetrieverNames = rawVectorStoreNames.concat("无").map((name2) => import_koishi2.Schema.const(name2));
+  const vectorStoreRetrieverNames = rawVectorStoreNames.concat("无").map((name2) => import_koishi3.Schema.const(name2));
   if (rawVectorStoreNames.length === 0) {
-    ctx.schema.set("long-memory", import_koishi2.Schema.boolean().disabled());
+    ctx.schema.set("long-memory", import_koishi3.Schema.boolean().disabled());
   } else {
-    ctx.schema.set("long-memory", import_koishi2.Schema.boolean());
+    ctx.schema.set("long-memory", import_koishi3.Schema.boolean());
   }
-  ctx.schema.set("vector-store", import_koishi2.Schema.union(vectorStoreRetrieverNames));
+  ctx.schema.set("vector-store", import_koishi3.Schema.union(vectorStoreRetrieverNames));
 }
 __name(updateVectorStores, "updateVectorStores");
 function getTools(service, filter) {
@@ -1303,12 +1310,12 @@ function getTools(service, filter) {
 }
 __name(getTools, "getTools");
 function getChatChainNames(service) {
-  return service.getChatChains().map((info) => import_koishi2.Schema.const(info.name).i18n(info.description));
+  return service.getChatChains().map((info) => import_koishi3.Schema.const(info.name).i18n(info.description));
 }
 __name(getChatChainNames, "getChatChainNames");
 function getModelNames(service, type = import_types.ModelType.llm) {
   const models = service.getAllModels(type).concat("无");
-  return models.map((model) => import_koishi2.Schema.const(model).description(model));
+  return models.map((model) => import_koishi3.Schema.const(model).description(model));
 }
 __name(getModelNames, "getModelNames");
 
@@ -1506,7 +1513,7 @@ __name(apply9, "apply");
 
 // src/chains/chain.ts
 var import_events = require("events");
-var import_koishi3 = require("koishi");
+var import_koishi4 = require("koishi");
 var import_error3 = require("koishi-plugin-chatluna/utils/error");
 var import_logger = require("koishi-plugin-chatluna/utils/logger");
 
@@ -1564,7 +1571,7 @@ __name(apply11, "apply");
 
 // src/chains/rooms.ts
 var import_crypto = require("crypto");
-var import_koishi4 = require("koishi");
+var import_koishi5 = require("koishi");
 var import_types2 = require("koishi-plugin-chatluna/llm-core/platform/types");
 var import_count_tokens = require("koishi-plugin-chatluna/llm-core/utils/count_tokens");
 var import_error4 = require("koishi-plugin-chatluna/utils/error");
@@ -1748,7 +1755,7 @@ async function getTemplateConversationRoom(ctx, config) {
 }
 __name(getTemplateConversationRoom, "getTemplateConversationRoom");
 async function getConversationRoomCount(ctx) {
-  const count = await ctx.database.select("chathub_room").execute((row) => import_koishi4.$.max(row.roomId));
+  const count = await ctx.database.select("chathub_room").execute((row) => import_koishi5.$.max(row.roomId));
   return count;
 }
 __name(getConversationRoomCount, "getConversationRoomCount");
@@ -2078,9 +2085,12 @@ function apply12(ctx, config, chain) {
 __name(apply12, "apply");
 
 // src/middlewares/allow_reply.ts
+var import_koishi6 = require("koishi");
 function apply13(ctx, config, chain) {
   chain.middleware("allow_reply", async (session, context) => {
     if (ctx.bots[session.uid]) return 1 /* STOP */;
+    context.options.reply_status = false;
+    const content = import_koishi6.h.select(session.elements, "text").join("");
     if (session.isDirect && config.allowPrivate && (context.command != null || config.privateChatWithoutCommand)) {
       return await checkReplyPermission();
     }
@@ -2100,21 +2110,17 @@ function apply13(ctx, config, chain) {
     if (config.allowQuoteReply && session.quote?.user?.id === botId) {
       return await checkReplyPermission();
     }
-    if (config.botNames.some(
-      (name2) => session.content.startsWith(name2)
-    ) && config.isNickname || config.isNickNameWithContent && config.botNames.some(
-      (name2) => session.content.includes(name2)
-    )) {
+    if (config.botNames.some((name2) => content.startsWith(name2)) && config.isNickname || config.isNickNameWithContent && config.botNames.some((name2) => content.includes(name2))) {
       return await checkReplyPermission();
     }
     if (Math.random() < await session.resolve(config.randomReplyFrequency)) {
       return await checkReplyPermission();
     }
-    if (config.allowChatWithRoomName) {
-      return await checkReplyPermission();
-    }
     if (context.command != null) {
-      return await checkReplyPermission();
+      return 2 /* CONTINUE */;
+    }
+    if (config.allowChatWithRoomName) {
+      return 2 /* CONTINUE */;
     }
     return 1 /* STOP */;
     async function checkReplyPermission() {
@@ -2122,7 +2128,9 @@ function apply13(ctx, config, chain) {
         "chatluna/before-check-sender",
         session
       );
-      return notReply ? 1 /* STOP */ : 2 /* CONTINUE */;
+      const status = notReply ? 1 /* STOP */ : 2 /* CONTINUE */;
+      context.options.reply_status = status === 2 /* CONTINUE */;
+      return status;
     }
     __name(checkReplyPermission, "checkReplyPermission");
   }).after("lifecycle-check");
@@ -2168,7 +2176,7 @@ var import_count_tokens2 = require("koishi-plugin-chatluna/llm-core/utils/count_
 var import_error5 = require("koishi-plugin-chatluna/utils/error");
 
 // src/cache.ts
-var import_koishi5 = require("koishi");
+var import_koishi7 = require("koishi");
 var Cache = class {
   constructor(ctx, config, tableName) {
     this.config = config;
@@ -2222,7 +2230,7 @@ var DatabaseCache = class {
     );
     ctx.setInterval(async () => {
       await ctx.database.remove("cache", { expire: { $lt: /* @__PURE__ */ new Date() } });
-    }, 10 * import_koishi5.Time.minute);
+    }, 10 * import_koishi7.Time.minute);
   }
   static {
     __name(this, "DatabaseCache");
@@ -3840,13 +3848,13 @@ function apply40(ctx, config, chain) {
 __name(apply40, "apply");
 
 // src/middlewares/read_chat_message.ts
-var import_koishi6 = require("koishi");
+var import_koishi8 = require("koishi");
 function apply41(ctx, config, chain) {
   chain.middleware("read_chat_message", async (session, context) => {
     let message = context.command != null ? context.message : session.elements;
     message = message;
     if (typeof message === "string") {
-      message = [import_koishi6.h.text(message)];
+      message = [import_koishi8.h.text(message)];
     }
     const transformedMessage = await ctx.chatluna.messageTransformer.transform(
       session,
@@ -3960,7 +3968,7 @@ async function renderMessage(ctx, message, options) {
 __name(renderMessage, "renderMessage");
 
 // src/middlewares/request_model.ts
-var import_koishi8 = require("koishi");
+var import_koishi10 = require("koishi");
 var import_prompt3 = require("koishi-plugin-chatluna/llm-core/prompt");
 var import_count_tokens3 = require("koishi-plugin-chatluna/llm-core/utils/count_tokens");
 var import_error6 = require("koishi-plugin-chatluna/utils/error");
@@ -3969,7 +3977,7 @@ var import_chains = require("koishi-plugin-chatluna/chains");
 var import_string = require("koishi-plugin-chatluna/utils/string");
 
 // src/utils/buffer_text.ts
-var import_koishi7 = require("koishi");
+var import_koishi9 = require("koishi");
 var import_lock2 = require("koishi-plugin-chatluna/utils/lock");
 var BufferText = class {
   constructor(sleepTime = 3, prefix, postfix) {
@@ -3999,7 +4007,7 @@ var BufferText = class {
     while (this.queue.length > 0 || !this.isEnd) {
       const text = await this.processChar();
       if (text == null) {
-        await (0, import_koishi7.sleep)(this.sleepTime);
+        await (0, import_koishi9.sleep)(this.sleepTime);
         continue;
       }
       this.rawText += text;
@@ -4014,7 +4022,7 @@ var BufferText = class {
     const text = this.queue.shift();
     unlock();
     if (!this.isEnd) {
-      await (0, import_koishi7.sleep)(this.sleepTime);
+      await (0, import_koishi9.sleep)(this.sleepTime);
     }
     return text;
   }
@@ -4261,7 +4269,7 @@ async function handleEditMessage(context, session, config, bufferText, sendMessa
     while (!isFinished) {
       const firstQueue = queue.shift();
       if (firstQueue == null) {
-        await (0, import_koishi8.sleep)(2);
+        await (0, import_koishi10.sleep)(2);
         continue;
       }
       await editMessage(firstQueue);
@@ -4397,7 +4405,7 @@ function apply44(ctx, config, chain) {
 __name(apply44, "apply");
 
 // src/middlewares/resolve_room.ts
-var import_koishi9 = require("koishi");
+var import_koishi11 = require("koishi");
 var import_uuid2 = require("uuid");
 var import_logger6 = require("koishi-plugin-chatluna/utils/logger");
 var logger8;
@@ -4410,21 +4418,10 @@ function apply45(ctx, config, chain) {
       context.options?.room_resolve?.name
     );
     if (config.allowChatWithRoomName) {
-      const needContinue = (
-        // 私聊
-        session.isDirect && config.allowPrivate && (context.command != null || config.privateChatWithoutCommand) ? true : session.stripped.appel && config.allowAtReply ? true : (
-          // bot名字
-          config.botNames.some(
-            (name2) => session.content.startsWith(name2)
-          ) && config.isNickname || config.isNickNameWithContent && config.botNames.some(
-            (name2) => session.content.includes(name2)
-          ) ? true : (
-            // 命令
-            context.command != null
-          )
-        )
-      );
-      const splitContent = context.message.split(" ");
+      const needContinue = context.command == null;
+      const rawMessageContent = context.message;
+      const messageContent = typeof rawMessageContent === "string" ? rawMessageContent : import_koishi11.h.select(rawMessageContent, "text").join("");
+      const splitContent = messageContent.split(" ");
       let matchedRoom;
       if (splitContent.length > 1) {
         matchedRoom = await queryJoinedConversationRoom(
@@ -4440,7 +4437,7 @@ function apply45(ctx, config, chain) {
         joinRoom = matchedRoom;
         context.options.inputMessage = await ctx.chatluna.messageTransformer.transform(
           session,
-          [import_koishi9.h.text(splitContent.concat(" "))]
+          [import_koishi11.h.text(splitContent.concat(" "))]
         );
       }
     }
@@ -4582,7 +4579,7 @@ function apply46(ctx, config, chain) {
 __name(apply46, "apply");
 
 // src/middlewares/rollback_chat.ts
-var import_koishi10 = require("koishi");
+var import_koishi12 = require("koishi");
 function apply47(ctx, config, chain) {
   chain.middleware("rollback_chat", async (session, context) => {
     const { command: command2 } = context;
@@ -4642,7 +4639,7 @@ function apply47(ctx, config, chain) {
     ]);
     if ((context.options.message?.length ?? 0) < 1) {
       context.options.inputMessage = await ctx.chatluna.messageTransformer.transform(session, [
-        import_koishi10.h.text(humanMessage.text)
+        import_koishi12.h.text(humanMessage.text)
       ]);
     }
     await ctx.database.remove("chathub_message", {
@@ -5907,84 +5904,84 @@ __name(middleware, "middleware");
 var import_chains2 = require("koishi-plugin-chatluna/chains");
 
 // src/config.ts
-var import_koishi11 = require("koishi");
-var Config2 = import_koishi11.Schema.intersect([
-  import_koishi11.Schema.object({
-    botNames: import_koishi11.Schema.array(import_koishi11.Schema.string()).default(["香草"]),
-    isNickname: import_koishi11.Schema.boolean().default(true),
-    isNickNameWithContent: import_koishi11.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_koishi11.Schema.object({
-    allowPrivate: import_koishi11.Schema.boolean().default(true),
-    allowAtReply: import_koishi11.Schema.boolean().default(true),
-    allowQuoteReply: import_koishi11.Schema.boolean().default(false),
-    isReplyWithAt: import_koishi11.Schema.boolean().default(false),
-    isForwardMsg: import_koishi11.Schema.boolean().default(false),
-    privateChatWithoutCommand: import_koishi11.Schema.boolean().default(true),
-    allowChatWithRoomName: import_koishi11.Schema.boolean().default(false),
-    includeQuoteReply: import_koishi11.Schema.boolean().default(true),
-    randomReplyFrequency: import_koishi11.Schema.percent().min(0).max(1).step(0.01).default(0).computed()
+  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),
+    isReplyWithAt: import_koishi13.Schema.boolean().default(false),
+    isForwardMsg: import_koishi13.Schema.boolean().default(false),
+    privateChatWithoutCommand: import_koishi13.Schema.boolean().default(true),
+    allowChatWithRoomName: import_koishi13.Schema.boolean().default(false),
+    includeQuoteReply: import_koishi13.Schema.boolean().default(true),
+    randomReplyFrequency: import_koishi13.Schema.percent().min(0).max(1).step(0.01).default(0).computed()
   }),
-  import_koishi11.Schema.object({
-    sendThinkingMessage: import_koishi11.Schema.boolean().default(true),
-    sendThinkingMessageTimeout: import_koishi11.Schema.number().default(15e3),
-    msgCooldown: import_koishi11.Schema.number().min(0).max(3600).step(1).default(0),
-    messageDelay: import_koishi11.Schema.number().min(0).max(60 * import_koishi11.Time.second).step(1).default(0),
-    showThoughtMessage: import_koishi11.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),
+    messageDelay: import_koishi13.Schema.number().min(0).max(60 * import_koishi13.Time.second).step(1).default(0),
+    showThoughtMessage: import_koishi13.Schema.boolean().default(false)
   }),
-  import_koishi11.Schema.object({
-    outputMode: import_koishi11.Schema.dynamic("output-mode").default("text"),
-    splitMessage: import_koishi11.Schema.boolean().default(false),
-    censor: import_koishi11.Schema.boolean().default(false),
-    rawOnCensor: import_koishi11.Schema.boolean().default(false),
-    streamResponse: import_koishi11.Schema.boolean().default(false)
+  import_koishi13.Schema.object({
+    outputMode: import_koishi13.Schema.dynamic("output-mode").default("text"),
+    splitMessage: import_koishi13.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_koishi11.Schema.object({
-    blackList: import_koishi11.Schema.boolean().computed().default(false)
+  import_koishi13.Schema.object({
+    blackList: import_koishi13.Schema.boolean().computed().default(false)
   }),
-  import_koishi11.Schema.object({
-    messageCount: import_koishi11.Schema.number().role("slider").min(2).max(100).step(1).default(40),
-    autoDelete: import_koishi11.Schema.boolean().default(false),
-    autoDeleteTimeout: import_koishi11.Schema.number().default(import_koishi11.Time.day * 10 / import_koishi11.Time.second).min(import_koishi11.Time.hour / import_koishi11.Time.second)
+  import_koishi13.Schema.object({
+    messageCount: import_koishi13.Schema.number().role("slider").min(2).max(100).step(1).default(40),
+    autoDelete: import_koishi13.Schema.boolean().default(false),
+    autoDeleteTimeout: import_koishi13.Schema.number().default(import_koishi13.Time.day * 10 / import_koishi13.Time.second).min(import_koishi13.Time.hour / import_koishi13.Time.second)
   }),
-  import_koishi11.Schema.object({
-    defaultEmbeddings: import_koishi11.Schema.dynamic("embeddings").default("无"),
-    defaultVectorStore: import_koishi11.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_koishi11.Schema.object({
-    autoCreateRoomFromUser: import_koishi11.Schema.boolean().default(false),
-    defaultChatMode: import_koishi11.Schema.dynamic("chat-mode").default("chat"),
-    defaultModel: import_koishi11.Schema.dynamic("model").default("无"),
-    defaultPreset: import_koishi11.Schema.dynamic("preset").default("chatgpt"),
-    autoUpdateRoomMode: import_koishi11.Schema.union([
-      import_koishi11.Schema.const("all"),
-      import_koishi11.Schema.const("manual"),
-      import_koishi11.Schema.const("disable")
+  import_koishi13.Schema.object({
+    autoCreateRoomFromUser: import_koishi13.Schema.boolean().default(false),
+    defaultChatMode: import_koishi13.Schema.dynamic("chat-mode").default("chat"),
+    defaultModel: import_koishi13.Schema.dynamic("model").default("无"),
+    defaultPreset: import_koishi13.Schema.dynamic("preset").default("chatgpt"),
+    autoUpdateRoomMode: import_koishi13.Schema.union([
+      import_koishi13.Schema.const("all"),
+      import_koishi13.Schema.const("manual"),
+      import_koishi13.Schema.const("disable")
     ]).default("manual")
   }),
-  import_koishi11.Schema.object({
-    authSystem: import_koishi11.Schema.boolean().experimental().hidden().default(false),
-    isProxy: import_koishi11.Schema.boolean().default(false),
-    voiceSpeakId: import_koishi11.Schema.number().default(0),
-    isLog: import_koishi11.Schema.boolean().default(false)
+  import_koishi13.Schema.object({
+    authSystem: import_koishi13.Schema.boolean().experimental().hidden().default(false),
+    isProxy: import_koishi13.Schema.boolean().default(false),
+    voiceSpeakId: import_koishi13.Schema.number().default(0),
+    isLog: import_koishi13.Schema.boolean().default(false)
   }),
-  import_koishi11.Schema.union([
-    import_koishi11.Schema.object({
-      isProxy: import_koishi11.Schema.const(true).required(),
-      proxyAddress: import_koishi11.Schema.string().default("")
+  import_koishi13.Schema.union([
+    import_koishi13.Schema.object({
+      isProxy: import_koishi13.Schema.const(true).required(),
+      proxyAddress: import_koishi13.Schema.string().default("")
     }),
-    import_koishi11.Schema.object({})
+    import_koishi13.Schema.object({})
   ]),
-  import_koishi11.Schema.union([
-    import_koishi11.Schema.object({
-      authSystem: import_koishi11.Schema.const(true).required(),
-      authUserDefaultGroup: import_koishi11.Schema.tuple([
-        import_koishi11.Schema.number().default(0),
-        import_koishi11.Schema.number().default(1),
-        import_koishi11.Schema.string().default("guest")
+  import_koishi13.Schema.union([
+    import_koishi13.Schema.object({
+      authSystem: import_koishi13.Schema.const(true).required(),
+      authUserDefaultGroup: import_koishi13.Schema.tuple([
+        import_koishi13.Schema.number().default(0),
+        import_koishi13.Schema.number().default(1),
+        import_koishi13.Schema.string().default("guest")
       ]).computed().default([0, 1, "guest"])
     }),
-    import_koishi11.Schema.object({})
+    import_koishi13.Schema.object({})
   ])
 ]).i18n({
   "zh-CN": require_zh_CN_schema(),
@@ -5992,7 +5989,7 @@ var Config2 = import_koishi11.Schema.intersect([
 });
 
 // src/render.ts
-var import_koishi17 = require("koishi");
+var import_koishi19 = require("koishi");
 var import_error7 = require("koishi-plugin-chatluna/utils/error");
 
 // src/renders/default.ts
@@ -6007,7 +6004,7 @@ var Renderer = class {
 
 // src/renders/text.ts
 var import_koishi_plugin_markdown = require("koishi-plugin-markdown");
-var import_koishi12 = require("koishi");
+var import_koishi14 = require("koishi");
 var import_he = __toESM(require("he"), 1);
 var TextRenderer = class extends Renderer {
   static {
@@ -6017,14 +6014,14 @@ var TextRenderer = class extends Renderer {
     let transformed = transformAndEscape(message.content);
     if (options.split) {
       transformed = transformed.map((element) => {
-        return (0, import_koishi12.h)("message", element);
+        return (0, import_koishi14.h)("message", element);
       });
     }
     if (transformed[0]?.type === "p") {
       const pElement = transformed.shift();
       const pElementContent = pElement.attrs["content"];
       if (pElementContent) {
-        transformed.unshift(import_koishi12.h.text(pElementContent));
+        transformed.unshift(import_koishi14.h.text(pElementContent));
       } else {
         transformed.unshift(...pElement.children);
       }
@@ -6033,7 +6030,7 @@ var TextRenderer = class extends Renderer {
       element: transformed
     };
   }
-  schema = import_koishi12.Schema.const("text").i18n({
+  schema = import_koishi14.Schema.const("text").i18n({
     "zh-CN": "将回复作为 markdown 进行渲染",
     "en-US": "Render as markdown"
   });
@@ -6057,7 +6054,7 @@ __name(transformAndEscape, "transformAndEscape");
 // src/renders/voice.ts
 var import_marked = require("marked");
 var import_koishi_plugin_chatluna3 = require("koishi-plugin-chatluna");
-var import_koishi13 = require("koishi");
+var import_koishi15 = require("koishi");
 var VoiceRenderer = class extends Renderer {
   static {
     __name(this, "VoiceRenderer");
@@ -6069,7 +6066,7 @@ var VoiceRenderer = class extends Renderer {
       return {
         element: await Promise.all(
           splitMessages.map(async (text) => {
-            return (0, import_koishi13.h)(
+            return (0, import_koishi15.h)(
               "message",
               await this._renderToVoice(text, options)
             );
@@ -6105,7 +6102,7 @@ var VoiceRenderer = class extends Renderer {
       )
     );
   }
-  schema = import_koishi13.Schema.const("voice").i18n({
+  schema = import_koishi15.Schema.const("voice").i18n({
     "zh-CN": "将回复渲染为语音",
     "en-US": "Render as voice"
   });
@@ -6124,24 +6121,24 @@ function renderTokens(tokens) {
 __name(renderTokens, "renderTokens");
 
 // src/renders/raw.ts
-var import_koishi14 = require("koishi");
+var import_koishi16 = require("koishi");
 var RawRenderer = class extends Renderer {
   static {
     __name(this, "RawRenderer");
   }
   async render(message, options) {
     return {
-      element: import_koishi14.h.text(message.content)
+      element: import_koishi16.h.text(message.content)
     };
   }
-  schema = import_koishi14.Schema.const("raw").i18n({
+  schema = import_koishi16.Schema.const("raw").i18n({
     "zh-CN": "原始输出",
     "en-US": "Raw text"
   });
 };
 
 // src/renders/koishi-element.ts
-var import_koishi15 = require("koishi");
+var import_koishi17 = require("koishi");
 var import_he2 = __toESM(require("he"), 1);
 var import_koishi_plugin_chatluna4 = require("koishi-plugin-chatluna");
 var KoishiElementRenderer = class extends Renderer {
@@ -6152,14 +6149,14 @@ var KoishiElementRenderer = class extends Renderer {
     let transformed = transformAndEscape2(message.content);
     if (options.split) {
       transformed = transformed.map((element) => {
-        return (0, import_koishi15.h)("message", element);
+        return (0, import_koishi17.h)("message", element);
       });
     }
     return {
       element: transformed
     };
   }
-  schema = import_koishi15.Schema.const("koishi-element").i18n({
+  schema = import_koishi17.Schema.const("koishi-element").i18n({
     "zh-CN": "将回复作为 koishi 消息元素进行渲染",
     "en-US": "Render as koishi message element template"
   });
@@ -6176,10 +6173,10 @@ function unescape2(element) {
 __name(unescape2, "unescape");
 function transformAndEscape2(source) {
   try {
-    return import_koishi15.h.parse(source).map(unescape2);
+    return import_koishi17.h.parse(source).map(unescape2);
   } catch (e) {
     import_koishi_plugin_chatluna4.logger.error(e);
-    return [import_koishi15.h.text(source)];
+    return [import_koishi17.h.text(source)];
   }
 }
 __name(transformAndEscape2, "transformAndEscape");
@@ -6187,7 +6184,7 @@ __name(transformAndEscape2, "transformAndEscape");
 // src/renders/mixed-voice.ts
 var import_marked2 = require("marked");
 var import_koishi_plugin_chatluna5 = require("koishi-plugin-chatluna");
-var import_koishi16 = require("koishi");
+var import_koishi18 = require("koishi");
 var MixedVoiceRenderer = class extends Renderer {
   static {
     __name(this, "MixedVoiceRenderer");
@@ -6214,7 +6211,7 @@ var MixedVoiceRenderer = class extends Renderer {
     let transformed = transformAndEscape(message.content);
     if (options.split) {
       transformed = transformed.map((element) => {
-        return (0, import_koishi16.h)("message", element);
+        return (0, import_koishi18.h)("message", element);
       });
     }
     return {
@@ -6248,7 +6245,7 @@ var MixedVoiceRenderer = class extends Renderer {
       )
     );
   }
-  schema = import_koishi16.Schema.const("mixed-voice").i18n({
+  schema = import_koishi18.Schema.const("mixed-voice").i18n({
     "zh-CN": "同时输出语音和文本",
     "en-US": "Output both voice and text"
   });
@@ -6303,7 +6300,7 @@ var DefaultRenderer = class {
         for (const additionalMessage of message.additionalReplyMessages) {
           const elements = await rawRenderer.render(additionalMessage, options).then((r) => r.element);
           result2.push({
-            element: (0, import_koishi17.h)(
+            element: (0, import_koishi19.h)(
               "message",
               { forward: true },
               Array.isArray(elements) ? elements : [elements]
@@ -6335,7 +6332,7 @@ var DefaultRenderer = class {
     }
     this.ctx.schema.set(
       "output-mode",
-      import_koishi17.Schema.union(this._getAllRendererScheme())
+      import_koishi19.Schema.union(this._getAllRendererScheme())
     );
   }
   _getAllRendererScheme() {
@@ -6392,7 +6389,7 @@ async function setupEntryPoint(ctx, config, disposables) {
     });
     setupMiddleware(ctx2);
   }, "entryPointPlugin");
-  const entryPointDisposable = (0, import_koishi19.forkScopeToDisposable)(
+  const entryPointDisposable = (0, import_koishi21.forkScopeToDisposable)(
     ctx.plugin(
       {
         apply: entryPointPlugin,
@@ -6439,7 +6436,7 @@ function setupMiddleware(ctx) {
 __name(setupMiddleware, "setupMiddleware");
 function setupLogger(config) {
   if (config.isLog) {
-    (0, import_logger9.setLoggerLevel)(import_koishi18.Logger.DEBUG);
+    (0, import_logger9.setLoggerLevel)(import_koishi20.Logger.DEBUG);
   }
 }
 __name(setupLogger, "setupLogger");
@@ -6464,8 +6461,8 @@ function setupProxy(ctx, config) {
 __name(setupProxy, "setupProxy");
 async function setupServices(ctx, config, disposables) {
   disposables.push(
-    (0, import_koishi19.forkScopeToDisposable)(ctx.plugin(import_chat2.ChatLunaService, config)),
-    (0, import_koishi19.forkScopeToDisposable)(ctx.plugin(ChatLunaAuthService, config))
+    (0, import_koishi21.forkScopeToDisposable)(ctx.plugin(import_chat2.ChatLunaService, config)),
+    (0, import_koishi21.forkScopeToDisposable)(ctx.plugin(ChatLunaAuthService, config))
   );
 }
 __name(setupServices, "setupServices");
@@ -6525,7 +6522,7 @@ async function setupAutoDelete(ctx, config) {
   await execute();
   ctx.setInterval(async () => {
     await execute();
-  }, import_koishi18.Time.minute * 5);
+  }, import_koishi20.Time.minute * 5);
 }
 __name(setupAutoDelete, "setupAutoDelete");
 // Annotate the CommonJS export names for ESM import in node:

package/lib/index.mjs

@@ -487,6 +487,7 @@ function apply(ctx, config, chain) {
 __name(apply, "apply");
 
 // src/commands/chat.ts
+import { h } from "koishi";
 function apply2(ctx, config, chain) {
   ctx.command("chatluna", {
     authority: 1
@@ -501,8 +502,9 @@ function apply2(ctx, config, chain) {
     )) {
       return session.text(".invalid-render-type");
     }
+    const elements = h.parse(message);
     await chain.receiveCommand(session, "", {
-      message,
+      message: elements,
       room_resolve: {
         name: options.room
       },
@@ -514,8 +516,9 @@ function apply2(ctx, config, chain) {
     });
   });
   ctx.command("chatluna.chat.rollback [message:text]").option("room", "-r <room:string>").option("i", "-i <i: string>").action(async ({ options, session }, message) => {
+    const elements = h.parse(message);
     await chain.receiveCommand(session, "rollback", {
-      message,
+      message: elements,
       room_resolve: {
         name: options.room
       },
@@ -535,8 +538,9 @@ function apply2(ctx, config, chain) {
     });
   });
   ctx.command("chatluna.chat.voice <message:text>").option("room", "-r <room:string>").option("speaker", "-s <speakerId:number>", { authority: 1 }).action(async ({ options, session }, message) => {
+    const elements = h.parse(message);
     await chain.receiveCommand(session, "", {
-      message,
+      message: elements,
       renderOptions: {
         split: config.splitMessage,
         type: "voice",
@@ -1029,7 +1033,10 @@ var ChatLunaPluginChain = class _ChatLunaPluginChain extends ChatLunaLLMChainWra
         agent: await createReactAgent({
           llm,
           tools,
-          prompt: this.prompt
+          prompt: this.prompt,
+          instructions: await this.preset().then((preset) => {
+            return preset.config.reActInstruction;
+          })
         }),
         tools,
         memory: void 0,
@@ -1490,7 +1497,7 @@ __name(apply9, "apply");
 
 // src/chains/chain.ts
 import { EventEmitter } from "events";
-import { h } from "koishi";
+import { h as h2 } from "koishi";
 import {
   ChatLunaError as ChatLunaError3,
   ChatLunaErrorCode as ChatLunaErrorCode3,
@@ -2069,9 +2076,12 @@ function apply12(ctx, config, chain) {
 __name(apply12, "apply");
 
 // src/middlewares/allow_reply.ts
+import { h as h3 } from "koishi";
 function apply13(ctx, config, chain) {
   chain.middleware("allow_reply", async (session, context) => {
     if (ctx.bots[session.uid]) return 1 /* STOP */;
+    context.options.reply_status = false;
+    const content = h3.select(session.elements, "text").join("");
     if (session.isDirect && config.allowPrivate && (context.command != null || config.privateChatWithoutCommand)) {
       return await checkReplyPermission();
     }
@@ -2091,21 +2101,17 @@ function apply13(ctx, config, chain) {
     if (config.allowQuoteReply && session.quote?.user?.id === botId) {
       return await checkReplyPermission();
     }
-    if (config.botNames.some(
-      (name2) => session.content.startsWith(name2)
-    ) && config.isNickname || config.isNickNameWithContent && config.botNames.some(
-      (name2) => session.content.includes(name2)
-    )) {
+    if (config.botNames.some((name2) => content.startsWith(name2)) && config.isNickname || config.isNickNameWithContent && config.botNames.some((name2) => content.includes(name2))) {
       return await checkReplyPermission();
     }
     if (Math.random() < await session.resolve(config.randomReplyFrequency)) {
       return await checkReplyPermission();
     }
-    if (config.allowChatWithRoomName) {
-      return await checkReplyPermission();
-    }
     if (context.command != null) {
-      return await checkReplyPermission();
+      return 2 /* CONTINUE */;
+    }
+    if (config.allowChatWithRoomName) {
+      return 2 /* CONTINUE */;
     }
     return 1 /* STOP */;
     async function checkReplyPermission() {
@@ -2113,7 +2119,9 @@ function apply13(ctx, config, chain) {
         "chatluna/before-check-sender",
         session
       );
-      return notReply ? 1 /* STOP */ : 2 /* CONTINUE */;
+      const status = notReply ? 1 /* STOP */ : 2 /* CONTINUE */;
+      context.options.reply_status = status === 2 /* CONTINUE */;
+      return status;
     }
     __name(checkReplyPermission, "checkReplyPermission");
   }).after("lifecycle-check");
@@ -3834,13 +3842,13 @@ function apply40(ctx, config, chain) {
 __name(apply40, "apply");
 
 // src/middlewares/read_chat_message.ts
-import { h as h2 } from "koishi";
+import { h as h4 } from "koishi";
 function apply41(ctx, config, chain) {
   chain.middleware("read_chat_message", async (session, context) => {
     let message = context.command != null ? context.message : session.elements;
     message = message;
     if (typeof message === "string") {
-      message = [h2.text(message)];
+      message = [h4.text(message)];
     }
     const transformedMessage = await ctx.chatluna.messageTransformer.transform(
       session,
@@ -4403,7 +4411,7 @@ function apply44(ctx, config, chain) {
 __name(apply44, "apply");
 
 // src/middlewares/resolve_room.ts
-import { h as h3 } from "koishi";
+import { h as h5 } from "koishi";
 import { v4 as uuidv42 } from "uuid";
 import { createLogger as createLogger6 } from "koishi-plugin-chatluna/utils/logger";
 var logger8;
@@ -4416,21 +4424,10 @@ function apply45(ctx, config, chain) {
       context.options?.room_resolve?.name
     );
     if (config.allowChatWithRoomName) {
-      const needContinue = (
-        // 私聊
-        session.isDirect && config.allowPrivate && (context.command != null || config.privateChatWithoutCommand) ? true : session.stripped.appel && config.allowAtReply ? true : (
-          // bot名字
-          config.botNames.some(
-            (name2) => session.content.startsWith(name2)
-          ) && config.isNickname || config.isNickNameWithContent && config.botNames.some(
-            (name2) => session.content.includes(name2)
-          ) ? true : (
-            // 命令
-            context.command != null
-          )
-        )
-      );
-      const splitContent = context.message.split(" ");
+      const needContinue = context.command == null;
+      const rawMessageContent = context.message;
+      const messageContent = typeof rawMessageContent === "string" ? rawMessageContent : h5.select(rawMessageContent, "text").join("");
+      const splitContent = messageContent.split(" ");
       let matchedRoom;
       if (splitContent.length > 1) {
         matchedRoom = await queryJoinedConversationRoom(
@@ -4446,7 +4443,7 @@ function apply45(ctx, config, chain) {
         joinRoom = matchedRoom;
         context.options.inputMessage = await ctx.chatluna.messageTransformer.transform(
           session,
-          [h3.text(splitContent.concat(" "))]
+          [h5.text(splitContent.concat(" "))]
         );
       }
     }
@@ -4588,7 +4585,7 @@ function apply46(ctx, config, chain) {
 __name(apply46, "apply");
 
 // src/middlewares/rollback_chat.ts
-import { h as h4 } from "koishi";
+import { h as h6 } from "koishi";
 function apply47(ctx, config, chain) {
   chain.middleware("rollback_chat", async (session, context) => {
     const { command: command2 } = context;
@@ -4648,7 +4645,7 @@ function apply47(ctx, config, chain) {
     ]);
     if ((context.options.message?.length ?? 0) < 1) {
       context.options.inputMessage = await ctx.chatluna.messageTransformer.transform(session, [
-        h4.text(humanMessage.text)
+        h6.text(humanMessage.text)
       ]);
     }
     await ctx.database.remove("chathub_message", {
@@ -5998,7 +5995,7 @@ var Config2 = Schema2.intersect([
 });
 
 // src/render.ts
-import { h as h10, Schema as Schema8 } from "koishi";
+import { h as h12, Schema as Schema8 } from "koishi";
 import {
   ChatLunaError as ChatLunaError7,
   ChatLunaErrorCode as ChatLunaErrorCode7
@@ -6016,7 +6013,7 @@ var Renderer = class {
 
 // src/renders/text.ts
 import { transform } from "koishi-plugin-markdown";
-import { h as h5, Schema as Schema3 } from "koishi";
+import { h as h7, Schema as Schema3 } from "koishi";
 import he from "he";
 var TextRenderer = class extends Renderer {
   static {
@@ -6026,14 +6023,14 @@ var TextRenderer = class extends Renderer {
     let transformed = transformAndEscape(message.content);
     if (options.split) {
       transformed = transformed.map((element) => {
-        return h5("message", element);
+        return h7("message", element);
       });
     }
     if (transformed[0]?.type === "p") {
       const pElement = transformed.shift();
       const pElementContent = pElement.attrs["content"];
       if (pElementContent) {
-        transformed.unshift(h5.text(pElementContent));
+        transformed.unshift(h7.text(pElementContent));
       } else {
         transformed.unshift(...pElement.children);
       }
@@ -6066,7 +6063,7 @@ __name(transformAndEscape, "transformAndEscape");
 // src/renders/voice.ts
 import { marked } from "marked";
 import { logger as logger11 } from "koishi-plugin-chatluna";
-import { h as h6, Schema as Schema4 } from "koishi";
+import { h as h8, Schema as Schema4 } from "koishi";
 var VoiceRenderer = class extends Renderer {
   static {
     __name(this, "VoiceRenderer");
@@ -6078,7 +6075,7 @@ var VoiceRenderer = class extends Renderer {
       return {
         element: await Promise.all(
           splitMessages.map(async (text) => {
-            return h6(
+            return h8(
               "message",
               await this._renderToVoice(text, options)
             );
@@ -6133,14 +6130,14 @@ function renderTokens(tokens) {
 __name(renderTokens, "renderTokens");
 
 // src/renders/raw.ts
-import { h as h7, Schema as Schema5 } from "koishi";
+import { h as h9, Schema as Schema5 } from "koishi";
 var RawRenderer = class extends Renderer {
   static {
     __name(this, "RawRenderer");
   }
   async render(message, options) {
     return {
-      element: h7.text(message.content)
+      element: h9.text(message.content)
     };
   }
   schema = Schema5.const("raw").i18n({
@@ -6150,7 +6147,7 @@ var RawRenderer = class extends Renderer {
 };
 
 // src/renders/koishi-element.ts
-import { h as h8, Schema as Schema6 } from "koishi";
+import { h as h10, Schema as Schema6 } from "koishi";
 import he2 from "he";
 import { logger as logger12 } from "koishi-plugin-chatluna";
 var KoishiElementRenderer = class extends Renderer {
@@ -6161,7 +6158,7 @@ var KoishiElementRenderer = class extends Renderer {
     let transformed = transformAndEscape2(message.content);
     if (options.split) {
       transformed = transformed.map((element) => {
-        return h8("message", element);
+        return h10("message", element);
       });
     }
     return {
@@ -6185,10 +6182,10 @@ function unescape2(element) {
 __name(unescape2, "unescape");
 function transformAndEscape2(source) {
   try {
-    return h8.parse(source).map(unescape2);
+    return h10.parse(source).map(unescape2);
   } catch (e) {
     logger12.error(e);
-    return [h8.text(source)];
+    return [h10.text(source)];
   }
 }
 __name(transformAndEscape2, "transformAndEscape");
@@ -6196,7 +6193,7 @@ __name(transformAndEscape2, "transformAndEscape");
 // src/renders/mixed-voice.ts
 import { marked as marked2 } from "marked";
 import { logger as logger13 } from "koishi-plugin-chatluna";
-import { h as h9, Schema as Schema7 } from "koishi";
+import { h as h11, Schema as Schema7 } from "koishi";
 var MixedVoiceRenderer = class extends Renderer {
   static {
     __name(this, "MixedVoiceRenderer");
@@ -6223,7 +6220,7 @@ var MixedVoiceRenderer = class extends Renderer {
     let transformed = transformAndEscape(message.content);
     if (options.split) {
       transformed = transformed.map((element) => {
-        return h9("message", element);
+        return h11("message", element);
       });
     }
     return {
@@ -6312,7 +6309,7 @@ var DefaultRenderer = class {
         for (const additionalMessage of message.additionalReplyMessages) {
           const elements = await rawRenderer.render(additionalMessage, options).then((r) => r.element);
           result2.push({
-            element: h10(
+            element: h12(
               "message",
               { forward: true },
               Array.isArray(elements) ? elements : [elements]

package/lib/llm-core/agent/index.cjs

@@ -1344,11 +1344,12 @@ async function createReactAgent({
   llm,
   tools,
   prompt,
-  streamRunnable
+  streamRunnable,
+  instructions
 }) {
   const toolNames = tools.map((tool) => tool.name);
   const instructionsFormat = import_prompts2.PromptTemplate.fromTemplate(
-    FORMAT_INSTRUCTIONS
+    instructions ?? FORMAT_INSTRUCTIONS
   ).format({
     tool_descriptions: renderTextDescriptionAndArgs(tools),
     tool_names: toolNames.join(", ")

package/lib/llm-core/agent/index.mjs

@@ -1334,11 +1334,12 @@ async function createReactAgent({
   llm,
   tools,
   prompt,
-  streamRunnable
+  streamRunnable,
+  instructions
 }) {
   const toolNames = tools.map((tool) => tool.name);
   const instructionsFormat = PromptTemplate.fromTemplate(
-    FORMAT_INSTRUCTIONS
+    instructions ?? FORMAT_INSTRUCTIONS
   ).format({
     tool_descriptions: renderTextDescriptionAndArgs(tools),
     tool_names: toolNames.join(", ")

package/lib/llm-core/agent/react/index.d.ts

@@ -21,6 +21,7 @@ export type CreateReactAgentParams = {
      * allowing streaming of intermediate steps. Defaults to true.
      */
     streamRunnable?: boolean;
+    instructions?: string;
 };
 /**
  * Create an agent that uses ReAct prompting.
@@ -65,7 +66,7 @@ export type CreateReactAgentParams = {
  * });
  * ```
  */
-export declare function createReactAgent({ llm, tools, prompt, streamRunnable }: CreateReactAgentParams): Promise<AgentRunnableSequence<{
+export declare function createReactAgent({ llm, tools, prompt, streamRunnable, instructions }: CreateReactAgentParams): Promise<AgentRunnableSequence<{
     steps: AgentStep[];
 }, import("@langchain/core/agents").AgentAction | import("@langchain/core/agents").AgentFinish>>;
 /**

package/lib/llm-core/prompt/type.d.ts

@@ -37,6 +37,7 @@ export interface RawPreset {
         longMemoryExtractPrompt?: string;
         longMemoryNewQuestionPrompt?: string;
         postHandler?: PostHandler;
+        reActInstruction?: string;
     };
 }
 export interface RoleBook {
@@ -77,6 +78,7 @@ export interface PresetTemplate {
         longMemoryExtractPrompt?: string;
         longMemoryNewQuestionPrompt?: string;
         postHandler?: PostHandler;
+        reActInstruction?: string;
     };
 }
 export interface KnowledgeConfig {

package/lib/middlewares/allow_reply.d.ts

@@ -6,4 +6,7 @@ declare module '../chains/chain' {
     interface ChainMiddlewareName {
         allow_reply: never;
     }
+    interface ChainMiddlewareContextOptions {
+        reply_status?: boolean;
+    }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna",
   "description": "chatluna for koishi",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",