koishi-plugin-qxgl-satori 0.0.1 → 0.0.3

package/lib/index.js

@@ -4,99 +4,49 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 
 // src/index.ts
 Object.defineProperty(exports, "__esModule", { value: true });
-var koishi = require("koishi");
 var { Schema, Logger, h } = require("koishi");
 var logger = new Logger("qxgl-satori");
 var inject = ["database"];
 var pluginName = "qxgl-satori";
-var fs = require("node:fs");
-var fsPromises = require("node:fs/promises");
+var fs = require("node:fs/promises");
+var fsSync = require("node:fs");
 var path = require("node:path");
 var { pathToFileURL } = require("node:url");
 var Config = Schema.intersect([
   Schema.object({
-    enableAuthSystem: Schema.boolean().default(true).description("启用授权系统（关闭时所有群可用，但仍记录群信息）"),
-    autoLeaveOnMute: Schema.boolean().default(true).description("被禁言时自动退群"),
-    autoLeaveOnExpiry: Schema.boolean().default(true).description("授权到期时自动退群"),
-    commandAuthority: Schema.number().default(3).description("授权管理指令所需权限等级"),
-    pictureStrategy: Schema.union([
-      Schema.const("auto").description("自动检测（Satori用路径，OneBot用file://）"),
-      Schema.const("http").description("强制HTTP服务（需配置对外可访问地址）")
-    ]).default("auto").description("图片发送策略"),
-    httpServePath: Schema.string().default("http://localhost:5140/qxgl-satori").description("图片HTTP服务基础地址（使用HTTP策略时）")
-  }).description("授权系统设置"),
+    authorizationMode: Schema.union([
+      Schema.const("disabled").description("关闭 - 所有群可用，仅记录不拦截"),
+      Schema.const("record").description("记录 - 新群自动创建未授权记录，不阻断"),
+      Schema.const("strict").description("严格 - 未授权/过期自动拦截消息")
+    ]).default("strict").description("授权系统模式"),
+    autoLeaveOnExpiry: Schema.boolean().default(false).description("严格模式下，授权到期是否自动退群"),
+    autoLeaveOnMute: Schema.boolean().default(false).description("被禁言时是否自动退群（Satori适配器需支持）"),
+    expiryReminderDays: Schema.tuple([Number, Number]).default([3, 1]).description("到期前提醒天数（默认3天和1天前）")
+  }).description("授权系统控制"),
   Schema.object({
-    defaultImageExtension: Schema.union(["jpg", "png", "gif"]).default("png").description("图片保存后缀"),
-    addKeywordTime: Schema.number().role("slider").min(1).max(30).step(1).default(5).description("添加回复输入时限（分钟）"),
-    Treat_all_as_lowercase: Schema.boolean().default(true).description("英文关键词匹配无视大小写"),
-    Delete_Branch_Only: Schema.boolean().default(true).description("删除多段回复时必须指定序号"),
-    HandleDuplicateKeywords: Schema.union([
-      Schema.const("1").description("直接替换/覆盖"),
-      Schema.const("2").description("并列添加（随机选择）"),
-      Schema.const("3").description("禁止重复")
-    ]).default("2").description("重复关键词处理"),
-    MultisegmentAdditionRecoveryEffect: Schema.union([
-      Schema.const("1").description("原版输入，原版输出（多段消息）"),
-      Schema.const("2").description("合为图文消息/多行消息（一次发出）"),
-      Schema.const("3").description("合为图文消息并合并转发"),
-      Schema.const("4").description("原版输入，合并转发发送")
-    ]).default("2").description("多段回复效果"),
-    Frequency_limitation: Schema.number().default(0).description("同一问答最小触发间隔（秒，0为不限制）"),
-    Type_of_restriction: Schema.union([
-      Schema.const("1").description("对同一个问题（全部对象）"),
-      Schema.const("2").description("仅对同一个频道（不同频道独立）")
-    ]).default("2").description("最小间隔限制对象"),
-    Search_Range: Schema.union([
-      Schema.const("1").description("仅在当前频道"),
-      Schema.const("2").description("搜索全部频道"),
-      Schema.const("3").description("当前频道+全局")
-    ]).default("3").description("搜索范围"),
-    Find_Return_Preset: Schema.union([
-      Schema.const("1").description("仅返回问答内容"),
-      Schema.const("2").description("仅返回位置"),
-      Schema.const("3").description("返回内容和位置")
-    ]).default("1").description("查找返回信息"),
-    Return_Limit: Schema.union([
-      Schema.const("1").description("返回全部"),
-      Schema.const("2").description("仅返回一条")
-    ]).default("2").description("返回限制"),
-    MatchPatternForExit: Schema.union([
-      Schema.const("1").description("仅接受一次性输入"),
-      Schema.const("2").description("完全匹配结束词退出"),
-      Schema.const("3").description("包含结束词退出"),
-      Schema.const("4").description("完全匹配或包含均可退出")
-    ]).default("4").description("退出添加方式"),
-    AlwayPrompt: Schema.union([
-      Schema.const("1").description("不返回提示"),
-      Schema.const("2").description("仅返回一次"),
-      Schema.const("3").description("每次输入都返回")
-    ]).default("2").description("提示方式"),
-    Prompt: Schema.string().role("textarea", { rows: [2, 4] }).default("请输入回复内容（输入 取消添加 以取消，输入 结束添加 以结束）：").description("添加提示文字"),
-    KeywordOfEsc: Schema.string().default("取消添加").description("取消添加关键词"),
-    KeywordOfEnd: Schema.string().default("结束添加").description("结束添加关键词")
-  }).description("关键词问答设置"),
-  Schema.object({
-    admin_list: Schema.array(Schema.object({
-      adminID: Schema.string().description("管理员用户ID"),
-      allowcommand: Schema.array(Schema.union([
-        "添加",
-        "全局添加",
-        "删除",
-        "全局删除",
-        "修改",
-        "全局修改",
-        "查找关键词",
-        "查看关键词列表",
+    commandAuthority: Schema.number().default(3).description("管理类指令所需权限等级"),
+    adminList: Schema.array(Schema.object({
+      adminId: Schema.string().description("管理员用户ID"),
+      allowedCommands: Schema.array(Schema.union([
         "群授权",
         "私聊授权",
         "到期时间",
         "查询到期",
         "全局延期",
         "全局减少",
-        "更新名称",
-        "列出已记录群",
         "取消授权",
         "更换授权",
+        "更新名称",
+        "列出已记录群",
+        "备份数据",
+        "添加",
+        "删除",
+        "全局添加",
+        "全局删除",
+        "查找关键词",
+        "修改",
+        "全局修改",
+        "查看关键词列表",
         "测试授权",
         "取消测试授权",
         "测试同步",
@@ -104,870 +54,1020 @@ var Config = Schema.intersect([
         "测试添加",
         "测试删除",
         "测试修改"
-      ])).default(["到期时间"]).description("可使用的指令")
-    })).role("table").description("管理员列表（0代表所有用户）").default([{ adminID: "0" }]),
-    channel_admin_auth: Schema.boolean().default(false).description("开启后自动允许群主/管理员使用全部指令（需适配器支持）")
+      ])).default(["到期时间"]).description("允许使用的指令")
+    })).role("table").description("管理员列表（ID填0代表所有用户）").default([{ adminId: "0", allowedCommands: ["到期时间"] }]),
+    channelAdminAuth: Schema.boolean().default(false).description("开启后自动允许群管理员/群主使用所有指令（需适配器支持角色获取）")
   }).description("权限设置"),
   Schema.object({
-    loggerinfo: Schema.boolean().default(false).description("日志调试模式")
-  }).description("调试设置")
+    triggerPrefix: Schema.string().default("添加").description("触发添加关键词的指令前缀"),
+    deletePrefix: Schema.string().default("删除").description("触发删除的指令前缀"),
+    cancelKeyword: Schema.string().default("取消添加").description("取消添加流程的关键词"),
+    endKeyword: Schema.string().default("结束添加").description("结束添加流程的关键词"),
+    globalTriggerPrefix: Schema.string().default("全局添加").description("全局添加指令前缀"),
+    globalDeletePrefix: Schema.string().default("全局删除").description("全局删除指令前缀"),
+    viewListCommand: Schema.string().default("查看关键词列表").description("查看列表指令"),
+    searchCommand: Schema.string().default("查找关键词").description("搜索指令"),
+    fixCommand: Schema.string().default("修改").description("修改指令"),
+    globalFixCommand: Schema.string().default("全局修改").description("全局修改指令"),
+    addTimeout: Schema.number().role("slider").min(1).max(30).step(1).default(5).description("添加回复输入时限（分钟）"),
+    defaultImageExt: Schema.union(["jpg", "png", "gif"]).default("png").description("保存图片默认后缀"),
+    imageSendMode: Schema.union([
+      Schema.const("file").description("本地文件路径（转换为file://URL）"),
+      Schema.const("base64").description("Base64 DataURI（兼容性最好）")
+    ]).default("file").description("图片发送方式"),
+    localPathMapping: Schema.string().default("").description("本地路径映射（如Docker内外路径映射，格式：/host/path:/container/path，可选）")
+  }).description("关键词指令设置"),
+  Schema.object({
+    matchPrefixes: Schema.array(String).role("table").default(["", "/", "#"]).description("关键词匹配前缀配置"),
+    treatAsLowercase: Schema.boolean().default(true).description("英文关键词匹配时忽略大小写"),
+    deleteBranchOnly: Schema.boolean().default(true).description("多段回复删除时必须指定序号（-q参数），防止误删"),
+    handleDuplicate: Schema.union([
+      Schema.const("replace").description("直接覆盖"),
+      Schema.const("append").description("添加并列回复（随机选择）"),
+      Schema.const("reject").description("拒绝添加，提示已存在")
+    ]).default("append").description("重复关键词处理方式"),
+    alwaysPrompt: Schema.union([
+      Schema.const("never").description("不返回提示（仅首次）"),
+      Schema.const("once").description("仅首次提示"),
+      Schema.const("always").description("每次输入都提示")
+    ]).default("once").description("添加流程提示频率"),
+    multisegmentMode: Schema.union([
+      Schema.const("1").description("多段独立发送（逐条）"),
+      Schema.const("2").description("合并为图文消息（单次发送）"),
+      Schema.const("3").description("合并转发（需适配器支持）"),
+      Schema.const("4").description("原格式合并转发")
+    ]).default("2").description("多段回复发送方式"),
+    frequencyLimit: Schema.number().default(0).description("同一问答最小触发间隔（秒，0为不限制）"),
+    frequencyScope: Schema.union([
+      Schema.const("global").description("全局限制"),
+      Schema.const("channel").description("按频道独立限制")
+    ]).default("channel").description("频率限制范围"),
+    searchRange: Schema.union([
+      Schema.const("local").description("仅当前频道"),
+      Schema.const("all").description("全部频道"),
+      Schema.const("mixed").description("当前频道+全局")
+    ]).default("mixed").description("查看/搜索的范围"),
+    viewListMode: Schema.union([
+      Schema.const("text").description("文字列表"),
+      Schema.const("image").description("图片列表（需puppeteer）")
+    ]).default("text").description("查看列表返回格式")
+  }).description("问答行为设置"),
+  Schema.object({
+    enableTestEnv: Schema.boolean().default(true).description("启用测试环境功能"),
+    unifiedAtField: Schema.boolean().default(true).description('统一at消息格式为<at id="xxx"/>（移除name属性防不一致）'),
+    debugMode: Schema.boolean().default(false).description("调试日志模式")
+  }).description("高级设置")
 ]);
-var usage = `<!DOCTYPE html>
-<html lang="zh">
+var usage = `
+<!DOCTYPE html>
+<html lang="zh-CN">
 <head>
 <meta charset="UTF-8">
 <title>qxgl-satori 插件使用说明</title>
+<style>
+body { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif; line-height: 1.6; max-width: 900px; margin: 0 auto; padding: 20px; color: #333; }
+h1 { color: #2c3e50; border-bottom: 3px solid #3498db; padding-bottom: 10px; }
+h2 { color: #34495e; margin-top: 30px; border-left: 5px solid #3498db; padding-left: 15px; }
+h3 { color: #7f8c8d; }
+ul { padding-left: 20px; }
+li { margin: 8px 0; }
+code { background: #f4f4f4; padding: 2px 6px; border-radius: 3px; font-family: Consolas, monospace; color: #e74c3c; }
+.detail { background: #ecf0f1; padding: 15px; border-radius: 8px; margin: 10px 0; }
+</style>
 </head>
 <body>
-<h1>插件功能说明</h1>
-<p>qxgl-satori 整合了群/私聊授权管理和关键词问答功能，支持多账号共享授权数据，Satori 原生适配。</p>
-<h2>授权管理指令</h2>
+<h1>qxgl-satori 插件使用说明</h1>
+<p>专为 Satori 适配器优化的群管与问答一体化插件，支持多账号共享授权数据。</p>
+
+<h2>一、授权管理系统（指令永不过期）</h2>
+<div class="detail">
+<p><strong>核心特性</strong>：所有授权管理指令不受授权状态影响，即使被拉黑或已过期仍可正常使用。</p>
 <ul>
-  <li><strong>群授权 &lt;群号&gt; &lt;±月数&gt; [授权人]</strong> - 授权/修改群到期时间（支持负数减少）</li>
-  <li><strong>私聊授权 &lt;用户ID&gt; &lt;±月数&gt; [授权人]</strong> - 私聊授权</li>
-  <li><strong>取消授权 &lt;目标ID&gt;</strong> - 删除授权记录</li>
-  <li><strong>更换授权 &lt;原ID&gt; &lt;新ID&gt;</strong> - 转移授权</li>
-  <li><strong>到期时间</strong> - 查询当前群/私聊到期时间</li>
-  <li><strong>查询到期 [目标ID]</strong> - 查询指定目标（无参数查当前）</li>
-  <li><strong>全局延期 &lt;天数&gt;</strong> - 所有群统一延期</li>
-  <li><strong>全局减少 &lt;天数&gt;</strong> - 所有群统一减少</li>
-  <li><strong>列出已记录群</strong> - 显示所有群授权信息</li>
-  <li><strong>更新名称</strong> - 刷新所有群名称缓存</li>
+  <li><code>群授权 &lt;群号&gt; &lt;±月数&gt; [授权人]</code> - 授权群聊，+6为增6月，-6为减6月</li>
+  <li><code>私聊授权 &lt;用户ID&gt; &lt;±月数&gt; [授权人]</code> - 授权私聊</li>
+  <li><code>取消授权 &lt;目标ID&gt;</code> - 删除授权记录</li>
+  <li><code>更换授权 &lt;原ID&gt; &lt;新ID&gt;</code> - 迁移授权数据</li>
+  <li><code>到期时间</code> - 查询当前上下文到期时间</li>
+  <li><code>查询到期 &lt;目标ID&gt;</code> - 查询指定目标</li>
+  <li><code>全局延期 &lt;天数&gt;</code> / <code>全局减少 &lt;天数&gt;</code> - 批量调整所有授权</li>
+  <li><code>更新名称</code> - 手动刷新群名缓存</li>
+  <li><code>列出已记录群</code> - 查看所有群授权状态</li>
+  <li><code>备份数据</code> - 导出数据库为JSON</li>
 </ul>
-<h2>关键词指令</h2>
+</div>
+
+<h2>二、关键词问答系统（Satori专精）</h2>
+<div class="detail">
 <ul>
-  <li><strong>添加 &lt;关键词&gt; [-x] [-f]</strong> - 添加关键词（-x正则，-f指定回复方式1-4）</li>
-  <li><strong>全局添加 &lt;关键词&gt; [-x] [-f]</strong> - 添加全局关键词</li>
-  <li><strong>删除 &lt;关键词&gt; [-q &lt;序号&gt;]</strong> - 删除关键词（-q删指定分支）</li>
-  <li><strong>全局删除 &lt;关键词&gt; [-q &lt;序号&gt;]</strong> - 删除全局关键词</li>
-  <li><strong>修改 &lt;关键词&gt; [-q &lt;序号&gt;]</strong> - 修改回复</li>
-  <li><strong>全局修改 &lt;关键词&gt; [-q &lt;序号&gt;]</strong> - 修改全局回复</li>
-  <li><strong>查找关键词 &lt;关键词&gt;</strong> - 模糊搜索</li>
-  <li><strong>查看关键词列表</strong> - 显示图文关键词列表</li>
+  <li><code>添加 [关键词] [-x] [-f方式]</code> - 添加关键词，-x为正则，-f指定发送方式(1-4)</li>
+  <li><code>全局添加 [关键词] [-x] [-f方式]</code> - 添加全局关键词</li>
+  <li><code>删除 [关键词] [-q序号]</code> / <code>全局删除 [关键词] [-q序号]</code> - 删除指定或全部回复</li>
+  <li><code>修改 [关键词] [-q序号]</code> / <code>全局修改 [关键词] [-q序号]</code> - 修改指定回复</li>
+  <li><code>查找关键词 [关键词]</code> - 模糊搜索</li>
+  <li><code>查看关键词列表</code> - 列出当前范围所有关键词</li>
 </ul>
-<h2>测试环境指令</h2>
+<p>支持变量：<code>{expiryDate}</code> <code>{authorizer}</code> <code>{channelId}</code> <code>{updateDate}</code></p>
+</div>
+
+<h2>三、测试环境管理</h2>
+<div class="detail">
 <ul>
-  <li><strong>测试授权 &lt;目标ID...&gt;</strong> - 将群/私聊加入测试名单</li>
-  <li><strong>取消测试授权 &lt;目标ID...&gt;</strong> - 移出测试名单</li>
-  <li><strong>测试同步</strong> - 全局问答复制到测试环境</li>
-  <li><strong>测试发布</strong> - 测试问答发布到全局（自动备份）</li>
-  <li><strong>测试添加/删除/修改</strong> - 同正式指令，仅操作测试数据</li>
+  <li><code>测试授权 &lt;ID1&gt; [ID2...]</code> - 将群/用户加入测试名单</li>
+  <li><code>取消测试授权 &lt;ID...&gt;</code> - 移出测试名单</li>
+  <li><code>测试同步</code> - 将正式数据复制到测试环境（覆盖）</li>
+  <li><code>测试发布</code>（别名：<code>测试转正</code>）- 将测试数据发布到正式（自动备份）</li>
+  <li><code>测试添加/测试删除/测试修改</code> - 独立的测试问答操作</li>
 </ul>
+<p><strong>注意</strong>：测试名单内的群仅响应测试数据，与正式环境完全隔离。</p>
+</div>
+
+<h2>四、多账号共享说明</h2>
+<div class="detail">
+<p>本插件使用 <code>platform</code> + <code>channelId</code> 作为主键，<strong>不区分 Bot 账号</strong>。</p>
+<p>同一平台（如 Satori）下的多个 Bot 账号共用同一套授权数据，更换 Bot 账号无需重新授权。</p>
+</div>
 </body>
-</html>`;
+</html>
+`;
 async function apply(ctx, config) {
-  const root = path.join(ctx.baseDir, "data", "qxgl-satori");
-  if (!fs.existsSync(root)) {
-    fs.mkdirSync(root, { recursive: true });
+  const dataDir = path.join(ctx.baseDir, "data", "qxgl-satori");
+  const imagesDir = path.join(dataDir, "images");
+  if (!fsSync.existsSync(dataDir)) {
+    fsSync.mkdirSync(dataDir, { recursive: true });
+  }
+  if (!fsSync.existsSync(imagesDir)) {
+    fsSync.mkdirSync(imagesDir, { recursive: true });
+  }
+  const testFilePath = path.join(dataDir, "test.json");
+  if (!fsSync.existsSync(testFilePath)) {
+    fsSync.writeFileSync(testFilePath, "{}");
   }
-  const globalFile = path.join(root, "global.json");
-  const testFile = path.join(root, "test.json");
-  if (!fs.existsSync(globalFile)) fs.writeFileSync(globalFile, "{}");
-  if (!fs.existsSync(testFile)) fs.writeFileSync(testFile, "{}");
   let lastTriggerTimes = {};
   function logInfo(message) {
-    if (config.loggerinfo) logger.info(message);
+    if (config.debugMode) {
+      logger.info(message);
+    }
   }
   __name(logInfo, "logInfo");
-  function isSatoriAdapter(session) {
-    return session?.bot?.adapter?.name?.includes("satori") || session?.bot?.constructor?.name?.toLowerCase().includes("satori") || false;
-  }
-  __name(isSatoriAdapter, "isSatoriAdapter");
   ctx.model.extend("qxgl_satori_auth", {
     platform: "string",
     channelId: "string",
     expiryDate: "date",
-    isblockedchannel: "boolean",
     authorizer: "string",
     channelName: "string",
     updateDate: "date",
+    isBlocked: "boolean",
     testChannels: "list"
   }, {
     primary: ["platform", "channelId"]
-    // 多账号共享关键：移除 selfId
   });
-  async function updateChannelName(session) {
-    if (!session.channelId || session.channelId.startsWith("private:")) return "私聊";
-    let name = "未知群聊";
-    try {
-      if (session.bot && typeof session.bot.getGuild === "function") {
-        const info = await session.bot.getGuild(session.channelId);
-        name = info?.name || name;
+  function hasPermission(session, command) {
+    const userId = session.userId;
+    const adminConfig = config.adminList.find((a) => a.adminId === userId);
+    const defaultConfig = config.adminList.find((a) => a.adminId === "0");
+    if (defaultConfig?.allowedCommands.includes(command)) return true;
+    if (adminConfig?.allowedCommands.includes(command)) return true;
+    if (config.channelAdminAuth) {
+      const roles = session.event?.member?.roles || [];
+      if (roles.includes("admin") || roles.includes("owner")) {
+        if (!adminConfig) return true;
+        return adminConfig.allowedCommands.includes(command);
       }
-    } catch (e) {
-      logInfo(`获取群名失败: ${e.message}`);
     }
-    return name;
-  }
-  __name(updateChannelName, "updateChannelName");
-  function formatDate(date) {
-    if (!date) return "未设置";
-    const d = new Date(date);
-    const year = d.getFullYear();
-    const month = (d.getMonth() + 1).toString().padStart(2, "0");
-    const day = d.getDate().toString().padStart(2, "0");
-    return `${year}/${month}/${day}`;
-  }
-  __name(formatDate, "formatDate");
-  function isAdmin(session) {
-    const roles = session.event?.member?.roles || [];
-    return roles.includes("admin") || roles.includes("owner");
-  }
-  __name(isAdmin, "isAdmin");
-  function hasPermission(session, commandName) {
-    const userId = session.userId;
-    const defaultConfig = config.admin_list.find((a) => a.adminID === "0");
-    if (defaultConfig?.allowcommand?.includes(commandName)) return true;
-    const userConfig = config.admin_list.find((a) => a.adminID === userId);
-    if (userConfig?.allowcommand?.includes(commandName)) return true;
-    if (config.channel_admin_auth && isAdmin(session)) return true;
     return false;
   }
   __name(hasPermission, "hasPermission");
-  async function authorizeGroup(session, channelId, months, authorizer) {
-    if (!channelId || !months) return "请提供群号和月数";
-    const monthsNum = parseInt(months);
-    if (isNaN(monthsNum)) return "月数必须是数字";
-    const channelName = await updateChannelName({ ...session, channelId });
-    const currentDate = /* @__PURE__ */ new Date();
-    const [record] = await ctx.database.get("qxgl_satori_auth", {
-      platform: session.platform,
-      channelId
-    });
-    let newExpiryDate;
-    if (!record) {
-      newExpiryDate = new Date(currentDate.getFullYear(), currentDate.getMonth() + monthsNum, currentDate.getDate());
+  async function ensureChannelRecorded(session) {
+    const { platform, channelId } = session;
+    if (!channelId || channelId.startsWith("private:")) return;
+    const record = await ctx.database.get("qxgl_satori_auth", { platform, channelId });
+    if (record.length === 0 && config.authorizationMode !== "disabled") {
+      let channelName = "未知群聊";
+      try {
+        if (session.bot?.getGuild) {
+          const guild = await session.bot.getGuild(channelId);
+          channelName = guild?.name || channelName;
+        }
+      } catch (e) {
+        logger.warn(`获取群名失败 ${channelId}: ${e.message}`);
+      }
       await ctx.database.create("qxgl_satori_auth", {
-        platform: session.platform,
+        platform,
         channelId,
-        expiryDate: newExpiryDate,
-        isblockedchannel: false,
-        authorizer: authorizer || "蒙面人",
+        expiryDate: null,
+        isBlocked: false,
+        authorizer: "系统",
         channelName,
-        updateDate: currentDate,
+        updateDate: /* @__PURE__ */ new Date(),
         testChannels: []
       });
-    } else {
-      const currentExpiry = record.expiryDate ? new Date(record.expiryDate) : currentDate;
-      newExpiryDate = new Date(currentExpiry.getFullYear(), currentExpiry.getMonth() + monthsNum, currentExpiry.getDate());
-      await ctx.database.set(
-        "qxgl_satori_auth",
-        { platform: session.platform, channelId },
-        {
-          expiryDate: newExpiryDate,
-          isblockedchannel: false,
-          authorizer: authorizer || "蒙面人",
-          channelName,
-          updateDate: currentDate
-        }
-      );
+      logInfo(`自动记录群 ${channelId}`);
     }
-    return `群号 "${channelId}" 的授权已${monthsNum > 0 ? "增加" : "减少"} ${Math.abs(monthsNum)} 个月
-新的到期时间：${formatDate(newExpiryDate)}
-开启人：${authorizer || "蒙面人"}
-更新日期：${formatDate(currentDate)}`;
   }
-  __name(authorizeGroup, "authorizeGroup");
-  async function authorizePrivate(session, userId, months, authorizer) {
-    if (!userId || !months) return "请提供用户ID和月数";
-    const monthsNum = parseInt(months);
-    if (isNaN(monthsNum)) return "月数必须是数字";
-    const channelId = `private:${userId}`;
-    const currentDate = /* @__PURE__ */ new Date();
-    const [record] = await ctx.database.get("qxgl_satori_auth", {
-      platform: session.platform,
-      channelId
-    });
-    let newExpiryDate;
-    if (!record) {
-      newExpiryDate = new Date(currentDate.getFullYear(), currentDate.getMonth() + monthsNum, currentDate.getDate());
-      await ctx.database.create("qxgl_satori_auth", {
-        platform: session.platform,
-        channelId,
-        expiryDate: newExpiryDate,
-        isblockedchannel: false,
-        authorizer: authorizer || "蒙面人",
-        channelName: "私聊",
-        updateDate: currentDate,
-        testChannels: []
-      });
-    } else {
-      const currentExpiry = record.expiryDate ? new Date(record.expiryDate) : currentDate;
-      newExpiryDate = new Date(currentExpiry.getFullYear(), currentExpiry.getMonth() + monthsNum, currentExpiry.getDate());
-      await ctx.database.set(
-        "qxgl_satori_auth",
-        { platform: session.platform, channelId },
-        {
-          expiryDate: newExpiryDate,
-          authorizer: authorizer || "蒙面人",
-          updateDate: currentDate
-        }
-      );
+  __name(ensureChannelRecorded, "ensureChannelRecorded");
+  async function isAuthorized(session) {
+    if (config.authorizationMode === "disabled") return true;
+    const { platform, channelId } = session;
+    const record = await ctx.database.get("qxgl_satori_auth", { platform, channelId });
+    if (record.length === 0) {
+      if (config.authorizationMode === "strict") return false;
+      return true;
     }
-    return `用户ID "${userId}" 的授权已${monthsNum > 0 ? "增加" : "减少"} ${Math.abs(monthsNum)} 个月
-新的到期时间：${formatDate(newExpiryDate)}`;
-  }
-  __name(authorizePrivate, "authorizePrivate");
-  async function cancelAuthorization(session, targetId) {
-    if (!targetId) return "请提供目标ID";
-    const channelId = targetId.startsWith("private:") ? targetId : targetId;
-    const [record] = await ctx.database.get("qxgl_satori_auth", {
-      platform: session.platform,
-      channelId
-    });
-    if (!record) return `未找到授权记录：${targetId}`;
-    await ctx.database.remove("qxgl_satori_auth", {
-      platform: session.platform,
-      channelId
-    });
-    return `授权已取消：${targetId}`;
+    const auth = record[0];
+    if (auth.isBlocked) return false;
+    if (!auth.expiryDate) return true;
+    return (/* @__PURE__ */ new Date()).getTime() <= new Date(auth.expiryDate).getTime();
   }
-  __name(cancelAuthorization, "cancelAuthorization");
-  async function changeAuthorization(session, sourceId, targetId) {
-    if (!sourceId || !targetId) return "请提供原ID和新ID";
-    const sourceChannelId = sourceId.startsWith("private:") ? sourceId : sourceId;
-    const targetChannelId = targetId.startsWith("private:") ? targetId : targetId;
-    const [sourceRecord] = await ctx.database.get("qxgl_satori_auth", {
-      platform: session.platform,
-      channelId: sourceChannelId
-    });
-    if (!sourceRecord) return `未找到原授权记录：${sourceId}`;
-    const [targetRecord] = await ctx.database.get("qxgl_satori_auth", {
-      platform: session.platform,
-      channelId: targetChannelId
-    });
-    if (targetRecord) return `新目标已存在授权记录：${targetId}`;
-    await ctx.database.create("qxgl_satori_auth", {
-      platform: session.platform,
-      channelId: targetChannelId,
-      expiryDate: sourceRecord.expiryDate,
-      isblockedchannel: sourceRecord.isblockedchannel,
-      authorizer: sourceRecord.authorizer,
-      channelName: "新授权",
-      updateDate: /* @__PURE__ */ new Date(),
-      testChannels: sourceRecord.testChannels || []
-    });
-    await ctx.database.remove("qxgl_satori_auth", {
-      platform: session.platform,
-      channelId: sourceChannelId
-    });
-    return `授权已从 ${sourceId} 更换到 ${targetId}`;
-  }
-  __name(changeAuthorization, "changeAuthorization");
-  async function checkExpiryTime(session) {
-    const [record] = await ctx.database.get("qxgl_satori_auth", {
-      platform: session.platform,
-      channelId: session.channelId
-    });
-    if (!record || !record.expiryDate) {
-      return `未设置到期时间`;
-    } else {
-      return `本次使用由《${record.authorizer || "蒙面人"}》激活
-到期时间：${formatDate(record.expiryDate)}`;
+  __name(isAuthorized, "isAuthorized");
+  async function checkAndUpdateExpiry(session) {
+    const { platform, channelId } = session;
+    const record = await ctx.database.get("qxgl_satori_auth", { platform, channelId });
+    if (record.length === 0) return;
+    const auth = record[0];
+    if (!auth.expiryDate) return;
+    const daysUntil = Math.floor((new Date(auth.expiryDate).getTime() - (/* @__PURE__ */ new Date()).getTime()) / (1e3 * 60 * 60 * 24));
+    const [remind3, remind1] = config.expiryReminderDays;
+    if (daysUntil === remind3 || daysUntil === remind1) {
+      await session.send(`⚠️ 授权提醒：本群授权将于 ${formatDate(auth.expiryDate)} 到期（剩${daysUntil}天）
+授权人：${auth.authorizer || "未知"}`);
     }
   }
-  __name(checkExpiryTime, "checkExpiryTime");
-  async function queryExpiryTime(session, targetId) {
-    if (!targetId) {
-      return await checkExpiryTime(session);
-    }
-    const channelId = targetId.startsWith("private:") ? targetId : targetId;
-    const [record] = await ctx.database.get("qxgl_satori_auth", {
-      platform: session.platform,
-      channelId
-    });
-    if (!record || !record.expiryDate) {
-      return `未找到授权记录：${targetId}`;
-    } else {
-      return `授权到期时间：${formatDate(record.expiryDate)}
-开启人：${record.authorizer || "蒙面人"}`;
-    }
+  __name(checkAndUpdateExpiry, "checkAndUpdateExpiry");
+  function getFilePath(channelId, isGlobal = false) {
+    if (isGlobal) return path.join(dataDir, "global.json");
+    return path.join(dataDir, `${channelId}.json`);
   }
-  __name(queryExpiryTime, "queryExpiryTime");
-  async function globalDelayExpiry(session, days) {
-    const daysNum = parseInt(days);
-    if (isNaN(daysNum) || daysNum <= 0) return "请输入有效的天数（正整数）";
-    const records = await ctx.database.get("qxgl_satori_auth");
-    const currentDate = /* @__PURE__ */ new Date();
-    let updatedCount = 0;
-    for (const record of records) {
-      if (record.expiryDate) {
-        const currentExpiry = new Date(record.expiryDate);
-        if (currentExpiry <= currentDate) continue;
-        const newExpiry = new Date(currentExpiry.getTime() + daysNum * 24 * 60 * 60 * 1e3);
-        await ctx.database.set(
-          "qxgl_satori_auth",
-          { platform: record.platform, channelId: record.channelId },
-          { expiryDate: newExpiry, updateDate: currentDate }
-        );
-        updatedCount++;
+  __name(getFilePath, "getFilePath");
+  async function downloadImage(url, scope = "global") {
+    try {
+      const buffer = await ctx.http.get(url, { responseType: "arraybuffer" }).then((r) => Buffer.from(r));
+      const folder = path.join(imagesDir, scope);
+      if (!fsSync.existsSync(folder)) {
+        fsSync.mkdirSync(folder, { recursive: true });
       }
+      const ext = (url.match(/\.(\w+)(?:\?|$)/)?.[1] || config.defaultImageExt).toLowerCase();
+      const fileName = `${Date.now()}_${Math.random().toString(36).slice(2)}.${ext}`;
+      const filePath = path.join(folder, fileName);
+      await fs.writeFile(filePath, buffer);
+      return { filePath, buffer };
+    } catch (e) {
+      logger.error(`下载图片失败: ${e.message}`);
+      throw new Error("图片下载失败");
     }
-    return `已为 ${updatedCount} 个群聊延期 ${daysNum} 天`;
   }
-  __name(globalDelayExpiry, "globalDelayExpiry");
-  async function globalReduceExpiry(session, days) {
-    const daysNum = parseInt(days);
-    if (isNaN(daysNum) || daysNum <= 0) return "请输入有效的天数（正整数）";
-    const records = await ctx.database.get("qxgl_satori_auth");
-    const currentDate = /* @__PURE__ */ new Date();
-    let updatedCount = 0;
-    for (const record of records) {
-      if (record.expiryDate) {
-        const currentExpiry = new Date(record.expiryDate);
-        if (currentExpiry <= currentDate) continue;
-        const newExpiry = new Date(currentExpiry.getTime() - daysNum * 24 * 60 * 60 * 1e3);
-        await ctx.database.set(
-          "qxgl_satori_auth",
-          { platform: record.platform, channelId: record.channelId },
-          { expiryDate: newExpiry, updateDate: currentDate }
-        );
-        updatedCount++;
+  __name(downloadImage, "downloadImage");
+  function resolveImagePath(filePath) {
+    if (config.localPathMapping) {
+      const [host, container] = config.localPathMapping.split(":");
+      if (host && container && filePath.startsWith(host)) {
+        filePath = filePath.replace(host, container);
       }
     }
-    return `已为 ${updatedCount} 个群聊减少 ${daysNum} 天`;
-  }
-  __name(globalReduceExpiry, "globalReduceExpiry");
-  function escapeRegExp(string) {
-    return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    return filePath;
   }
-  __name(escapeRegExp, "escapeRegExp");
-  async function downloadImage(url, rootDir, isGlobal, session) {
-    try {
-      const buf = await ctx.http.get(url, { responseType: "arraybuffer" }).then((r) => Buffer.from(r));
-      const folder = path.join(rootDir, isGlobal ? "global" : `${session.platform}_${session.channelId}`);
-      await fsPromises.mkdir(folder, { recursive: true });
-      const fileName = `${Date.now()}_${Math.random().toString(36).slice(2)}.${config.defaultImageExtension}`;
-      const localPath = path.join(folder, fileName);
-      await fsPromises.writeFile(localPath, buf);
-      return localPath;
-    } catch (e) {
-      logger.error(`下载图片失败: ${e.message}`);
-      throw new Error(`图片下载失败，请更换链接`);
+  __name(resolveImagePath, "resolveImagePath");
+  async function formatImageReply(imagePathOrData) {
+    if (config.imageSendMode === "base64") {
+      let buffer;
+      if (imagePathOrData.startsWith("data:")) {
+        return h.image(imagePathOrData);
+      } else if (imagePathOrData.startsWith("http")) {
+        const result = await downloadImage(imagePathOrData);
+        buffer = result.buffer;
+      } else {
+        const realPath = resolveImagePath(imagePathOrData);
+        buffer = await fs.readFile(realPath);
+      }
+      const base64 = buffer.toString("base64");
+      return h.image(`data:image/png;base64,${base64}`);
+    } else {
+      if (imagePathOrData.startsWith("http")) {
+        const { filePath } = await downloadImage(imagePathOrData);
+        const realPath = resolveImagePath(filePath);
+        return h.image(pathToFileURL(realPath).href);
+      } else {
+        const realPath = resolveImagePath(imagePathOrData);
+        if (!fsSync.existsSync(realPath)) {
+          return h.text("[图片文件丢失]");
+        }
+        return h.image(pathToFileURL(realPath).href);
+      }
     }
   }
-  __name(downloadImage, "downloadImage");
-  async function parseReplyContent(reply, rootDir, session, options) {
-    const elements = h.parse(reply);
+  __name(formatImageReply, "formatImageReply");
+  async function parseReplyContent(replyContent, scope = "global") {
+    const elements = h.parse(replyContent);
     const results = [];
-    for (const element of elements) {
-      let item = null;
-      if (element.type === "img" || element.type === "image") {
-        const localPath = await downloadImage(element.attrs.src, rootDir, options.global, session);
-        item = {
-          type: "image",
-          text: localPath,
-          fileSize: element.attrs.fileSize || "",
-          replyway: options.forward || config.MultisegmentAdditionRecoveryEffect
-        };
-      } else if (element.type === "text") {
-        item = {
-          type: "text",
-          text: element.attrs.content,
-          replyway: options.forward || config.MultisegmentAdditionRecoveryEffect
-        };
-      } else if (element.type === "at") {
-        item = {
-          type: "at",
-          text: element.attrs.id,
-          replyway: options.forward || config.MultisegmentAdditionRecoveryEffect
-        };
-      } else if (element.type === "audio") {
-        item = { type: "audio", text: element.attrs.path || element.attrs.url, replyway: options.forward || config.MultisegmentAdditionRecoveryEffect };
-      } else if (element.type === "video") {
-        item = { type: "video", text: element.attrs.src, replyway: options.forward || config.MultisegmentAdditionRecoveryEffect };
+    for (const el of elements) {
+      if (el.type === "img" || el.type === "image") {
+        try {
+          const { filePath } = await downloadImage(el.attrs.src, scope);
+          results.push({
+            type: "image",
+            content: filePath,
+            replyMode: config.multisegmentMode
+          });
+        } catch (e) {
+          results.push({ type: "text", content: `[图片下载失败]`, replyMode: config.multisegmentMode });
+        }
+      } else if (el.type === "text") {
+        results.push({ type: "text", content: el.attrs.content, replyMode: config.multisegmentMode });
+      } else if (el.type === "at") {
+        results.push({ type: "at", content: el.attrs.id, replyMode: config.multisegmentMode });
+      } else if (el.type === "audio") {
+        results.push({ type: "audio", content: el.attrs.url || el.attrs.path, replyMode: config.multisegmentMode });
+      } else if (el.type === "video") {
+        results.push({ type: "video", content: el.attrs.src, replyMode: config.multisegmentMode });
       }
-      if (item) results.push(item);
     }
     return results;
   }
   __name(parseReplyContent, "parseReplyContent");
-  async function formatReply(reply, session) {
-    if (reply.type === "image") {
-      if (config.pictureStrategy === "http") {
-        const fileName = path.basename(reply.text);
-        const url = `${config.httpServePath}/${reply.text.includes("/global/") ? "global/" : ""}${fileName}`;
-        return h.image(url);
+  async function sendFormattedReply(session, replyGroup, authRecord) {
+    const mode = replyGroup[0]?.replyMode || config.multisegmentMode;
+    const replaceVars = /* @__PURE__ */ __name((text) => {
+      if (!text || typeof text !== "string") return text;
+      if (authRecord) {
+        text = text.replace(/\{expiryDate\}/g, formatDate(authRecord.expiryDate));
+        text = text.replace(/\{expiryTime\}/g, formatDate(authRecord.expiryDate));
+        text = text.replace(/\{authorizer\}/g, authRecord.authorizer || "未设置");
+        text = text.replace(/\{channelId\}/g, authRecord.channelId);
+        text = text.replace(/\{updateDate\}/g, formatDate(authRecord.updateDate));
       } else {
-        if (isSatoriAdapter(session)) {
-          return h.image(reply.text);
-        } else {
-          if (!reply.text.startsWith("http") && !reply.text.startsWith("data:")) {
-            return h.image(pathToFileURL(reply.text).href);
-          }
-          return h.image(reply.text);
+        text = text.replace(/\{expiryDate\}/g, "未设置");
+        text = text.replace(/\{expiryTime\}/g, "未设置");
+        text = text.replace(/\{authorizer\}/g, "未设置");
+      }
+      return text;
+    }, "replaceVars");
+    if (mode === "1") {
+      for (const item of replyGroup) {
+        if (item.type === "text") {
+          await session.send(h.text(replaceVars(item.content)));
+        } else if (item.type === "image") {
+          await session.send(await formatImageReply(item.content));
+        } else if (item.type === "at") {
+          await session.send(h.at(item.content));
+        } else if (item.type === "audio") {
+          await session.send(h.audio(item.content));
+        } else if (item.type === "video") {
+          await session.send(h.video(item.content));
         }
       }
-    } else if (reply.type === "text") {
-      return h.text(reply.text);
-    } else if (reply.type === "at") {
-      return h.at(reply.text);
-    } else if (reply.type === "audio") {
-      return h.audio(reply.text);
-    } else if (reply.type === "video") {
-      return h.video(reply.text);
-    }
-    return h.text(String(reply.text));
-  }
-  __name(formatReply, "formatReply");
-  async function addKeywordReply(session, filePath, keyword, options) {
-    let data = {};
-    if (fs.existsSync(filePath)) {
-      try {
-        data = JSON.parse(fs.readFileSync(filePath, "utf-8"));
-      } catch (e) {
-        data = {};
+    } else if (mode === "2") {
+      let combined = "";
+      for (const item of replyGroup) {
+        if (item.type === "text") {
+          combined += replaceVars(item.content) + "\n";
+        } else if (item.type === "image") {
+          await session.send(h.text(combined.trim()));
+          combined = "";
+          await session.send(await formatImageReply(item.content));
+        } else if (item.type === "at") {
+          combined += `@${item.content} `;
+        }
       }
-    }
-    if (config.Treat_all_as_lowercase) keyword = keyword.toLowerCase();
-    const key = options.regex ? `regex:${keyword}` : keyword;
-    if (!data[key]) data[key] = [];
-    if (data[key].length > 0 && config.HandleDuplicateKeywords === "3") {
-      return `关键词 "${keyword}" 已存在，请先删除`;
-    }
-    if (config.HandleDuplicateKeywords === "1") data[key] = [];
-    if (config.AlwayPrompt === "2" || config.AlwayPrompt === "3") {
-      await session.send(config.Prompt);
-    }
-    const replies = [];
-    if (config.MatchPatternForExit === "1") {
-      const timeout = config.addKeywordTime * 6e4;
-      const reply = await session.prompt(timeout);
-      if (!reply) return "输入超时";
-      if (reply.includes(config.KeywordOfEsc)) return "已取消";
-      const parsed = await parseReplyContent(reply, root, session, options);
-      replies.push(parsed);
-    } else {
-      while (true) {
-        if (config.AlwayPrompt === "3") await session.send(config.Prompt);
-        const timeout = config.addKeywordTime * 6e4;
-        const reply = await session.prompt(timeout);
-        if (!reply) return "输入超时";
-        if (reply.includes(config.KeywordOfEsc)) return "已取消";
-        if (config.MatchPatternForExit === "2" && reply === config.KeywordOfEnd) break;
-        if (config.MatchPatternForExit === "3" && reply.includes(config.KeywordOfEnd)) break;
-        if (config.MatchPatternForExit === "4" && (reply === config.KeywordOfEnd || reply.includes(config.KeywordOfEnd))) break;
-        const parsed = await parseReplyContent(reply, root, session, options);
-        replies.push(...parsed);
+      if (combined.trim()) {
+        await session.send(h.text(combined.trim()));
+      }
+    } else if (mode === "3" || mode === "4") {
+      const children = [];
+      for (const item of replyGroup) {
+        if (item.type === "text") {
+          children.push(h.text(replaceVars(item.content)));
+        } else if (item.type === "image") {
+          children.push(await formatImageReply(item.content));
+        } else if (item.type === "at") {
+          children.push(h.at(item.content));
+        }
       }
+      await session.send(h("figure", {}, children));
     }
-    data[key].push(replies);
-    fs.writeFileSync(filePath, JSON.stringify(data, null, 2));
-    return `关键词 "${keyword}" 的回复已添加`;
   }
-  __name(addKeywordReply, "addKeywordReply");
-  async function deleteKeywordReply(session, filePath, keyword, specifiedIndex) {
-    if (!fs.existsSync(filePath)) return `关键词 "${keyword}" 不存在`;
-    let data = JSON.parse(fs.readFileSync(filePath, "utf-8"));
-    const searchKey = config.Treat_all_as_lowercase ? keyword.toLowerCase() : keyword;
-    let foundKey = null;
-    for (const k in data) {
-      const checkKey = config.Treat_all_as_lowercase ? k.toLowerCase() : k;
-      const realKey = checkKey.startsWith("regex:") ? checkKey.slice(6) : checkKey;
-      if (realKey === searchKey) {
-        foundKey = k;
-        break;
+  __name(sendFormattedReply, "sendFormattedReply");
+  async function matchKeyword(session, content, isTest = false) {
+    const searchFiles = isTest ? [path.join(dataDir, "test.json")] : [
+      path.join(dataDir, "global.json"),
+      path.join(dataDir, `${session.channelId}.json`)
+    ];
+    for (const filePath of searchFiles) {
+      if (!fsSync.existsSync(filePath)) continue;
+      const data = JSON.parse(fsSync.readFileSync(filePath, "utf-8"));
+      const keys = Object.keys(data).sort((a, b) => {
+        const lenA = a.startsWith("regex:") ? a.slice(6).length : a.length;
+        const lenB = b.startsWith("regex:") ? b.slice(6).length : b.length;
+        return lenB - lenA;
+      });
+      for (const key of keys) {
+        let isMatch = false;
+        let cleanKey = config.treatAsLowercase ? key.toLowerCase() : key;
+        let cleanContent = config.treatAsLowercase ? content.toLowerCase() : content;
+        if (key.startsWith("regex:")) {
+          const pattern = key.slice(6);
+          try {
+            const regex = new RegExp(pattern);
+            isMatch = regex.test(content);
+          } catch (e) {
+            continue;
+          }
+        } else {
+          for (const prefix of config.matchPrefixes) {
+            const prefixedKey = prefix + cleanKey;
+            if (cleanContent === prefixedKey) {
+              isMatch = true;
+              break;
+            }
+            const match = cleanContent.match(new RegExp(`^${escapeRegExp(prefixedKey)}\\s*(\\d+)$`));
+            if (match) {
+              const idx = parseInt(match[1]);
+              if (data[key][idx - 1]) {
+                const authRecord = await ctx.database.get("qxgl_satori_auth", {
+                  platform: session.platform,
+                  channelId: session.channelId
+                }).then((r) => r[0] || null);
+                await sendFormattedReply(session, data[key][idx - 1], authRecord);
+                return true;
+              }
+            }
+          }
+        }
+        if (isMatch) {
+          const limitKey = config.frequencyScope === "channel" ? `${key}:${session.channelId}` : key;
+          const now = Date.now();
+          if (lastTriggerTimes[limitKey] && now - lastTriggerTimes[limitKey] < config.frequencyLimit * 1e3) {
+            return true;
+          }
+          lastTriggerTimes[limitKey] = now;
+          const authRecord = await ctx.database.get("qxgl_satori_auth", {
+            platform: session.platform,
+            channelId: session.channelId
+          }).then((r) => r[0] || null);
+          const replies = data[key];
+          const selected = replies[Math.floor(Math.random() * replies.length)];
+          await sendFormattedReply(session, selected, authRecord);
+          return true;
+        }
       }
     }
-    if (!foundKey) return `关键词 "${keyword}" 不存在`;
-    const replies = data[foundKey];
-    if (config.Delete_Branch_Only && replies.length > 1) {
-      if (!specifiedIndex) {
-        return `该关键词有 ${replies.length} 个回复，请使用 -q 指定删除序号（1-${replies.length}）`;
+    return false;
+  }
+  __name(matchKeyword, "matchKeyword");
+  const AUTH_COMMANDS = [
+    "群授权",
+    "私聊授权",
+    "取消授权",
+    "更换授权",
+    "到期时间",
+    "查询到期",
+    "全局延期",
+    "全局减少",
+    "更新名称",
+    "列出已记录群",
+    "备份数据"
+  ];
+  function isAuthCommand(content) {
+    const trimmed = content.trim();
+    for (const cmd of AUTH_COMMANDS) {
+      if (trimmed.startsWith(cmd) || trimmed.startsWith("/" + cmd) || trimmed.startsWith("#" + cmd)) {
+        return true;
       }
-      const idx = parseInt(specifiedIndex) - 1;
-      if (idx < 0 || idx >= replies.length) return "序号无效";
-      replies.splice(idx, 1);
-      if (replies.length === 0) delete data[foundKey];
-      fs.writeFileSync(filePath, JSON.stringify(data, null, 2));
-      return `已删除 "${keyword}" 的第 ${specifiedIndex} 个回复`;
-    } else {
-      delete data[foundKey];
-      fs.writeFileSync(filePath, JSON.stringify(data, null, 2));
-      return `关键词 "${keyword}" 已删除`;
     }
+    return false;
   }
-  __name(deleteKeywordReply, "deleteKeywordReply");
-  async function getTestChannels(session) {
-    const records = await ctx.database.get("qxgl_satori_auth", { platform: session.platform });
-    if (records.length > 0 && records[0].testChannels) {
-      return records[0].testChannels;
+  __name(isAuthCommand, "isAuthCommand");
+  ctx.middleware(async (session, next) => {
+    const { platform, channelId } = session;
+    if (isAuthCommand(session.content)) {
+      return next();
     }
-    return [];
-  }
-  __name(getTestChannels, "getTestChannels");
-  async function setTestChannels(session, channels) {
-    await ctx.database.set(
-      "qxgl_satori_auth",
-      { platform: session.platform },
-      { testChannels: channels }
-    );
-  }
-  __name(setTestChannels, "setTestChannels");
-  ctx.before("command", (session, command) => {
-    const whiteList = [
-      "qxgl-satori.群授权",
-      "qxgl-satori.私聊授权",
-      "qxgl-satori.取消授权",
-      "qxgl-satori.更换授权",
-      "qxgl-satori.到期时间",
-      "qxgl-satori.查询到期",
-      "qxgl-satori.全局延期",
-      "qxgl-satori.全局减少",
-      "qxgl-satori.列出已记录群",
-      "qxgl-satori.更新名称"
-    ];
-    if (whiteList.includes(command.name)) {
-      session.skipAuthCheck = true;
+    if (config.authorizationMode !== "disabled") {
+      await ensureChannelRecorded(session);
     }
-    return true;
-  }, true);
-  ctx.middleware(async (session, next) => {
-    if (!session.channelId) return next();
-    const [record] = await ctx.database.get("qxgl_satori_auth", {
-      platform: session.platform,
-      channelId: session.channelId
-    });
-    if (!record) {
-      const channelName = await updateChannelName(session);
-      await ctx.database.create("qxgl_satori_auth", {
-        platform: session.platform,
-        channelId: session.channelId,
-        expiryDate: config.enableAuthSystem ? null : /* @__PURE__ */ new Date("2099-12-31"),
-        isblockedchannel: false,
-        authorizer: "",
-        channelName,
-        updateDate: /* @__PURE__ */ new Date(),
-        testChannels: []
-      });
-      logInfo(`自动记录新群聊: ${session.channelId}`);
+    if (config.authorizationMode === "strict") {
+      const authorized = await isAuthorized(session);
+      if (!authorized) {
+        logInfo(`拦截未授权群消息: ${channelId}`);
+        const record = await ctx.database.get("qxgl_satori_auth", { platform, channelId });
+        if (record.length > 0 && record[0].expiryDate) {
+          const expired = (/* @__PURE__ */ new Date()).getTime() > new Date(record[0].expiryDate).getTime();
+          if (expired && config.autoLeaveOnExpiry) {
+            try {
+              await session.bot?.leaveGuild?.(channelId);
+            } catch (e) {
+              logger.warn(`自动退群失败: ${e.message}`);
+            }
+          }
+        }
+        return;
+      }
     }
+    await checkAndUpdateExpiry(session);
     return next();
   }, true);
   ctx.middleware(async (session, next) => {
-    if (session.skipAuthCheck) return next();
-    if (!config.enableAuthSystem) return next();
-    const [record] = await ctx.database.get("qxgl_satori_auth", {
+    let content = session.content;
+    if (config.unifiedAtField) {
+      content = content.replace(/<at\s+id="(\d+)"[^>]*>/g, '<at id="$1"/>');
+    }
+    content = content.replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"');
+    if (config.treatAsLowercase) {
+      content = content.toLowerCase();
+    }
+    let isTest = false;
+    const authRecord = await ctx.database.get("qxgl_satori_auth", {
       platform: session.platform,
       channelId: session.channelId
     });
-    if (record?.expiryDate) {
-      const expiry = new Date(record.expiryDate);
-      const now = /* @__PURE__ */ new Date();
-      if (now > expiry) {
-        if (config.autoLeaveOnExpiry && session.platform === "onebot") {
-          await session.bot?.leaveGroup?.(session.channelId);
-        }
-        await ctx.database.set(
-          "qxgl_satori_auth",
-          { platform: session.platform, channelId: session.channelId },
-          { isblockedchannel: true }
-        );
-        return;
-      }
+    if (authRecord.length > 0 && authRecord[0].testChannels) {
+      const testChannels = authRecord[0].testChannels;
+      isTest = testChannels.includes(session.channelId) || testChannels.includes(`private:${session.userId}`);
     }
-    if (record?.isblockedchannel) return;
+    const matched = await matchKeyword(session, content, isTest);
+    if (matched) return;
     return next();
   });
-  ctx.command(`${pluginName}/群授权 <channelId> <months> [authorizer]`, "群授权", { authority: config.commandAuthority }).action(async ({ session }, channelId, months, authorizer) => {
-    return await authorizeGroup(session, channelId, months, authorizer);
+  ctx.command(pluginName);
+  ctx.command(pluginName + "/群授权 <channelId> <months> [authorizer]", "群授权管理").authority(config.commandAuthority).action(async ({ session }, channelId, months, authorizer = "蒙面人") => {
+    if (!channelId || !months) return "格式错误：群授权 <群号> <±月数> [授权人]";
+    const monthsNum = parseInt(months);
+    if (isNaN(monthsNum)) return "请输入有效的月份数（正数增加，负数减少）";
+    let groupName = "未知群聊";
+    try {
+      if (session.bot?.getGuild) {
+        const guild = await session.bot.getGuild(channelId);
+        groupName = guild?.name || groupName;
+      }
+    } catch (e) {
+    }
+    const { platform } = session;
+    const record = await ctx.database.get("qxgl_satori_auth", { platform, channelId });
+    const now = /* @__PURE__ */ new Date();
+    let newExpiry;
+    if (record.length === 0) {
+      newExpiry = new Date(now.getFullYear(), now.getMonth() + monthsNum, now.getDate());
+      await ctx.database.create("qxgl_satori_auth", {
+        platform,
+        channelId,
+        expiryDate: newExpiry,
+        isBlocked: false,
+        authorizer,
+        channelName: groupName,
+        updateDate: now,
+        testChannels: []
+      });
+    } else {
+      const current = record[0].expiryDate ? new Date(record[0].expiryDate) : now;
+      newExpiry = new Date(current.getFullYear(), current.getMonth() + monthsNum, current.getDate());
+      await ctx.database.set("qxgl_satori_auth", { platform, channelId }, {
+        expiryDate: newExpiry,
+        authorizer,
+        channelName: groupName,
+        updateDate: now,
+        isBlocked: false
+      });
+    }
+    const action = monthsNum > 0 ? "增加" : "减少";
+    return `群号 "${channelId}" 授权已${action} ${Math.abs(monthsNum)} 个月
+到期时间：${formatDate(newExpiry)}
+授权人：${authorizer}
+更新日期：${formatDate(now)}`;
+  });
+  ctx.command(pluginName + "/私聊授权 <userId> <months> [authorizer]", "私聊授权管理").authority(config.commandAuthority).action(async ({ session }, userId, months, authorizer = "蒙面人") => {
+    if (!userId || !months) return "格式错误：私聊授权 <用户ID> <±月数> [授权人]";
+    const monthsNum = parseInt(months);
+    if (isNaN(monthsNum)) return "请输入有效的月份数";
+    const channelId = `private:${userId}`;
+    const { platform } = session;
+    const record = await ctx.database.get("qxgl_satori_auth", { platform, channelId });
+    const now = /* @__PURE__ */ new Date();
+    let newExpiry;
+    if (record.length === 0) {
+      newExpiry = new Date(now.getFullYear(), now.getMonth() + monthsNum, now.getDate());
+      await ctx.database.create("qxgl_satori_auth", {
+        platform,
+        channelId,
+        expiryDate: newExpiry,
+        isBlocked: false,
+        authorizer,
+        channelName: "私聊",
+        updateDate: now,
+        testChannels: []
+      });
+    } else {
+      const current = record[0].expiryDate ? new Date(record[0].expiryDate) : now;
+      newExpiry = new Date(current.getFullYear(), current.getMonth() + monthsNum, current.getDate());
+      await ctx.database.set("qxgl_satori_auth", { platform, channelId }, {
+        expiryDate: newExpiry,
+        authorizer,
+        updateDate: now,
+        isBlocked: false
+      });
+    }
+    const action = monthsNum > 0 ? "增加" : "减少";
+    return `用户 "${userId}" 授权已${action} ${Math.abs(monthsNum)} 个月
+到期时间：${formatDate(newExpiry)}
+授权人：${authorizer}`;
   });
-  ctx.command(`${pluginName}/私聊授权 <userId> <months> [authorizer]`, "私聊授权", { authority: config.commandAuthority }).action(async ({ session }, userId, months, authorizer) => {
-    return await authorizePrivate(session, userId, months, authorizer);
+  ctx.command(pluginName + "/取消授权 <targetId>", "取消指定群/私聊授权").authority(config.commandAuthority).action(async ({ session }, targetId) => {
+    if (!targetId) return "请提供目标ID";
+    const channelId = targetId.startsWith("private:") ? targetId : targetId;
+    const { platform } = session;
+    const record = await ctx.database.get("qxgl_satori_auth", { platform, channelId });
+    if (record.length === 0) return `未找到授权记录：${targetId}`;
+    await ctx.database.remove("qxgl_satori_auth", { platform, channelId });
+    return `已取消授权：${targetId}`;
   });
-  ctx.command(`${pluginName}/取消授权 <targetId>`, "取消授权", { authority: config.commandAuthority }).action(async ({ session }, targetId) => {
-    return await cancelAuthorization(session, targetId);
+  ctx.command(pluginName + "/更换授权 <sourceId> <targetId>", "迁移授权数据").authority(config.commandAuthority).action(async ({ session }, sourceId, targetId) => {
+    if (!sourceId || !targetId) return "格式：更换授权 <原ID> <新ID>";
+    const sourceChannel = sourceId.startsWith("private:") ? sourceId : sourceId;
+    const targetChannel = targetId.startsWith("private:") ? targetId : targetId;
+    const { platform } = session;
+    const source = await ctx.database.get("qxgl_satori_auth", { platform, channelId: sourceChannel });
+    if (source.length === 0) return `原目标未找到：${sourceId}`;
+    const target = await ctx.database.get("qxgl_satori_auth", { platform, channelId: targetChannel });
+    if (target.length > 0) return `新目标已存在授权：${targetId}`;
+    const data = source[0];
+    await ctx.database.create("qxgl_satori_auth", {
+      ...data,
+      channelId: targetChannel,
+      channelName: "新迁移群聊",
+      updateDate: /* @__PURE__ */ new Date()
+    });
+    await ctx.database.remove("qxgl_satori_auth", { platform, channelId: sourceChannel });
+    return `授权已从 ${sourceId} 迁移到 ${targetId}`;
   });
-  ctx.command(`${pluginName}/更换授权 <sourceId> <targetId>`, "更换授权", { authority: config.commandAuthority }).action(async ({ session }, sourceId, targetId) => {
-    return await changeAuthorization(session, sourceId, targetId);
+  ctx.command(pluginName + "/到期时间", "查询当前授权到期时间").authority(0).action(async ({ session }) => {
+    const { platform, channelId } = session;
+    const record = await ctx.database.get("qxgl_satori_auth", { platform, channelId });
+    if (record.length === 0 || !record[0].expiryDate) {
+      return "当前未设置到期时间（永久授权或无授权记录）";
+    }
+    return `到期时间：${formatDate(record[0].expiryDate)}
+授权人：${record[0].authorizer || "未知"}
+更新于：${formatDate(record[0].updateDate)}`;
   });
-  ctx.command(`${pluginName}/到期时间`, "查询本群/私聊到期时间", { authority: 0 }).action(async ({ session }) => {
-    return await checkExpiryTime(session);
+  ctx.command(pluginName + "/查询到期 <targetId>", "查询指定目标授权").authority(config.commandAuthority).action(async ({ session }, targetId) => {
+    const channelId = targetId.startsWith("private:") ? targetId : targetId;
+    const record = await ctx.database.get("qxgl_satori_auth", {
+      platform: session.platform,
+      channelId
+    });
+    if (record.length === 0) return `未找到授权记录：${targetId}`;
+    return `目标：${targetId}
+到期：${formatDate(record[0].expiryDate)}
+授权人：${record[0].authorizer || "未知"}`;
   });
-  ctx.command(`${pluginName}/查询到期 [targetId]`, "查询指定群/私聊到期时间", { authority: config.commandAuthority }).action(async ({ session }, targetId) => {
-    return await queryExpiryTime(session, targetId);
+  ctx.command(pluginName + "/全局延期 <days>", "为所有授权增加天数").authority(config.commandAuthority).action(async ({ session }, days) => {
+    const d = parseInt(days);
+    if (isNaN(d) || d <= 0) return "请输入正整数天数";
+    const records = await ctx.database.get("qxgl_satori_auth");
+    const now = /* @__PURE__ */ new Date();
+    let count = 0;
+    for (const r of records) {
+      if (!r.expiryDate) continue;
+      if (new Date(r.expiryDate).getTime() <= now.getTime()) continue;
+      const newDate = new Date(new Date(r.expiryDate).getTime() + d * 864e5);
+      await ctx.database.set(
+        "qxgl_satori_auth",
+        { platform: r.platform, channelId: r.channelId },
+        { expiryDate: newDate, updateDate: now }
+      );
+      count++;
+    }
+    return `已为 ${count} 个有效授权延期 ${d} 天`;
   });
-  ctx.command(`${pluginName}/全局延期 <days>`, "为所有群统一延期", { authority: config.commandAuthority }).action(async ({ session }, days) => {
-    return await globalDelayExpiry(session, days);
+  ctx.command(pluginName + "/全局减少 <days>", "为所有授权减少天数").authority(config.commandAuthority).action(async ({ session }, days) => {
+    const d = parseInt(days);
+    if (isNaN(d) || d <= 0) return "请输入正整数天数";
+    const records = await ctx.database.get("qxgl_satori_auth");
+    const now = /* @__PURE__ */ new Date();
+    let count = 0;
+    for (const r of records) {
+      if (!r.expiryDate) continue;
+      if (new Date(r.expiryDate).getTime() <= now.getTime()) continue;
+      const newDate = new Date(new Date(r.expiryDate).getTime() - d * 864e5);
+      await ctx.database.set(
+        "qxgl_satori_auth",
+        { platform: r.platform, channelId: r.channelId },
+        { expiryDate: newDate, updateDate: now }
+      );
+      count++;
+    }
+    return `已为 ${count} 个授权减少 ${d} 天`;
   });
-  ctx.command(`${pluginName}/全局减少 <days>`, "为所有群统一减少", { authority: config.commandAuthority }).action(async ({ session }, days) => {
-    return await globalReduceExpiry(session, days);
+  ctx.command(pluginName + "/更新名称", "刷新群名称缓存").authority(config.commandAuthority).action(async ({ session }) => {
+    const records = await ctx.database.get("qxgl_satori_auth");
+    let count = 0;
+    for (const r of records) {
+      if (r.channelId.startsWith("private:")) continue;
+      try {
+        if (session.bot?.getGuild) {
+          const guild = await session.bot.getGuild(r.channelId);
+          if (guild?.name) {
+            await ctx.database.set(
+              "qxgl_satori_auth",
+              { platform: r.platform, channelId: r.channelId },
+              { channelName: guild.name }
+            );
+            count++;
+          }
+        }
+      } catch (e) {
+      }
+    }
+    return `已更新 ${count} 个群名称`;
   });
-  ctx.command(`${pluginName}/列出已记录群`, "列出所有已记录的群", { authority: config.commandAuthority }).action(async ({ session }) => {
+  ctx.command(pluginName + "/列出已记录群", "列出所有群授权状态").authority(config.commandAuthority).action(async () => {
     const records = await ctx.database.get("qxgl_satori_auth");
     const groups = records.filter((r) => !r.channelId.startsWith("private:"));
-    if (!groups.length) return "暂无群聊记录";
+    if (groups.length === 0) return "暂无群记录";
     return groups.map(
       (r) => `群名：${r.channelName}
 群号：${r.channelId}
 到期：${formatDate(r.expiryDate)}
-开启人：${r.authorizer || "蒙面人"}
-更新：${formatDate(r.updateDate)}`
+授权：${r.authorizer}
+状态：${r.isBlocked ? "已拉黑" : "正常"}`
     ).join("\n\n");
   });
-  ctx.command(`${pluginName}/更新名称`, "刷新所有群名称缓存", { authority: config.commandAuthority }).action(async ({ session }) => {
+  ctx.command(pluginName + "/备份数据", "备份数据到JSON").authority(config.commandAuthority).action(async () => {
     const records = await ctx.database.get("qxgl_satori_auth");
-    let count = 0;
-    for (const record of records) {
-      if (record.channelId.startsWith("private:")) continue;
-      const name = await updateChannelName({ ...session, channelId: record.channelId });
-      await ctx.database.set(
-        "qxgl_satori_auth",
-        { platform: record.platform, channelId: record.channelId },
-        { channelName: name }
-      );
-      count++;
-    }
-    return `已更新 ${count} 个群聊名称`;
+    const backupPath = path.join(dataDir, `backup_${Date.now()}.json`);
+    await fs.writeFile(backupPath, JSON.stringify(records, null, 2));
+    return `已备份 ${records.length} 条记录到 ${backupPath}`;
   });
-  ctx.command(`${pluginName}/添加 <keyword>`, "添加关键词", { authority: config.commandAuthority }).option("regex", "-x 使用正则匹配").option("forward", "-f <type> 指定回复方式(1-4)").action(async ({ session, options }, keyword) => {
+  async function addKeywordLogic(session, keyword, isGlobal = false, isRegex = false) {
+    if (!keyword) return "请输入关键词";
+    const filePath = isGlobal ? getFilePath(null, true) : getFilePath(session.channelId);
+    if (!fsSync.existsSync(filePath)) {
+      fsSync.writeFileSync(filePath, "{}");
+    }
+    let data;
+    try {
+      data = JSON.parse(fsSync.readFileSync(filePath, "utf-8"));
+    } catch {
+      data = {};
+    }
+    const key = isRegex ? `regex:${keyword}` : config.treatAsLowercase ? keyword.toLowerCase() : keyword;
+    if (data[key] && config.handleDuplicate === "reject") {
+      return `关键词 "${keyword}" 已存在`;
+    }
+    if (!data[key] || config.handleDuplicate === "replace") {
+      data[key] = [];
+    }
+    if (config.alwaysPrompt !== "never") {
+      await session.send('请输入回复内容（支持多段，输入"结束添加"完成，"取消添加"放弃）：');
+    }
+    const replies = [];
+    const timeout = config.addTimeout * 6e4;
+    while (true) {
+      if (config.alwaysPrompt === "always") {
+        await session.send("请继续输入（结束添加/取消添加）：");
+      }
+      const reply = await session.prompt(timeout);
+      if (!reply) return "输入超时，已取消";
+      if (reply.includes(config.cancelKeyword)) return "已取消添加";
+      if (reply.includes(config.endKeyword)) break;
+      const parsed = await parseReplyContent(reply, isGlobal ? "global" : session.channelId);
+      replies.push(...parsed);
+    }
+    if (replies.length === 0) return "未输入有效回复";
+    data[key].push(replies);
+    fsSync.writeFileSync(filePath, JSON.stringify(data, null, 2));
+    return `关键词 "${keyword}" 添加完成，共 ${data[key].length} 条回复`;
+  }
+  __name(addKeywordLogic, "addKeywordLogic");
+  ctx.command(pluginName + `/${config.triggerPrefix} [keyword]`, "添加关键词").option("regex", "-x 使用正则匹配").authority(config.commandAuthority).action(async ({ session, options }, keyword) => {
     if (!hasPermission(session, "添加")) return "权限不足";
-    if (!keyword) return "请提供关键词";
-    const filePath = path.join(root, `${session.platform}_${session.channelId}.json`);
-    return await addKeywordReply(session, filePath, keyword, { ...options, global: false });
+    return addKeywordLogic(session, keyword, false, options.regex);
   });
-  ctx.command(`${pluginName}/全局添加 <keyword>`, "添加全局关键词", { authority: config.commandAuthority }).option("regex", "-x 使用正则匹配").option("forward", "-f <type> 指定回复方式(1-4)").action(async ({ session, options }, keyword) => {
+  ctx.command(pluginName + `/${config.globalTriggerPrefix} [keyword]`, "添加全局关键词").option("regex", "-x 使用正则匹配").authority(config.commandAuthority).action(async ({ session, options }, keyword) => {
     if (!hasPermission(session, "全局添加")) return "权限不足";
-    if (!keyword) return "请提供关键词";
-    return await addKeywordReply(session, globalFile, keyword, { ...options, global: true });
+    return addKeywordLogic(session, keyword, true, options.regex);
   });
-  ctx.command(`${pluginName}/删除 <keyword>`, "删除关键词", { authority: config.commandAuthority }).option("question", "-q <index> 指定删除序号").action(async ({ session, options }, keyword) => {
+  async function deleteKeywordLogic(session, keyword, isGlobal, index = null) {
+    if (!keyword) return "请输入关键词";
+    const filePath = isGlobal ? getFilePath(null, true) : getFilePath(session.channelId);
+    if (!fsSync.existsSync(filePath)) return "暂无数据";
+    const data = JSON.parse(fsSync.readFileSync(filePath, "utf-8"));
+    const searchKey = config.treatAsLowercase ? keyword.toLowerCase() : keyword;
+    let targetKey = null;
+    for (const k of Object.keys(data)) {
+      const cleanK = k.startsWith("regex:") ? k.slice(6) : k;
+      if (cleanK === searchKey) {
+        targetKey = k;
+        break;
+      }
+    }
+    if (!targetKey) return `关键词 "${keyword}" 不存在`;
+    if (config.deleteBranchOnly && data[targetKey].length > 1 && index === null) {
+      return `该关键词有 ${data[targetKey].length} 条回复，请使用 -q 指定序号删除`;
+    }
+    if (index !== null) {
+      const idx = parseInt(index) - 1;
+      if (isNaN(idx) || idx < 0 || idx >= data[targetKey].length) {
+        return "无效的回复序号";
+      }
+      data[targetKey].splice(idx, 1);
+      if (data[targetKey].length === 0) {
+        delete data[targetKey];
+        fsSync.writeFileSync(filePath, JSON.stringify(data, null, 2));
+        return `已删除关键词 "${keyword}"`;
+      }
+      fsSync.writeFileSync(filePath, JSON.stringify(data, null, 2));
+      return `已删除 "${keyword}" 的第 ${index} 条回复`;
+    } else {
+      delete data[targetKey];
+      fsSync.writeFileSync(filePath, JSON.stringify(data, null, 2));
+      return `已删除关键词 "${keyword}"`;
+    }
+  }
+  __name(deleteKeywordLogic, "deleteKeywordLogic");
+  ctx.command(pluginName + `/${config.deletePrefix} [keyword]`, "删除关键词").option("index", "-q <number> 指定回复序号").authority(config.commandAuthority).action(async ({ session, options }, keyword) => {
     if (!hasPermission(session, "删除")) return "权限不足";
-    if (!keyword) return "请提供关键词";
-    const filePath = path.join(root, `${session.platform}_${session.channelId}.json`);
-    return await deleteKeywordReply(session, filePath, keyword, options.question);
+    return deleteKeywordLogic(session, keyword, false, options.index);
   });
-  ctx.command(`${pluginName}/全局删除 <keyword>`, "删除全局关键词", { authority: config.commandAuthority }).option("question", "-q <index> 指定删除序号").action(async ({ session, options }, keyword) => {
+  ctx.command(pluginName + `/${config.globalDeletePrefix} [keyword]`, "删除全局关键词").option("index", "-q <number> 指定回复序号").authority(config.commandAuthority).action(async ({ session, options }, keyword) => {
     if (!hasPermission(session, "全局删除")) return "权限不足";
-    if (!keyword) return "请提供关键词";
-    return await deleteKeywordReply(session, globalFile, keyword, options.question);
+    return deleteKeywordLogic(session, keyword, true, options.index);
   });
-  ctx.command(`${pluginName}/修改 <keyword>`, "修改关键词回复", { authority: config.commandAuthority }).option("question", "-q <index> 指定回复序号").action(async ({ session, options }, keyword) => {
+  async function fixKeywordLogic(session, keyword, isGlobal, idx = 0) {
+    if (!keyword) return "请输入关键词";
+    const filePath = isGlobal ? getFilePath(null, true) : getFilePath(session.channelId);
+    if (!fsSync.existsSync(filePath)) return "文件不存在";
+    const data = JSON.parse(fsSync.readFileSync(filePath, "utf-8"));
+    const searchKey = config.treatAsLowercase ? keyword.toLowerCase() : keyword;
+    let targetKey = null;
+    for (const k of Object.keys(data)) {
+      const cleanK = k.startsWith("regex:") ? k.slice(6) : k;
+      if (cleanK === searchKey) targetKey = k;
+    }
+    if (!targetKey) return `关键词 "${keyword}" 不存在`;
+    if (!data[targetKey][idx]) return "回复序号无效";
+    await session.send(`正在修改 "${keyword}" 的第 ${idx + 1} 条回复，当前内容：`);
+    await sendFormattedReply(session, data[targetKey][idx], null);
+    await session.send("请输入新内容（取消添加 放弃）：");
+    const reply = await session.prompt(config.addTimeout * 6e4);
+    if (!reply || reply.includes(config.cancelKeyword)) return "已取消";
+    const parsed = await parseReplyContent(reply, isGlobal ? "global" : session.channelId);
+    data[targetKey][idx] = parsed;
+    fsSync.writeFileSync(filePath, JSON.stringify(data, null, 2));
+    return "修改完成";
+  }
+  __name(fixKeywordLogic, "fixKeywordLogic");
+  ctx.command(pluginName + `/${config.fixCommand} [keyword]`, "修改关键词").option("index", "-q <number> 回复序号").authority(config.commandAuthority).action(async ({ session, options }, keyword) => {
     if (!hasPermission(session, "修改")) return "权限不足";
-    if (!keyword) return "请提供关键词";
-    const filePath = path.join(root, `${session.platform}_${session.channelId}.json`);
-    if (!fs.existsSync(filePath)) return "未找到数据";
-    let data = JSON.parse(fs.readFileSync(filePath, "utf-8"));
-    const key = config.Treat_all_as_lowercase ? keyword.toLowerCase() : keyword;
-    if (!data[key]) return `关键词 "${keyword}" 不存在`;
-    const idx = (parseInt(options.question) || 1) - 1;
-    if (idx < 0 || idx >= data[key].length) return "序号无效";
-    let current = "";
-    for (const item of data[key][idx]) {
-      current += await formatReply(item, session);
-    }
-    await session.send(`正在修改【${keyword}】的第 ${idx + 1} 条回复：
-${current}`);
-    await session.send(`请一次性输入新内容（${config.KeywordOfEsc} 取消）：`);
-    const reply = await session.prompt(config.addKeywordTime * 6e4);
-    if (!reply || reply.includes(config.KeywordOfEsc)) return "已取消";
-    data[key][idx] = await parseReplyContent(reply, root, session, { global: false });
-    fs.writeFileSync(filePath, JSON.stringify(data, null, 2));
-    return `已修改 "${keyword}" 的第 ${idx + 1} 条回复`;
+    return fixKeywordLogic(session, keyword, false, (options.index || 1) - 1);
   });
-  ctx.command(`${pluginName}/全局修改 <keyword>`, "修改全局关键词", { authority: config.commandAuthority }).option("question", "-q <index> 指定回复序号").action(async ({ session, options }, keyword) => {
+  ctx.command(pluginName + `/${config.globalFixCommand} [keyword]`, "修改全局关键词").option("index", "-q <number> 回复序号").authority(config.commandAuthority).action(async ({ session, options }, keyword) => {
     if (!hasPermission(session, "全局修改")) return "权限不足";
-    if (!keyword) return "请提供关键词";
-    if (!fs.existsSync(globalFile)) return "未找到全局数据";
-    let data = JSON.parse(fs.readFileSync(globalFile, "utf-8"));
-    const key = config.Treat_all_as_lowercase ? keyword.toLowerCase() : keyword;
-    if (!data[key]) return `全局关键词 "${keyword}" 不存在`;
-    const idx = (parseInt(options.question) || 1) - 1;
-    if (idx < 0 || idx >= data[key].length) return "序号无效";
-    let current = "";
-    for (const item of data[key][idx]) {
-      current += await formatReply(item, session);
-    }
-    await session.send(`正在修改全局【${keyword}】的第 ${idx + 1} 条回复：
-${current}`);
-    await session.send(`请一次性输入新内容（${config.KeywordOfEsc} 取消）：`);
-    const reply = await session.prompt(config.addKeywordTime * 6e4);
-    if (!reply || reply.includes(config.KeywordOfEsc)) return "已取消";
-    data[key][idx] = await parseReplyContent(reply, root, session, { global: true });
-    fs.writeFileSync(globalFile, JSON.stringify(data, null, 2));
-    return `已修改全局 "${keyword}" 的第 ${idx + 1} 条回复`;
+    return fixKeywordLogic(session, keyword, true, (options.index || 1) - 1);
   });
-  ctx.command(`${pluginName}/查找关键词 <keyword>`, "查找关键词", { authority: config.commandAuthority }).action(async ({ session }, keyword) => {
+  ctx.command(pluginName + `/${config.searchCommand} [keyword]`, "查找关键词").authority(config.commandAuthority).action(async ({ session }, keyword) => {
     if (!hasPermission(session, "查找关键词")) return "权限不足";
-    if (!keyword) return "请提供关键词";
-    const files = [];
-    if (config.Search_Range === "1" || config.Search_Range === "3") {
-      files.push(path.join(root, `${session.platform}_${session.channelId}.json`));
-    }
-    if (config.Search_Range === "2" || config.Search_Range === "3") {
-      files.push(globalFile);
-      const allFiles = fs.readdirSync(root).filter((f) => f.endsWith(".json") && f !== "test.json" && f !== "global.json");
-      files.push(...allFiles.map((f) => path.join(root, f)));
+    if (!keyword) return "请输入搜索词";
+    let files = [];
+    if (config.searchRange === "local") {
+      files = [getFilePath(session.channelId)];
+    } else if (config.searchRange === "all") {
+      files = fsSync.readdirSync(dataDir).filter((f) => f.endsWith(".json")).map((f) => path.join(dataDir, f));
+    } else {
+      files = [getFilePath(session.channelId), getFilePath(null, true)];
     }
-    const results = [];
-    for (const file of [...new Set(files)]) {
-      if (!fs.existsSync(file)) continue;
-      const data = JSON.parse(fs.readFileSync(file, "utf-8"));
-      for (const key in data) {
-        const checkKey = config.Treat_all_as_lowercase ? key.toLowerCase() : key;
-        const searchKey = config.Treat_all_as_lowercase ? keyword.toLowerCase() : keyword;
-        if (checkKey.includes(searchKey)) {
-          const channelId = path.basename(file, ".json").replace(`${session.platform}_`, "");
-          const content = data[key].map(
-            (group, i) => `回复${i + 1}: ${group.map((g) => g.type === "text" ? g.text : `[${g.type}]`).join(", ")}`
-          ).join("\n");
-          if (config.Find_Return_Preset === "1") results.push(`关键词：${key}
-${content}`);
-          else if (config.Find_Return_Preset === "2") results.push(`位置：${channelId}`);
-          else results.push(`位置：${channelId}
-关键词：${key}
-${content}`);
-          if (config.Return_Limit === "2") break;
+    let results = [];
+    for (const file of files) {
+      if (!fsSync.existsSync(file)) continue;
+      const data = JSON.parse(fsSync.readFileSync(file, "utf-8"));
+      for (const k of Object.keys(data)) {
+        if (k.includes(keyword)) {
+          results.push(`在 ${path.basename(file, ".json")} 找到：${k}（${data[k].length}条回复）`);
         }
       }
     }
-    if (!results.length) return `未找到 "${keyword}"`;
-    return results.join("\n\n");
+    return results.length ? results.slice(0, 10).join("\n") : "未找到";
   });
-  ctx.command(`${pluginName}/查看关键词列表`, "查看关键词列表", { authority: config.commandAuthority }).action(async ({ session }) => {
+  ctx.command(pluginName + `/${config.viewListCommand}`, "查看关键词列表").authority(config.commandAuthority).action(async ({ session }) => {
     if (!hasPermission(session, "查看关键词列表")) return "权限不足";
-    const filePath = path.join(root, `${session.platform}_${session.channelId}.json`);
-    const globalData = fs.existsSync(globalFile) ? JSON.parse(fs.readFileSync(globalFile, "utf-8")) : {};
-    const localData = fs.existsSync(filePath) ? JSON.parse(fs.readFileSync(filePath, "utf-8")) : {};
-    const keys = [.../* @__PURE__ */ new Set([...Object.keys(globalData), ...Object.keys(localData)])];
-    if (!keys.length) return "暂无关键词";
-    return `关键词列表（共${keys.length}个）：
-` + keys.join("\n");
+    const filePath = getFilePath(session.channelId);
+    const globalPath = getFilePath(null, true);
+    let keys = [];
+    if (config.searchRange !== "local" && fsSync.existsSync(globalPath)) {
+      keys.push(...Object.keys(JSON.parse(fsSync.readFileSync(globalPath, "utf-8"))).map((k) => `[全]${k}`));
+    }
+    if (fsSync.existsSync(filePath)) {
+      keys.push(...Object.keys(JSON.parse(fsSync.readFileSync(filePath, "utf-8"))).map((k) => `[本]${k}`));
+    }
+    if (keys.length === 0) return "暂无关键词";
+    return keys.join("\n");
   });
-  ctx.command(`${pluginName}/测试授权 <...targets>`, "将群/私聊加入测试名单", { authority: config.commandAuthority }).action(async ({ session }, ...targets) => {
-    if (!targets.length) return "请提供至少一个目标ID";
-    const channels = await getTestChannels(session);
-    const set = new Set(channels);
+  ctx.command(pluginName + "/测试授权 <targetId...>", "加入测试名单").authority(config.commandAuthority).action(async ({ session }, ...targets) => {
+    if (!targets.length) return "请提供目标ID";
+    const allRecords = await ctx.database.get("qxgl_satori_auth");
+    let testChannels = [];
+    if (allRecords.length > 0 && allRecords[0].testChannels) {
+      testChannels = allRecords[0].testChannels;
+    }
     const added = [];
     for (const t of targets) {
       const cid = t.startsWith("private:") ? t : t;
-      if (!set.has(cid)) {
-        set.add(cid);
+      if (!testChannels.includes(cid)) {
+        testChannels.push(cid);
         added.push(t);
       }
     }
-    if (added.length) await setTestChannels(session, Array.from(set));
-    return added.length ? `已加入测试名单：${added.join("、")}` : "指定目标已在测试名单中";
+    if (added.length > 0) {
+      await ctx.database.set("qxgl_satori_auth", {}, { testChannels });
+    }
+    return `已添加测试：${added.join("、") || "无新增"}`;
   });
-  ctx.command(`${pluginName}/取消测试授权 <...targets>`, "将群/私聊移出测试名单", { authority: config.commandAuthority }).action(async ({ session }, ...targets) => {
-    if (!targets.length) return "请提供至少一个目标ID";
-    const channels = await getTestChannels(session);
-    const set = new Set(channels);
+  ctx.command(pluginName + "/取消测试授权 <targetId...>", "移出测试名单").authority(config.commandAuthority).action(async ({ session }, ...targets) => {
+    const allRecords = await ctx.database.get("qxgl_satori_auth");
+    if (!allRecords.length) return "无数据";
+    let testChannels = allRecords[0].testChannels || [];
     const removed = [];
     for (const t of targets) {
-      const cid = t.startsWith("private:") ? t : t;
-      if (set.has(cid)) {
-        set.delete(cid);
+      const idx = testChannels.indexOf(t);
+      if (idx > -1) {
+        testChannels.splice(idx, 1);
         removed.push(t);
+      } else if (t.startsWith("private:")) {
+        const plain = t.replace("private:", "");
+        const idx2 = testChannels.indexOf(plain);
+        if (idx2 > -1) {
+          testChannels.splice(idx2, 1);
+          removed.push(t);
+        }
       }
     }
-    if (removed.length) await setTestChannels(session, Array.from(set));
-    return removed.length ? `已移出测试名单：${removed.join("、")}` : "指定目标不在测试名单中";
+    await ctx.database.set("qxgl_satori_auth", {}, { testChannels });
+    return `已移出：${removed.join("、") || "无"}`;
   });
-  ctx.command(`${pluginName}/测试同步`, "全局问答复制到测试环境", { authority: config.commandAuthority }).action(async ({ session }) => {
-    if (!fs.existsSync(globalFile)) return "全局问答文件不存在";
-    fs.copyFileSync(globalFile, testFile);
-    const data = JSON.parse(fs.readFileSync(testFile, "utf-8"));
-    return `测试同步完成，共 ${Object.keys(data).length} 条问答已复制`;
+  ctx.command(pluginName + "/测试同步", "正式→测试数据同步").authority(config.commandAuthority).action(async () => {
+    const globalPath = getFilePath(null, true);
+    if (!fsSync.existsSync(globalPath)) return "全局文件不存在";
+    fsSync.copyFileSync(globalPath, testFilePath);
+    const count = Object.keys(JSON.parse(fsSync.readFileSync(testFilePath, "utf-8"))).length;
+    return `测试同步完成，共 ${count} 条数据`;
   });
-  ctx.command(`${pluginName}/测试发布`, "测试问答发布到全局", { authority: config.commandAuthority }).alias("测试转正").alias("全局发布").action(async ({ session }) => {
-    if (!fs.existsSync(testFile)) return "测试问答文件不存在";
-    const backupFile = path.join(root, "global.json.pub.bak");
-    if (fs.existsSync(globalFile)) fs.copyFileSync(globalFile, backupFile);
-    fs.copyFileSync(testFile, globalFile);
-    const data = JSON.parse(fs.readFileSync(globalFile, "utf-8"));
-    return `测试发布完成，共 ${Object.keys(data).length} 条问答已发布，原全局已备份`;
+  ctx.command(pluginName + "/测试发布", "测试→正式发布（带备份）").alias("测试转正").authority(config.commandAuthority).action(async () => {
+    if (!fsSync.existsSync(testFilePath)) return "测试文件不存在";
+    const globalPath = getFilePath(null, true);
+    const backupPath = path.join(dataDir, `global.json.bak_${Date.now()}`);
+    if (fsSync.existsSync(globalPath)) {
+      fsSync.copyFileSync(globalPath, backupPath);
+    }
+    fsSync.copyFileSync(testFilePath, globalPath);
+    const count = Object.keys(JSON.parse(fsSync.readFileSync(globalPath, "utf-8"))).length;
+    return `测试发布完成，共 ${count} 条数据，原数据已备份`;
   });
-  ctx.command(`${pluginName}/测试添加 <keyword>`, "添加测试关键词", { authority: config.commandAuthority }).option("regex", "-x 使用正则匹配").option("forward", "-f <type> 指定回复方式(1-4)").action(async ({ session, options }, keyword) => {
+  ctx.command(pluginName + "/测试添加 <keyword>", "测试环境添加").option("regex", "-x").authority(config.commandAuthority).action(async ({ session, options }, keyword) => {
     if (!hasPermission(session, "测试添加")) return "权限不足";
-    return await addKeywordReply(session, testFile, keyword, { ...options, global: false });
-  });
-  ctx.command(`${pluginName}/测试删除 <keyword>`, "删除测试关键词", { authority: config.commandAuthority }).option("question", "-q <index> 指定删除序号").action(async ({ session, options }, keyword) => {
-    if (!hasPermission(session, "测试删除")) return "权限不足";
-    return await deleteKeywordReply(session, testFile, keyword, options.question);
-  });
-  ctx.command(`${pluginName}/测试修改 <keyword>`, "修改测试关键词", { authority: config.commandAuthority }).option("question", "-q <index> 指定回复序号").action(async ({ session, options }, keyword) => {
-    if (!hasPermission(session, "测试修改")) return "权限不足";
-    if (!fs.existsSync(testFile)) return "测试文件不存在";
-    return "测试修改功能待完善";
-  });
-  ctx.middleware(async (session, next) => {
-    if (!session.content) return next();
-    let content = session.content;
-    if (config.Treat_all_as_lowercase) content = content.toLowerCase();
-    const testChannels = await getTestChannels(session);
-    const isTest = testChannels.includes(session.channelId) || testChannels.includes(`private:${session.userId}`);
-    const files = [];
-    if (isTest) {
-      files.push(testFile);
-    } else {
-      if (config.Search_Range === "3" || config.Search_Range === "2") files.push(globalFile);
-      if (config.Search_Range === "1" || config.Search_Range === "3") {
-        files.push(path.join(root, `${session.platform}_${session.channelId}.json`));
-      }
+    if (!fsSync.existsSync(testFilePath)) fsSync.writeFileSync(testFilePath, "{}");
+    let data = JSON.parse(fsSync.readFileSync(testFilePath, "utf-8"));
+    const key = options.regex ? `regex:${keyword}` : keyword;
+    if (config.alwaysPrompt !== "never") {
+      await session.send("【测试模式】请输入回复内容（结束添加/取消添加）：");
     }
-    for (const file of files) {
-      if (!fs.existsSync(file)) continue;
-      const data = JSON.parse(fs.readFileSync(file, "utf-8"));
-      const keys = Object.keys(data).sort((a, b) => {
-        const lenA = a.startsWith("regex:") ? a.slice(6).length : a.length;
-        const lenB = b.startsWith("regex:") ? b.slice(6).length : b.length;
-        return lenB - lenA;
-      });
-      for (const key of keys) {
-        let isMatch = false;
-        let replies = data[key];
-        if (key.startsWith("regex:")) {
-          const pattern = key.slice(6);
-          isMatch = new RegExp(pattern).test(content);
-        } else {
-          isMatch = content === key;
-        }
-        if (isMatch) {
-          const limitKey = config.Type_of_restriction === "2" ? `${key}:${session.channelId}` : key;
-          const now = Date.now();
-          if (config.Frequency_limitation > 0 && lastTriggerTimes[limitKey] && now - lastTriggerTimes[limitKey] < config.Frequency_limitation * 1e3) {
-            return;
-          }
-          lastTriggerTimes[limitKey] = now;
-          const group = replies[Math.floor(Math.random() * replies.length)];
-          const replyway = group[0]?.replyway || config.MultisegmentAdditionRecoveryEffect;
-          if (replyway === "1") {
-            for (const item of group) {
-              await session.send(await formatReply(item, session));
-            }
-          } else if (replyway === "2") {
-            let combined = "";
-            for (const item of group) combined += await formatReply(item, session);
-            await session.send(combined);
-          } else if (replyway === "3" || replyway === "4") {
-            const figure = h("figure");
-            for (const item of group) {
-              const formatted = await formatReply(item, session);
-              figure.children.push(replyway === "4" ? h("message", {}, formatted) : formatted);
-            }
-            await session.send(figure);
-          }
-          return;
-        }
-      }
+    const replies = [];
+    const timeout = config.addTimeout * 6e4;
+    while (true) {
+      const reply = await session.prompt(timeout);
+      if (!reply) return "超时";
+      if (reply.includes(config.cancelKeyword)) return "取消";
+      if (reply.includes(config.endKeyword)) break;
+      const parsed = await parseReplyContent(reply, "test");
+      replies.push(...parsed);
     }
-    return next();
+    if (!data[key]) data[key] = [];
+    data[key].push(replies);
+    fsSync.writeFileSync(testFilePath, JSON.stringify(data, null, 2));
+    return `测试关键词 ${keyword} 已添加`;
   });
-  ctx.on("guild-member", async (session) => {
-    if (!config.autoLeaveOnMute) return;
-    if (session.subtype !== "ban") return;
-    if (session.selfId !== session.userId) return;
-    const [record] = await ctx.database.get("qxgl_satori_auth", {
-      platform: session.platform,
-      channelId: session.guildId
+  if (config.autoLeaveOnMute) {
+    ctx.on("guild-member", async (session) => {
+      if (session.subtype !== "ban" || session.selfId !== session.userId) return;
+      try {
+        await session.bot?.leaveGuild?.(session.guildId);
+        logger.info(`被禁言自动退群：${session.guildId}`);
+      } catch (e) {
+        logger.warn(`退群失败：${e.message}`);
+      }
     });
-    if (record && session.bot?.leaveGroup) {
-      await session.bot.leaveGroup(session.guildId);
-    }
-  });
+  }
 }
 __name(apply, "apply");
+function formatDate(date) {
+  if (!date) return "未设置";
+  const d = new Date(date);
+  const year = d.getFullYear();
+  const month = (d.getMonth() + 1).toString().padStart(2, "0");
+  const day = d.getDate().toString().padStart(2, "0");
+  return `${year}/${month}/${day}`;
+}
+__name(formatDate, "formatDate");
+function escapeRegExp(string) {
+  return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+__name(escapeRegExp, "escapeRegExp");
 exports.apply = apply;
 exports.Config = Config;
 exports.name = pluginName;