cortico-world-bili-watch 0.2.6 → 0.2.7

package/CHANGELOG.md

@@ -3,6 +3,35 @@
 桌宠的市场按本文件的 `## <版本号>` 分段显示更新说明，
 标题里的版本号必须和 `package.json` 的 `version` 一致。
 
+## 0.2.7
+
+修「bili_publish 明明传了 target、oid、root、parent、type=1，还是报『评论类型仅支持
+视频(1)、动态(11/17)』；补上 retryRejected 又变成『新评论必须提供固定 requestId』；
+最后自己编了个 requestId 才发出去」。
+
+**根因：publish 不会从凭据里取目标。** `bili_prepare` 返回的 brief 里明明存着
+target，但 publish 是先 `normalizeTarget(input.target)`、后读 brief —— 于是
+「只传 briefId」必然被判成缺 target；补上 target 又卡在 requestId 上；模型只好
+自己编一个（这次编的是 `reply-323189507152-20261107`），四层防重直接失效。
+
+连带发现（鱼自己也看出来了：「带 briefId 的回复被当成新评论处理」）：kind 判定
+只看 `inboxId`，凭据接楼（`parent≠0`）一律记成 `proactive`。今早 13:51 那条回复
+就是这么落库的 —— 扣的是「主动发言」额度、单人每日上限没生效、记录页还显示成
+主动评论。
+
+- **target 来源**：`input.target ?? brief.target`；两个都没有时给明确提示
+  「缺少发送目标：给 briefId 或完整 target」，而不是误导性的类型错误。
+- **requestId 自动派生**：有 briefId 就用 `brief:<briefId>`，同一个凭据重试必然
+  复用同一键；显式传 target + requestId 的旧用法原样保留。
+- **kind 按目标判定**：接楼（`parent≠0`）记 `reply`，新评论记 `proactive`，
+  推荐仍记 `recommend`。
+- 工具描述同步：有 briefId 就不必再传 target / requestId。
+
+离线验证 5/5（真实 state 副本 + 假网络，不真的发出去，脚本在 `test/publish-brief.mts`）：
+① 只给 briefId 的接楼 → `kind=reply`、`req=brief:71f211fc…`、真正 POST 到 reply/add；
+② 只给 briefId 的新评论 → `kind=proactive`；③ 什么都不给 → 「缺少发送目标」；
+④ 显式 target + requestId 的旧用法仍然 `sent`；⑤ 同一 brief 重发 → `reused`、零重复提交。
+
 ## 0.2.6
 
 修「评论永远发不出去：发送前的网页会话初始化未完成，第五次了」（鱼的今早反馈，

package/describe.json

@@ -580,7 +580,7 @@
     },
     {
       "name": "bili_publish",
-      "description": "Publish a PUBLIC comment. Preparation binds platform, account, target and draft; never reuse\na brief across destinations. A changed draft returns a renewed needs_review brief without sending.\n\nFor a notification supply `inboxId`; otherwise supply a full target and a **stable requestId**.\nReuse the same requestId when checking a retry. An unknown result is pending confirmation,\nnot a definite failure - do not bypass it by changing text or requestId at the same target.\n\n`sent` means accepted, not verified public visibility. Check `delivery`: public is guest-list\nverified, self-only is platform restricted, unconfirmed is inconclusive.\n**Never repost self-only or unconfirmed receipts automatically.**",
+      "description": "Publish a PUBLIC comment. Preparation binds platform, account, target and draft; never reuse\na brief across destinations. A changed draft returns a renewed needs_review brief without sending.\n\nFor a notification supply `inboxId`. For a prepared reply just pass `briefId` — the target\nand a stable requestId are derived from the brief, so do **not** re-supply them.\nOnly a bare new comment (no preparation) needs a full `target` plus a **stable requestId**.\nReuse the same requestId when checking a retry. An unknown result is pending confirmation,\nnot a definite failure - do not bypass it by changing text or requestId at the same target.\n\n`sent` means accepted, not verified public visibility. Check `delivery`: public is guest-list\nverified, self-only is platform restricted, unconfirmed is inconclusive.\n**Never repost self-only or unconfirmed receipts automatically.**",
       "parameters": {
         "type": "object",
         "additionalProperties": false,
@@ -629,7 +629,7 @@
           "requestId": {
             "type": "string",
             "maxLength": 180,
-            "description": "Stable idempotency key for a new top-level comment or an unsolicited thread reply."
+            "description": "Stable idempotency key for a new top-level comment or an unsolicited thread reply. Omit it when `briefId` is given (derived from the brief)."
           },
           "text": {
             "type": "string",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cortico-world-bili-watch",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "type": "module",
   "description": "Cortico World：只做 B 站的社交伴侣。看视频（分镜图+逐格台词，低成本）、看评论、接楼发言、自主闲逛；带通知监听与可见性核验。",
   "license": "MIT",

package/src/social/service.ts

@@ -656,6 +656,19 @@ export class BiliService {
 
     const acc = this.account ?? (await this.connect(signal));
 
+    // ── 凭据（briefId）：先读，它本身就是 target 与 requestId 的来源 ────
+    //
+    // 模型只需要 `bili_prepare` → `bili_publish({ briefId, text })`。凭据里已经
+    // 绑定了平台/账号/目标，还要它自己再抄一遍 target，只会抄错 —— 实测：
+    // 漏传 target 被报「评论类型仅支持视频(1)」，补上 target 又要自己编
+    // requestId，编出来的还是新键（防重直接失效）。
+    const brief = input.preparation?.briefId
+      ? this.d.store.brief(input.preparation.briefId)
+      : undefined;
+    if (input.preparation?.briefId && !brief) {
+      throw new BiliError('找不到这份接话凭据（可能已过期），请重新 bili_prepare。', 'rejected');
+    }
+
     // ── 定位目标与账本 ───────────────────────────────────────────────
     let target: CommentTarget;
     let kind: SendRecord['kind'] = input.recommend ? 'recommend' : 'proactive';
@@ -671,7 +684,18 @@ export class BiliService {
       kind = inboxItem.focusOwnerId ? 'focus' : 'reply';
       recipientId = inboxItem.authorId || undefined;
     } else {
-      target = normalizeTarget(input.target);
+      const raw = input.target ?? brief?.target;
+      if (!raw) {
+        throw new BiliError(
+          '缺少发送目标：给 briefId（bili_prepare 拿到的）或完整 target（oid/type/root/parent）。',
+          'invalid',
+        );
+      }
+      target = normalizeTarget(raw);
+      // 接楼就是回复，用回复账本（每人每日上限才算得对）。
+      // 以前只有 inboxId 才记 reply，凭据接楼一律记成 proactive —— 主动发言
+      // 额度被扣、单人上限没生效、记录页还显示成"主动评论"。
+      if (!input.recommend) kind = target.parent !== '0' ? 'reply' : 'proactive';
     }
 
     // 接楼必须有 recipientId：拿不到就不发，绝不绕过单人上限
@@ -684,7 +708,11 @@ export class BiliService {
       }
     }
 
-    const requestId = input.inboxId ? `reply:${input.inboxId}` : input.requestId;
+    // 凭据本身就是幂等键：同一个 brief 重试沿用同一个 requestId，
+    // 模型不用编、也不该编（编新的会让四层防重失效）。
+    const requestId = input.inboxId
+      ? `reply:${input.inboxId}`
+      : (input.requestId ?? (brief ? `brief:${brief.id}` : undefined));
     if (!requestId || (!input.inboxId && requestId.length > 180) || /[\r\n]/.test(requestId)) {
       throw new BiliError('新评论必须提供固定的 requestId；重试要沿用原值。', 'invalid');
     }
@@ -729,13 +757,7 @@ export class BiliService {
       };
     }
 
-    // ── 凭据（briefId）：目标/账号/草稿必须对得上 ─────────────────────
-    const brief = input.preparation?.briefId
-      ? this.d.store.brief(input.preparation.briefId)
-      : undefined;
-    if (input.preparation?.briefId && !brief) {
-      throw new BiliError('找不到这份接话凭据（可能已过期），请重新 bili_prepare。', 'rejected');
-    }
+    // ── 凭据绑定的账号/目标/草稿必须对得上 ───────────────────────────
     if (brief) {
       if (brief.accountId !== acc.id) {
         throw new BiliError('凭据属于另一个账号，未提交。', 'rejected');

package/src/tools.ts

@@ -424,7 +424,9 @@ const socialTools = [
       'Publish a PUBLIC comment. Preparation binds platform, account, target and draft; never reuse',
       'a brief across destinations. A changed draft returns a renewed needs_review brief without sending.',
       '',
-      'For a notification supply `inboxId`; otherwise supply a full target and a **stable requestId**.',
+      'For a notification supply `inboxId`. For a prepared reply just pass `briefId` — the target',
+      'and a stable requestId are derived from the brief, so do **not** re-supply them.',
+      'Only a bare new comment (no preparation) needs a full `target` plus a **stable requestId**.',
       'Reuse the same requestId when checking a retry. An unknown result is pending confirmation,',
       'not a definite failure - do not bypass it by changing text or requestId at the same target.',
       '',
@@ -446,7 +448,8 @@ const socialTools = [
         requestId: {
           type: 'string',
           maxLength: 180,
-          description: 'Stable idempotency key for a new top-level comment or an unsolicited thread reply.',
+          description:
+            'Stable idempotency key for a new top-level comment or an unsolicited thread reply. Omit it when `briefId` is given (derived from the brief).',
         },
         text: { type: 'string', minLength: 1, maxLength: 1000 },
         mentionFocus: {