dsh-conversation-recycle-bin 0.3.3 → 0.3.4

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to `dsh-conversation-recycle-bin` are documented here.
 The format follows Keep a Changelog; the project uses Semantic Versioning.
 
+## [0.3.4] — 2026-10-20
+
+对应 `AUDIT-2026-10-20-last3-versions.md` 的四条非阻塞隐患 N1–N4，以及测试驱动下新发现的 P3 回归 N5。
+
+### Fixed
+
+- **N1：批量删除中途限流会静默丢尾项**：`deletePlan` 循环里 `!reservation.ok` 分支的 `break` 改为 `continue`。0.3.3 之前当第二 Host 在 preflight 与 take 之间抢走额度、或 `sessions.length > limiter.remaining`（跨进程 / 时间窗滑动）时，第一条被拒之后的所有 session 既不进 `results` 也不进 `failures`——一次 50 项批量 + 20/min 上限下，第 22–50 项从 UI 反馈里凭空消失。`continue` 让每一项各得一条 `E_RATE_LIMITED` 记录；首个项目预算不足直接抛 429 的既有契约不变。新增 `test/api.test.mjs` 用例：monkey-patch limiter 让 take 从第二次起即失败，断言 3 项批量 → 1 结果 + 2 失败。
+- **N2：审计 `tail()` 字节窗口对齐到 `\n` 时丢一条完整记录**：`start > 0` 分支不再无条件 `rawLines.slice(1)`——先读 `start-1` 一字节，`\n` 意味着窗口从行首开始，`rawLines[0]` 是完整 JSON 保留；否则才丢。同时 `CHUNK` 抽为 `createAuditLog({ tailWindowBytes })` 便于回归。新增 `test/trash-audit.test.mjs` 用例：对齐窗口断言三条完整记录全在，偏移 1 字节窗口断言撕裂片段被正确丢弃。
+- **N5（连带发现）：`tail()` 从未真正做窗口读**：Node `fs.readFile(path, {encoding,flag,signal})` 不接受 `start/end`，0.3.3 P3「只读尾部 256KB」的实现其实每次仍全量读盘。改用 `fsApi.open(filePath, 'r')` + `FileHandle.read(buffer, offset, length, position)` 的位置化读，`stat` 也走 handle；`fsApi` 类型签名加 `open`。修复后 5MB 审计文件 tail 只吃 256KB 内存，与 P3 原意一致。
+- **N3：HTTP 反馈通道对自定义鉴权头也强加 `Bearer ` 前缀**：`deliverHttp` 现只在 `authHeader === 'Authorization'` 时前缀 `Bearer `（RFC 7235 语法的合法要求），其它如 `X-Api-Key` / `x-goog-api-key` 直接发送裸 token——多数非 `Authorization` 中转拒绝 Bearer 前缀，此前配任何自定义头都会 401。默认 `Authorization` 通道逐字节不变。新增 `test/feedback.test.mjs` 双 case 用例（Bearer vs 裸 token）。
+- **N4：`visitorAsFrom: true` 的 UI 提示未说明与常见发信方冲突**：`feedback.emailHintAsFrom` 词条中英各扩写为完整句子，说明「QQ / 163 / Gmail 一类要求 From 与登录账号一致会拒收，仅允许任意 From 的中继才生效」。行为不变、配置不变。
+
+### Changed / Maintenance
+
+- 回归测试：`api` 38 → 39、`feedback` 18 → 19、`trash-audit` 3 → 4；总 128 → **131 全绿**。
+
 ## [0.3.3] — 2026-10-19
 
 本次修复对应 `AUDIT-2026-10-19-review.md` 的 S1–S3、P1–P5、R1–R4 与 M 项；每条均带回归测试。

package/README.md

@@ -190,7 +190,7 @@ dsh-conversation-recycle-bin/
 │     ├─ memory.js               # 适配器装配
 │     ├─ feedback.js             # 反馈校验/渲染/投递（http 或 smtp，凭证只读环境变量）
 │     └─ api.js                 # 同源 HTTP API、确认 token、限流
-└─ test/                        # 122 个用例，覆盖用户要求的 5 类场景 + live 删除 + 记忆锁 + 原地刷新 + 部分失败/跨进程/未完成条目 + 反馈通道 + Client 半渲染冒烟
+└─ test/                        # 131 个用例，覆盖用户要求的 5 类场景 + live 删除 + 记忆锁 + 原地刷新 + 部分失败/跨进程/未完成条目 + 反馈通道 + Client 半渲染冒烟
 ```
 
 ---
@@ -199,7 +199,7 @@ dsh-conversation-recycle-bin/
 
 ```powershell
 cd D:\Users\34332\AI\dsh-conversation-recycle-bin
-npm test        # = manifest && client-module && core && cascade && memory && trash-audit && feedback && api（122 个用例）
+npm test        # = manifest && client-module && core && cascade && memory && trash-audit && feedback && api（131 个用例）
 npm run check   # 语法 + manifest
 ```
 
@@ -258,8 +258,8 @@ npm run check   # 语法 + manifest
 | `DSH_CRB_FEEDBACK_TO` | 收件人（优先于 `feedback.to`） |
 | `DSH_CRB_FEEDBACK_FROM` | 发件人（优先于 `feedback.from`） |
 | `DSH_CRB_MAIL_API_URL` | 邮件 HTTP API 地址（Resend 兼容形状，也可指向自建转发网关） |
-| `DSH_CRB_MAIL_API_TOKEN` | 该 API 的 Bearer token |
-| `DSH_CRB_MAIL_API_AUTH_HEADER` | 可选，鉴权头名，默认 `authorization`，值为 `Bearer <token>` |
+| `DSH_CRB_MAIL_API_TOKEN` | 该 API 的鉴权 token |
+| `DSH_CRB_MAIL_API_AUTH_HEADER` | 可选，鉴权头名，默认 `authorization`；`authorization` 时值形如 `Bearer <token>`（RFC 7235），其它自定义头（如 `x-api-key`）直接发送裸 token |
 | `DSH_CRB_SMTP_URL` | SMTP 连接串，如 `smtps://user:pass@smtp.example.com:465` |
 
 HTTP 通道发出的 JSON 固定为 `{from, to: [收件人], subject, text, reply_to}`，`text` 是纯文本（不生成 HTML）；`reply_to` 取自表单里访客填写的邮箱（留空则不填）。SMTP 通道按需 `import('nodemailer')`：它已声明为 `optionalDependencies`（`^10.1.2`），正常安装会随包就位；以 `link:` 方式开发安装时插件从自身真实目录解析，需在**本仓库**跑一次 `npm install`。仍未安装时返回 `E_FEEDBACK_TRANSPORT` + `reason: nodemailer-missing`。
@@ -287,8 +287,8 @@ node -e "console.log('b64:' + Buffer.from('your-feedback@example.com','utf8').to
 ```powershell
 cd D:\Users\34332\AI\dsh-conversation-recycle-bin
 npm run check                      # 语法 + manifest（含 feedback.js）
-node test/feedback.test.mjs        # 17 个反馈用例
-npm test                           # 全量 122 个用例
+node test/feedback.test.mjs        # 19 个反馈用例
+npm test                           # 全量 131 个用例
 
 # 端到端：用本机收件桩观察真实投递路径，不外发邮件
 $env:DSH_CRB_MAIL_API_URL   = 'http://127.0.0.1:9099/emails'

package/client.js

@@ -165,7 +165,7 @@ window.__ModuleLoader__.load({
         'feedback.emailLabel': 'Your email (optional)',
         'feedback.emailPlaceholder': 'you@example.com',
         'feedback.emailHint': 'Used as Reply-To so the maintainer can answer you. Leave it empty to stay anonymous.',
-        'feedback.emailHintAsFrom': 'Shown as the sender (From) of the mail.',
+        'feedback.emailHintAsFrom': 'Sent as the mail\'s From address. Most relays (QQ, 163, Gmail) reject this unless the mailbox matches the login account — enable only when the relay accepts arbitrary From.',
         'feedback.contextLabel': 'Attached automatically',
         'feedback.contextHint': 'Plugin version, platform and language. Conversation content is never attached.',
         'feedback.contextVersion': 'Plugin version',
@@ -319,7 +319,7 @@ window.__ModuleLoader__.load({
         'feedback.emailLabel': '你的邮箱（选填）',
         'feedback.emailPlaceholder': 'you@example.com',
         'feedback.emailHint': '作为 Reply-To，便于维护者直接回复你；留空即匿名。',
-        'feedback.emailHintAsFrom': '会直接作为这封邮件的发件人。',
+        'feedback.emailHintAsFrom': '会直接作为这封邮件的发件人（From）。QQ / 163 / Gmail 一类会拒收非登录账号的 From，只有允许任意 From 的中继才生效。',
         'feedback.contextLabel': '自动附带',
         'feedback.contextHint': '插件版本、平台与语言；不会附带任何对话内容。',
         'feedback.contextVersion': '插件版本',

package/lib/core/audit.js

@@ -11,7 +11,7 @@
  * actor (the local Web UI), session ids, mode, the memory checkbox, per-adapter
  * counts, and whether a failed transaction was rolled back.
  */
-import { appendFile, mkdir, readFile, rename, stat, writeFile } from 'node:fs/promises'
+import { appendFile, mkdir, open, readFile, rename, stat, writeFile } from 'node:fs/promises'
 import { dirname } from 'node:path'
 
 /**
@@ -19,10 +19,11 @@ import { dirname } from 'node:path'
  * @param {string} options.filePath absolute path of the JSONL file
  * @param {number} [options.maxBytes] compact threshold
  * @param {number} [options.retentionLines] lines kept after compaction
+ * @param {number} [options.tailWindowBytes] byte window tail() reads from the end (default 256KB)
  * @param {() => number} [options.now]
- * @param {Pick<typeof import('node:fs/promises'), 'readFile'|'writeFile'|'mkdir'|'appendFile'|'rename'|'stat'>} [options.fsApi]
+ * @param {Pick<typeof import('node:fs/promises'), 'readFile'|'writeFile'|'mkdir'|'appendFile'|'rename'|'stat'|'open'>} [options.fsApi]
  */
-export function createAuditLog({ filePath, maxBytes = 5 * 1024 * 1024, retentionLines = 5_000, now = Date.now, fsApi = { readFile, writeFile, mkdir, appendFile, rename, stat } }) {
+export function createAuditLog({ filePath, maxBytes = 5 * 1024 * 1024, retentionLines = 5_000, tailWindowBytes = 256 * 1024, now = Date.now, fsApi = { readFile, writeFile, mkdir, appendFile, rename, stat, open } }) {
   let pending = Promise.resolve()
 
   function serialize(operation) {
@@ -77,48 +78,59 @@ export function createAuditLog({ filePath, maxBytes = 5 * 1024 * 1024, retention
 
     /**
      * Read the most recent `limit` records; malformed lines are counted, not
-     * thrown. Only the tail window (≤256KB) is read and parsed: the settings
-     * page asks for the last N rows on every open, and a full up-to-5MB parse
-     * on each request scaled with the whole trail, not with `limit`. Malformed
-     * lines outside the window are not counted (the metric describes the
-     * displayed window).
+     * thrown. Only the tail window (default 256KB) is read and parsed: the
+     * settings page asks for the last N rows on every open, and a full
+     * up-to-5MB parse on each request scaled with the whole trail, not with
+     * `limit`. `fs.readFile` does not honour `{start,end}`, so this uses a
+     * positional `FileHandle.read`; earlier revisions silently read the whole
+     * file while appearing to window. Malformed lines outside the window are
+     * not counted (the metric describes the displayed window).
      */
     async tail(limit = 50) {
       const maxRecords = Math.max(1, Math.floor(limit))
-      const CHUNK = 256 * 1024
-      let size = 0
+      const CHUNK = Math.max(1, Math.floor(tailWindowBytes))
+      let handle
       try {
-        size = (await fsApi.stat(filePath)).size
+        handle = await fsApi.open(filePath, 'r')
       } catch (error) {
         if (error?.code === 'ENOENT') return { records: [], malformed: 0 }
         throw error
       }
-      const start = Math.max(0, size - CHUNK)
-      let buffer
       try {
-        buffer = start > 0
-          ? await fsApi.readFile(filePath, { start, end: size })
-          : await fsApi.readFile(filePath, 'utf8')
-      } catch (error) {
-        if (error?.code === 'ENOENT') return { records: [], malformed: 0 }
-        throw error
-      }
-      const text = Buffer.isBuffer(buffer) ? buffer.toString('utf8') : String(buffer)
-      const rawLines = text.split('\n')
-      // A chunk starts mid-line; drop the partial first line instead of
-      // parsing a torn fragment as malformed.
-      const lines = (start > 0 ? rawLines.slice(1) : rawLines)
-        .filter((line) => line.trim() !== '')
-      const records = []
-      let malformed = 0
-      for (const line of lines) {
-        try {
-          records.push(JSON.parse(line))
-        } catch {
-          malformed += 1
+        const statInfo = await handle.stat()
+        const size = statInfo.size
+        const start = Math.max(0, size - CHUNK)
+        const windowLength = size - start
+        const buffer = Buffer.alloc(windowLength)
+        const windowRead = await handle.read(buffer, 0, windowLength, start)
+        const text = buffer.subarray(0, windowRead.bytesRead).toString('utf8')
+        // `rawLines[0]` is only a torn fragment when the window starts
+        // *inside* a line. Read the byte at `start-1`: `\n` means the window
+        // begins on a line boundary and rawLines[0] is a complete record;
+        // unconditionally dropping it (pre-0.3.4) silently lost one valid
+        // record whenever the byte window happened to align with a newline.
+        let dropFirst = false
+        if (start > 0) {
+          const peek = Buffer.alloc(1)
+          const peekRead = await handle.read(peek, 0, 1, start - 1)
+          dropFirst = !(peekRead.bytesRead === 1 && peek[0] === 0x0a)
+        }
+        const rawLines = text.split('\n')
+        const lines = (dropFirst ? rawLines.slice(1) : rawLines)
+          .filter((line) => line.trim() !== '')
+        const records = []
+        let malformed = 0
+        for (const line of lines) {
+          try {
+            records.push(JSON.parse(line))
+          } catch {
+            malformed += 1
+          }
         }
+        return { records: records.slice(-maxRecords), malformed }
+      } finally {
+        await handle.close()
       }
-      return { records: records.slice(-maxRecords), malformed }
     },
   }
 }

package/lib/host/api.js

@@ -634,7 +634,13 @@ export function createDeleteApi({ ctx, config, paths, now = Date.now, logger = c
     // Budget is consumed per actually-attempted deletion: a failed item must
     // not silently spend the minute quota it never used. The very first item
     // still refuses outright with 429 (the existing contract); once a plan
-    // has started, later exhausted items are recorded as failures instead.
+    // has started, later exhausted items are recorded as failures.
+    //
+    // A refusal inside the loop uses `continue`, never `break`: `break` used
+    // to drop every session after the exhausted one from both `results` and
+    // `failures`, so a batch of 50 with a 20/min budget left items 22-50
+    // looking like the plan never mentioned them. Under the per-plan
+    // serialize this is still visible via `maxBatchSessions` > budget.
     const request = requestId()
     const results = []
     const failures = []
@@ -647,7 +653,7 @@ export function createDeleteApi({ ctx, config, paths, now = Date.now, logger = c
         })
         if (results.length === 0 && failures.length === 0) throw rateError
         failures.push({ sessionId: session.id, error: rateError.toJSON() })
-        break
+        continue
       }
       if (!validated.record.used) markConfirmationUsed(validated)
       try {

package/lib/host/feedback.js

@@ -338,7 +338,14 @@ export function createFeedbackService({ config, env = process.env, now = Date.no
       throw new DeleteError('E_FEEDBACK_TRANSPORT', 'This Host runtime provides no fetch() to deliver feedback.', { transport: 'http' })
     }
     const headers = { 'content-type': 'application/json' }
-    if (settings.apiToken !== '') headers[settings.authHeader.toLowerCase()] = `Bearer ${settings.apiToken}`
+    if (settings.apiToken !== '') {
+      // `Authorization` is the one header whose RFC 7235 grammar mandates an
+      // auth-scheme token; a custom header (X-Api-Key, x-goog-api-key, …)
+      // expects the bare secret. Prefixing `Bearer` unconditionally 401'd
+      // every non-Authorization relay the user pointed us at.
+      const scheme = settings.authHeader.toLowerCase() === 'authorization' ? `Bearer ${settings.apiToken}` : settings.apiToken
+      headers[settings.authHeader.toLowerCase()] = scheme
+    }
     const body = {
       from: (settings.visitorAsFrom === true && submission.email) ? submission.email : (settings.from === '' ? undefined : settings.from),
       to: [settings.to],

package/lib/version.js

@@ -5,4 +5,4 @@
  * asserted against it by `test/manifest.test.mjs` so the two can never drift
  * (they did: the constant stayed at 0.1.0 while the package reached 0.1.4).
  */
-export const PLUGIN_VERSION = '0.3.3'
+export const PLUGIN_VERSION = '0.3.4'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-conversation-recycle-bin",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "DSH conversation deletion with an optional, previewed cascade into conversation-associated memory: soft delete + recycle bin, audit trail, batch rate limits and per-session rollback. 删除对话（可选一并删除关联记忆）：软删除与回收站、审计留痕、批量限流、失败回滚。",
   "repository": {
     "type": "git",