@clawos-dev/clawd 0.2.385 → 0.2.386

package/dist/cli.cjs

@@ -6613,17 +6613,19 @@ var init_shift_internal = __esm({
 });
 
 // ../protocol/src/channel.ts
-var ChannelSchema, nonBlank, ChannelCreateArgsSchema, ChannelUpdateArgsSchema, ChannelDeleteArgsSchema, ChannelListResultSchema, ChannelResultSchema, ChannelDeleteResultSchema;
+var MASTER_PERSONA_ID, ChannelSchema, nonBlank, ChannelCreateArgsSchema, ChannelUpdateArgsSchema, ChannelDeleteArgsSchema, ChannelListResultSchema, ChannelResultSchema, ChannelDeleteResultSchema;
 var init_channel = __esm({
   "../protocol/src/channel.ts"() {
     "use strict";
     init_zod();
+    MASTER_PERSONA_ID = "persona-master";
     ChannelSchema = external_exports.object({
       id: external_exports.string().min(1),
       name: external_exports.string().min(1),
       /** 该频道里可被派活的 persona */
       memberPersonaIds: external_exports.array(external_exports.string().min(1)),
-      /** 人类成员（contact deviceId）；M2 只存不用，P1 异步询问才消费 */
+      /** 人类成员（contact deviceId）。跨设备派活的成员边界认这张名单（personaDispatch 校验），
+       *  P1 人类异步询问也用它 */
       memberContactDeviceIds: external_exports.array(external_exports.string().min(1)),
       createdAt: external_exports.string().min(1),
       updatedAt: external_exports.string().min(1)
@@ -6672,7 +6674,18 @@ var init_topic = __esm({
     });
     TopicLineMetaSchema = external_exports.object({
       rejectCount: external_exports.number().int().min(0),
-      accepted: external_exports.boolean().default(false)
+      accepted: external_exports.boolean().default(false),
+      /**
+       * Master 在 watcher 判 fail 的情况下仍判合格的次数。
+       *
+       * 为什么要单独数：watcher 的 fail 若能被一句「这是可观测性缺口」无声绕过，核验就形同
+       * 虚设——实测一个话题三条线的 watcher 全报 fail、无一打回，Master 自己下场补证后判了合格。
+       * 覆盖本身不禁止（watcher 确实会误判），但必须留痕、必须计数、反复覆盖必须惊动老板。
+       *
+       * optional 而非 default(0)：store 不按 schema parse（见 topic-store），存量 lineMeta
+       * 里本来就没有这个字段，读侧一律 `?? 0`。
+       */
+      overrideCount: external_exports.number().int().min(0).optional()
     });
     TopicSchema = external_exports.object({
       id: external_exports.string().min(1),
@@ -6742,7 +6755,17 @@ var init_topic = __esm({
       /** 凭什么判合格（逐条标准对应到什么证据）——与打回同样必填 */
       reason: nonBlank2,
       /** watcher 认定的产出物，一并进影响面 */
-      artifacts: external_exports.array(nonBlank2).optional()
+      artifacts: external_exports.array(nonBlank2).optional(),
+      /**
+       * 这条线的 watcher 核验结论。**必填**：不填等于允许「压根没跑 watcher 就发合格证」，
+       * 而合格与打回之所以要对称落账，就是为了让老板事后分得出「判过且过了」和「没judge过」。
+       */
+      watcherVerdict: external_exports.enum(["pass", "fail"]),
+      /** watcher 判 fail 却仍要判合格时，凭什么推翻它（fail 时必填） */
+      overrideReason: nonBlank2.optional()
+    }).refine((v2) => v2.watcherVerdict !== "fail" || Boolean(v2.overrideReason), {
+      message: "watcherVerdict=fail \u65F6\u5FC5\u987B\u7ED9 overrideReason\uFF08\u63A8\u7FFB watcher \u7684\u7406\u7531\uFF09",
+      path: ["overrideReason"]
     });
     TopicCloseArgsSchema = external_exports.object({
       topicId: external_exports.string().min(1),
@@ -6769,27 +6792,25 @@ var init_topic = __esm({
       acceptedLines: external_exports.number().int().min(1),
       totalLines: external_exports.number().int().min(1),
       /** 全部线都合格了 → 可以收敛上报。由 daemon 数，不让 Master 自己盘 */
-      allAccepted: external_exports.boolean()
+      allAccepted: external_exports.boolean(),
+      /** 本话题累计推翻 watcher 的次数（含这一次） */
+      overrides: external_exports.number().int().min(0),
+      /**
+       * 反复推翻 watcher = 取证链路有系统性问题（如 worker 用 heredoc 写文件导致正文
+       * 写得没法验），该让老板知道并去修验收标准，而不是每条线都靠 Master 补证。
+       */
+      needsOwnerAttention: external_exports.boolean()
     });
     TopicResultSchema = external_exports.object({ topic: TopicSchema });
   }
 });
 
 // ../protocol/src/master.ts
-var LineDigestArgsSchema, LineDigestResultSchema, AUTHORITY_ACTIONS, AuthorityActionSchema, AuthorityRuleSchema, AuthorityTableSchema, AuthorityCheckArgsSchema, AuthorityCheckResultSchema;
+var AUTHORITY_ACTIONS, AuthorityActionSchema, AuthorityRuleSchema, AuthorityTableSchema, AuthorityCheckArgsSchema, AuthorityCheckResultSchema;
 var init_master = __esm({
   "../protocol/src/master.ts"() {
     "use strict";
     init_zod();
-    LineDigestArgsSchema = external_exports.object({
-      /** 一条线 = 一条 dispatch；daemon 内部据此解析 worker session 与 transcript */
-      dispatchId: external_exports.string().min(1)
-    });
-    LineDigestResultSchema = external_exports.object({
-      digest: external_exports.string(),
-      /** 抽取时是否因超上限被截断——watcher 据此避免"仅凭没看到就判 fail" */
-      truncated: external_exports.boolean()
-    });
     AUTHORITY_ACTIONS = ["ask", "allow", "deny"];
     AuthorityActionSchema = external_exports.enum(AUTHORITY_ACTIONS);
     AuthorityRuleSchema = external_exports.object({
@@ -8476,18 +8497,19 @@ var init_methods = __esm({
         args: TopicRejectArgsSchema
       },
       "topic:accept": {
-        summary: "\u5224\u67D0\u6761\u7EBF\u5408\u683C\uFF1A\u7F6E accepted \u5E76\u540C\u6B65\u843D\u4E00\u6761\u6D41\u6C34\uFF1Breason \u5FC5\u586B\uFF08\u4E0E\u6253\u56DE\u5BF9\u79F0\uFF0C\u53EA\u8BB0\u6253\u56DE\u7B49\u4E8E\u53EA\u8BB0\u5206\u5B50\uFF09\u3002\u8FD4\u56DE acceptedLines / totalLines / allAccepted\uFF0C\u6536\u655B\u65F6\u673A\u7531 daemon \u6570\u4E0D\u7531 Master \u76D8",
-        args: TopicAcceptArgsSchema
+        summary: "\u5224\u67D0\u6761\u7EBF\u5408\u683C\uFF1A\u7F6E accepted \u5E76\u540C\u6B65\u843D\u4E00\u6761\u6D41\u6C34\uFF1Breason \u4E0E watcherVerdict \u5FC5\u586B\uFF08\u4E0E\u6253\u56DE\u5BF9\u79F0\uFF0C\u53EA\u8BB0\u6253\u56DE\u7B49\u4E8E\u53EA\u8BB0\u5206\u5B50\uFF09\u3002watcherVerdict=fail \u65F6\u5FC5\u987B\u7ED9 overrideReason\uFF0Cdaemon \u5355\u72EC\u8BA1\u63A8\u7FFB\u6B21\u6570\u3002\u8FD4\u56DE acceptedLines / totalLines / allAccepted / overrides / needsOwnerAttention\uFF0C\u6536\u655B\u65F6\u673A\u7531 daemon \u6570\u4E0D\u7531 Master \u76D8",
+        args: TopicAcceptArgsSchema,
+        argsConstraints: {
+          // watcherVerdict=fail 时 overrideReason 必填（.refine 的谓词不可序列化，这里显式声明）
+          if: { properties: { watcherVerdict: { const: "fail" } }, required: ["watcherVerdict"] },
+          then: { required: ["overrideReason"] }
+        }
       },
       "topic:close": {
         summary: "\u6536\u655B\u8BDD\u9898\uFF1Astate \u7F6E done / archived",
         args: TopicCloseArgsSchema
       },
-      // ---- line:digest / master:*（核验与授权，Master 经 clawd-rpc 桥调）----
-      "line:digest": {
-        summary: "\u628A\u4E00\u6761\u7EBF\uFF08dispatch\uFF09\u7684 worker transcript \u62BD\u6210 \u226420KB digest\uFF1A\u6539\u52A8\u8FC7\u7684\u6587\u4EF6 / \u6267\u884C\u8FC7\u7684\u547D\u4EE4 / \u6210\u529F\u547D\u4EE4\u8F93\u51FA\u6458\u5F55 / \u62A5\u9519\u805A\u5408 / \u5C3E\u90E8 assistant \u8F93\u51FA\u3002\u6838\u9A8C subagent \u7528\u5B83\uFF0C\u907F\u514D\u76F4\u63A5\u8BFB\u53EF\u8FBE 10MB \u7684\u539F\u59CB\u6D41",
-        args: LineDigestArgsSchema
-      },
+      // ---- master:*（授权查表，Master 经 clawd-rpc 桥调）----
       "master:authorityCheck": {
         summary: "\u67E5 Master \u7684\u6388\u6743\u8BBE\u5B9A\uFF08\u5168\u5C40\u4E00\u5957\uFF09\uFF1A\u8FD4\u56DE ask / allow / deny\u3002\u8868\u7F3A\u5931\u3001\u8BFB\u574F\u3001\u7ED3\u6784\u4E0D\u5BF9\u3001action \u62FC\u9519\u3001id \u672A\u767B\u8BB0\uFF0C\u4E00\u5F8B\u88C1\u51B3 ask",
         args: AuthorityCheckArgsSchema
@@ -14597,7 +14619,7 @@ var init_claude_history = __esm({
       /**
        * 定位一条 session 的 transcript 文件；不存在返回 null。
        *
-       * 对外开这一口是为了让 adapter 之外的消费者（`line:digest`）**不必自己拼路径**：
+       * 对外开这一口是为了让 adapter 之外的消费者**不必自己拼路径**：
        * 「按 cwd 直取 → 按 tsid 全局兜底」这套 relocation 逻辑曾被抄成第二份，
        * 规则一改就静默漂移。路径编码（cwdToHashDir）与兜底顺序全仓只此一处。
        *
@@ -52691,7 +52713,7 @@ function createTopicStore(deps) {
   const touch = (t) => {
     t.updatedAt = new Date(deps.now()).toISOString();
   };
-  const lineMetaOf = (t, lineId) => t.lineMeta[lineId] ??= { rejectCount: 0, accepted: false };
+  const lineMetaOf = (t, lineId) => t.lineMeta[lineId] ??= { rejectCount: 0, accepted: false, overrideCount: 0 };
   return {
     load: file.load,
     flushNow: file.flushNow,
@@ -52748,6 +52770,15 @@ function createTopicStore(deps) {
       file.scheduleFlush();
       return meta;
     },
+    bumpOverride(topicId, lineId) {
+      const t = get(topicId);
+      if (!t) return void 0;
+      const meta = lineMetaOf(t, lineId);
+      meta.overrideCount = (meta.overrideCount ?? 0) + 1;
+      touch(t);
+      file.scheduleFlush();
+      return meta;
+    },
     markAccepted(topicId, lineId) {
       const t = get(topicId);
       if (!t) return void 0;
@@ -52757,7 +52788,7 @@ function createTopicStore(deps) {
       file.scheduleFlush();
       return meta;
     },
-    close(topicId, state) {
+    setState(topicId, state) {
       const t = get(topicId);
       if (!t) return void 0;
       t.state = state;
@@ -54387,6 +54418,21 @@ function buildPersonaDispatchHandlers(deps) {
         );
       }
     }
+    const topicId = args.meta?.topicId;
+    if (typeof topicId === "string" && topicId && deps.getTopicMembership) {
+      const members = deps.getTopicMembership(topicId);
+      if (!members) {
+        throw new ClawdError(ERROR_CODES.INVALID_PARAM, `topic not found: ${topicId}`);
+      }
+      const who = args.targetDeviceId ?? targetPersona;
+      const isMember = args.targetDeviceId ? members.deviceIds.includes(args.targetDeviceId) : members.personaIds.includes(targetPersona);
+      if (!isMember) {
+        throw new ClawdError(
+          ERROR_CODES.INVALID_PARAM,
+          `${who} is not a member of the channel behind topic ${topicId} \u2014\u2014 \u5148\u628A\u5B83\u52A0\u8FDB\u9891\u9053\u518D\u6D3E\u6D3B`
+        );
+      }
+    }
     if (args.targetDeviceId) {
       if (ctx?.principal.kind === "guest") {
         throw new ClawdError(
@@ -61658,7 +61704,6 @@ var METHOD_GRANT_MAP = {
   "topic:reject": ADMIN_ANY,
   "topic:accept": ADMIN_ANY,
   "topic:close": ADMIN_ANY,
-  "line:digest": ADMIN_ANY,
   "master:authorityCheck": ADMIN_ANY,
   // project:*（sidebar 项目分区，spec 2026-08-17）：registry 是 owner 本机资源，owner-only 一刀切
   "project:list": ADMIN_ANY,
@@ -61825,7 +61870,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.385".length > 0 ? "0.2.385" : "dev";
+var version = "0.2.386".length > 0 ? "0.2.386" : "dev";
 
 // src/cli-probe/probe.ts
 var fs66 = __toESM(require("fs"), 1);
@@ -64017,6 +64062,7 @@ function buildChannelHandlers(deps) {
 // src/handlers/topic.ts
 init_protocol();
 var REJECT_ESCALATE_AT = 2;
+var OVERRIDE_ESCALATE_AT = 2;
 function joinLines(records, lineMeta) {
   const out = [];
   for (const r of records) {
@@ -64104,8 +64150,9 @@ function buildTopicHandlers(deps) {
     },
     "topic:reject": async (frame) => {
       const args = TopicRejectArgsSchema.parse(frame);
-      mustGet(args.topicId);
+      const topic = mustGet(args.topicId);
       const { rejectCount } = deps.topicStore.bumpReject(args.topicId, args.lineId);
+      if (topic.state === "done") deps.topicStore.setState(args.topicId, "running");
       deps.topicStore.appendActivity(args.topicId, {
         actor: "master",
         action: `\u6253\u56DE ${args.lineId}\uFF08\u7B2C ${rejectCount} \u6B21\uFF09`,
@@ -64129,206 +64176,49 @@ function buildTopicHandlers(deps) {
         );
       }
       deps.topicStore.markAccepted(args.topicId, args.lineId);
+      if (args.watcherVerdict === "fail") {
+        deps.topicStore.bumpOverride(args.topicId, args.lineId);
+        deps.topicStore.appendActivity(args.topicId, {
+          actor: "master",
+          action: `\u63A8\u7FFB watcher \u5BF9 ${args.lineId} \u7684 fail \u5224\u5B9A`,
+          target: args.lineId,
+          reason: args.overrideReason
+        });
+      }
       deps.topicStore.appendActivity(args.topicId, {
         actor: "master",
-        action: `\u5224\u5B9A ${args.lineId} \u5408\u683C`,
+        action: `\u5224\u5B9A ${args.lineId} \u5408\u683C\uFF08watcher: ${args.watcherVerdict}\uFF09`,
         target: args.lineId,
         reason: args.reason,
         ...args.artifacts ? { artifacts: args.artifacts } : {}
       });
       const lines = linesOf(mustGet(args.topicId));
       const acceptedLines = lines.filter((l) => l.accepted).length;
+      const allAccepted = lines.length > 0 && acceptedLines === lines.length;
+      if (allAccepted) deps.topicStore.setState(args.topicId, "done");
+      const overrides = Object.values(mustGet(args.topicId).lineMeta).reduce(
+        (n, m2) => n + (m2.overrideCount ?? 0),
+        0
+      );
       return {
         response: TopicAcceptResultSchema.parse({
           acceptedLines,
           totalLines: lines.length,
-          allAccepted: acceptedLines === lines.length
+          allAccepted,
+          overrides,
+          needsOwnerAttention: overrides >= OVERRIDE_ESCALATE_AT
         })
       };
     },
     "topic:close": async (frame) => {
       const args = TopicCloseArgsSchema.parse(frame);
       mustGet(args.topicId);
-      const topic = deps.topicStore.close(args.topicId, args.state);
+      const topic = deps.topicStore.setState(args.topicId, args.state);
       return { response: TopicResultSchema.parse({ topic }) };
     }
   };
 }
 
-// src/handlers/line.ts
-init_protocol();
-init_claude_history();
-
-// src/channel/digest.ts
-var QUOTA = { files: 0.14, commands: 0.12, outputs: 0.22, errors: 0.24, tail: 0.28 };
-var WRITE_TOOLS = /* @__PURE__ */ new Set(["Write", "Edit", "MultiEdit", "NotebookEdit"]);
-var READ_TOOLS = /* @__PURE__ */ new Set(["Read", "NotebookRead"]);
-var DIGEST_DEFAULTS = { tailAssistant: 12, maxBytes: 2e4 };
-var firstLine = (s) => String(s ?? "").split("\n")[0].trim();
-var errSignature = (s) => firstLine(s).replace(/\d+/g, "N").replace(/(^|[\s'"`([])\/[^\s'"`)\]]+/g, "$1<path>").slice(0, 200);
-var blocksOf = (rec4) => {
-  const c = rec4?.message?.content;
-  return Array.isArray(c) ? c : [];
-};
-function takeWithin(lines, budget) {
-  if (!lines.length) return { out: ["- \uFF08\u65E0\uFF09"], clipped: false };
-  const out = [];
-  let used = 0;
-  for (let i = 0; i < lines.length; i++) {
-    const size = Buffer.byteLength(lines[i], "utf8") + 1;
-    if (used + size > budget && out.length) {
-      out.push(`- \u2026\u672C\u8282\u8FD8\u6709 ${lines.length - i} \u6761\u672A\u5217\u51FA\uFF08\u672C\u8282\u914D\u989D ${budget} \u5B57\u8282\u5DF2\u6EE1\uFF09`);
-      return { out, clipped: true };
-    }
-    out.push(lines[i]);
-    used += size;
-  }
-  return { out, clipped: false };
-}
-function clampBytes(text, limit) {
-  if (Buffer.byteLength(text, "utf8") <= limit) return text;
-  let lo = 0;
-  let hi = text.length;
-  while (lo < hi) {
-    const mid = Math.ceil((lo + hi) / 2);
-    if (Buffer.byteLength(text.slice(0, mid), "utf8") <= limit) lo = mid;
-    else hi = mid - 1;
-  }
-  return text.slice(0, lo);
-}
-function buildDigest(records, opts = {}) {
-  const maxBytes = opts.maxBytes ?? DIGEST_DEFAULTS.maxBytes;
-  const tailAssistant = opts.tailAssistant ?? DIGEST_DEFAULTS.tailAssistant;
-  const filesWritten = /* @__PURE__ */ new Set();
-  const filesRead = /* @__PURE__ */ new Set();
-  const commands = /* @__PURE__ */ new Map();
-  const errors = /* @__PURE__ */ new Map();
-  const outputs = [];
-  const pendingCmd = /* @__PURE__ */ new Map();
-  let lastCmd = null;
-  const tail = [];
-  let toolCalls = 0;
-  for (const rec4 of records) {
-    for (const b2 of blocksOf(rec4)) {
-      if (b2.type === "tool_use") {
-        toolCalls += 1;
-        const fp = b2.input?.file_path ?? b2.input?.notebook_path;
-        if (fp && b2.name && WRITE_TOOLS.has(b2.name)) filesWritten.add(String(fp));
-        else if (fp && b2.name && READ_TOOLS.has(b2.name)) filesRead.add(String(fp));
-        if (b2.name === "Bash" && b2.input?.command) {
-          const c = firstLine(b2.input.command);
-          commands.set(c, (commands.get(c) ?? 0) + 1);
-          if (b2.id) pendingCmd.set(b2.id, c);
-          lastCmd = c;
-        }
-      } else if (b2.type === "tool_result" && !b2.is_error) {
-        const cmd = b2.tool_use_id ? pendingCmd.get(b2.tool_use_id) : lastCmd;
-        if (cmd) {
-          const text2 = typeof b2.content === "string" ? b2.content : JSON.stringify(b2.content ?? "");
-          const flat = text2.replace(/\s+/g, " ").trim();
-          if (flat) {
-            outputs.push(`- ${cmd} \u2192 \u2026${flat.slice(-220)}`);
-            if (outputs.length > 40) outputs.shift();
-          }
-          if (b2.tool_use_id) pendingCmd.delete(b2.tool_use_id);
-        }
-      } else if (b2.type === "tool_result" && b2.is_error) {
-        const text2 = typeof b2.content === "string" ? b2.content : JSON.stringify(b2.content ?? "");
-        const sig = errSignature(text2);
-        const prev = errors.get(sig);
-        if (prev) prev.count += 1;
-        else errors.set(sig, { count: 1, sample: firstLine(text2).slice(0, 300) });
-      } else if (b2.type === "text" && rec4.type === "assistant") {
-        tail.push(b2.text ?? "");
-        if (tail.length > tailAssistant) tail.shift();
-      }
-    }
-  }
-  const budget = (k2) => Math.max(200, Math.floor(maxBytes * QUOTA[k2]));
-  let anyClipped = false;
-  const take = (lines, k2) => {
-    const r = takeWithin(lines, budget(k2));
-    if (r.clipped) anyClipped = true;
-    return r.out;
-  };
-  const errLines = [...errors.entries()].sort((x, y2) => y2[1].count - x[1].count).map(([, v2]) => `- \xD7${v2.count}  ${v2.sample}`);
-  const cmdLines = [...commands.entries()].map(([c, n]) => n > 1 ? `- \xD7${n}  ${c}` : `- ${c}`);
-  const out = [
-    "# worker transcript digest",
-    ...opts.transcriptPath ? [`transcript: ${opts.transcriptPath}`] : [],
-    `\u5DE5\u5177\u8C03\u7528\u603B\u6570: ${toolCalls}\uFF5C\u5199\u6587\u4EF6 ${filesWritten.size} \u4E2A\uFF5C\u8BFB\u6587\u4EF6 ${filesRead.size} \u4E2A\uFF5C\u4E0D\u540C\u547D\u4EE4 ${commands.size} \u6761\uFF5C\u62A5\u9519\u7B7E\u540D ${errors.size} \u79CD`,
-    "",
-    "## \u6539\u52A8\u8FC7\u7684\u6587\u4EF6\uFF08\u5F71\u54CD\u9762\uFF1B\u53EA\u7EDF\u8BA1 Write/Edit/MultiEdit/NotebookEdit\uFF09",
-    ...take([...filesWritten].map((f) => `- ${f}`), "files"),
-    "",
-    "## \u6267\u884C\u8FC7\u7684\u547D\u4EE4\uFF08\u91CD\u590D\u7684\u6298\u53E0\u8BA1\u6570\uFF09",
-    ...take(cmdLines, "commands"),
-    "",
-    "## \u62A5\u9519\uFF08\u6309\u7B7E\u540D\u805A\u5408\uFF1B\u91CD\u590D\u6B21\u6570\u9AD8 = \u649E\u5899\uFF09",
-    ...take(errLines, "errors"),
-    "",
-    "## \u6210\u529F\u547D\u4EE4\u7684\u8F93\u51FA\u6458\u5F55\uFF08\u5404\u53D6\u5C3E\u90E8\uFF1B\u5224\u300C\u6D4B\u8BD5\u771F\u8DD1\u8FC7\u6CA1\u3001\u8FC7\u4E86\u51E0\u6761\u300D\u770B\u8FD9\u91CC\uFF09",
-    ...take(outputs, "outputs"),
-    "",
-    `## \u6700\u540E ${tail.length} \u6BB5 assistant \u8F93\u51FA\uFF08\u4FDD\u7559\u539F\u6587\u6362\u884C\uFF0C\u6BCF\u6BB5\u622A\u65AD\u81F3 500 \u5B57\uFF09`,
-    // 只留首行会把 worker 的收尾报告砍成「做完了」这种没信息量的一句，
-    // 而那正是判「假完成」最需要的原文。
-    ...take(tail.map((t) => `- ${String(t ?? "").slice(0, 500)}`), "tail")
-  ];
-  let text = out.join("\n");
-  let truncated = anyClipped;
-  if (Buffer.byteLength(text, "utf8") > maxBytes) {
-    text = clampBytes(text, maxBytes);
-    text += `
-
-\u26A0\uFE0F digest \u5DF2\u622A\u65AD\uFF08\u4E0A\u9650 ${maxBytes} \u5B57\u8282\uFF09\u2014\u2014\u672A\u89C1\u5168\u90E8\u5185\u5BB9\uFF0C\u5224\u5B9A"\u6CA1\u505A"\u524D\u5148\u8981\u6C42 worker \u81EA\u8BC1\u3002`;
-    truncated = true;
-  } else if (anyClipped) {
-    text += `
-
-\u26A0\uFE0F digest \u5DF2\u622A\u65AD\uFF08\u6709\u5C0F\u8282\u8D85\u51FA\u914D\u989D\uFF0C\u89C1\u4E0A\u65B9\u300C\u672A\u5217\u51FA\u300D\u6807\u6CE8\uFF09\u2014\u2014\u672A\u89C1\u5168\u90E8\u5185\u5BB9\uFF0C\u5224\u5B9A"\u6CA1\u505A"\u524D\u5148\u8981\u6C42 worker \u81EA\u8BC1\u3002`;
-  }
-  return { digest: text, truncated };
-}
-
-// src/handlers/line.ts
-function buildLineHandlers(deps) {
-  return {
-    "line:digest": async (frame) => {
-      const args = LineDigestArgsSchema.parse(frame);
-      const rec4 = deps.dispatchStore.get(args.dispatchId);
-      if (!rec4) {
-        throw new ClawdError(ERROR_CODES.INVALID_PARAM, `dispatch not found: ${args.dispatchId}`);
-      }
-      if (!rec4.workerSessionId) {
-        throw new ClawdError(
-          ERROR_CODES.INVALID_PARAM,
-          `\u8BE5\u7EBF\u8FD8\u6CA1\u6709 worker \u4F1A\u8BDD\uFF08spawn \u672A\u5B8C\u6210\uFF09\uFF0C\u6682\u65F6\u65E0\u6CD5\u6838\u9A8C: ${args.dispatchId}`
-        );
-      }
-      const sf = deps.getSessionFile(rec4.workerSessionId);
-      if (!sf?.toolSessionId) {
-        throw new ClawdError(
-          ERROR_CODES.INVALID_PARAM,
-          `worker \u4F1A\u8BDD\u5C1A\u672A\u4EA7\u751F transcript\uFF08\u8FD8\u6CA1\u8DD1\u8D77\u6765\uFF09: ${rec4.workerSessionId}`
-        );
-      }
-      const file = deps.history.resolveTranscriptFile(sf.cwd, sf.toolSessionId);
-      if (!file) {
-        throw new ClawdError(
-          ERROR_CODES.INVALID_PARAM,
-          `transcript \u4E0D\u5B58\u5728\uFF08worker \u53EF\u80FD\u8FD8\u6CA1\u5199\u76D8\uFF09: ${sf.toolSessionId}`
-        );
-      }
-      return {
-        response: LineDigestResultSchema.parse(
-          buildDigest(streamJsonlLines(file), { transcriptPath: file })
-        )
-      };
-    }
-  };
-}
-
 // src/handlers/master.ts
 init_protocol();
 
@@ -64964,12 +64854,6 @@ function buildMethodHandlers(deps) {
     ...buildMasterHandlers({
       authorityTablePath: import_node_path67.default.join(deps.masterDataDir, "master-authority.json")
     }),
-    ...buildLineHandlers({
-      dispatchStore: deps.dispatchStore,
-      getSessionFile: deps.getWorkerSessionFile,
-      // transcript 定位/读取复用 history:* 那个同一个 reader，不另起一份路径规则
-      history: deps.history
-    }),
     ...buildTopicHandlers({
       topicStore: deps.topicStore,
       channelStore: deps.channelStore,
@@ -66440,17 +66324,12 @@ async function startDaemon(config) {
       channelStore,
       topicStore,
       dispatchStore,
-      // line:digest 用：worker session 的 cwd / toolSessionId（transcript 定位的输入）
-      getWorkerSessionFile: (sessionId) => {
-        const f = manager.findOwnedSession(sessionId);
-        return f ? { cwd: f.cwd, ...f.toolSessionId ? { toolSessionId: f.toolSessionId } : {} } : void 0;
-      },
       masterDataDir: config.dataDir,
       // 建话题即起该话题的 Master session（1:1）。走与 session:create 同一条 manager.create
       // 链路，不复制会话创建逻辑；creatorPrincipalId 用本机 deviceId（owner ctx 的 principal.id）。
       createMasterSession: ({ label }) => {
         const { response } = manager.create(
-          { ownerPersonaId: "persona-master", label },
+          { ownerPersonaId: MASTER_PERSONA_ID, label },
           authFile.deviceId,
           ownerDisplayName
         );
@@ -66683,6 +66562,15 @@ async function startDaemon(config) {
   const dispatchHandlers = buildPersonaDispatchHandlers({
     personaDispatchManager,
     store: dispatchStore,
+    // 话题工作线的派活边界：topicId → 它所属频道的两张成员名单。频道 / 话题任一不存在
+    // 都返回 undefined，由 handler 判成「话题不存在」拒掉（编 topicId 绕不过去）。
+    getTopicMembership: (topicId) => {
+      const t = topicStore.get(topicId);
+      if (!t) return void 0;
+      const ch = channelStore.get(t.channelId);
+      if (!ch) return void 0;
+      return { personaIds: [...ch.memberPersonaIds], deviceIds: [...ch.memberContactDeviceIds] };
+    },
     // 续派（spec 2026-07-21）：任务包注入 worker session，复用投递同款注入路径。
     sendFollowUp: (workerSessionId, text) => manager.injectIntoSession(workerSessionId, text),
     logger,

package/dist/dispatch/mcp-server.cjs

@@ -21820,7 +21820,8 @@ var ChannelSchema = external_exports.object({
   name: external_exports.string().min(1),
   /** 该频道里可被派活的 persona */
   memberPersonaIds: external_exports.array(external_exports.string().min(1)),
-  /** 人类成员（contact deviceId）；M2 只存不用，P1 异步询问才消费 */
+  /** 人类成员（contact deviceId）。跨设备派活的成员边界认这张名单（personaDispatch 校验），
+   *  P1 人类异步询问也用它 */
   memberContactDeviceIds: external_exports.array(external_exports.string().min(1)),
   createdAt: external_exports.string().min(1),
   updatedAt: external_exports.string().min(1)
@@ -21861,7 +21862,18 @@ var TopicActivityEntrySchema = external_exports.object({
 });
 var TopicLineMetaSchema = external_exports.object({
   rejectCount: external_exports.number().int().min(0),
-  accepted: external_exports.boolean().default(false)
+  accepted: external_exports.boolean().default(false),
+  /**
+   * Master 在 watcher 判 fail 的情况下仍判合格的次数。
+   *
+   * 为什么要单独数：watcher 的 fail 若能被一句「这是可观测性缺口」无声绕过，核验就形同
+   * 虚设——实测一个话题三条线的 watcher 全报 fail、无一打回，Master 自己下场补证后判了合格。
+   * 覆盖本身不禁止（watcher 确实会误判），但必须留痕、必须计数、反复覆盖必须惊动老板。
+   *
+   * optional 而非 default(0)：store 不按 schema parse（见 topic-store），存量 lineMeta
+   * 里本来就没有这个字段，读侧一律 `?? 0`。
+   */
+  overrideCount: external_exports.number().int().min(0).optional()
 });
 var TopicSchema = external_exports.object({
   id: external_exports.string().min(1),
@@ -21931,7 +21943,17 @@ var TopicAcceptArgsSchema = external_exports.object({
   /** 凭什么判合格（逐条标准对应到什么证据）——与打回同样必填 */
   reason: nonBlank2,
   /** watcher 认定的产出物，一并进影响面 */
-  artifacts: external_exports.array(nonBlank2).optional()
+  artifacts: external_exports.array(nonBlank2).optional(),
+  /**
+   * 这条线的 watcher 核验结论。**必填**：不填等于允许「压根没跑 watcher 就发合格证」，
+   * 而合格与打回之所以要对称落账，就是为了让老板事后分得出「判过且过了」和「没judge过」。
+   */
+  watcherVerdict: external_exports.enum(["pass", "fail"]),
+  /** watcher 判 fail 却仍要判合格时，凭什么推翻它（fail 时必填） */
+  overrideReason: nonBlank2.optional()
+}).refine((v) => v.watcherVerdict !== "fail" || Boolean(v.overrideReason), {
+  message: "watcherVerdict=fail \u65F6\u5FC5\u987B\u7ED9 overrideReason\uFF08\u63A8\u7FFB watcher \u7684\u7406\u7531\uFF09",
+  path: ["overrideReason"]
 });
 var TopicCloseArgsSchema = external_exports.object({
   topicId: external_exports.string().min(1),
@@ -21958,20 +21980,18 @@ var TopicAcceptResultSchema = external_exports.object({
   acceptedLines: external_exports.number().int().min(1),
   totalLines: external_exports.number().int().min(1),
   /** 全部线都合格了 → 可以收敛上报。由 daemon 数，不让 Master 自己盘 */
-  allAccepted: external_exports.boolean()
+  allAccepted: external_exports.boolean(),
+  /** 本话题累计推翻 watcher 的次数（含这一次） */
+  overrides: external_exports.number().int().min(0),
+  /**
+   * 反复推翻 watcher = 取证链路有系统性问题（如 worker 用 heredoc 写文件导致正文
+   * 写得没法验），该让老板知道并去修验收标准，而不是每条线都靠 Master 补证。
+   */
+  needsOwnerAttention: external_exports.boolean()
 });
 var TopicResultSchema = external_exports.object({ topic: TopicSchema });
 
 // ../protocol/src/master.ts
-var LineDigestArgsSchema = external_exports.object({
-  /** 一条线 = 一条 dispatch；daemon 内部据此解析 worker session 与 transcript */
-  dispatchId: external_exports.string().min(1)
-});
-var LineDigestResultSchema = external_exports.object({
-  digest: external_exports.string(),
-  /** 抽取时是否因超上限被截断——watcher 据此避免"仅凭没看到就判 fail" */
-  truncated: external_exports.boolean()
-});
 var AUTHORITY_ACTIONS = ["ask", "allow", "deny"];
 var AuthorityActionSchema = external_exports.enum(AUTHORITY_ACTIONS);
 var AuthorityRuleSchema = external_exports.object({
@@ -23537,18 +23557,19 @@ var METHOD_DOCS = {
     args: TopicRejectArgsSchema
   },
   "topic:accept": {
-    summary: "\u5224\u67D0\u6761\u7EBF\u5408\u683C\uFF1A\u7F6E accepted \u5E76\u540C\u6B65\u843D\u4E00\u6761\u6D41\u6C34\uFF1Breason \u5FC5\u586B\uFF08\u4E0E\u6253\u56DE\u5BF9\u79F0\uFF0C\u53EA\u8BB0\u6253\u56DE\u7B49\u4E8E\u53EA\u8BB0\u5206\u5B50\uFF09\u3002\u8FD4\u56DE acceptedLines / totalLines / allAccepted\uFF0C\u6536\u655B\u65F6\u673A\u7531 daemon \u6570\u4E0D\u7531 Master \u76D8",
-    args: TopicAcceptArgsSchema
+    summary: "\u5224\u67D0\u6761\u7EBF\u5408\u683C\uFF1A\u7F6E accepted \u5E76\u540C\u6B65\u843D\u4E00\u6761\u6D41\u6C34\uFF1Breason \u4E0E watcherVerdict \u5FC5\u586B\uFF08\u4E0E\u6253\u56DE\u5BF9\u79F0\uFF0C\u53EA\u8BB0\u6253\u56DE\u7B49\u4E8E\u53EA\u8BB0\u5206\u5B50\uFF09\u3002watcherVerdict=fail \u65F6\u5FC5\u987B\u7ED9 overrideReason\uFF0Cdaemon \u5355\u72EC\u8BA1\u63A8\u7FFB\u6B21\u6570\u3002\u8FD4\u56DE acceptedLines / totalLines / allAccepted / overrides / needsOwnerAttention\uFF0C\u6536\u655B\u65F6\u673A\u7531 daemon \u6570\u4E0D\u7531 Master \u76D8",
+    args: TopicAcceptArgsSchema,
+    argsConstraints: {
+      // watcherVerdict=fail 时 overrideReason 必填（.refine 的谓词不可序列化，这里显式声明）
+      if: { properties: { watcherVerdict: { const: "fail" } }, required: ["watcherVerdict"] },
+      then: { required: ["overrideReason"] }
+    }
   },
   "topic:close": {
     summary: "\u6536\u655B\u8BDD\u9898\uFF1Astate \u7F6E done / archived",
     args: TopicCloseArgsSchema
   },
-  // ---- line:digest / master:*（核验与授权，Master 经 clawd-rpc 桥调）----
-  "line:digest": {
-    summary: "\u628A\u4E00\u6761\u7EBF\uFF08dispatch\uFF09\u7684 worker transcript \u62BD\u6210 \u226420KB digest\uFF1A\u6539\u52A8\u8FC7\u7684\u6587\u4EF6 / \u6267\u884C\u8FC7\u7684\u547D\u4EE4 / \u6210\u529F\u547D\u4EE4\u8F93\u51FA\u6458\u5F55 / \u62A5\u9519\u805A\u5408 / \u5C3E\u90E8 assistant \u8F93\u51FA\u3002\u6838\u9A8C subagent \u7528\u5B83\uFF0C\u907F\u514D\u76F4\u63A5\u8BFB\u53EF\u8FBE 10MB \u7684\u539F\u59CB\u6D41",
-    args: LineDigestArgsSchema
-  },
+  // ---- master:*（授权查表，Master 经 clawd-rpc 桥调）----
   "master:authorityCheck": {
     summary: "\u67E5 Master \u7684\u6388\u6743\u8BBE\u5B9A\uFF08\u5168\u5C40\u4E00\u5957\uFF09\uFF1A\u8FD4\u56DE ask / allow / deny\u3002\u8868\u7F3A\u5931\u3001\u8BFB\u574F\u3001\u7ED3\u6784\u4E0D\u5BF9\u3001action \u62FC\u9519\u3001id \u672A\u767B\u8BB0\uFF0C\u4E00\u5F8B\u88C1\u51B3 ask",
     args: AuthorityCheckArgsSchema