koishi-plugin-githubsth 1.0.5 → 1.1.0

package/README.en.md

@@ -0,0 +1,68 @@
+# koishi-plugin-githubsth
+
+[![npm](https://img.shields.io/npm/v/koishi-plugin-githubsth?style=flat-square)](https://www.npmjs.com/package/koishi-plugin-githubsth)
+
+A Koishi plugin that delivers GitHub event notifications with repository-level subscription management.
+
+## Features
+
+- GitHub event notifications: `push`, `issues`, `issue_comment`, `pull_request`, `pull_request_review`, `release`, `star`, `fork`, `discussion`, `workflow_run`
+- Trusted repository allowlist (admin-only)
+- Channel-level subscription persistence (via Koishi `database`)
+- Text/image/auto rendering mode
+- Theme and style controls (global and per-subscription)
+- Digest aggregation mode
+- Built-in i18n (`zh-CN`, `en-US`)
+
+## Installation
+
+```bash
+npm i koishi-plugin-githubsth
+```
+
+## Requirements
+
+- `koishi` `^4.18.0`
+- `koishi-plugin-adapter-github` `^1.0.0`
+- Koishi `database` service (required)
+- `puppeteer` service (optional, required for image rendering)
+
+## Configuration
+
+Main config fields:
+
+- `defaultOwner`, `defaultRepo`
+- `defaultEvents`
+- `debug`, `logUnhandledEvents`
+- `formatterLocale`
+- `renderMode`, `renderFallback`
+- `renderTheme`, `renderStyle`
+- `renderWidth`, `renderTimeoutMs`
+- `digestEnabled`, `digestWindowSec`, `digestMaxItems`
+
+## Commands
+
+User commands:
+
+- `githubsth.subscribe <owner/repo> [events]`
+- `githubsth.unsubscribe <owner/repo>`
+- `githubsth.list`
+- `githubsth.repo [owner/repo]`
+
+Admin commands (authority `3`):
+
+- `githubsth.trust.add <owner/repo>`
+- `githubsth.trust.remove <owner/repo>`
+- `githubsth.trust.list`
+- `githubsth.trust.enable <owner/repo>`
+- `githubsth.trust.disable <owner/repo>`
+- `githubsth.render.*` (render mode/theme/style/preview/digest controls)
+
+## Notes
+
+- `githubsth.subscribe` only works for repositories in trusted list.
+- If `renderMode=auto` and image rendering is unavailable, fallback behavior follows `renderFallback`.
+
+## License
+
+MIT

package/README.md

@@ -1,69 +1,180 @@
 # koishi-plugin-githubsth
 
-[![npm](https://img.shields.io/npm/v/koishi-plugin-githubsth?style=flat-square)](https://www.npmjs.com/package/koishi-plugin-githubsth)
+[![npm](https://img.shields.io/npm/v/koishi-plugin-githubsth)](https://www.npmjs.com/package/koishi-plugin-githubsth)
 
-Koishi 的 GitHub 集成插件，提供强大的事件通知服务和仓库管理命令。支持数据库存储订阅关系，并提供信任仓库管理功能。
-
-## 功能特性
-
-- **事件通知**: 实时接收 GitHub 事件通知 (Push, Issue, PR, Release, Star, Fork, Discussion, Workflow)。
-- **数据库订阅**: 订阅关系持久化存储在 Koishi 数据库中，支持动态管理。
-- **信任仓库管理**: 管理员可配置允许订阅的仓库白名单，确保安全。
-- **灵活的规则**: 支持按仓库、目标频道和事件类型进行订阅。
-- **丰富格式**: 消息格式美观，包含关键信息。
-- **调试模式**: 支持开启详细日志输出，方便排查问题。
+> GitHub 订阅通知插件 — 监控仓库事件，推送到你的聊天频道 ✨
 
 ## 安装
 
 ```bash
 npm install koishi-plugin-githubsth
+# 或者
+yarn add koishi-plugin-githubsth
+# 或
+pipx install ...  # 开玩笑的，Koishi 用 npm 啦！
 ```
 
-## 配置
+然后在 Koishi 配置中添加插件：
 
-本插件需要 `database` 服务和 `koishi-plugin-adapter-github` 才能正常工作。
+```yaml
+plugins:
+  githubsth:
+    # 见下方配置
+```
 
-### 插件配置
+## 前置依赖
 
-在 Koishi 控制台中配置插件：
+| 依赖 | 版本要求 | 说明 |
+|:----|:-------:|:----|
+| koishi | ^4.18.0 | 嗯，就是 Koishi 本体 |
+| koishi-plugin-adapter-github | ^1.0.0 | GitHub 适配器，提供事件源 |
+| database | — | 任意 Koishi 数据库（内置 memory 也行） |
+| puppeteer | *可选* | 需要图片渲染时加这个 |
 
-- **defaultOwner**: 默认仓库拥有者 (可选)。
-- **defaultRepo**: 默认仓库名称 (可选)。
-- **debug**: 启用调试模式，输出详细日志 (默认 false)。
+> 💡 如果不需要图片渲染（纯文本模式），puppeteer 可以不装。
 
-### 订阅管理
+## 快速开始
 
-插件使用数据库管理订阅。
+### 1. 添加可信仓库
 
-#### 管理员命令 (权限等级 3)
+只有添加到可信列表的仓库才能被订阅：
 
-- `githubsth.trust.add <repo>`: 添加信任仓库 (owner/repo)。
-- `githubsth.trust.remove <repo>`: 移除信任仓库。
-- `githubsth.trust.list`: 列出所有信任仓库。
-- `githubsth.trust.enable <repo>`: 启用信任仓库。
-- `githubsth.trust.disable <repo>`: 禁用信任仓库。
+```
+gh.trust add owner/repo
+```
 
-#### 用户命令
+### 2. 订阅仓库事件
 
-- `githubsth.subscribe <repo> [events]`: 订阅仓库事件。
-  - `repo`: 仓库全名 (owner/repo)。
-  - `events`: (可选) 订阅的事件列表，逗号分隔。默认为 `push, issues, pull_request`。
-  - 注意：仅能订阅已添加到信任列表的仓库。
-- `githubsth.unsubscribe <repo>`: 取消订阅仓库。
-- `githubsth.list`: 查看当前频道的订阅列表。
-- `githubsth.repo [name]`: 获取仓库信息。
+```
+gh.sub owner/repo
+gh.sub owner/repo push,issues,star
+```
+
+### 3. 查看效果
 
-### 支持的事件
+当仓库有 push、issue、PR 等事件时，插件会自动推送到当前频道～
 
-- `push`: 代码推送
-- `issues`: Issue 创建、关闭等
-- `pull_request`: PR 创建、合并等
-- `release`: 新版本发布
-- `star`: 仓库标星
-- `fork`: 仓库复刻
-- `discussion`: 讨论区动态
-- `workflow_run`: CI/CD 工作流状态
+## 命令列表
+
+### 订阅管理
 
-## 许可证
+| 命令 | 别名 | 说明 |
+|:----|:----|:----|
+| `githubsth.subscribe <repo> [events]` | `gh.sub` | 订阅仓库事件 |
+| `githubsth.unsubscribe <repo>` | `gh.unsub` | 取消订阅 |
+| `githubsth.list` | `gh.list` | 查看当前频道的订阅列表 |
+
+### 可信仓库管理
+
+| 命令 | 别名 | 说明 |
+|:----|:----|:----|
+| `githubsth.trust add <repo>` | `gh.trust add` | 添加可信仓库 |
+| `githubsth.trust remove <repo>` | `gh.trust remove` | 移除可信仓库 |
+| `githubsth.trust list` | `gh.trust list` | 查看可信仓库列表 |
+
+### 渲染设置
+
+| 命令 | 别名 | 说明 |
+|:----|:----|:----|
+| `githubsth.render.mode <mode>` | `gh.render mode` | 设置渲染模式（text/image/auto） |
+| `githubsth.render.theme <theme>` | `gh.render theme` | 切换主题 |
+| `githubsth.render.style <style>` | `gh.render style` | 切换排版风格 |
+| `githubsth.render.preview [event]` | `gh.render preview` | 预览渲染效果 |
+| `githubsth.render.status` | `gh.render status` | 查看当前渲染配置 |
+
+### 管理命令
+
+| 命令 | 说明 |
+|:----|:----|
+| `githubsth.admin.subscribe <channel> <repo>` | 强制给指定频道订阅 |
+| `githubsth.admin.unsubscribe <channel> <repo>` | 强制取消订阅 |
+| `githubsth.admin.cleanup` | 清理失效的频道订阅 |
+
+## 配置项
+
+| 配置项 | 类型 | 默认值 | 说明 |
+|:------|:---:|:-----:|:----|
+| `defaultEvents` | `string[]` | push, issues, pull_request 等 | 订阅时默认监听的事件 |
+| `renderMode` | `'auto' \| 'image' \| 'text'` | `'auto'` | 渲染模式 |
+| `renderTheme` | `string` | `'github-dark'` | 默认主题 |
+| `renderStyle` | `string` | `'auto'` | 默认排版风格 |
+| `renderWidth` | `number` | `860` | 图片宽度(px) |
+| `renderTimeoutMs` | `number` | `12000` | 图片渲染超时 |
+| `renderFallback` | `'text' \| 'drop'` | `'text'` | 图片渲染失败时的策略 |
+| `digestEnabled` | `boolean` | `false` | 启用聚合推送 |
+| `digestWindowSec` | `number` | `60` | 聚合窗口(秒) |
+| `digestMaxItems` | `number` | `12` | 每条聚合最大事件数 |
+| `formatterLocale` | `'zh-CN' \| 'en-US'` | `'zh-CN'` | 通知语言 |
+| `debug` | `boolean` | `false` | 调试日志 |
+| `logUnhandledEvents` | `boolean` | `false` | 记录未处理的事件 |
+| `enableSessionFallback` | `boolean` | `true` | 启用消息会话兜底解析 |
+| `dedupRetentionHours` | `number` | `72` | 去重记录保留时间 |
+| `sendRetryCount` | `number` | `2` | 发送失败重试次数 |
+| `sendRetryBaseDelayMs` | `number` | `800` | 重试基准延迟 |
+
+## 主题与排版
+
+### 内置主题
+
+| 主题 | 说明 |
+|:----|:----|
+| `github-light` | GitHub 亮色 ✨ |
+| `github-dark` | GitHub 暗色 🌙 |
+| `aurora` | 极光主题 🌌 |
+| `sunset` | 落日主题 🌅 |
+| `matrix` | 矩阵主题 💚 |
+| `compact` | 紧凑主题 |
+| `card` | 卡片主题 |
+| `terminal` | 终端主题 💻 |
+
+### 排版风格
+
+| 风格 | 说明 |
+|:----|:----|
+| `auto` | 跟随主题默认排版 |
+| `github` | GitHub 风格 |
+| `glass` | 玻璃风格 |
+| `neon` | 霓虹风格 |
+| `compact` | 紧凑风格 |
+| `card` | 卡片风格 |
+| `terminal` | 终端风格 |
+
+## 支持的事件类型
+
+| 事件 | 说明 |
+|:----|:----|
+| `push` | 代码推送 🚀 |
+| `issues` | Issue 相关 |
+| `issue_comment` | Issue 评论 💬 |
+| `pull_request` | PR 相关 |
+| `pull_request_review` | PR 审核 👀 |
+| `star` | Star ⭐ |
+| `fork` | Fork 🍴 |
+| `release` | 版本发布 🏷️ |
+| `discussion` | Discussion 💭 |
+| `workflow_run` | Actions 工作流 ⚙️ |
+
+## 常见问题
+
+### Q: 事件收不到？
+
+1. 检查是否添加了可信仓库：`gh.trust list`
+2. 检查是否订阅了：`gh.list`
+3. 确认 GitHub 适配器配置正确，Webhook 或 Pull 模式已启用
+4. 看日志有没有报错：开启 `debug: true`
+
+### Q: 图片渲染不出来？
+
+1. 确认装了 puppeteer 插件
+2. 检查 `renderTimeoutMs` 是否太短
+3. 插件会自动回退到文本模式（如果 `renderFallback` 是 `'text'`）
+
+### Q: 同一个事件收到了多次？
+
+内置去重机制：
+- 内存去重：5 秒内相同事件自动过滤
+- 数据库去重：按 `dedupRetentionHours` 保留记录
+
+## License
 
 MIT

package/README.zh-CN.md

@@ -0,0 +1,68 @@
+# koishi-plugin-githubsth
+
+[![npm](https://img.shields.io/npm/v/koishi-plugin-githubsth?style=flat-square)](https://www.npmjs.com/package/koishi-plugin-githubsth)
+
+一个用于 Koishi 的 GitHub 订阅通知插件，支持仓库级订阅管理与多样化渲染。
+
+## 功能特性
+
+- GitHub 事件通知：`push`、`issues`、`issue_comment`、`pull_request`、`pull_request_review`、`release`、`star`、`fork`、`discussion`、`workflow_run`
+- 可信仓库白名单（管理员）
+- 基于 Koishi `database` 的频道订阅持久化
+- 文本/图片/自动渲染模式
+- 全局与订阅级主题/样式控制
+- Digest 聚合推送
+- 内置中英文文案（`zh-CN`、`en-US`）
+
+## 安装
+
+```bash
+npm i koishi-plugin-githubsth
+```
+
+## 依赖要求
+
+- `koishi` `^4.18.0`
+- `koishi-plugin-adapter-github` `^1.0.0`
+- Koishi `database` 服务（必需）
+- `puppeteer` 服务（可选，图片渲染需要）
+
+## 配置项
+
+主要配置包括：
+
+- `defaultOwner`、`defaultRepo`
+- `defaultEvents`
+- `debug`、`logUnhandledEvents`
+- `formatterLocale`
+- `renderMode`、`renderFallback`
+- `renderTheme`、`renderStyle`
+- `renderWidth`、`renderTimeoutMs`
+- `digestEnabled`、`digestWindowSec`、`digestMaxItems`
+
+## 指令
+
+用户指令：
+
+- `githubsth.subscribe <owner/repo> [events]`
+- `githubsth.unsubscribe <owner/repo>`
+- `githubsth.list`
+- `githubsth.repo [owner/repo]`
+
+管理员指令（权限 `3`）：
+
+- `githubsth.trust.add <owner/repo>`
+- `githubsth.trust.remove <owner/repo>`
+- `githubsth.trust.list`
+- `githubsth.trust.enable <owner/repo>`
+- `githubsth.trust.disable <owner/repo>`
+- `githubsth.render.*`（渲染模式/主题/样式/预览/digest 控制）
+
+## 使用说明
+
+- `githubsth.subscribe` 仅允许订阅已加入可信列表的仓库。
+- 当 `renderMode=auto` 且图片渲染不可用时，将按 `renderFallback` 回退。
+
+## 许可证
+
+MIT

package/lib/commands/admin.js

@@ -5,12 +5,12 @@ function apply(ctx) {
     const logger = ctx.logger('githubsth');
     const repoRegex = /^[\w-]+\/[\w-.]+$/;
     ctx.command('githubsth.trust', '管理信任仓库', { authority: 3 }).alias('gh.trust');
-    ctx.command('githubsth.trust.add <repo>', '添加信任仓库')
+    ctx.command('githubsth.trust.add <repo>', '添加信任仓库', { authority: 3 })
         .action(async ({ session }, repo) => {
         if (!repo)
-            return '请指定仓库名称（owner/repo）。';
+            return '请指定仓库（owner/repo）。';
         if (!repoRegex.test(repo))
-            return '仓库名称格式不正确（应为 owner/repo）。';
+            return '仓库格式错误，应为 owner/repo。';
         try {
             logger.debug(`Adding trusted repo: ${repo}`);
             const existing = await ctx.database.get('github_trusted_repo', { repo });
@@ -22,43 +22,47 @@ function apply(ctx) {
                 addedBy: session?.userId || 'unknown',
                 addedAt: new Date(),
             });
-            return `已添加信任仓库: ${repo}`;
+            return `已添加信任仓库：${repo}`;
         }
         catch (e) {
             logger.warn('Failed to add trusted repo:', e);
             if (e.code === 'SQLITE_CONSTRAINT')
                 return '该仓库已在信任列表中。';
-            return `添加失败: ${e.message}`;
+            return `添加失败：${e.message}`;
         }
     });
-    ctx.command('githubsth.trust.remove <repo>', '移除信任仓库')
+    ctx.command('githubsth.trust.remove <repo>', '移除信任仓库', { authority: 3 })
         .action(async (_, repo) => {
         if (!repo)
-            return '请指定仓库名称（owner/repo）。';
+            return '请指定仓库（owner/repo）。';
         const result = await ctx.database.remove('github_trusted_repo', { repo });
         if (result.matched === 0)
             return '未找到该信任仓库。';
-        return `已移除信任仓库: ${repo}`;
+        return `已移除信任仓库：${repo}`;
     });
-    ctx.command('githubsth.trust.list', '列出所有信任仓库')
+    ctx.command('githubsth.trust.list', '列出所有信任仓库', { authority: 3 })
         .action(async () => {
         const repos = await ctx.database.get('github_trusted_repo', {});
         if (repos.length === 0)
             return '暂无信任仓库。';
         return repos.map((r) => `${r.repo} [${r.enabled ? '启用' : '禁用'}]`).join('\n');
     });
-    ctx.command('githubsth.trust.enable <repo>', '启用信任仓库')
+    ctx.command('githubsth.trust.enable <repo>', '启用信任仓库', { authority: 3 })
         .action(async (_, repo) => {
+        if (!repo)
+            return '请指定仓库（owner/repo）。';
         const result = await ctx.database.set('github_trusted_repo', { repo }, { enabled: true });
         if (result.matched === 0)
             return '未找到该信任仓库。';
-        return `已启用信任仓库: ${repo}`;
+        return `已启用信任仓库：${repo}`;
     });
-    ctx.command('githubsth.trust.disable <repo>', '禁用信任仓库')
+    ctx.command('githubsth.trust.disable <repo>', '禁用信任仓库', { authority: 3 })
         .action(async (_, repo) => {
+        if (!repo)
+            return '请指定仓库（owner/repo）。';
         const result = await ctx.database.set('github_trusted_repo', { repo }, { enabled: false });
         if (result.matched === 0)
             return '未找到该信任仓库。';
-        return `已禁用信任仓库: ${repo}`;
+        return `已禁用信任仓库：${repo}`;
     });
 }

package/lib/commands/render.js

@@ -188,8 +188,8 @@ function apply(ctx, config) {
         return subs
             .map((sub) => session?.text('commands.githubsth.render.messages.repo_style_item', [
             sub.repo,
-            sub.renderTheme || '(default)',
-            sub.renderStyle || '(default)',
+            sub.renderTheme || '默认',
+            sub.renderStyle || '默认',
         ]) || `${sub.repo}`)
             .join('\n');
     });

package/lib/commands/subscribe.js

@@ -13,9 +13,9 @@ function apply(ctx, config) {
     ctx.command('githubsth.subscribe <repo> [events:text]', '订阅 GitHub 仓库事件')
         .alias('gh.sub')
         .usage(`
-Subscribe GitHub repository notifications. If events are omitted, default events are used: ${defaultConfigEvents.join(', ')}
+订阅 GitHub 仓库通知。若省略 events，将使用默认事件：${defaultConfigEvents.join(', ')}
 
-Examples:
+示例：
 - gh.sub koishijs/koishi
 - gh.sub koishijs/koishi push,issues,star
 `)
@@ -31,7 +31,7 @@ Examples:
             return session?.text('commands.githubsth.subscribe.messages.repo_not_trusted');
         let events;
         if (eventsStr) {
-            events = eventsStr.split(/[,，\s]+/).map((e) => e.trim()).filter(Boolean).map((e) => e.replace(/-/g, '_'));
+            events = eventsStr.split(/[,\s，]+/).map((e) => e.trim()).filter(Boolean).map((e) => e.replace(/-/g, '_'));
             const invalidEvents = events.filter((e) => !validEvents.includes(e) && e !== '*');
             if (invalidEvents.length) {
                 return session?.text('commands.githubsth.subscribe.messages.invalid_events', [invalidEvents.join(', '), validEvents.join(', ')]);
@@ -94,8 +94,8 @@ Examples:
             .map((sub) => session?.text('commands.githubsth.list.messages.item', [
             sub.repo,
             sub.events.join(', '),
-            sub.renderTheme || '(default)',
-            sub.renderStyle || '(default)',
+            sub.renderTheme || '默认',
+            sub.renderStyle || '默认',
         ]) || `${sub.repo} [${sub.events.join(', ')}]`)
             .join('\n');
     });

package/lib/config.js

@@ -3,56 +3,56 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Config = void 0;
 const koishi_1 = require("koishi");
 const renderThemeSchema = koishi_1.Schema.union([
-    koishi_1.Schema.const('github-light').description('GitHub Light'),
-    koishi_1.Schema.const('github-dark').description('GitHub Dark'),
-    koishi_1.Schema.const('aurora').description('Aurora'),
-    koishi_1.Schema.const('sunset').description('Sunset'),
-    koishi_1.Schema.const('matrix').description('Matrix'),
-    koishi_1.Schema.const('compact').description('Compact (legacy)'),
-    koishi_1.Schema.const('card').description('Card (legacy)'),
-    koishi_1.Schema.const('terminal').description('Terminal (legacy)'),
+    koishi_1.Schema.const('github-light').description('GitHub 亮色'),
+    koishi_1.Schema.const('github-dark').description('GitHub 暗色'),
+    koishi_1.Schema.const('aurora').description('极光主题'),
+    koishi_1.Schema.const('sunset').description('落日主题'),
+    koishi_1.Schema.const('matrix').description('矩阵主题'),
+    koishi_1.Schema.const('compact').description('紧凑主题（兼容）'),
+    koishi_1.Schema.const('card').description('卡片主题（兼容）'),
+    koishi_1.Schema.const('terminal').description('终端主题（兼容）'),
 ]);
 const renderStyleSchema = koishi_1.Schema.union([
-    koishi_1.Schema.const('auto').description('Follow theme default style'),
-    koishi_1.Schema.const('github').description('GitHub style'),
-    koishi_1.Schema.const('glass').description('Glass style'),
-    koishi_1.Schema.const('neon').description('Neon style'),
-    koishi_1.Schema.const('compact').description('Compact style'),
-    koishi_1.Schema.const('card').description('Card style'),
-    koishi_1.Schema.const('terminal').description('Terminal style'),
+    koishi_1.Schema.const('auto').description('跟随主题默认排版'),
+    koishi_1.Schema.const('github').description('GitHub 排版'),
+    koishi_1.Schema.const('glass').description('玻璃排版'),
+    koishi_1.Schema.const('neon').description('霓虹排版'),
+    koishi_1.Schema.const('compact').description('紧凑排版'),
+    koishi_1.Schema.const('card').description('卡片排版'),
+    koishi_1.Schema.const('terminal').description('终端排版'),
 ]);
 exports.Config = koishi_1.Schema.object({
-    defaultOwner: koishi_1.Schema.string().description('Default repository owner.'),
-    defaultRepo: koishi_1.Schema.string().description('Default repository name.'),
-    debug: koishi_1.Schema.boolean().default(false).description('Enable debug logs.'),
-    logUnhandledEvents: koishi_1.Schema.boolean().default(false).description('Log unhandled webhook events.'),
-    enableSessionFallback: koishi_1.Schema.boolean().default(true).description('Enable message-created fallback parser.'),
-    dedupRetentionHours: koishi_1.Schema.number().min(1).max(720).default(72).description('Dedup record retention in hours.'),
-    sendRetryCount: koishi_1.Schema.number().min(0).max(10).default(2).description('Retry count for sending message.'),
-    sendRetryBaseDelayMs: koishi_1.Schema.number().min(100).max(30000).default(800).description('Base retry delay in ms.'),
+    defaultOwner: koishi_1.Schema.string().description('默认仓库拥有者。'),
+    defaultRepo: koishi_1.Schema.string().description('默认仓库名称。'),
+    debug: koishi_1.Schema.boolean().default(false).description('启用调试日志。'),
+    logUnhandledEvents: koishi_1.Schema.boolean().default(false).description('记录未处理的 Webhook 事件。'),
+    enableSessionFallback: koishi_1.Schema.boolean().default(true).description('启用消息会话兜底解析。'),
+    dedupRetentionHours: koishi_1.Schema.number().min(1).max(720).default(72).description('幂等去重记录保留时长（小时）。'),
+    sendRetryCount: koishi_1.Schema.number().min(0).max(10).default(2).description('发送失败重试次数。'),
+    sendRetryBaseDelayMs: koishi_1.Schema.number().min(100).max(30000).default(800).description('重试基准退避间隔（毫秒）。'),
     formatterLocale: koishi_1.Schema.union([
-        koishi_1.Schema.const('zh-CN').description('Chinese'),
-        koishi_1.Schema.const('en-US').description('English'),
-    ]).default('zh-CN').description('Formatter locale.'),
+        koishi_1.Schema.const('zh-CN').description('中文'),
+        koishi_1.Schema.const('en-US').description('英文'),
+    ]).default('zh-CN').description('通知文案语言。'),
     renderMode: koishi_1.Schema.union([
-        koishi_1.Schema.const('auto').description('Prefer image, fallback by policy'),
-        koishi_1.Schema.const('image').description('Image only'),
-        koishi_1.Schema.const('text').description('Text only'),
-    ]).default('auto').description('Render mode.'),
+        koishi_1.Schema.const('auto').description('优先图片，失败按策略回退'),
+        koishi_1.Schema.const('image').description('仅图片'),
+        koishi_1.Schema.const('text').description('仅文本'),
+    ]).default('auto').description('渲染模式。'),
     renderFallback: koishi_1.Schema.union([
-        koishi_1.Schema.const('text').description('Fallback to text when image fails'),
-        koishi_1.Schema.const('drop').description('Drop message when image fails'),
-    ]).default('text').description('Fallback policy for image render failure.'),
-    renderTheme: renderThemeSchema.default('github-dark').description('Default render theme.'),
-    renderStyle: renderStyleSchema.default('auto').description('Default render style.'),
-    renderWidth: koishi_1.Schema.number().min(480).max(1600).default(860).description('Image width in px.'),
-    renderTimeoutMs: koishi_1.Schema.number().min(1000).max(60000).default(12000).description('Image render timeout in ms.'),
-    digestEnabled: koishi_1.Schema.boolean().default(false).description('Enable digest mode for batched notifications.'),
-    digestWindowSec: koishi_1.Schema.number().min(5).max(3600).default(60).description('Digest window in seconds.'),
-    digestMaxItems: koishi_1.Schema.number().min(2).max(100).default(12).description('Max events per digest message.'),
+        koishi_1.Schema.const('text').description('图片失败时回退文本'),
+        koishi_1.Schema.const('drop').description('图片失败时丢弃本条消息'),
+    ]).default('text').description('图片渲染失败回退策略。'),
+    renderTheme: renderThemeSchema.default('github-dark').description('默认主题。'),
+    renderStyle: renderStyleSchema.default('auto').description('默认排版样式。'),
+    renderWidth: koishi_1.Schema.number().min(480).max(1600).default(860).description('图片宽度（像素）。'),
+    renderTimeoutMs: koishi_1.Schema.number().min(1000).max(60000).default(12000).description('图片渲染超时（毫秒）。'),
+    digestEnabled: koishi_1.Schema.boolean().default(false).description('启用 Digest 聚合推送。'),
+    digestWindowSec: koishi_1.Schema.number().min(5).max(3600).default(60).description('Digest 聚合窗口（秒）。'),
+    digestMaxItems: koishi_1.Schema.number().min(2).max(100).default(12).description('每条 Digest 最大事件数。'),
     defaultEvents: koishi_1.Schema.array(koishi_1.Schema.string())
         .default(['push', 'issues', 'issue_comment', 'pull_request', 'pull_request_review', 'release', 'star', 'fork'])
-        .description('Default events used by subscribe command.'),
+        .description('订阅命令默认事件列表。'),
     rules: koishi_1.Schema.array(koishi_1.Schema.object({
         repo: koishi_1.Schema.string().required(),
         channelId: koishi_1.Schema.string().required(),
@@ -60,5 +60,5 @@ exports.Config = koishi_1.Schema.object({
         events: koishi_1.Schema.array(koishi_1.Schema.string()).default(['push', 'issues', 'pull_request', 'issue_comment', 'pull_request_review']),
         renderTheme: renderThemeSchema,
         renderStyle: renderStyleSchema,
-    })).hidden().description('Deprecated compatibility field, use db subscriptions.'),
+    })).hidden().description('已弃用兼容字段，请使用数据库订阅。'),
 });

package/lib/locales/zh-CN.js

@@ -3,35 +3,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     commands: {
         githubsth: {
-            description: 'GitHub 订阅通知插件',
+            description: 'GitHub 订阅通知',
         },
         'githubsth.repo': {
             description: '获取仓库信息',
             messages: {
-                repo_info: '仓库: {0}/{1}\n描述: {2}\nStars: {3}',
-                error: '获取仓库信息失败: {0}',
-                specify_repo: '请指定仓库名称（owner/repo）。',
-                not_found: '未找到仓库或无权限访问。',
+                repo_info: '仓库：{0}/{1}\n描述：{2}\nStars：{3}',
+                error: '获取仓库信息失败：{0}',
+                specify_repo: '请指定仓库，格式为 owner/repo。',
+                not_found: '仓库不存在或无权限访问。',
             },
         },
         'githubsth.subscribe': {
             description: '订阅 GitHub 仓库事件',
             messages: {
-                specify_repo: '请指定仓库（owner/repo）。',
+                specify_repo: '请指定仓库，格式为 owner/repo。',
                 invalid_repo: '仓库格式错误，应为 owner/repo。',
-                run_in_channel: '请在群聊/频道中执行该命令。',
+                run_in_channel: '请在群聊或频道中执行该命令。',
                 repo_not_trusted: '该仓库不在信任列表中，请先由管理员添加。',
                 invalid_events: '无效事件：{0}\n可选事件：{1}',
                 updated: '已更新订阅：{0}\n事件：{1}',
-                created: '已订阅 {0}\n事件：{1}',
+                created: '已订阅：{0}\n事件：{1}',
                 failed: '订阅失败，请稍后重试。',
             },
         },
         'githubsth.unsubscribe': {
             description: '取消订阅 GitHub 仓库',
             messages: {
-                specify_repo: '请指定仓库（owner/repo）。',
-                run_in_channel: '请在群聊/频道中执行该命令。',
+                specify_repo: '请指定仓库，格式为 owner/repo。',
+                run_in_channel: '请在群聊或频道中执行该命令。',
                 not_found: '未找到该订阅。',
                 success: '已取消订阅：{0}',
             },
@@ -39,19 +39,19 @@ exports.default = {
         'githubsth.list': {
             description: '查看当前频道订阅',
             messages: {
-                run_in_channel: '请在群聊/频道中执行该命令。',
+                run_in_channel: '请在群聊或频道中执行该命令。',
                 empty: '当前频道没有订阅。',
-                item: '{0} [{1}] theme={2} style={3}',
+                item: '{0} [{1}] 主题={2} 样式={3}',
             },
         },
         'githubsth.render': {
             description: '渲染设置',
             messages: {
                 invalid_mode: '无效模式。可选：{0}',
-                mode_set: '运行时渲染模式已设置为 {0}（配置默认值 {1}）。',
-                invalid_theme: '无效主题。请先执行 githubsth.render.themes。',
+                mode_set: '运行时渲染模式已设为 {0}（配置默认：{1}）。',
+                invalid_theme: '无效主题，请先执行 githubsth.render.themes 查看列表。',
                 theme_set: '默认主题已设置为：{0}',
-                invalid_style: '无效样式。请先执行 githubsth.render.styles。',
+                invalid_style: '无效样式，请先执行 githubsth.render.styles 查看列表。',
                 style_set: '默认样式已设置为：{0}',
                 invalid_width: '请提供有效的宽度数字。',
                 width_set: '图片宽度已设置为 {0}px',
@@ -61,13 +61,13 @@ exports.default = {
                 digest_window_set: 'Digest 窗口已设置为 {0}s',
                 invalid_count: '请提供有效的数量。',
                 digest_max_set: 'Digest 最大条目已设置为 {0}',
-                themes_list: '主题列表:\n- {0}',
-                styles_list: '样式列表:\n- {0}',
-                status_text: 'mode: {0} (configured: {1})\nfallback: {2}\ntheme(default): {3}\nstyle(default): {4}\nwidth: {5}\ntimeout: {6}ms\ndigest: {7} ({8}s, max {9})\npuppeteer: {10}',
+                themes_list: '主题列表：\n- {0}',
+                styles_list: '样式列表：\n- {0}',
+                status_text: '当前模式：{0}（配置默认：{1}）\n回退策略：{2}\n默认主题：{3}\n默认样式：{4}\n图片宽度：{5}\n渲染超时：{6}ms\nDigest：{7}（窗口 {8}s，最多 {9} 条）\nPuppeteer：{10}',
                 unknown_event: '未知事件 {0}，已回退到 issue_comment。',
                 unknown_theme: '未知主题 {0}，已回退到默认主题。',
                 unknown_style: '未知样式 {0}，已回退到默认样式。',
-                preview_failed: '预览失败，请检查 puppeteer 或渲染设置。',
+                preview_failed: '预览失败，请检查 puppeteer 或渲染配置。',
                 repo_required: '请提供仓库（owner/repo）。',
                 no_sub_in_channel: '当前频道没有该仓库订阅。',
                 repo_theme_set: '订阅主题已设置：{0} -> {1}',
@@ -75,7 +75,7 @@ exports.default = {
                 repo_style_set: '订阅样式已设置：{0} -> {1}',
                 repo_style_cleared: '订阅样式已清除：{0}',
                 no_matched_subs: '没有匹配的订阅。',
-                repo_style_item: '{0} => theme={1} style={2}',
+                repo_style_item: '{0} => 主题={1} 样式={2}',
             },
         },
         'githubsth.trust': {

package/lib/services/notifier.d.ts

@@ -13,7 +13,12 @@ export declare class Notifier extends Service {
     private dedupWriteCounter;
     private runtimeRenderMode;
     private readonly digestBuckets;
+    private healthCheckTimer;
     constructor(ctx: Context, config: Config);
+    /** 启动健康检查：定期检查数据库连接和订阅状态 */
+    private startHealthCheck;
+    /** 执行健康检查 */
+    private performHealthCheck;
     listThemes(): RenderTheme[];
     normalizeTheme(theme?: string | null): RenderTheme | null;
     listStyles(): RenderStyle[];
@@ -36,6 +41,11 @@ export declare class Notifier extends Service {
     renderPreview(event?: string, theme?: RenderTheme | null): Promise<any>;
     private registerListeners;
     private handleEvent;
+    /**
+     * 将新适配器的结构化事件数据转换为 formatter 能用的扁平格式
+     * 兼容旧格式 (repository.full_name, sender.login 等)
+     */
+    private buildFlatPayload;
     private resolveRuleTheme;
     private resolveRuleStyle;
     private formatByEvent;
@@ -45,12 +55,10 @@ export declare class Notifier extends Service {
     private renderTextAsImage;
     private normalizeRenderedImage;
     private extractRepoName;
-    private patchPayloadForEvent;
     private buildEventDedupKey;
     private shouldProcessEvent;
     private cleanupDedupTable;
     private sendMessage;
     private sendWithRetry;
-    private sleep;
     private getPreviewPayload;
 }

package/lib/services/notifier.js

@@ -14,8 +14,37 @@ class Notifier extends koishi_1.Service {
         this.dedupWriteCounter = 0;
         this.runtimeRenderMode = null;
         this.digestBuckets = new Map();
+        this.healthCheckTimer = null;
         this.ctx.logger('githubsth').info('Notifier service initialized');
         this.registerListeners();
+        this.startHealthCheck();
+    }
+    /** 启动健康检查：定期检查数据库连接和订阅状态 */
+    startHealthCheck() {
+        const interval = 5 * 60 * 1000; // 每 5 分钟检查一次
+        this.healthCheckTimer = setInterval(() => {
+            void this.performHealthCheck();
+        }, interval);
+        // 启动后马上检查一次
+        void this.performHealthCheck();
+    }
+    /** 执行健康检查 */
+    async performHealthCheck() {
+        try {
+            // 检查数据库连通性
+            const count = await this.ctx.database.get('github_subscription', {});
+            if (this.config.debug) {
+                this.ctx.logger('githubsth').debug(`Health check OK — ${count.length} active subscriptions`);
+            }
+        }
+        catch (error) {
+            this.ctx.logger('githubsth').error('Health check failed — database may be unavailable:', error);
+            // 数据库不可用时，5 秒后重试一次，然后等下一轮
+            setTimeout(() => {
+                this.ctx.logger('githubsth').info('Retrying health check...');
+                void this.performHealthCheck();
+            }, 5000);
+        }
     }
     listThemes() {
         return (0, render_card_1.listRenderThemes)();
@@ -68,17 +97,13 @@ class Notifier extends koishi_1.Service {
         bind('github/issue', 'issues');
         bind('github/issue-comment', 'issue_comment');
         bind('github/pull-request', 'pull_request');
-        bind('github/pull-request-review', 'pull_request_review');
+        bind('github/pull-request-review-comment', 'pull_request_review');
         bind('github/workflow-run', 'workflow_run');
         bind('github/push', 'push');
         bind('github/star', 'star');
         bind('github/fork', 'fork');
         bind('github/release', 'release');
         bind('github/discussion', 'discussion');
-        bind('github/issues', 'issues');
-        bind('github/pull_request', 'pull_request');
-        bind('github/workflow_run', 'workflow_run');
-        bind('github/issue_comment', 'issue_comment');
         if (this.config.enableSessionFallback !== false) {
             this.ctx.on('message-created', (session) => {
                 if (session.platform !== 'github')
@@ -86,28 +111,30 @@ class Notifier extends koishi_1.Service {
                 const payload = session.payload || session.extra || session.data;
                 if (!payload)
                     return;
+                // 新适配器的 session fallback：payload 已经是结构化事件数据
+                // 包含 owner, repo, repoKey, actor, payload(原始), type, action
                 const realPayload = payload.payload || payload;
                 let eventType = 'unknown';
                 if (realPayload.issue && realPayload.comment)
                     eventType = 'issue_comment';
                 else if (realPayload.issue)
                     eventType = 'issues';
-                else if (realPayload.pull_request && realPayload.review)
+                else if (realPayload.pullRequest && realPayload.comment)
                     eventType = 'pull_request_review';
-                else if (realPayload.pull_request)
+                else if (realPayload.pullRequest)
                     eventType = 'pull_request';
                 else if (realPayload.commits)
                     eventType = 'push';
-                else if (realPayload.starred_at !== undefined || realPayload.action === 'started')
-                    eventType = 'star';
                 else if (realPayload.forkee)
                     eventType = 'fork';
                 else if (realPayload.release)
                     eventType = 'release';
                 else if (realPayload.discussion)
                     eventType = 'discussion';
-                else if (realPayload.workflow_run)
+                else if (realPayload.workflowRun)
                     eventType = 'workflow_run';
+                else if (realPayload.starred_at !== undefined || payload.action === 'started')
+                    eventType = 'star';
                 else if (realPayload.repository && (realPayload.action === 'created' || realPayload.action === 'started'))
                     eventType = 'star';
                 if (eventType !== 'unknown')
@@ -116,36 +143,21 @@ class Notifier extends koishi_1.Service {
         }
     }
     async handleEvent(event, payload) {
+        // 新适配器 v1.1.2 的 payload 是结构化事件数据
+        // 包含 owner, repo, repoKey, actor, action, timestamp
+        // 以及对应的 issue, comment, pullRequest, discussion 等
+        // realPayload 是原始 GitHub webhook payload（如果存在）
         const realPayload = payload.payload || payload;
-        if (payload.actor && !realPayload.sender) {
-            const actorLogin = payload.actor.login || payload.actor.name || 'GitHub';
-            realPayload.sender = { ...payload.actor, login: actorLogin };
-        }
-        if (payload.repository && !realPayload.repository) {
-            realPayload.repository = payload.repository;
-        }
-        let repoName = this.extractRepoName(payload, realPayload, event);
-        if (!realPayload.repository)
-            realPayload.repository = { full_name: repoName || 'Unknown/Repo' };
-        else if (!realPayload.repository.full_name)
-            realPayload.repository.full_name = repoName || 'Unknown/Repo';
-        if (!realPayload.sender) {
-            if (realPayload.issue?.user)
-                realPayload.sender = realPayload.issue.user;
-            else if (realPayload.pull_request?.user)
-                realPayload.sender = realPayload.pull_request.user;
-            else if (realPayload.discussion?.user)
-                realPayload.sender = realPayload.discussion.user;
-            else if (realPayload.pusher)
-                realPayload.sender = { login: realPayload.pusher.name || 'Pusher' };
-            else
-                realPayload.sender = { login: 'GitHub' };
-        }
-        if (!(await this.shouldProcessEvent(event, payload, realPayload, repoName)))
-            return;
-        this.patchPayloadForEvent(event, realPayload, repoName || 'Unknown/Repo');
-        repoName = repoName || realPayload.repository?.full_name;
-        if (!repoName)
+        // 从结构化数据中提取 repo 信息
+        const repoName = payload.repoKey
+            || (payload.owner && payload.repo ? `${payload.owner}/${payload.repo}` : null)
+            || this.extractRepoName(payload, realPayload, event)
+            || realPayload.repository?.full_name
+            || 'Unknown/Repo';
+        // 确保 formatter 能读取到数据
+        // 构造一个兼容新旧格式的扁平 payload 给 formatter 用
+        const flatPayload = this.buildFlatPayload(payload, realPayload, event, repoName);
+        if (!(await this.shouldProcessEvent(event, payload, flatPayload, repoName)))
             return;
         const repoNames = [repoName];
         if (repoName !== repoName.toLowerCase())
@@ -160,22 +172,76 @@ class Notifier extends koishi_1.Service {
         if (!matchedRules.length)
             return;
         const uniqueRules = Array.from(new Map(matchedRules.map((rule) => [`${repoName}|${rule.channelId}`, rule])).values());
-        const textMessage = this.formatByEvent(event, realPayload);
+        const textMessage = this.formatByEvent(event, flatPayload);
         if (!textMessage)
             return;
         for (const rule of uniqueRules) {
             const theme = this.resolveRuleTheme(rule);
             const style = this.resolveRuleStyle(rule);
             if (this.config.digestEnabled) {
-                this.enqueueDigest({ event, repo: repoName, text: textMessage, payload: realPayload, theme, style, rule });
+                this.enqueueDigest({ event, repo: repoName, text: textMessage, payload: flatPayload, theme, style, rule });
                 continue;
             }
-            const outbound = await this.prepareOutboundMessage(textMessage, event, realPayload, theme, style);
+            const outbound = await this.prepareOutboundMessage(textMessage, event, flatPayload, theme, style);
             if (!outbound)
                 continue;
             await this.sendMessage(rule, outbound);
         }
     }
+    /**
+     * 将新适配器的结构化事件数据转换为 formatter 能用的扁平格式
+     * 兼容旧格式 (repository.full_name, sender.login 等)
+     */
+    buildFlatPayload(payload, realPayload, event, repoName) {
+        // 如果已经是旧格式（有 repository.full_name），直接返回
+        if (realPayload.repository?.full_name)
+            return realPayload;
+        const flat = { ...realPayload };
+        const actor = payload.actor || realPayload.actor || {};
+        const actorLogin = actor.login || actor.name || 'GitHub';
+        // 构造 repository 对象
+        if (!flat.repository) {
+            flat.repository = {
+                full_name: repoName,
+                stargazers_count: realPayload.repository?.stargazers_count
+                    || payload.repository?.stargazers_count
+                    || 0,
+                html_url: `https://github.com/${repoName}`,
+            };
+        }
+        // 构造 sender
+        if (!flat.sender) {
+            flat.sender = {
+                login: actorLogin,
+                id: actor.id || 0,
+                avatar_url: actor.avatar_url || '',
+            };
+        }
+        // 统一字段名：新适配器用 camelCase，旧格式用 snake_case
+        // issue -> 已有，不变
+        // pullRequest -> 需要映射到 pull_request
+        if (payload.pullRequest && !flat.pull_request) {
+            flat.pull_request = payload.pullRequest;
+        }
+        if (payload.workflowRun && !flat.workflow_run) {
+            flat.workflow_run = payload.workflowRun;
+        }
+        if (payload.workflow && !flat.workflow) {
+            flat.workflow = payload.workflow;
+        }
+        if (payload.headCommit && !flat.head_commit) {
+            flat.head_commit = payload.headCommit;
+        }
+        // action
+        if (payload.action && !flat.action) {
+            flat.action = payload.action;
+        }
+        // 补全其他字段
+        if (!flat.pusher && payload.actor) {
+            flat.pusher = { name: actorLogin };
+        }
+        return flat;
+    }
     resolveRuleTheme(rule) {
         return this.normalizeTheme(rule.renderTheme) || this.normalizeTheme(this.config.renderTheme) || 'github-dark';
     }
@@ -308,6 +374,8 @@ class Notifier extends koishi_1.Service {
         }
         if (!repoName && realPayload.pull_request?.base?.repo?.full_name)
             repoName = realPayload.pull_request.base.repo.full_name;
+        if (!repoName && realPayload.pullRequest?.base?.repo?.full_name)
+            repoName = realPayload.pullRequest.base.repo.full_name;
         if (!repoName && typeof payload.repoKey === 'string' && payload.repoKey.includes('/'))
             repoName = payload.repoKey;
         if (!repoName && typeof payload.owner === 'string' && typeof payload.repo === 'string')
@@ -321,109 +389,18 @@ class Notifier extends koishi_1.Service {
         }
         return repoName;
     }
-    patchPayloadForEvent(event, payload, repoName) {
-        const defaultUser = { login: 'GitHub', id: 0, avatar_url: '' };
-        if (!payload.sender)
-            payload.sender = defaultUser;
-        const defaultRepo = { full_name: repoName, stargazers_count: 0, html_url: `https://github.com/${repoName}` };
-        if (!payload.repository)
-            payload.repository = defaultRepo;
-        switch (event) {
-            case 'push':
-                if (!payload.pusher)
-                    payload.pusher = { name: payload.sender.login };
-                if (!payload.commits)
-                    payload.commits = [];
-                if (!payload.ref)
-                    payload.ref = 'refs/heads/unknown';
-                if (!payload.compare)
-                    payload.compare = '';
-                for (const commit of payload.commits) {
-                    if (!commit.author)
-                        commit.author = { name: 'Unknown' };
-                    if (!commit.id)
-                        commit.id = '0000000';
-                    if (!commit.message)
-                        commit.message = 'No message';
-                }
-                break;
-            case 'issues':
-                if (!payload.action)
-                    payload.action = 'updated';
-                if (!payload.issue)
-                    payload.issue = { number: 0, title: 'Unknown Issue', html_url: '', user: payload.sender };
-                if (!payload.issue.user)
-                    payload.issue.user = payload.sender;
-                break;
-            case 'pull_request':
-                if (!payload.action)
-                    payload.action = 'updated';
-                if (!payload.pull_request)
-                    payload.pull_request = { number: 0, title: 'Unknown PR', state: 'unknown', html_url: '', user: payload.sender };
-                if (!payload.pull_request.user)
-                    payload.pull_request.user = payload.sender;
-                break;
-            case 'star':
-                if (!payload.action || payload.action === 'started')
-                    payload.action = 'created';
-                if (payload.repository?.stargazers_count === undefined)
-                    payload.repository.stargazers_count = '?';
-                break;
-            case 'fork':
-                if (!payload.forkee)
-                    payload.forkee = { full_name: 'unknown/fork' };
-                break;
-            case 'release':
-                if (!payload.action)
-                    payload.action = 'published';
-                if (!payload.release)
-                    payload.release = { tag_name: 'unknown', name: 'Unknown Release', html_url: '' };
-                break;
-            case 'discussion':
-                if (!payload.action)
-                    payload.action = 'updated';
-                if (!payload.discussion)
-                    payload.discussion = { number: 0, title: 'Unknown Discussion', html_url: '', user: payload.sender };
-                if (!payload.discussion.user)
-                    payload.discussion.user = payload.sender;
-                break;
-            case 'workflow_run':
-                if (!payload.action)
-                    payload.action = 'completed';
-                if (!payload.workflow_run)
-                    payload.workflow_run = { conclusion: 'unknown', name: 'Unknown Workflow', head_branch: 'unknown', html_url: '' };
-                break;
-            case 'issue_comment':
-                if (!payload.action)
-                    payload.action = 'created';
-                if (!payload.issue)
-                    payload.issue = { number: 0, title: 'Unknown Issue', html_url: '', user: payload.sender };
-                if (!payload.comment)
-                    payload.comment = { body: '', html_url: '' };
-                if (!payload.issue.user)
-                    payload.issue.user = payload.sender;
-                break;
-            case 'pull_request_review':
-                if (!payload.action)
-                    payload.action = 'submitted';
-                if (!payload.pull_request)
-                    payload.pull_request = { number: 0, title: 'Unknown PR', html_url: '', user: payload.sender };
-                if (!payload.review)
-                    payload.review = { state: 'unknown', html_url: '' };
-                if (!payload.pull_request.user)
-                    payload.pull_request.user = payload.sender;
-                break;
-        }
-    }
     buildEventDedupKey(event, payload, realPayload, repoName) {
         const keyRepo = repoName || payload.repoKey || `${payload.owner || ''}/${payload.repo || ''}` || realPayload.repository?.full_name || 'unknown/repo';
         const action = realPayload.action || payload.action || '';
-        const commentId = realPayload.comment?.id || '';
+        const commentId = realPayload.comment?.id || payload.comment?.id || '';
         const issueId = realPayload.issue?.id || realPayload.issue?.number || '';
-        const prId = realPayload.pull_request?.id || realPayload.pull_request?.number || '';
+        const prId = realPayload.pull_request?.id || realPayload.pull_request?.number
+            || realPayload.pullRequest?.id || realPayload.pullRequest?.number || '';
         const releaseId = realPayload.release?.id || realPayload.release?.tag_name || '';
-        const workflowId = realPayload.workflow_run?.id || realPayload.workflow_run?.run_id || '';
-        const headCommit = realPayload.head_commit?.id || realPayload.after || realPayload.commits?.[0]?.id || '';
+        const workflowId = realPayload.workflow_run?.id || realPayload.workflow_run?.run_id
+            || payload.workflowRun?.id || '';
+        const headCommit = realPayload.head_commit?.id || realPayload.after || payload.after
+            || realPayload.commits?.[0]?.id || '';
         const explicitId = payload.id || realPayload.id || payload.timestamp || '';
         return [event, keyRepo, action, commentId, issueId, prId, releaseId, workflowId, headCommit, explicitId].join('|');
     }
@@ -455,6 +432,7 @@ class Notifier extends koishi_1.Service {
         catch (error) {
             if (error?.code === 'SQLITE_CONSTRAINT')
                 return false;
+            this.ctx.logger('githubsth').warn('Dedup write error:', error?.message || error);
         }
         return true;
     }
@@ -463,7 +441,9 @@ class Notifier extends koishi_1.Service {
         try {
             await this.ctx.database.remove('github_event_dedup', { createdAt: { $lt: cutoff } });
         }
-        catch { }
+        catch (error) {
+            this.ctx.logger('githubsth').warn('Dedup cleanup error:', error);
+        }
     }
     async sendMessage(rule, outbound) {
         const bots = this.ctx.bots.filter((bot) => !rule.platform || bot.platform === rule.platform);
@@ -476,14 +456,19 @@ class Notifier extends koishi_1.Service {
                     this.ctx.logger('notifier').info(`Sent message to ${rule.channelId} via ${bot.platform}:${bot.selfId}`);
                 return;
             }
-            catch {
+            catch (sendError) {
                 if (outbound.isImage && this.config.renderFallback === 'text') {
                     try {
                         await this.sendWithRetry(bot, rule.channelId, outbound.text);
                         this.ctx.logger('notifier').warn(`Image failed on ${bot.platform}:${bot.selfId}, fallback to text succeeded.`);
                         return;
                     }
-                    catch { }
+                    catch (fallbackError) {
+                        this.ctx.logger('notifier').error(`Image + text fallback both failed on ${bot.platform}:${bot.selfId}:`, fallbackError);
+                    }
+                }
+                else {
+                    this.ctx.logger('notifier').warn(`Send failed on ${bot.platform}:${bot.selfId}:`, sendError);
                 }
             }
         }
@@ -500,56 +485,94 @@ class Notifier extends koishi_1.Service {
             }
             catch (error) {
                 lastError = error;
-                if (attempt >= retryCount)
-                    break;
-                await this.sleep(baseDelay * Math.pow(2, attempt));
+                if (attempt < retryCount) {
+                    const delay = baseDelay * Math.pow(2, attempt);
+                    await new Promise((resolve) => setTimeout(resolve, delay));
+                }
             }
         }
         throw lastError;
     }
-    sleep(ms) {
-        return new Promise((resolve) => setTimeout(resolve, ms));
-    }
     getPreviewPayload(event) {
-        const payload = {
-            action: 'created',
-            repository: { full_name: 'acmuhan/JackalClientDocs', stargazers_count: 128, forks_count: 12, open_issues_count: 3 },
-            sender: { login: 'vercel[bot]' },
-            issue: {
-                number: 29,
-                title: 'Delete demobot',
-                html_url: 'https://github.com/acmuhan/JackalClientDocs/issues/29',
-                pull_request: { html_url: 'https://github.com/acmuhan/JackalClientDocs/pull/29' },
-            },
-            comment: { body: '[vc]: digest payload hidden' },
-            pull_request: {
-                number: 29,
-                title: 'Delete demobot',
-                state: 'open',
-                html_url: 'https://github.com/acmuhan/JackalClientDocs/pull/29',
-            },
-            workflow_run: {
-                name: 'Deploy',
-                conclusion: 'success',
-                head_branch: 'main',
-                html_url: 'https://github.com/acmuhan/JackalClientDocs/actions/runs/1',
-            },
-            commits: [{ id: 'ea5eaddca38f25ce013ee50d70addb49c8d28844', message: 'feat: delete demobot', author: { name: 'MuHan' } }],
-            ref: 'refs/heads/main',
-            compare: 'https://github.com/acmuhan/JackalClientDocs/compare/old...new',
-            pusher: { name: 'acmuhan' },
-            release: { tag_name: 'v1.2.0', name: 'Spring Patch', html_url: 'https://github.com/acmuhan/JackalClientDocs/releases/tag/v1.2.0' },
-            forkee: { full_name: 'acmuhan/JackalClientDocs-fork' },
-            discussion: { number: 7, title: 'Roadmap', html_url: 'https://github.com/acmuhan/JackalClientDocs/discussions/7' },
-            review: { state: 'approved', html_url: 'https://github.com/acmuhan/JackalClientDocs/pull/29#pullrequestreview-1' },
-        };
-        if (event === 'workflow_run')
-            payload.action = 'completed';
-        if (event === 'pull_request_review')
-            payload.action = 'submitted';
-        if (event === 'release')
-            payload.action = 'published';
-        return payload;
+        const mockRepo = 'owner/repo';
+        switch (event) {
+            case 'push':
+                return {
+                    repository: { full_name: mockRepo, html_url: `https://github.com/${mockRepo}` },
+                    sender: { login: 'octocat' },
+                    ref: 'refs/heads/main',
+                    commits: [
+                        { id: 'abc123', message: 'feat: add new feature', author: { name: 'octocat' } },
+                    ],
+                    compare: `https://github.com/${mockRepo}/compare/old..new`,
+                    pusher: { name: 'octocat' },
+                };
+            case 'issues':
+                return {
+                    repository: { full_name: mockRepo, html_url: `https://github.com/${mockRepo}` },
+                    sender: { login: 'octocat' },
+                    action: 'opened',
+                    issue: { number: 1, title: 'Example Issue', html_url: `https://github.com/${mockRepo}/issues/1`, user: { login: 'octocat' } },
+                };
+            case 'issue_comment':
+                return {
+                    repository: { full_name: mockRepo, html_url: `https://github.com/${mockRepo}` },
+                    sender: { login: 'octocat' },
+                    action: 'created',
+                    issue: { number: 1, title: 'Example Issue', html_url: `https://github.com/${mockRepo}/issues/1`, user: { login: 'octocat' } },
+                    comment: { body: 'This is a sample comment', html_url: `https://github.com/${mockRepo}/issues/1#issuecomment-1` },
+                };
+            case 'pull_request':
+                return {
+                    repository: { full_name: mockRepo, html_url: `https://github.com/${mockRepo}` },
+                    sender: { login: 'octocat' },
+                    action: 'opened',
+                    pull_request: { number: 1, title: 'Example PR', html_url: `https://github.com/${mockRepo}/pull/1`, user: { login: 'octocat' } },
+                };
+            case 'pull_request_review':
+                return {
+                    repository: { full_name: mockRepo, html_url: `https://github.com/${mockRepo}` },
+                    sender: { login: 'octocat' },
+                    action: 'submitted',
+                    pull_request: { number: 1, title: 'Example PR', html_url: `https://github.com/${mockRepo}/pull/1`, user: { login: 'octocat' } },
+                    review: { state: 'approved', html_url: `https://github.com/${mockRepo}/pull/1#pullrequestreview-1` },
+                };
+            case 'star':
+                return {
+                    repository: { full_name: mockRepo, stargazers_count: 42, html_url: `https://github.com/${mockRepo}` },
+                    sender: { login: 'octocat' },
+                    action: 'created',
+                };
+            case 'fork':
+                return {
+                    repository: { full_name: mockRepo, html_url: `https://github.com/${mockRepo}` },
+                    sender: { login: 'octocat' },
+                    forkee: { full_name: 'octocat/repo', html_url: `https://github.com/octocat/repo` },
+                };
+            case 'release':
+                return {
+                    repository: { full_name: mockRepo, html_url: `https://github.com/${mockRepo}` },
+                    sender: { login: 'octocat' },
+                    action: 'published',
+                    release: { tag_name: 'v1.0.0', name: 'Initial Release', html_url: `https://github.com/${mockRepo}/releases/v1.0.0` },
+                };
+            case 'discussion':
+                return {
+                    repository: { full_name: mockRepo, html_url: `https://github.com/${mockRepo}` },
+                    sender: { login: 'octocat' },
+                    action: 'created',
+                    discussion: { number: 1, title: 'Example Discussion', html_url: `https://github.com/${mockRepo}/discussions/1`, user: { login: 'octocat' } },
+                };
+            case 'workflow_run':
+                return {
+                    repository: { full_name: mockRepo, html_url: `https://github.com/${mockRepo}` },
+                    sender: { login: 'octocat' },
+                    action: 'completed',
+                    workflow_run: { name: 'CI', conclusion: 'success', head_branch: 'main', html_url: `https://github.com/${mockRepo}/actions/runs/1` },
+                };
+            default:
+                return null;
+        }
     }
 }
 exports.Notifier = Notifier;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-githubsth",
-  "version": "1.0.5",
-  "description": "Github Subscriptions Notifications, push notifications for GitHub subscriptions For koishi",
+  "version": "1.1.0",
+  "description": "Koishi plugin for GitHub subscription notifications, trusted repositories, and rich rendering.",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -34,8 +34,8 @@
   },
   "koishi": {
     "description": {
-      "en": "Github Subscriptions Notifications, push notifications for GitHub subscriptions",
-      "zh": "GitHub 订阅推送通知，依赖 GitHub 适配器"
+      "en": "GitHub subscription notifications with trusted repository controls and render customization.",
+      "zh": "支持可信仓库控制与渲染自定义的 GitHub 订阅通知插件。"
     },
     "service": {
       "required": [
@@ -47,5 +47,3 @@
     }
   }
 }
-
-