koishi-plugin-mai-bridge 0.1.3 → 0.1.4

package/README.md

@@ -59,6 +59,7 @@ webuiHost: 0.0.0.0
 webuiPort: 8002
 messageMode: coexist
 groupMessageTriggerCount: 1
+directMessageTriggerCount: 1
 ```
 
 说明：
@@ -68,7 +69,8 @@ groupMessageTriggerCount: 1
 - `apiKey` 可以留空。插件会生成并复用运行期密钥。
 - `dockerNetwork` 按你的 Koishi Docker 网络填写。Koishi 需要能通过 `apiHost` 访问 `maimai-ko`。
 - `webuiPublicUrl` 可填写反代或宿主机映射后的 WebUI 地址，用于 Koishi 控制台显示入口。
-- `groupMessageTriggerCount` 控制群聊累计多少条消息后批量转发并强制触发 maibot 思考。设为 `3` 时，同一群前两条先缓存，第 3 条会连同前两条一起转发；私聊不受影响。
+- `groupMessageTriggerCount` 控制群聊累计多少条消息后批量转发并强制触发 maibot 思考。设为 `3` 时，同一群前两条先缓存，第 3 条会连同前两条一起转发。
+- `directMessageTriggerCount` 控制私聊累计多少条消息后批量转发并强制触发 maibot 思考。默认 `1`，表示每条私信都会触发；设为 `3` 时，同一私聊前两条只缓存，第 3 条统一转发并触发回复。
 
 ## 消息模式
 

package/client/page.vue

@@ -10,6 +10,7 @@
       <p>Bridge：{{ status?.transport.state || 'unknown' }}</p>
       <p v-if="status?.bridge">中转：Koishi 收 {{ status.bridge.koishiReceived }} / 发往 mai.ko {{ status.bridge.maimSent }} / 收到 mai.ko {{ status.bridge.maimReceived }} / 回发 Koishi {{ status.bridge.koishiSent }}</p>
       <p v-if="status?.bridge">中转异常：路由失败 {{ status.bridge.routeMissed }} / 发送失败 {{ status.bridge.sendFailed }}</p>
+      <p v-if="status?.bridge">触发限制：群聊跳过 {{ status.bridge.groupTriggerSkipped }} / 私信跳过 {{ status.bridge.directTriggerSkipped }}</p>
       <p>WebUI：{{ webuiText }}</p>
       <p v-if="status?.webui.token?.value">WebUI Token：<code>{{ status.webui.token.value }}</code></p>
       <p v-else-if="status?.webui.token?.lastError">WebUI Token：{{ status.webui.token.lastError }}</p>
@@ -76,6 +77,8 @@ interface RuntimeStatus {
     koishiSent: number
     routeMissed: number
     sendFailed: number
+    groupTriggerSkipped: number
+    directTriggerSkipped: number
     lastError?: string
   }
   webui: {

package/dist/index.js

@@ -1,2 +1,2 @@
-import{defineComponent as Z,ref as ee,computed as te,onMounted as oe,resolveComponent as p,openBlock as a,createBlock as F,withCtx as r,createVNode as s,createElementVNode as d,toDisplayString as o,createElementBlock as n,createCommentVNode as u,createTextVNode as l}from"vue";import{send as k}from"@koishijs/client";const ae={key:0},re={key:1},ne={key:2},ue={key:3},le={key:4},ie={key:5},se={key:6},ke={key:7},de={key:8},ve={key:9},pe={key:11},ce={key:12},fe=Z({__name:"page",setup(c){const e=ee(),P=te(()=>e.value?e.value.webui.enabled?e.value.webui.url||`${e.value.webui.host}:${e.value.webui.port}`:"disabled":"unknown");async function f(){e.value=await k("mai-ko/status")}async function h(){e.value=await k("mai-ko/start")}async function q(){e.value=await k("mai-ko/stop")}async function z(){e.value=await k("mai-ko/restart")}async function A(){e.value=await k("mai-ko/reconnect")}async function G(){e.value=await k("mai-ko/prepare")}async function J(){e.value=await k("mai-ko/docker-start")}async function L(){e.value=await k("mai-ko/docker-stop")}async function O(){e.value=await k("mai-ko/docker-restart")}function Q(){var v;(v=e.value)!=null&&v.webui.url&&window.open(e.value.webui.url,"_blank","noopener,noreferrer")}return oe(f),(v,t)=>{const i=p("k-button"),X=p("k-card"),Y=p("k-layout");return a(),F(Y,null,{default:r(()=>[s(X,null,{header:r(()=>[...t[0]||(t[0]=[d("span",null,"mai.ko 托管状态",-1)])]),default:r(()=>{var b,m,w,_,y,g,C,E,D,R,x,B,I,N,S,W,T,U,V,H,K,M,$,j;return[d("p",null,"进程："+o(((b=e.value)==null?void 0:b.process.state)||"unknown"),1),d("p",null,"准备："+o(((m=e.value)==null?void 0:m.prepare.state)||"unknown")+" / "+o(((w=e.value)==null?void 0:w.prepare.root)||"-"),1),d("p",null,"Docker："+o(((_=e.value)==null?void 0:_.docker.state)||"unknown")+" / "+o(((y=e.value)==null?void 0:y.docker.containerName)||"-"),1),d("p",null,"Bridge："+o(((g=e.value)==null?void 0:g.transport.state)||"unknown"),1),(C=e.value)!=null&&C.bridge?(a(),n("p",ae,"中转：Koishi 收 "+o(e.value.bridge.koishiReceived)+" / 发往 mai.ko "+o(e.value.bridge.maimSent)+" / 收到 mai.ko "+o(e.value.bridge.maimReceived)+" / 回发 Koishi "+o(e.value.bridge.koishiSent),1)):u("v-if",true),(E=e.value)!=null&&E.bridge?(a(),n("p",re,"中转异常：路由失败 "+o(e.value.bridge.routeMissed)+" / 发送失败 "+o(e.value.bridge.sendFailed),1)):u("v-if",true),d("p",null,"WebUI："+o(P.value),1),(R=(D=e.value)==null?void 0:D.webui.token)!=null&&R.value?(a(),n("p",ne,[t[1]||(t[1]=l("WebUI Token：",-1)),d("code",null,o(e.value.webui.token.value),1)])):(B=(x=e.value)==null?void 0:x.webui.token)!=null&&B.lastError?(a(),n("p",ue,"WebUI Token："+o(e.value.webui.token.lastError),1)):u("v-if",true),d("p",null,"PID："+o(((I=e.value)==null?void 0:I.process.pid)||"-"),1),(N=e.value)!=null&&N.process.blockedReason?(a(),n("p",le,"阻塞原因："+o(e.value.process.blockedReason),1)):u("v-if",true),(S=e.value)!=null&&S.prepare.blockedReason?(a(),n("p",ie,"准备阻塞："+o(e.value.prepare.blockedReason),1)):u("v-if",true),(W=e.value)!=null&&W.prepare.lastError?(a(),n("p",se,"准备错误："+o(e.value.prepare.lastError),1)):u("v-if",true),(T=e.value)!=null&&T.docker.lastError?(a(),n("p",ke,"Docker 错误："+o(e.value.docker.lastError),1)):u("v-if",true),(U=e.value)!=null&&U.transport.lastError?(a(),n("p",de,"Bridge 错误："+o(e.value.transport.lastError),1)):u("v-if",true),(H=(V=e.value)==null?void 0:V.bridge)!=null&&H.lastError?(a(),n("p",ve,"中转错误："+o(e.value.bridge.lastError),1)):u("v-if",true),s(i,{onClick:f},{default:r(()=>[...t[2]||(t[2]=[l("刷新",-1)])]),_:1}),s(i,{onClick:h},{default:r(()=>[...t[3]||(t[3]=[l("启动",-1)])]),_:1}),s(i,{onClick:q},{default:r(()=>[...t[4]||(t[4]=[l("停止",-1)])]),_:1}),s(i,{onClick:z},{default:r(()=>[...t[5]||(t[5]=[l("重启",-1)])]),_:1}),s(i,{onClick:A},{default:r(()=>[...t[6]||(t[6]=[l("重连",-1)])]),_:1}),s(i,{onClick:G},{default:r(()=>[...t[7]||(t[7]=[l("准备",-1)])]),_:1}),s(i,{onClick:J},{default:r(()=>[...t[8]||(t[8]=[l("Docker 启动",-1)])]),_:1}),s(i,{onClick:L},{default:r(()=>[...t[9]||(t[9]=[l("Docker 停止",-1)])]),_:1}),s(i,{onClick:O},{default:r(()=>[...t[10]||(t[10]=[l("Docker 重启",-1)])]),_:1}),(K=e.value)!=null&&K.webui.enabled&&((M=e.value)!=null&&M.webui.url)?(a(),F(i,{key:10,onClick:Q},{default:r(()=>[...t[11]||(t[11]=[l("打开 WebUI",-1)])]),_:1})):u("v-if",true),($=e.value)!=null&&$.logsHint?(a(),n("p",pe,o(e.value.logsHint),1)):u("v-if",true),(j=e.value)!=null&&j.logs.length?(a(),n("pre",ce,o(e.value.logs.slice(-20).join(`
-`)),1)):u("v-if",true)]}),_:1})]),_:1})}}}),we=c=>{c.page({name:"mai.ko",path:"/mai-ko",authority:3,component:fe})};export{we as default};
+import{defineComponent as ee,ref as te,computed as oe,onMounted as re,resolveComponent as v,openBlock as r,createBlock as F,withCtx as a,createVNode as s,createElementVNode as k,toDisplayString as t,createElementBlock as n,createCommentVNode as u,createTextVNode as l}from"vue";import{send as d}from"@koishijs/client";const ae={key:0},ne={key:1},ue={key:2},le={key:3},ie={key:4},se={key:5},de={key:6},ke={key:7},pe={key:8},ve={key:9},ce={key:10},fe={key:12},be={key:13},me=ee({__name:"page",setup(c){const e=te(),P=oe(()=>e.value?e.value.webui.enabled?e.value.webui.url||`${e.value.webui.host}:${e.value.webui.port}`:"disabled":"unknown");async function f(){e.value=await d("mai-ko/status")}async function q(){e.value=await d("mai-ko/start")}async function z(){e.value=await d("mai-ko/stop")}async function A(){e.value=await d("mai-ko/restart")}async function G(){e.value=await d("mai-ko/reconnect")}async function J(){e.value=await d("mai-ko/prepare")}async function L(){e.value=await d("mai-ko/docker-start")}async function O(){e.value=await d("mai-ko/docker-stop")}async function Q(){e.value=await d("mai-ko/docker-restart")}function X(){var p;(p=e.value)!=null&&p.webui.url&&window.open(e.value.webui.url,"_blank","noopener,noreferrer")}return re(f),(p,o)=>{const i=v("k-button"),Y=v("k-card"),Z=v("k-layout");return r(),F(Z,null,{default:a(()=>[s(Y,null,{header:a(()=>[...o[0]||(o[0]=[k("span",null,"mai.ko 托管状态",-1)])]),default:a(()=>{var b,m,_,w,g,y,C,E,D,R,S,x,T,B,I,N,W,U,V,H,K,M,$,h,j;return[k("p",null,"进程："+t(((b=e.value)==null?void 0:b.process.state)||"unknown"),1),k("p",null,"准备："+t(((m=e.value)==null?void 0:m.prepare.state)||"unknown")+" / "+t(((_=e.value)==null?void 0:_.prepare.root)||"-"),1),k("p",null,"Docker："+t(((w=e.value)==null?void 0:w.docker.state)||"unknown")+" / "+t(((g=e.value)==null?void 0:g.docker.containerName)||"-"),1),k("p",null,"Bridge："+t(((y=e.value)==null?void 0:y.transport.state)||"unknown"),1),(C=e.value)!=null&&C.bridge?(r(),n("p",ae,"中转：Koishi 收 "+t(e.value.bridge.koishiReceived)+" / 发往 mai.ko "+t(e.value.bridge.maimSent)+" / 收到 mai.ko "+t(e.value.bridge.maimReceived)+" / 回发 Koishi "+t(e.value.bridge.koishiSent),1)):u("v-if",true),(E=e.value)!=null&&E.bridge?(r(),n("p",ne,"中转异常：路由失败 "+t(e.value.bridge.routeMissed)+" / 发送失败 "+t(e.value.bridge.sendFailed),1)):u("v-if",true),(D=e.value)!=null&&D.bridge?(r(),n("p",ue,"触发限制：群聊跳过 "+t(e.value.bridge.groupTriggerSkipped)+" / 私信跳过 "+t(e.value.bridge.directTriggerSkipped),1)):u("v-if",true),k("p",null,"WebUI："+t(P.value),1),(S=(R=e.value)==null?void 0:R.webui.token)!=null&&S.value?(r(),n("p",le,[o[1]||(o[1]=l("WebUI Token：",-1)),k("code",null,t(e.value.webui.token.value),1)])):(T=(x=e.value)==null?void 0:x.webui.token)!=null&&T.lastError?(r(),n("p",ie,"WebUI Token："+t(e.value.webui.token.lastError),1)):u("v-if",true),k("p",null,"PID："+t(((B=e.value)==null?void 0:B.process.pid)||"-"),1),(I=e.value)!=null&&I.process.blockedReason?(r(),n("p",se,"阻塞原因："+t(e.value.process.blockedReason),1)):u("v-if",true),(N=e.value)!=null&&N.prepare.blockedReason?(r(),n("p",de,"准备阻塞："+t(e.value.prepare.blockedReason),1)):u("v-if",true),(W=e.value)!=null&&W.prepare.lastError?(r(),n("p",ke,"准备错误："+t(e.value.prepare.lastError),1)):u("v-if",true),(U=e.value)!=null&&U.docker.lastError?(r(),n("p",pe,"Docker 错误："+t(e.value.docker.lastError),1)):u("v-if",true),(V=e.value)!=null&&V.transport.lastError?(r(),n("p",ve,"Bridge 错误："+t(e.value.transport.lastError),1)):u("v-if",true),(K=(H=e.value)==null?void 0:H.bridge)!=null&&K.lastError?(r(),n("p",ce,"中转错误："+t(e.value.bridge.lastError),1)):u("v-if",true),s(i,{onClick:f},{default:a(()=>[...o[2]||(o[2]=[l("刷新",-1)])]),_:1}),s(i,{onClick:q},{default:a(()=>[...o[3]||(o[3]=[l("启动",-1)])]),_:1}),s(i,{onClick:z},{default:a(()=>[...o[4]||(o[4]=[l("停止",-1)])]),_:1}),s(i,{onClick:A},{default:a(()=>[...o[5]||(o[5]=[l("重启",-1)])]),_:1}),s(i,{onClick:G},{default:a(()=>[...o[6]||(o[6]=[l("重连",-1)])]),_:1}),s(i,{onClick:J},{default:a(()=>[...o[7]||(o[7]=[l("准备",-1)])]),_:1}),s(i,{onClick:L},{default:a(()=>[...o[8]||(o[8]=[l("Docker 启动",-1)])]),_:1}),s(i,{onClick:O},{default:a(()=>[...o[9]||(o[9]=[l("Docker 停止",-1)])]),_:1}),s(i,{onClick:Q},{default:a(()=>[...o[10]||(o[10]=[l("Docker 重启",-1)])]),_:1}),(M=e.value)!=null&&M.webui.enabled&&(($=e.value)!=null&&$.webui.url)?(r(),F(i,{key:11,onClick:X},{default:a(()=>[...o[11]||(o[11]=[l("打开 WebUI",-1)])]),_:1})):u("v-if",true),(h=e.value)!=null&&h.logsHint?(r(),n("p",fe,t(e.value.logsHint),1)):u("v-if",true),(j=e.value)!=null&&j.logs.length?(r(),n("pre",be,t(e.value.logs.slice(-20).join(`
+`)),1)):u("v-if",true)]}),_:1})]),_:1})}}}),ge=c=>{c.page({name:"mai.ko",path:"/mai-ko",authority:3,component:me})};export{ge as default};

package/out/bridge/convert.js

@@ -204,7 +204,8 @@ async function sessionToMaimMessage(session, route, apiKey, options = {}) {
                 koishi_reply_to_message_id: replyContext?.targetMessageId,
                 koishi_reply_context_count: replyContext?.contextCount,
                 koishi_is_direct: !!session.isDirect,
-                koishi_group_trigger_forced: forceMention,
+                koishi_group_trigger_forced: !session.isDirect && forceMention,
+                koishi_direct_trigger_forced: !!session.isDirect && forceMention,
                 at_bot: mentioned,
                 is_mentioned: mentioned,
             },

package/out/bridge/group-trigger.d.ts

@@ -20,3 +20,11 @@ export declare class GroupMessageTrigger {
     clear(): void;
     private createKey;
 }
+export declare class DirectMessageTrigger {
+    private threshold;
+    private pending;
+    constructor(threshold: number);
+    test(session: Session, route: KoishiRoute): GroupTriggerResult;
+    clear(): void;
+    private createKey;
+}

package/out/bridge/group-trigger.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GroupMessageTrigger = void 0;
+exports.DirectMessageTrigger = exports.GroupMessageTrigger = void 0;
 class GroupMessageTrigger {
     threshold;
     pending = new Map();
@@ -35,3 +35,39 @@ class GroupMessageTrigger {
     }
 }
 exports.GroupMessageTrigger = GroupMessageTrigger;
+class DirectMessageTrigger {
+    threshold;
+    pending = new Map();
+    constructor(threshold) {
+        this.threshold = threshold;
+    }
+    test(session, route) {
+        const threshold = Math.max(1, Math.floor(this.threshold || 1));
+        const entry = { session, route };
+        if (!session.isDirect || !route.userId) {
+            return { shouldForward: true, count: 1, threshold, entries: [entry] };
+        }
+        if (threshold <= 1) {
+            return { shouldForward: true, count: 1, threshold, entries: [entry], forceMention: true };
+        }
+        const key = this.createKey(route);
+        const entries = [...this.pending.get(key) || [], entry];
+        if (entries.length >= threshold) {
+            this.pending.delete(key);
+            return { shouldForward: true, count: entries.length, threshold, key, entries, forceMention: true };
+        }
+        this.pending.set(key, entries);
+        return { shouldForward: false, count: entries.length, threshold, key, entries: [] };
+    }
+    clear() {
+        this.pending.clear();
+    }
+    createKey(route) {
+        return [
+            route.platform,
+            route.botSelfId,
+            route.userId,
+        ].join(':');
+    }
+}
+exports.DirectMessageTrigger = DirectMessageTrigger;

package/out/commands/index.js

@@ -16,6 +16,7 @@ function renderStatus(status) {
         `重连次数: ${status.transport.reconnectAttempts}`,
         `中转: Koishi收=${status.bridge.koishiReceived} / 发往mai.ko=${status.bridge.maimSent} / 收到mai.ko=${status.bridge.maimReceived} / 回发Koishi=${status.bridge.koishiSent}`,
         `中转异常: 路由失败=${status.bridge.routeMissed} / 发送失败=${status.bridge.sendFailed}`,
+        `触发限制: 群聊跳过=${status.bridge.groupTriggerSkipped} / 私信跳过=${status.bridge.directTriggerSkipped}`,
         `启动时间: ${formatTime(status.process.startedAt)}`,
     ];
     if (status.process.blockedReason)

package/out/config.d.ts

@@ -24,6 +24,7 @@ export interface Config {
     messageMode: MessageMode;
     commandPrefix: string;
     groupMessageTriggerCount: number;
+    directMessageTriggerCount: number;
     imageDownloadEnabled: boolean;
     imageDownloadTimeout: number;
     imageDownloadMaxBytes: number;

package/out/config.js

@@ -43,7 +43,8 @@ exports.Config = koishi_1.Schema.intersect([
             koishi_1.Schema.const('command').description('命令：仅命中指令前缀时转发。'),
         ]).default('coexist').description('消息转发模式。'),
         commandPrefix: koishi_1.Schema.string().default('mai.ko').description('command 模式下触发 mai.ko 的文本前缀。'),
-        groupMessageTriggerCount: koishi_1.Schema.number().min(1).default(1).description('同一群聊累计达到多少条消息后批量转发并强制触发 mai.ko 思考；1 表示每条群消息都转发。私聊不受影响。'),
+        groupMessageTriggerCount: koishi_1.Schema.number().min(1).default(1).description('同一群聊累计达到多少条消息后批量转发并强制触发 mai.ko 思考；1 表示每条群消息都转发。'),
+        directMessageTriggerCount: koishi_1.Schema.number().min(1).default(1).description('同一私聊累计达到多少条消息后批量转发并强制触发 mai.ko 思考；1 表示每条私信都转发。'),
         imageDownloadEnabled: koishi_1.Schema.boolean().default(true).description('转发图片消息前由 Koishi 下载图片并转为 mai.ko 可识别的 base64 图片段。'),
         imageDownloadTimeout: koishi_1.Schema.number().min(1000).default(10000).description('下载单张入站图片的超时时间，单位毫秒。'),
         imageDownloadMaxBytes: koishi_1.Schema.number().min(1024).default(10 * 1024 * 1024).description('允许转发给 mai.ko 的单张图片最大字节数。'),

package/out/service.d.ts

@@ -11,6 +11,7 @@ export declare class MaibotService extends Service {
     private process;
     private externalLogs;
     private groupTrigger;
+    private directTrigger;
     private history;
     private routes;
     private transport;

package/out/service.js

@@ -23,6 +23,7 @@ class MaibotService extends koishi_1.Service {
     process;
     externalLogs;
     groupTrigger;
+    directTrigger;
     history;
     routes;
     transport;
@@ -46,6 +47,7 @@ class MaibotService extends koishi_1.Service {
         routeMissed: 0,
         sendFailed: 0,
         groupTriggerSkipped: 0,
+        directTriggerSkipped: 0,
     };
     constructor(ctx, pluginConfig) {
         super(ctx, 'maimai');
@@ -57,6 +59,7 @@ class MaibotService extends koishi_1.Service {
         this.process = new process_1.MaibotProcessManager(ctx, pluginConfig, this.apiKey);
         this.externalLogs = new external_logs_1.ExternalLogForwarder(ctx, pluginConfig, [this.apiKey, pluginConfig.apiKey]);
         this.groupTrigger = new group_trigger_1.GroupMessageTrigger(pluginConfig.groupMessageTriggerCount);
+        this.directTrigger = new group_trigger_1.DirectMessageTrigger(pluginConfig.directMessageTriggerCount);
         this.history = new history_1.MessageHistory(pluginConfig.routeTtl);
         this.routes = new routes_1.RouteRegistry(pluginConfig.routeTtl);
         this.transport = new transport_1.MaimTransport(ctx, pluginConfig, this.apiKey, {
@@ -226,14 +229,24 @@ class MaibotService extends koishi_1.Service {
         this.logMessageDetail(`koishi message received: ${(0, logging_1.describeSession)(session)}`);
         try {
             const route = this.routes.remember(session);
-            const trigger = this.groupTrigger.test(session, route);
+            const triggerKind = session.isDirect ? 'direct' : 'group';
+            const trigger = session.isDirect
+                ? this.directTrigger.test(session, route)
+                : this.groupTrigger.test(session, route);
             if (!trigger.shouldForward) {
                 this.history.rememberSession(session, route);
-                this.bridge.groupTriggerSkipped += 1;
-                this.bridge.lastGroupTriggerCount = trigger.count;
-                this.bridge.lastGroupTriggerThreshold = trigger.threshold;
+                if (triggerKind === 'direct') {
+                    this.bridge.directTriggerSkipped += 1;
+                    this.bridge.lastDirectTriggerCount = trigger.count;
+                    this.bridge.lastDirectTriggerThreshold = trigger.threshold;
+                }
+                else {
+                    this.bridge.groupTriggerSkipped += 1;
+                    this.bridge.lastGroupTriggerCount = trigger.count;
+                    this.bridge.lastGroupTriggerThreshold = trigger.threshold;
+                }
                 this.bridge.lastRouteId = route.routeId;
-                this.logMessageDetail(`koishi -> maimai gated: route=${route.routeId} count=${trigger.count}/${trigger.threshold} ${(0, logging_1.describeSession)(session)}`);
+                this.logMessageDetail(`koishi -> maimai gated: kind=${triggerKind} route=${route.routeId} count=${trigger.count}/${trigger.threshold} ${(0, logging_1.describeSession)(session)}`);
                 if (this.pluginConfig.messageMode === 'exclusive')
                     return '';
                 return next();
@@ -251,7 +264,7 @@ class MaibotService extends koishi_1.Service {
             }
             const entries = trigger.entries.length ? trigger.entries : [{ session, route }];
             if (trigger.forceMention) {
-                this.logMessageSummary(`group trigger reached: route=${route.routeId} count=${trigger.count}/${trigger.threshold} flushing=${entries.length}`);
+                this.logMessageSummary(`${triggerKind} trigger reached: route=${route.routeId} count=${trigger.count}/${trigger.threshold} flushing=${entries.length}`);
             }
             for (let index = 0; index < entries.length; index++) {
                 const entry = entries[index];
@@ -283,13 +296,14 @@ class MaibotService extends koishi_1.Service {
         this.bridge.lastRouteId = route.routeId;
         this.bridge.lastMessageId = message.message_info.message_id;
         const replyLog = replyContext ? ` reply=${replyContext.targetMessageId} context=${replyContext.contextCount || 0}` : '';
-        const forceLog = forceMention ? ' forced=group-trigger' : '';
+        const forceLog = forceMention ? ' forced=message-trigger' : '';
         this.logMessageDetail(`koishi -> maimai forwarded: route=${route.routeId}${replyLog}${forceLog} ${(0, logging_1.describeSegment)(message.message_segment)}`);
     }
     async dispose() {
         await this.shutdown();
         this.routes.clear();
         this.groupTrigger.clear();
+        this.directTrigger.clear();
         this.history.clear();
     }
     logMessageDetail(message) {

package/out/types.d.ts

@@ -52,6 +52,7 @@ export interface RuntimeStatus {
         routeMissed: number;
         sendFailed: number;
         groupTriggerSkipped: number;
+        directTriggerSkipped: number;
         lastKoishiMessageAt?: number;
         lastMaimSendAt?: number;
         lastMaimMessageAt?: number;
@@ -60,6 +61,8 @@ export interface RuntimeStatus {
         lastMessageId?: string;
         lastGroupTriggerCount?: number;
         lastGroupTriggerThreshold?: number;
+        lastDirectTriggerCount?: number;
+        lastDirectTriggerThreshold?: number;
         lastError?: string;
     };
     webui: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-mai-bridge",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "将 maibot 作为 docker 托管的消息回复后端运行，使用 mai.ko 桥接消息收发。",
   "author": "Jelly10086 <wow40469600@gmail.com>",
   "contributors": [

package/src/bridge/convert.ts

@@ -228,7 +228,8 @@ export async function sessionToMaimMessage(
         koishi_reply_to_message_id: replyContext?.targetMessageId,
         koishi_reply_context_count: replyContext?.contextCount,
         koishi_is_direct: !!session.isDirect,
-        koishi_group_trigger_forced: forceMention,
+        koishi_group_trigger_forced: !session.isDirect && forceMention,
+        koishi_direct_trigger_forced: !!session.isDirect && forceMention,
         at_bot: mentioned,
         is_mentioned: mentioned,
       },

package/src/bridge/group-trigger.ts

@@ -51,3 +51,42 @@ export class GroupMessageTrigger {
     ].join(':')
   }
 }
+
+export class DirectMessageTrigger {
+  private pending = new Map<string, GroupTriggerEntry[]>()
+
+  constructor(private threshold: number) {}
+
+  test(session: Session, route: KoishiRoute): GroupTriggerResult {
+    const threshold = Math.max(1, Math.floor(this.threshold || 1))
+    const entry = { session, route }
+    if (!session.isDirect || !route.userId) {
+      return { shouldForward: true, count: 1, threshold, entries: [entry] }
+    }
+    if (threshold <= 1) {
+      return { shouldForward: true, count: 1, threshold, entries: [entry], forceMention: true }
+    }
+
+    const key = this.createKey(route)
+    const entries = [...this.pending.get(key) || [], entry]
+    if (entries.length >= threshold) {
+      this.pending.delete(key)
+      return { shouldForward: true, count: entries.length, threshold, key, entries, forceMention: true }
+    }
+
+    this.pending.set(key, entries)
+    return { shouldForward: false, count: entries.length, threshold, key, entries: [] }
+  }
+
+  clear() {
+    this.pending.clear()
+  }
+
+  private createKey(route: KoishiRoute) {
+    return [
+      route.platform,
+      route.botSelfId,
+      route.userId,
+    ].join(':')
+  }
+}

package/src/commands/index.ts

@@ -17,6 +17,7 @@ export function renderStatus(status: RuntimeStatus) {
     `重连次数: ${status.transport.reconnectAttempts}`,
     `中转: Koishi收=${status.bridge.koishiReceived} / 发往mai.ko=${status.bridge.maimSent} / 收到mai.ko=${status.bridge.maimReceived} / 回发Koishi=${status.bridge.koishiSent}`,
     `中转异常: 路由失败=${status.bridge.routeMissed} / 发送失败=${status.bridge.sendFailed}`,
+    `触发限制: 群聊跳过=${status.bridge.groupTriggerSkipped} / 私信跳过=${status.bridge.directTriggerSkipped}`,
     `启动时间: ${formatTime(status.process.startedAt)}`,
   ]
   if (status.process.blockedReason) lines.push(`阻塞原因: ${status.process.blockedReason}`)

package/src/config.ts

@@ -25,6 +25,7 @@ export interface Config {
   messageMode: MessageMode
   commandPrefix: string
   groupMessageTriggerCount: number
+  directMessageTriggerCount: number
   imageDownloadEnabled: boolean
   imageDownloadTimeout: number
   imageDownloadMaxBytes: number
@@ -93,7 +94,8 @@ export const Config: Schema<Config> = Schema.intersect([
       Schema.const('command').description('命令：仅命中指令前缀时转发。'),
     ]).default('coexist').description('消息转发模式。'),
     commandPrefix: Schema.string().default('mai.ko').description('command 模式下触发 mai.ko 的文本前缀。'),
-    groupMessageTriggerCount: Schema.number().min(1).default(1).description('同一群聊累计达到多少条消息后批量转发并强制触发 mai.ko 思考；1 表示每条群消息都转发。私聊不受影响。'),
+    groupMessageTriggerCount: Schema.number().min(1).default(1).description('同一群聊累计达到多少条消息后批量转发并强制触发 mai.ko 思考；1 表示每条群消息都转发。'),
+    directMessageTriggerCount: Schema.number().min(1).default(1).description('同一私聊累计达到多少条消息后批量转发并强制触发 mai.ko 思考；1 表示每条私信都转发。'),
     imageDownloadEnabled: Schema.boolean().default(true).description('转发图片消息前由 Koishi 下载图片并转为 mai.ko 可识别的 base64 图片段。'),
     imageDownloadTimeout: Schema.number().min(1000).default(10000).description('下载单张入站图片的超时时间，单位毫秒。'),
     imageDownloadMaxBytes: Schema.number().min(1024).default(10 * 1024 * 1024).description('允许转发给 mai.ko 的单张图片最大字节数。'),

package/src/service.ts

@@ -3,7 +3,7 @@ import type { Config } from './config'
 import { getFallbackRouteHints, getRouteIdFromMaim, maimMessageToFragment, sessionToMaimMessage, shouldForwardSession } from './bridge/convert'
 import { MaibotDockerManager } from './bridge/docker'
 import { ExternalLogForwarder } from './bridge/external-logs'
-import { GroupMessageTrigger } from './bridge/group-trigger'
+import { DirectMessageTrigger, GroupMessageTrigger } from './bridge/group-trigger'
 import { MessageHistory } from './bridge/history'
 import { MaibotPrepareManager } from './bridge/prepare'
 import { MaibotProcessManager, createApiKey } from './bridge/process'
@@ -21,6 +21,7 @@ export class MaibotService extends Service {
   private process: MaibotProcessManager
   private externalLogs: ExternalLogForwarder
   private groupTrigger: GroupMessageTrigger
+  private directTrigger: DirectMessageTrigger
   private history: MessageHistory
   private routes: RouteRegistry
   private transport: MaimTransport
@@ -44,6 +45,7 @@ export class MaibotService extends Service {
     routeMissed: 0,
     sendFailed: 0,
     groupTriggerSkipped: 0,
+    directTriggerSkipped: 0,
   }
 
   constructor(public ctx: Context, private pluginConfig: Config) {
@@ -54,6 +56,7 @@ export class MaibotService extends Service {
     this.process = new MaibotProcessManager(ctx, pluginConfig, this.apiKey)
     this.externalLogs = new ExternalLogForwarder(ctx, pluginConfig, [this.apiKey, pluginConfig.apiKey])
     this.groupTrigger = new GroupMessageTrigger(pluginConfig.groupMessageTriggerCount)
+    this.directTrigger = new DirectMessageTrigger(pluginConfig.directMessageTriggerCount)
     this.history = new MessageHistory(pluginConfig.routeTtl)
     this.routes = new RouteRegistry(pluginConfig.routeTtl)
     this.transport = new MaimTransport(ctx, pluginConfig, this.apiKey, {
@@ -232,14 +235,23 @@ export class MaibotService extends Service {
 
     try {
       const route = this.routes.remember(session)
-      const trigger = this.groupTrigger.test(session, route)
+      const triggerKind = session.isDirect ? 'direct' : 'group'
+      const trigger = session.isDirect
+        ? this.directTrigger.test(session, route)
+        : this.groupTrigger.test(session, route)
       if (!trigger.shouldForward) {
         this.history.rememberSession(session, route)
-        this.bridge.groupTriggerSkipped += 1
-        this.bridge.lastGroupTriggerCount = trigger.count
-        this.bridge.lastGroupTriggerThreshold = trigger.threshold
+        if (triggerKind === 'direct') {
+          this.bridge.directTriggerSkipped += 1
+          this.bridge.lastDirectTriggerCount = trigger.count
+          this.bridge.lastDirectTriggerThreshold = trigger.threshold
+        } else {
+          this.bridge.groupTriggerSkipped += 1
+          this.bridge.lastGroupTriggerCount = trigger.count
+          this.bridge.lastGroupTriggerThreshold = trigger.threshold
+        }
         this.bridge.lastRouteId = route.routeId
-        this.logMessageDetail(`koishi -> maimai gated: route=${route.routeId} count=${trigger.count}/${trigger.threshold} ${describeSession(session)}`)
+        this.logMessageDetail(`koishi -> maimai gated: kind=${triggerKind} route=${route.routeId} count=${trigger.count}/${trigger.threshold} ${describeSession(session)}`)
         if (this.pluginConfig.messageMode === 'exclusive') return ''
         return next()
       }
@@ -256,7 +268,7 @@ export class MaibotService extends Service {
 
       const entries = trigger.entries.length ? trigger.entries : [{ session, route }]
       if (trigger.forceMention) {
-        this.logMessageSummary(`group trigger reached: route=${route.routeId} count=${trigger.count}/${trigger.threshold} flushing=${entries.length}`)
+        this.logMessageSummary(`${triggerKind} trigger reached: route=${route.routeId} count=${trigger.count}/${trigger.threshold} flushing=${entries.length}`)
       }
 
       for (let index = 0; index < entries.length; index++) {
@@ -290,7 +302,7 @@ export class MaibotService extends Service {
     this.bridge.lastRouteId = route.routeId
     this.bridge.lastMessageId = message.message_info.message_id
     const replyLog = replyContext ? ` reply=${replyContext.targetMessageId} context=${replyContext.contextCount || 0}` : ''
-    const forceLog = forceMention ? ' forced=group-trigger' : ''
+    const forceLog = forceMention ? ' forced=message-trigger' : ''
     this.logMessageDetail(`koishi -> maimai forwarded: route=${route.routeId}${replyLog}${forceLog} ${describeSegment(message.message_segment)}`)
   }
 
@@ -298,6 +310,7 @@ export class MaibotService extends Service {
     await this.shutdown()
     this.routes.clear()
     this.groupTrigger.clear()
+    this.directTrigger.clear()
     this.history.clear()
   }
 

package/src/types.ts

@@ -54,6 +54,7 @@ export interface RuntimeStatus {
     routeMissed: number
     sendFailed: number
     groupTriggerSkipped: number
+    directTriggerSkipped: number
     lastKoishiMessageAt?: number
     lastMaimSendAt?: number
     lastMaimMessageAt?: number
@@ -62,6 +63,8 @@ export interface RuntimeStatus {
     lastMessageId?: string
     lastGroupTriggerCount?: number
     lastGroupTriggerThreshold?: number
+    lastDirectTriggerCount?: number
+    lastDirectTriggerThreshold?: number
     lastError?: string
   }
   webui: {