koishi-plugin-mai-bridge 0.1.1 → 0.1.2

package/README.md

@@ -58,6 +58,7 @@ webuiEnabled: true
 webuiHost: 0.0.0.0
 webuiPort: 8002
 messageMode: coexist
+groupMessageTriggerCount: 1
 ```
 
 说明：
@@ -67,6 +68,7 @@ messageMode: coexist
 - `apiKey` 可以留空。插件会生成并复用运行期密钥。
 - `dockerNetwork` 按你的 Koishi Docker 网络填写。Koishi 需要能通过 `apiHost` 访问 `maimai-ko`。
 - `webuiPublicUrl` 可填写反代或宿主机映射后的 WebUI 地址，用于 Koishi 控制台显示入口。
+- `groupMessageTriggerCount` 控制群聊累计多少条消息后才转发给 maibot。设为 `3` 时，同一群前两条只记录上下文，第 3 条才拉起思考；私聊不受影响。
 
 ## 消息模式
 

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

@@ -0,0 +1,16 @@
+import type { Session } from 'koishi';
+import type { KoishiRoute } from '../types';
+export interface GroupTriggerResult {
+    shouldForward: boolean;
+    count: number;
+    threshold: number;
+    key?: string;
+}
+export declare class GroupMessageTrigger {
+    private threshold;
+    private counters;
+    constructor(threshold: number);
+    test(session: Session, route: KoishiRoute): GroupTriggerResult;
+    clear(): void;
+    private createKey;
+}

package/out/bridge/group-trigger.js

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

package/out/bridge/prepare.d.ts

@@ -32,7 +32,12 @@ export declare class MaibotPrepareManager {
     private isValidGitRepository;
     private isRecoverablePartialDirectory;
     private ensurePatch;
+    private applyPatch;
     private checkPatchState;
+    private refreshManagedPatch;
+    private readMarker;
+    private listPatchPaths;
+    private listDirtyTrackedFiles;
     private readCommit;
     private writeMarker;
     private resolvePatchPath;

package/out/bridge/prepare.js

@@ -133,6 +133,13 @@ class MaibotPrepareManager {
             throw new Error(`blocked: bundled patch not found: ${patchPath}`);
         }
         if (patchState === 'conflict') {
+            const refreshed = await this.refreshManagedPatch(patchPath);
+            if (refreshed === 'applied')
+                return;
+            if (refreshed === 'pending') {
+                await this.applyPatch(patchPath);
+                return;
+            }
             throw new Error('blocked: bundled patch cannot be applied cleanly; check MaiBot ref or update maimai-koishi.patch');
         }
         if (patchState === 'applied') {
@@ -140,6 +147,9 @@ class MaibotPrepareManager {
             this.pushLog('bundled patch already applied');
             return;
         }
+        await this.applyPatch(patchPath);
+    }
+    async applyPatch(patchPath) {
         this.pushLog(`applying bundled patch: ${patchPath}`);
         await this.git(['apply', patchPath], this.root);
         this.patchApplied = true;
@@ -155,6 +165,71 @@ class MaibotPrepareManager {
             return 'applied';
         return 'conflict';
     }
+    async refreshManagedPatch(patchPath) {
+        const marker = this.readMarker();
+        if (!marker?.patchApplied)
+            return;
+        if (marker.gitUrl !== this.config.maibotGitUrl || marker.gitRef !== this.config.maibotGitRef)
+            return;
+        if (!marker.patchChecksum || marker.patchChecksum === this.patchChecksum)
+            return;
+        const patchPaths = new Set(this.listPatchPaths(patchPath));
+        const dirtyFiles = await this.listDirtyTrackedFiles();
+        if (!dirtyFiles.length)
+            return;
+        const foreignFiles = dirtyFiles.filter((file) => !patchPaths.has(file));
+        if (foreignFiles.length) {
+            throw new Error(`blocked: MaiBot has local changes outside bundled patch: ${foreignFiles.slice(0, 5).join(', ')}`);
+        }
+        this.pushLog('refreshing managed bundled patch');
+        await this.git(['restore', '--source', 'HEAD', '--', ...dirtyFiles], this.root);
+        const patchState = await this.checkPatchState(patchPath);
+        if (patchState === 'pending')
+            return 'pending';
+        if (patchState === 'applied') {
+            this.patchApplied = true;
+            this.pushLog('bundled patch already applied');
+            return 'applied';
+        }
+        throw new Error('blocked: bundled patch cannot be refreshed cleanly; check MaiBot ref or update maimai-koishi.patch');
+    }
+    readMarker() {
+        try {
+            const marker = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(this.root, '.mai-ko-prepare.json'), 'utf8'));
+            if (!marker || typeof marker !== 'object')
+                return;
+            return marker;
+        }
+        catch {
+            return;
+        }
+    }
+    listPatchPaths(patchPath) {
+        const paths = new Set();
+        const patch = (0, fs_1.readFileSync)(patchPath, 'utf8');
+        for (const line of patch.split(/\r?\n/)) {
+            const match = /^diff --git a\/(.+) b\/(.+)$/.exec(line);
+            if (!match)
+                continue;
+            if (match[2] !== '/dev/null')
+                paths.add(match[2]);
+        }
+        return [...paths];
+    }
+    async listDirtyTrackedFiles() {
+        const result = await this.git(['status', '--porcelain', '--untracked-files=no'], this.root, true, false);
+        if (result.code !== 0)
+            return [];
+        return result.stdout
+            .split(/\r?\n/)
+            .map((line) => {
+            if (!line.trim())
+                return '';
+            const path = line.slice(3);
+            return path.includes(' -> ') ? path.split(' -> ').pop() : path;
+        })
+            .filter(Boolean);
+    }
     async readCommit() {
         const result = await this.git(['rev-parse', 'HEAD'], this.root, true, false);
         return result.code === 0 ? result.stdout.trim() : undefined;

package/out/config.d.ts

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

package/out/config.js

@@ -43,6 +43,7 @@ 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 表示每条群消息都转发。私聊不受影响。'),
         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

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

package/out/service.js

@@ -5,6 +5,7 @@ const koishi_1 = require("koishi");
 const convert_1 = require("./bridge/convert");
 const docker_1 = require("./bridge/docker");
 const external_logs_1 = require("./bridge/external-logs");
+const group_trigger_1 = require("./bridge/group-trigger");
 const history_1 = require("./bridge/history");
 const prepare_1 = require("./bridge/prepare");
 const process_1 = require("./bridge/process");
@@ -21,6 +22,7 @@ class MaibotService extends koishi_1.Service {
     docker;
     process;
     externalLogs;
+    groupTrigger;
     history;
     routes;
     transport;
@@ -43,6 +45,7 @@ class MaibotService extends koishi_1.Service {
         koishiSent: 0,
         routeMissed: 0,
         sendFailed: 0,
+        groupTriggerSkipped: 0,
     };
     constructor(ctx, pluginConfig) {
         super(ctx, 'maimai');
@@ -53,6 +56,7 @@ class MaibotService extends koishi_1.Service {
         this.docker = new docker_1.MaibotDockerManager(pluginConfig, this.apiKey);
         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.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, {
@@ -221,6 +225,19 @@ class MaibotService extends koishi_1.Service {
         this.bridge.lastMessageId = String(session.messageId || session.id || '');
         this.logMessageDetail(`koishi message received: ${(0, logging_1.describeSession)(session)}`);
         try {
+            const route = this.routes.remember(session);
+            const trigger = 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;
+                this.bridge.lastRouteId = route.routeId;
+                this.logMessageDetail(`koishi -> maimai gated: route=${route.routeId} count=${trigger.count}/${trigger.threshold} ${(0, logging_1.describeSession)(session)}`);
+                if (this.pluginConfig.messageMode === 'exclusive')
+                    return '';
+                return next();
+            }
             if (this.transportState !== 'connected') {
                 const error = `bridge is not connected: state=${this.transportState}`;
                 this.bridge.sendFailed += 1;
@@ -232,7 +249,6 @@ class MaibotService extends koishi_1.Service {
                     return '';
                 return next();
             }
-            const route = this.routes.remember(session);
             const replyContext = this.history.resolveReplyContext(session, route);
             const message = await (0, convert_1.sessionToMaimMessage)(session, route, this.apiKey, {
                 resolveImage: (source) => this.resolveImageToBase64(source),
@@ -260,6 +276,7 @@ class MaibotService extends koishi_1.Service {
     async dispose() {
         await this.shutdown();
         this.routes.clear();
+        this.groupTrigger.clear();
         this.history.clear();
     }
     logMessageDetail(message) {

package/out/types.d.ts

@@ -51,12 +51,15 @@ export interface RuntimeStatus {
         koishiSent: number;
         routeMissed: number;
         sendFailed: number;
+        groupTriggerSkipped: number;
         lastKoishiMessageAt?: number;
         lastMaimSendAt?: number;
         lastMaimMessageAt?: number;
         lastKoishiSendAt?: number;
         lastRouteId?: string;
         lastMessageId?: string;
+        lastGroupTriggerCount?: number;
+        lastGroupTriggerThreshold?: number;
         lastError?: string;
     };
     webui: {

package/package.json

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

package/src/bridge/group-trigger.ts

@@ -0,0 +1,45 @@
+import type { Session } from 'koishi'
+import type { KoishiRoute } from '../types'
+
+export interface GroupTriggerResult {
+  shouldForward: boolean
+  count: number
+  threshold: number
+  key?: string
+}
+
+export class GroupMessageTrigger {
+  private counters = new Map<string, number>()
+
+  constructor(private threshold: number) {}
+
+  test(session: Session, route: KoishiRoute): GroupTriggerResult {
+    const threshold = Math.max(1, Math.floor(this.threshold || 1))
+    if (threshold <= 1 || session.isDirect || !route.channelId) {
+      return { shouldForward: true, count: 1, threshold }
+    }
+
+    const key = this.createKey(route)
+    const count = (this.counters.get(key) || 0) + 1
+    if (count >= threshold) {
+      this.counters.delete(key)
+      return { shouldForward: true, count, threshold, key }
+    }
+
+    this.counters.set(key, count)
+    return { shouldForward: false, count, threshold, key }
+  }
+
+  clear() {
+    this.counters.clear()
+  }
+
+  private createKey(route: KoishiRoute) {
+    return [
+      route.platform,
+      route.botSelfId,
+      route.guildId || '',
+      route.channelId,
+    ].join(':')
+  }
+}

package/src/bridge/prepare.ts

@@ -158,6 +158,12 @@ export class MaibotPrepareManager {
       throw new Error(`blocked: bundled patch not found: ${patchPath}`)
     }
     if (patchState === 'conflict') {
+      const refreshed = await this.refreshManagedPatch(patchPath)
+      if (refreshed === 'applied') return
+      if (refreshed === 'pending') {
+        await this.applyPatch(patchPath)
+        return
+      }
       throw new Error('blocked: bundled patch cannot be applied cleanly; check MaiBot ref or update maimai-koishi.patch')
     }
     if (patchState === 'applied') {
@@ -166,6 +172,10 @@ export class MaibotPrepareManager {
       return
     }
 
+    await this.applyPatch(patchPath)
+  }
+
+  private async applyPatch(patchPath: string) {
     this.pushLog(`applying bundled patch: ${patchPath}`)
     await this.git(['apply', patchPath], this.root)
     this.patchApplied = true
@@ -180,6 +190,68 @@ export class MaibotPrepareManager {
     return 'conflict'
   }
 
+  private async refreshManagedPatch(patchPath: string): Promise<'pending' | 'applied' | undefined> {
+    const marker = this.readMarker()
+    if (!marker?.patchApplied) return
+    if (marker.gitUrl !== this.config.maibotGitUrl || marker.gitRef !== this.config.maibotGitRef) return
+    if (!marker.patchChecksum || marker.patchChecksum === this.patchChecksum) return
+
+    const patchPaths = new Set(this.listPatchPaths(patchPath))
+    const dirtyFiles = await this.listDirtyTrackedFiles()
+    if (!dirtyFiles.length) return
+
+    const foreignFiles = dirtyFiles.filter((file) => !patchPaths.has(file))
+    if (foreignFiles.length) {
+      throw new Error(`blocked: MaiBot has local changes outside bundled patch: ${foreignFiles.slice(0, 5).join(', ')}`)
+    }
+
+    this.pushLog('refreshing managed bundled patch')
+    await this.git(['restore', '--source', 'HEAD', '--', ...dirtyFiles], this.root)
+
+    const patchState = await this.checkPatchState(patchPath)
+    if (patchState === 'pending') return 'pending'
+    if (patchState === 'applied') {
+      this.patchApplied = true
+      this.pushLog('bundled patch already applied')
+      return 'applied'
+    }
+    throw new Error('blocked: bundled patch cannot be refreshed cleanly; check MaiBot ref or update maimai-koishi.patch')
+  }
+
+  private readMarker(): PrepareMarker | undefined {
+    try {
+      const marker = JSON.parse(readFileSync(join(this.root, '.mai-ko-prepare.json'), 'utf8')) as PrepareMarker
+      if (!marker || typeof marker !== 'object') return
+      return marker
+    } catch {
+      return
+    }
+  }
+
+  private listPatchPaths(patchPath: string) {
+    const paths = new Set<string>()
+    const patch = readFileSync(patchPath, 'utf8')
+    for (const line of patch.split(/\r?\n/)) {
+      const match = /^diff --git a\/(.+) b\/(.+)$/.exec(line)
+      if (!match) continue
+      if (match[2] !== '/dev/null') paths.add(match[2])
+    }
+    return [...paths]
+  }
+
+  private async listDirtyTrackedFiles() {
+    const result = await this.git(['status', '--porcelain', '--untracked-files=no'], this.root, true, false)
+    if (result.code !== 0) return []
+    return result.stdout
+      .split(/\r?\n/)
+      .map((line) => {
+        if (!line.trim()) return ''
+        const path = line.slice(3)
+        return path.includes(' -> ') ? path.split(' -> ').pop()! : path
+      })
+      .filter(Boolean)
+  }
+
   private async readCommit() {
     const result = await this.git(['rev-parse', 'HEAD'], this.root, true, false)
     return result.code === 0 ? result.stdout.trim() : undefined

package/src/config.ts

@@ -24,6 +24,7 @@ export interface Config {
   showWebuiToken: boolean
   messageMode: MessageMode
   commandPrefix: string
+  groupMessageTriggerCount: number
   imageDownloadEnabled: boolean
   imageDownloadTimeout: number
   imageDownloadMaxBytes: number
@@ -92,6 +93,7 @@ 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 表示每条群消息都转发。私聊不受影响。'),
     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,6 +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 { MessageHistory } from './bridge/history'
 import { MaibotPrepareManager } from './bridge/prepare'
 import { MaibotProcessManager, createApiKey } from './bridge/process'
@@ -19,6 +20,7 @@ export class MaibotService extends Service {
   private docker: MaibotDockerManager
   private process: MaibotProcessManager
   private externalLogs: ExternalLogForwarder
+  private groupTrigger: GroupMessageTrigger
   private history: MessageHistory
   private routes: RouteRegistry
   private transport: MaimTransport
@@ -41,6 +43,7 @@ export class MaibotService extends Service {
     koishiSent: 0,
     routeMissed: 0,
     sendFailed: 0,
+    groupTriggerSkipped: 0,
   }
 
   constructor(public ctx: Context, private pluginConfig: Config) {
@@ -50,6 +53,7 @@ export class MaibotService extends Service {
     this.docker = new MaibotDockerManager(pluginConfig, this.apiKey)
     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.history = new MessageHistory(pluginConfig.routeTtl)
     this.routes = new RouteRegistry(pluginConfig.routeTtl)
     this.transport = new MaimTransport(ctx, pluginConfig, this.apiKey, {
@@ -227,6 +231,19 @@ export class MaibotService extends Service {
     this.logMessageDetail(`koishi message received: ${describeSession(session)}`)
 
     try {
+      const route = this.routes.remember(session)
+      const trigger = 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
+        this.bridge.lastRouteId = route.routeId
+        this.logMessageDetail(`koishi -> maimai gated: route=${route.routeId} count=${trigger.count}/${trigger.threshold} ${describeSession(session)}`)
+        if (this.pluginConfig.messageMode === 'exclusive') return ''
+        return next()
+      }
+
       if (this.transportState !== 'connected') {
         const error = `bridge is not connected: state=${this.transportState}`
         this.bridge.sendFailed += 1
@@ -237,7 +254,6 @@ export class MaibotService extends Service {
         return next()
       }
 
-      const route = this.routes.remember(session)
       const replyContext = this.history.resolveReplyContext(session, route)
       const message = await sessionToMaimMessage(session, route, this.apiKey, {
         resolveImage: (source) => this.resolveImageToBase64(source),
@@ -265,6 +281,7 @@ export class MaibotService extends Service {
   async dispose() {
     await this.shutdown()
     this.routes.clear()
+    this.groupTrigger.clear()
     this.history.clear()
   }
 

package/src/types.ts

@@ -53,12 +53,15 @@ export interface RuntimeStatus {
     koishiSent: number
     routeMissed: number
     sendFailed: number
+    groupTriggerSkipped: number
     lastKoishiMessageAt?: number
     lastMaimSendAt?: number
     lastMaimMessageAt?: number
     lastKoishiSendAt?: number
     lastRouteId?: string
     lastMessageId?: string
+    lastGroupTriggerCount?: number
+    lastGroupTriggerThreshold?: number
     lastError?: string
   }
   webui: {