koishi-plugin-chatluna 1.4.2 → 1.4.3

package/lib/chains/chain.d.ts

@@ -50,7 +50,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 | ChainMiddlewareRunStatus | h[] | h[][]>;
+    run(session: Session, options: ChainMiddlewareContext): Promise<string | h[] | h[][] | ChainMiddlewareRunStatus>;
 }
 export interface ChainMiddlewareContext {
     config: Config;

package/lib/index.cjs

@@ -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)) {
@@ -7750,7 +7757,6 @@ var ReplyStream = class {
   sentAdditional = false;
   closed = false;
   moderated;
-  pending = [];
   renderMessage;
   renderAdditional;
   async write(frame) {
@@ -7767,10 +7773,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 +7793,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 +7851,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,

package/lib/index.mjs

@@ -3265,10 +3265,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(
@@ -3277,9 +3278,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");
 
@@ -3322,7 +3323,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}`
@@ -3331,7 +3332,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);
@@ -3508,11 +3508,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)) {
@@ -7791,7 +7798,6 @@ var ReplyStream = class {
   sentAdditional = false;
   closed = false;
   moderated;
-  pending = [];
   renderMessage;
   renderAdditional;
   async write(frame) {
@@ -7808,10 +7814,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"
@@ -7832,26 +7834,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");
@@ -7906,7 +7892,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,

package/lib/llm-core/agent/sub-agent/tool.d.ts

@@ -21,8 +21,8 @@ declare class AgentTaskTool extends StructuredTool {
     }, "strip", z.ZodTypeAny, {
         message?: string;
         id?: string;
-        action?: "run" | "message" | "status" | "list" | "stop" | "list_all";
         prompt?: string;
+        action?: "message" | "status" | "list" | "run" | "stop" | "list_all";
         agent?: string;
         background?: boolean;
         goal?: string;
@@ -30,8 +30,8 @@ declare class AgentTaskTool extends StructuredTool {
     }, {
         message?: string;
         id?: string;
-        action?: "run" | "message" | "status" | "list" | "stop" | "list_all";
         prompt?: string;
+        action?: "message" | "status" | "list" | "run" | "stop" | "list_all";
         agent?: string;
         background?: boolean;
         goal?: string;
@@ -39,8 +39,8 @@ declare class AgentTaskTool extends StructuredTool {
     }>, {
         message?: string;
         id?: string;
-        action?: "run" | "message" | "status" | "list" | "stop" | "list_all";
         prompt?: string;
+        action?: "message" | "status" | "list" | "run" | "stop" | "list_all";
         agent?: string;
         background?: boolean;
         goal?: string;
@@ -48,8 +48,8 @@ declare class AgentTaskTool extends StructuredTool {
     }, {
         message?: string;
         id?: string;
-        action?: "run" | "message" | "status" | "list" | "stop" | "list_all";
         prompt?: string;
+        action?: "message" | "status" | "list" | "run" | "stop" | "list_all";
         agent?: string;
         background?: boolean;
         goal?: string;

package/lib/llm-core/chat/helper.d.ts

@@ -1,4 +1,3 @@
-import { Embeddings } from '@langchain/core/embeddings';
 import { AIMessage } from '@langchain/core/messages';
 import { ComputedRef } from '@vue/reactivity';
 import { ChatLunaChatModel } from 'koishi-plugin-chatluna/llm-core/platform/model';
@@ -6,7 +5,7 @@ import { PlatformService } from 'koishi-plugin-chatluna/llm-core/platform/servic
 import { ModelInfo } from 'koishi-plugin-chatluna/llm-core/platform/types';
 import type { ChatLunaService } from '../../services/chat';
 export declare function createDisplayResponse(responseMessage: AIMessage): AIMessage;
-export declare function initEmbeddings(service: PlatformService, model: string | undefined): Promise<ComputedRef<Embeddings<number[]>>>;
+export declare function initEmbeddings(service: PlatformService, model: string | undefined): Promise<ComputedRef<import("koishi-plugin-chatluna/llm-core/model/in_memory").EmptyEmbeddings>>;
 export declare function initModel(chatluna: ChatLunaService, llmPlatform: string, llmModelName: string): Promise<[
     ComputedRef<ChatLunaChatModel>,
     ComputedRef<ModelInfo | undefined>

package/lib/migration/validators.d.ts

@@ -45,4 +45,4 @@ export declare function isComplexRoom(room: LegacyRoomRecord, members: LegacyRoo
 export declare function filterValidRooms(rooms: LegacyRoomRecord[]): LegacyRoomRecord[];
 export declare function aclKey(conversationId: string, principalType: string, principalId: string, permission: string): string;
 export declare function resolveRoomBindingKey(room: LegacyRoomRecord, members: LegacyRoomMemberRecord[], groups: LegacyRoomGroupRecord[], routeModes: Map<string, 'shared' | 'personal'>): string;
-export declare function inferLegacyGroupRouteModes(users: LegacyUserRecord[], rooms: LegacyRoomRecord[], groups: LegacyRoomGroupRecord[]): Map<string, "personal" | "shared">;
+export declare function inferLegacyGroupRouteModes(users: LegacyUserRecord[], rooms: LegacyRoomRecord[], groups: LegacyRoomGroupRecord[]): Map<string, "shared" | "personal">;

package/lib/render/stream.d.ts

@@ -25,7 +25,6 @@ export declare class ReplyStream {
     private sentAdditional;
     private closed;
     private moderated;
-    private pending;
     private renderMessage;
     private renderAdditional?;
     constructor(ctx: Context, config: Config, context: ChainMiddlewareContext, renderer: Renderer, opts: ReplyStreamOptions);

package/package.json

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