@clawos-dev/clawd 0.2.392 → 0.2.394

package/dist/cli.cjs

@@ -6174,11 +6174,13 @@ var init_dispatch = __esm({
       external_exports.object({
         kind: external_exports.literal("success"),
         text: external_exports.string(),
+        brief: external_exports.string().optional(),
         filePaths: external_exports.array(external_exports.string()).optional()
       }),
       external_exports.object({
         kind: external_exports.literal("failure"),
-        reason: external_exports.string()
+        reason: external_exports.string(),
+        brief: external_exports.string().optional()
       })
     ]);
     DispatchRunArgsSchema = external_exports.object({
@@ -6189,6 +6191,9 @@ var init_dispatch = __esm({
       // 省略 = 新开一件事，daemon 铸新 id。
       dispatchId: external_exports.string().min(1).optional(),
       prompt: external_exports.string(),
+      // 派活方写的 2-3 句摘要（与 prompt 同源同结构）。落台账 `taskBrief` + 进任务包信封
+      // `<brief>`，worker session 的卡片头常显。optional 同 DispatchOutcome.brief 的理由。
+      brief: external_exports.string().optional(),
       // 跨设备 dispatch：非空 = A 角色，转发到该 contact deviceId 的 peer daemon；
       // 省略 = 本地 dispatch / B 角色本地执行。A 转发给 B 时 body 不带此字段。
       targetDeviceId: external_exports.string().min(1).optional(),
@@ -6241,6 +6246,18 @@ var init_dispatch = __esm({
       workerSessionId: external_exports.string().min(1).optional(),
       /** 任务摘要；截断（≤500 字符）在 daemon store.add 处保证 */
       taskText: external_exports.string(),
+      /**
+       * 派活方写的 2-3 句任务摘要（`DispatchRunArgs.brief`）。台账列表 / butler 面板显示它
+       * 而不是被截断到 500 字符的 `taskText` 半截原文。回报侧的 brief 随 `outcome` 已落盘，
+       * 不在这里重复存。
+       */
+      taskBrief: external_exports.string().optional(),
+      /**
+       * 第几轮：新开 = 1，每次续派 +1。续派**不单开分型**（一件事一行一 id），
+       * 「第 N 轮」这个语义就落在这里，并透进任务包信封的 `round` 属性供卡片头显示。
+       * 老台账行缺省 → 消费方按 1 处理。
+       */
+      round: external_exports.number().int().positive().optional(),
       status: DispatchStatusSchema,
       outcome: DispatchOutcomeSchema.optional(),
       /** 上层消费者语义（如司礼监的口谕/验收状态），daemon 不解释 */
@@ -7089,7 +7106,14 @@ var init_events = __esm({
       "skill-hint",
       "meta-text",
       "attachment-skills",
-      "attachment-deferred-tools"
+      "attachment-deferred-tools",
+      // persona dispatch 来源分型（信封契约见 dispatch-format.ts）：
+      //   dispatch-task   派出去的任务包（首发 + 续派，续派靠信封 round 属性区分，不单开分型）
+      //   dispatch-result worker 干完回报注入发起方 session 的结果包
+      // 这两类跟其它 meta 的关键差别：**它们是一轮真实交互**，参与 turn 切分与分页计数
+      // （见 isDispatchUserMeta 的消费点），不是 CC 内部注入的辅助消息。
+      "dispatch-task",
+      "dispatch-result"
     ];
     SKILL_SOURCE_VALUES = ["builtin", "global", "project", "plugin"];
     AGENT_SOURCE_VALUES = [
@@ -9033,12 +9057,87 @@ var init_visitor_schemas = __esm({
 function formatLarkSpeakerReminder(speaker) {
   return `<system-reminder>\u6B64\u6D88\u606F\u6765\u81EA\u98DE\u4E66\u7FA4\u6210\u5458 ${speaker}</system-reminder>`;
 }
+function formatSenderAttribution(sender) {
+  if (sender.principal === "owner") return "";
+  if (!sender.displayName) return "";
+  return `<system-reminder>\u6B64\u6D88\u606F\u6765\u81EA ${sender.principal}\uFF1A${sender.displayName}</system-reminder>`;
+}
 var init_lark_bot_format = __esm({
   "../protocol/src/lark-bot-format.ts"() {
     "use strict";
   }
 });
 
+// ../protocol/src/dispatch-format.ts
+function formatDispatchTaskEnvelope(args) {
+  const attrs = [
+    `dispatch-id="${escapeAttr(args.dispatchId)}"`,
+    ...args.from ? [`from="${escapeAttr(args.from)}"`] : [],
+    `round="${args.round}"`
+  ].join(" ");
+  return [
+    `<${DISPATCH_TASK_TAG} ${attrs}>`,
+    ...briefSection(args.brief),
+    "<detail>",
+    escapeInner(args.detail),
+    "</detail>",
+    `</${DISPATCH_TASK_TAG}>`
+  ].join("\n");
+}
+function formatDispatchResultEnvelope(args) {
+  const attrs = [
+    `dispatch-id="${escapeAttr(args.dispatchId)}"`,
+    `from="${escapeAttr(args.from)}"`,
+    `status="${args.status}"`
+  ].join(" ");
+  return [
+    `<${DISPATCH_RESULT_TAG} ${attrs}>`,
+    ...briefSection(args.brief),
+    "<detail>",
+    escapeInner(args.detail),
+    "</detail>",
+    ...filesSection(args.filePaths),
+    `</${DISPATCH_RESULT_TAG}>`
+  ].join("\n");
+}
+function detectDispatchEnvelope(text) {
+  if (!text) return null;
+  const task = text.search(openTagRe(DISPATCH_TASK_TAG));
+  const result = text.search(openTagRe(DISPATCH_RESULT_TAG));
+  if (task < 0 && result < 0) return null;
+  if (result < 0) return "task";
+  if (task < 0) return "result";
+  return task < result ? "task" : "result";
+}
+function briefSection(brief) {
+  if (!brief || brief.trim().length === 0) return [];
+  return ["<brief>", escapeInner(brief.trim()), "</brief>"];
+}
+function escapeInner(s) {
+  return s.replace(INNER_TAG_ESCAPE_RE, "<\\$1$2$3");
+}
+function filesSection(filePaths) {
+  if (!filePaths || filePaths.length === 0) return [];
+  return ["<files>", ...filePaths.map((p2) => `- ${p2}`), "</files>"];
+}
+function openTagRe(tag) {
+  return new RegExp(`<${tag}\\b[^>]*>`, "i");
+}
+function escapeAttr(v2) {
+  return v2.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
+var DISPATCH_TASK_TAG, DISPATCH_RESULT_TAG, INNER_TAG_NAMES, INNER_TAG_ESCAPE_RE, INNER_TAG_UNESCAPE_RE;
+var init_dispatch_format = __esm({
+  "../protocol/src/dispatch-format.ts"() {
+    "use strict";
+    DISPATCH_TASK_TAG = "clawd-dispatch-task";
+    DISPATCH_RESULT_TAG = "clawd-dispatch-result";
+    INNER_TAG_NAMES = "clawd-dispatch-task|clawd-dispatch-result|brief|detail|files";
+    INNER_TAG_ESCAPE_RE = new RegExp(`<(\\\\*)(/?)(${INNER_TAG_NAMES})\\b`, "g");
+    INNER_TAG_UNESCAPE_RE = new RegExp(`<\\\\(\\\\*)(/?)(${INNER_TAG_NAMES})\\b`, "g");
+  }
+});
+
 // ../protocol/src/runtime.ts
 var init_runtime = __esm({
   "../protocol/src/runtime.ts"() {
@@ -9070,6 +9169,7 @@ var init_runtime = __esm({
     init_shift_internal();
     init_lark_bot_schemas();
     init_lark_bot_format();
+    init_dispatch_format();
     init_onboarding_schemas();
   }
 });
@@ -14330,6 +14430,10 @@ function classifyUserMessage(input) {
     if (parentToolUseId) out.parentToolUseId = parentToolUseId;
     return out;
   }
+  const dispatchKind = detectDispatchEnvelope(text);
+  if (dispatchKind) {
+    return { meta: dispatchKind === "task" ? "dispatch-task" : "dispatch-result" };
+  }
   if (SLASH_COMMAND_RE.test(text)) return { meta: "slash-command" };
   if (LOCAL_COMMAND_RE.test(text)) return { meta: "local-command" };
   if (SYSTEM_REMINDER_RE.test(text) || OPENSPEC_BLOCK_RE.test(text)) {
@@ -14586,6 +14690,7 @@ var init_claude_history = __esm({
     import_node_path5 = __toESM(require("path"), 1);
     import_node_string_decoder = require("string_decoder");
     init_lib();
+    init_protocol();
     init_tool_result_extra();
     JSONL_CHUNK_BYTES = 256 * 1024;
     TASK_NOTIFICATION_RE = /<task-notification\b[\s\S]*?<\/task-notification>/i;
@@ -44590,7 +44695,7 @@ function mergeOwnerCredentials(guestSandbox, bundle) {
 // src/shift/wrap.ts
 function wrapShiftFirePrompt(args) {
   return [
-    `<clawd-shift-fire target-persona="${escapeAttr(args.targetPersona)}">`,
+    `<clawd-shift-fire target-persona="${escapeAttr2(args.targetPersona)}">`,
     "This is a scheduled shift fire \u2014 not a live user message.",
     "Respond as an assistant turn (start your output directly).",
     "",
@@ -44599,7 +44704,7 @@ function wrapShiftFirePrompt(args) {
     "</clawd-shift-fire>"
   ].join("\n");
 }
-function escapeAttr(v2) {
+function escapeAttr2(v2) {
   return v2.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
 
@@ -44645,6 +44750,7 @@ function dispatchShiftEnd(info, settle, killImpl) {
 }
 
 // src/dispatch/delivery.ts
+init_protocol();
 function selectPendingForDelivery(records, sourceSessionId) {
   return records.filter(
     (r) => r.sourceSessionId === sourceSessionId && (r.status === "completed" || r.status === "failed") && !r.deliveredAt
@@ -44652,16 +44758,24 @@ function selectPendingForDelivery(records, sourceSessionId) {
 }
 function formatDeliveryText(records) {
   const blocks = records.map((r) => {
-    const head = `[dispatch ${r.dispatchId} \u2192 ${r.targetPersonaId}]`;
     if (r.outcome?.kind === "success") {
-      const files = r.outcome.filePaths && r.outcome.filePaths.length > 0 ? `
-Related files:
-${r.outcome.filePaths.map((p2) => `- ${p2}`).join("\n")}` : "";
-      return `${head} \u5B8C\u6210\uFF1A
-${r.outcome.text}${files}`;
+      return formatDispatchResultEnvelope({
+        dispatchId: r.dispatchId,
+        from: r.targetPersonaId,
+        status: "success",
+        ...r.outcome.brief ? { brief: r.outcome.brief } : {},
+        detail: r.outcome.text,
+        ...r.outcome.filePaths && r.outcome.filePaths.length > 0 ? { filePaths: r.outcome.filePaths } : {}
+      });
     }
     const reason = r.outcome?.kind === "failure" ? r.outcome.reason : "unknown failure";
-    return `${head} \u5931\u8D25\uFF1A${reason}`;
+    return formatDispatchResultEnvelope({
+      dispatchId: r.dispatchId,
+      from: r.targetPersonaId,
+      status: "failure",
+      ...r.outcome?.kind === "failure" && r.outcome.brief ? { brief: r.outcome.brief } : {},
+      detail: reason
+    });
   });
   return ["\u4F60\u4E4B\u524D\u59D4\u6D3E\u51FA\u53BB\u7684\u4EFB\u52A1\u6709\u4E86\u7ED3\u679C\uFF1A", "", blocks.join("\n\n")].join("\n");
 }
@@ -44832,6 +44946,7 @@ var DISPATCH_SYSTEM_PROMPT_HINT = `## \u59D4\u6D3E\u7ED9\u53E6\u4E00\u4E2A perso
 
 - \`targetPersona = <id>\`\uFF08@ token \u91CC\u7684 persona id\uFF09
 - \`prompt = \u53BB\u6389 @persona/<id> token \u7684\u7528\u6237\u539F\u6587\`
+- \`brief = 2-3 \u53E5\u8BF4\u6E05\u4F60\u5728\u8981\u4EC0\u4E48\u3001\u4E3A\u4EC0\u4E48\u91CD\u8981\`\uFF08\u5BF9\u65B9 session \u7684\u5361\u7247\u5934\u5E38\u663E\u8FD9\u6BB5\uFF0C\u7528\u6237\u4E0D\u5C55\u5F00\u5C31\u53EA\u770B\u5F97\u5230\u5B83\uFF1B\u7ED3\u6784\u8981\u8DDF prompt \u5BF9\u5E94\uFF0C\u522B\u8BB2\u4E24\u4E2A\u6545\u4E8B\uFF09
 
 \u544A\u8BC9\u7528\u6237"\u4EFB\u52A1\u5DF2\u4EA4\u529E"\u5373\u53EF\u7ED3\u675F\u672C\u8F6E\u3002\u7ED3\u679C\u4F1A\u4F5C\u4E3A\u4E00\u6761\u65B0\u6D88\u606F\u81EA\u52A8\u6CE8\u5165\u56DE\u4F60\u7684 session\uFF0C\u5C4A\u65F6\u518D\u7EFC\u5408\u8F6C\u8FBE\u7ED9\u7528\u6237\u3002\u60F3\u67E5\u8FDB\u5C55\u65F6\uFF08\u7528\u6237\u95EE\u8D77\uFF09\u8C03\u540C\u4E00 MCP \u7684 \`personaDispatchList\`\u3002
 
@@ -44867,13 +44982,26 @@ deviceId \u76F4\u63A5\u53D6\u81EA token\uFF0C\u4E0D\u8981\u6539\u5199\u6216\u731
 
 ## \u88AB dispatch \u63A5\u5230\u4EFB\u52A1
 
-\u5982\u679C\u4F60\u7684 session \u7B2C\u4E00\u6761 user message \u662F\u4EE5 \`[Dispatched from owner \u2014 another persona session\u59D4\u6D3E\u7ED9\u4F60\u6267\u884C\u4EFB\u52A1]\` \u8D77\u5934\u7684 plain text \u4EFB\u52A1\u5305\uFF0C\u4F60\u662F\u88AB\u53E6\u4E00\u4E2A persona \u59D4\u6D3E\u6765\u5E72\u6D3B\u7684\uFF1A
+\u5982\u679C\u6536\u5230\u4E00\u6761\u5305\u5728 \`<clawd-dispatch-task \u2026>\` \u4FE1\u5C01\u91CC\u7684\u6D88\u606F\uFF0C\u4F60\u662F\u88AB\u53E6\u4E00\u4E2A persona \u59D4\u6D3E\u6765\u5E72\u6D3B\u7684\uFF1A
+
+\`\`\`
+<clawd-dispatch-task dispatch-id="\u2026" from="<\u6D3E\u6D3B\u65B9 persona>" round="1">
+<brief>\u6D3E\u6D3B\u65B9\u5199\u7684 2-3 \u53E5\u6458\u8981</brief>
+<detail>
+[Dispatched from owner \u2014 another persona session\u59D4\u6D3E\u7ED9\u4F60\u6267\u884C\u4EFB\u52A1]
+\u2026\u4EFB\u52A1\u6B63\u6587\u2026
+</detail>
+</clawd-dispatch-task>
+\`\`\`
 
-- \u4EFB\u52A1\u5728 \`Task:\` \u6BB5
+- \u4EFB\u52A1\u5728 \`<detail>\` \u6BB5\u7684 \`Task:\` \u91CC\uFF1B\`<brief>\` \u53EA\u662F\u6458\u8981\uFF0C\u522B\u5F53\u4EFB\u52A1\u8BFB
+- \`round="N"\`\uFF1A\`1\` = \u9996\u6B21\u6D3E\u6D3B\uFF0C\`2\` \u53CA\u4EE5\u4E0A = **\u540C\u4E00\u4EF6\u4E8B\u7684\u7B2C N \u8F6E\u7EED\u6D3E**\uFF08\u4E0A\u4E0B\u6587\u8FD8\u5728\uFF0C\u63A5\u7740\u5E72\uFF0C\u4E0D\u8981\u4ECE\u5934\u6765\uFF09
 - \u539F\u4F1A\u8BDD\u7684\u5BF9\u8BDD\u5386\u53F2\u5728 \`Source conversation\` \u6BB5\u7ED9\u7684 jsonl \u8DEF\u5F84\u4E0B\uFF1B\u6309\u9700 Read \u5B83\u4E86\u89E3\u4E0A\u4E0B\u6587\uFF08\u4E0D\u5FC5\u8BFB\u5B8C\uFF09
 - \u5E72\u5B8C\u540E**\u5FC5\u987B**\u8C03 \`clawd-dispatch\` MCP \u7684 \`personaDispatchComplete\` tool \u62A5\u544A\u7ED3\u679C\uFF1A
-  - \u6210\u529F\uFF1A\`{ text: "\u603B\u7ED3/\u7ED3\u8BBA", filePaths?: ["\u4F60\u4EA7\u51FA/\u6539\u7684\u6587\u4EF6\u7EDD\u5BF9\u8DEF\u5F84"] }\`
-  - \u5931\u8D25\uFF1A\`{ isFailure: true, reason: "..." }\`
+  - \u6210\u529F\uFF1A\`{ text: "\u603B\u7ED3/\u7ED3\u8BBA", brief: "2-3 \u53E5", filePaths?: ["\u4F60\u4EA7\u51FA/\u6539\u7684\u6587\u4EF6\u7EDD\u5BF9\u8DEF\u5F84"] }\`
+  - \u5931\u8D25\uFF1A\`{ isFailure: true, reason: "...", brief: "2-3 \u53E5\u8BF4\u6E05\u5361\u5728\u54EA" }\`
+  - \`brief\` \u4E24\u79CD\u60C5\u51B5\u90FD\u8981\u586B\uFF1A\u5B83\u662F\u5BF9\u65B9\u770B\u5230\u7684\u5E38\u663E\u6458\u8981\uFF08\u987A\u4E0D\u987A\u3001\u6709\u6CA1\u6709\u574F\u3001\u6700\u8BE5\u77E5\u9053\u7684\u4E00\u4EF6\u4E8B\uFF09\uFF0C
+    \u7ED3\u6784\u8DDF \`text\` / \`reason\` \u4E00\u4E00\u5BF9\u5E94\u2014\u2014brief \u8BF4\u4E09\u70B9\uFF0C\u6B63\u6587\u5C31\u8BE5\u6709\u5BF9\u5E94\u7684\u4E09\u6BB5\uFF0C\u522B\u8BB2\u4E24\u4E2A\u6545\u4E8B
 - \u62A5\u544A\u5B8C\u540E\u4F60\u7684 session \u5C31\u7ED3\u675F\u4E86\uFF0C\u4E0D\u8981\u7EE7\u7EED\u8F93\u51FA`;
 
 // src/session/reducer-types.ts
@@ -45315,7 +45443,10 @@ function applyCommand(state, command, deps) {
         kind: "user_text",
         text: command.text,
         uuid: deps.genUuid?.(),
-        sender: command.senderPrincipal
+        sender: command.senderPrincipal,
+        // dispatch 来源分型（L2）：daemon 自注入的消息在 command 上显式带分型值。
+        // history 侧同一条消息由 classifyUserMessage 从信封解出同一个值 —— 两路必须一致。
+        ...command.meta ? { meta: command.meta } : {}
       };
       const pushed = pushEventToBuffer(next, userEvent, deps);
       effects.push(...pushed.effects);
@@ -46369,6 +46500,16 @@ function newSessionId() {
   return v4_default().replace(/-/g, "").slice(0, 16);
 }
 function buildDispatchTaskPack(args) {
+  return formatDispatchTaskEnvelope({
+    dispatchId: args.dispatchId,
+    ...args.from ? { from: args.from } : {},
+    // 首发恒 1；续派包由 handlers/persona-dispatch.ts 的 buildFollowUpTaskPack 带 N
+    round: 1,
+    ...args.brief ? { brief: args.brief } : {},
+    detail: buildDispatchTaskDetail(args)
+  });
+}
+function buildDispatchTaskDetail(args) {
   return `[Dispatched from owner \u2014 another persona session\u59D4\u6D3E\u7ED9\u4F60\u6267\u884C\u4EFB\u52A1]
 
 Task:
@@ -47314,7 +47455,8 @@ var SessionManager = class {
     if (pending.length === 0) return;
     const state = this.tryGetState(sourceSessionId);
     if (state && compressStatus(state.status) === "running") return;
-    if (!this.injectIntoSession(sourceSessionId, formatDeliveryText(pending))) return;
+    if (!this.injectIntoSession(sourceSessionId, formatDeliveryText(pending), "dispatch-result"))
+      return;
     const nowIso3 = new Date(this.deps.now?.() ?? Date.now()).toISOString();
     for (const r of pending) store.update(r.dispatchId, { deliveredAt: nowIso3 });
     this.deps.logger?.info("dispatch.deliver.ok", {
@@ -47328,8 +47470,17 @@ var SessionManager = class {
    * （deliverPending）与续派任务包（handlers/persona-dispatch 经 sendFollowUp 闭包）共用。
    * session 文件不存在或 send 抛错 → false（记 log，不 throw）。直接 runner.input
    * （无 collector），frames 经 routeFromRunner 正常广播上 wire。
+   *
+   * 来源分型（L2）：`meta` 显式声明"这条注入是什么"（'dispatch-task' / 'dispatch-result'），
+   * reducer 原样 stamp 到 synth 的 user_text，与 history 侧 classifyUserMessage 从信封
+   * 解出的值必须一致。
+   *
+   * sender 仍是 owner —— **sender 与 origin 是两个正交维度**：sender 回答"以谁的身份跑
+   * 这一轮"（MCP endpoint / ticket api 主键要它，daemon 是代 owner 触发的，伪造 'persona'
+   * 会污染下游主键），origin 回答"这条消息从哪来"，后者由 meta + 信封表达。渲染层按
+   * origin 分 owner / guest / persona 三档，persona 档正是 meta 命中 dispatch-* 这一支。
    */
-  injectIntoSession(sessionId, text) {
+  injectIntoSession(sessionId, text, meta) {
     if (!this.deps.ownerPrincipalId) {
       this.deps.logger?.warn("dispatch.inject.no-owner-principal", { sessionId });
       return false;
@@ -47350,7 +47501,7 @@ var SessionManager = class {
       const runner = this.ensureRunnerForScope(file, this.scopeForFile(file));
       runner.input({
         kind: "command",
-        command: { kind: "send", text, senderPrincipal: sender }
+        command: { kind: "send", text, senderPrincipal: sender, ...meta ? { meta } : {} }
       });
       return true;
     } catch (err) {
@@ -47926,10 +48077,13 @@ var SessionManager = class {
       dispatchId: args.dispatchId,
       bSessionId: sessionId
     });
+    const fromPersonaId = args.guestPrincipalId ? args.guestDisplayName : this.findOwnedSession(args.sourceSessionId)?.ownerPersonaId;
     const taskPack = buildDispatchTaskPack({
       prompt: args.prompt,
       sourceJsonlPath: args.sourceJsonlPath,
-      dispatchId: args.dispatchId
+      dispatchId: args.dispatchId,
+      ...fromPersonaId ? { from: fromPersonaId } : {},
+      ...args.brief ? { brief: args.brief } : {}
     });
     let dispatchSender;
     if (args.guestPrincipalId) {
@@ -47950,7 +48104,14 @@ var SessionManager = class {
     }
     runner.input({
       kind: "command",
-      command: { kind: "send", text: taskPack, senderPrincipal: dispatchSender }
+      // 来源分型（L2）：realtime 路径显式带 meta，与 history 侧 classifyUserMessage
+      // 从信封解出的值一致 —— 两路不一致会打歪 trimHistoryOverlap 的 anchor。
+      command: {
+        kind: "send",
+        text: taskPack,
+        senderPrincipal: dispatchSender,
+        meta: "dispatch-task"
+      }
     });
     this.deps.logger?.info("dispatch.createDispatchedSession.task-pack-sent", {
       dispatchId: args.dispatchId,
@@ -52488,6 +52649,7 @@ var PersonaDispatchManager = class {
       ...args.sourcePersonaId ? { sourcePersonaId: args.sourcePersonaId } : {},
       targetPersonaId: args.targetPersona,
       taskText: args.taskText,
+      ...args.taskBrief ? { taskBrief: args.taskBrief } : {},
       ...args.meta ? { meta: args.meta } : {}
     });
     return { dispatchId };
@@ -52600,6 +52762,9 @@ function createDispatchStore(deps) {
       ...input.sourcePersonaId ? { sourcePersonaId: input.sourcePersonaId } : {},
       targetPersonaId: input.targetPersonaId,
       taskText: input.taskText.slice(0, TASK_TEXT_MAX),
+      ...input.taskBrief ? { taskBrief: input.taskBrief } : {},
+      // 新开 dispatch = 第 1 轮；续派在 handler 里 +1
+      round: 1,
       status: "running",
       ...input.meta ? { meta: input.meta } : {},
       createdAt: new Date(deps.now()).toISOString()
@@ -54349,16 +54514,20 @@ function canAccessPersona(grants, personaId2, action) {
 
 // src/handlers/persona-dispatch.ts
 init_claude();
-function buildFollowUpTaskPack(dispatchId, prompt) {
-  return [
-    `[Follow-up instruction for dispatch ${dispatchId}]`,
-    "",
-    `Task: ${prompt}`,
-    "",
-    `This is a follow-up turn in the same dispatched task (dispatchId=${dispatchId}).`,
-    "When you finish this round, report back by calling personaDispatchComplete again,",
-    "exactly as you did before."
-  ].join("\n");
+function buildFollowUpTaskPack(dispatchId, prompt, round) {
+  return formatDispatchTaskEnvelope({
+    dispatchId,
+    round,
+    detail: [
+      `[Follow-up instruction for dispatch ${dispatchId}]`,
+      "",
+      `Task: ${prompt}`,
+      "",
+      `This is a follow-up turn in the same dispatched task (dispatchId=${dispatchId}).`,
+      "When you finish this round, report back by calling personaDispatchComplete again,",
+      "exactly as you did before."
+    ].join("\n")
+  });
 }
 function buildPersonaDispatchHandlers(deps) {
   const { personaDispatchManager: mgr, spawnB, logger } = deps;
@@ -54405,12 +54574,15 @@ function buildPersonaDispatchHandlers(deps) {
       if (!deps.sendFollowUp) {
         throw new Error("follow-up dispatch not wired (sendFollowUp missing)");
       }
+      const nextRound = (rec4.round ?? 1) + 1;
       deps.store.update(args.dispatchId, {
         status: "running",
         outcome: void 0,
         completedAt: void 0,
         deliveredAt: void 0,
         taskText: args.prompt.slice(0, TASK_TEXT_MAX),
+        round: nextRound,
+        ...args.brief ? { taskBrief: args.brief } : {},
         ...args.meta ? { meta: { ...rec4.meta ?? {}, ...args.meta } } : {}
       });
       mgr.reopen(args.dispatchId, {
@@ -54425,7 +54597,10 @@ function buildPersonaDispatchHandlers(deps) {
       });
       const ok = deps.sendFollowUp(
         rec4.workerSessionId,
-        buildFollowUpTaskPack(args.dispatchId, args.prompt)
+        buildFollowUpTaskPack(args.dispatchId, args.prompt, nextRound),
+        // 来源分型（L2）：续派并进 dispatch-task；realtime 侧靠这个 meta 打标，
+        // history 侧靠 classifyUserMessage 从信封解出同值。
+        "dispatch-task"
       );
       if (!ok) {
         mgr.complete(args.dispatchId, {
@@ -54487,6 +54662,7 @@ function buildPersonaDispatchHandlers(deps) {
         sourceSessionId,
         targetPersona,
         taskText: args.prompt,
+        ...args.brief ? { taskBrief: args.brief } : {},
         ...args.meta ? { meta: args.meta } : {}
       });
       logger?.info("dispatch.run.forward", {
@@ -54520,6 +54696,7 @@ function buildPersonaDispatchHandlers(deps) {
         sourceSessionId: ctx.principal.id,
         targetPersona,
         taskText: args.prompt,
+        ...args.brief ? { taskBrief: args.brief } : {},
         ...args.meta ? { meta: args.meta } : {}
       });
       logger?.info("dispatch.run.received.guest", {
@@ -54533,6 +54710,7 @@ function buildPersonaDispatchHandlers(deps) {
         sourceSessionId: ctx.principal.id,
         targetPersona,
         prompt: args.prompt,
+        ...args.brief ? { brief: args.brief } : {},
         guestPrincipalId: ctx.principal.id,
         guestDisplayName: ctx.principal.displayName,
         // T-31: 把 A 的飞书 union_id 透传给 B（connectGuestContext 已把它挂在 principal.feishuUnionId）
@@ -54557,6 +54735,7 @@ function buildPersonaDispatchHandlers(deps) {
       sourceSessionId,
       targetPersona,
       taskText: args.prompt,
+      ...args.brief ? { taskBrief: args.brief } : {},
       ...args.meta ? { meta: args.meta } : {}
     });
     logger?.info("dispatch.run.received", {
@@ -54570,6 +54749,7 @@ function buildPersonaDispatchHandlers(deps) {
       sourceSessionId,
       targetPersona,
       prompt: args.prompt,
+      ...args.brief ? { brief: args.brief } : {},
       ...args.model ? { model: args.model } : {},
       // 一次性 engine override（spec 2026-08-24）：只有本机 owner 入口能带（guest 已在上方拒）
       ...args.tool ? { tool: args.tool } : {},
@@ -60201,7 +60381,11 @@ function buildSessionHandlers(deps) {
         deps.getOwnerIdentity().feishuUnionId
       )
     );
-    const { broadcast } = manager.send(args, sender);
+    const attribution = formatSenderAttribution(sender);
+    const outbound = attribution ? { ...args, text: `${args.text}
+
+${attribution}` } : args;
+    const { broadcast } = manager.send(outbound, sender);
     return { response: { type: "session:send", ok: true }, broadcast };
   };
   const currentTurnSender = async (frame, _client, ctx) => {
@@ -61912,7 +62096,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.392".length > 0 ? "0.2.392" : "dev";
+var version = "0.2.394".length > 0 ? "0.2.394" : "dev";
 
 // src/cli-probe/probe.ts
 var fs66 = __toESM(require("fs"), 1);
@@ -66647,7 +66831,7 @@ async function startDaemon(config) {
       return { personaIds: [...ch.memberPersonaIds], deviceIds: [...ch.memberContactDeviceIds] };
     },
     // 续派（spec 2026-07-21）：任务包注入 worker session，复用投递同款注入路径。
-    sendFollowUp: (workerSessionId, text) => manager.injectIntoSession(workerSessionId, text),
+    sendFollowUp: (workerSessionId, text, meta) => manager.injectIntoSession(workerSessionId, text, meta),
     logger,
     spawnB: async (args) => {
       logger.info("dispatch.spawnB.start", {
@@ -66668,6 +66852,8 @@ async function startDaemon(config) {
         targetPersona: args.targetPersona,
         prompt: args.prompt,
         sourceJsonlPath,
+        // 派活方写的 2-3 句摘要 → 任务包信封 <brief>（卡片头常显）
+        ...args.brief ? { brief: args.brief } : {},
         // B 角色（跨设备）：非空 → guest scope + creatorPrincipalId/creatorDisplayName = A。
         guestPrincipalId: args.guestPrincipalId,
         guestDisplayName: args.guestDisplayName,

package/dist/dispatch/mcp-server.cjs

@@ -21450,11 +21450,13 @@ var DispatchOutcomeSchema = external_exports.discriminatedUnion("kind", [
   external_exports.object({
     kind: external_exports.literal("success"),
     text: external_exports.string(),
+    brief: external_exports.string().optional(),
     filePaths: external_exports.array(external_exports.string()).optional()
   }),
   external_exports.object({
     kind: external_exports.literal("failure"),
-    reason: external_exports.string()
+    reason: external_exports.string(),
+    brief: external_exports.string().optional()
   })
 ]);
 var DispatchRunArgsSchema = external_exports.object({
@@ -21465,6 +21467,9 @@ var DispatchRunArgsSchema = external_exports.object({
   // 省略 = 新开一件事，daemon 铸新 id。
   dispatchId: external_exports.string().min(1).optional(),
   prompt: external_exports.string(),
+  // 派活方写的 2-3 句摘要（与 prompt 同源同结构）。落台账 `taskBrief` + 进任务包信封
+  // `<brief>`，worker session 的卡片头常显。optional 同 DispatchOutcome.brief 的理由。
+  brief: external_exports.string().optional(),
   // 跨设备 dispatch：非空 = A 角色，转发到该 contact deviceId 的 peer daemon；
   // 省略 = 本地 dispatch / B 角色本地执行。A 转发给 B 时 body 不带此字段。
   targetDeviceId: external_exports.string().min(1).optional(),
@@ -21517,6 +21522,18 @@ var DispatchRecordSchema = external_exports.object({
   workerSessionId: external_exports.string().min(1).optional(),
   /** 任务摘要；截断（≤500 字符）在 daemon store.add 处保证 */
   taskText: external_exports.string(),
+  /**
+   * 派活方写的 2-3 句任务摘要（`DispatchRunArgs.brief`）。台账列表 / butler 面板显示它
+   * 而不是被截断到 500 字符的 `taskText` 半截原文。回报侧的 brief 随 `outcome` 已落盘，
+   * 不在这里重复存。
+   */
+  taskBrief: external_exports.string().optional(),
+  /**
+   * 第几轮：新开 = 1，每次续派 +1。续派**不单开分型**（一件事一行一 id），
+   * 「第 N 轮」这个语义就落在这里，并透进任务包信封的 `round` 属性供卡片头显示。
+   * 老台账行缺省 → 消费方按 1 处理。
+   */
+  round: external_exports.number().int().positive().optional(),
   status: DispatchStatusSchema,
   outcome: DispatchOutcomeSchema.optional(),
   /** 上层消费者语义（如司礼监的口谕/验收状态），daemon 不解释 */
@@ -22235,7 +22252,14 @@ var HISTORY_USER_META_VALUES = [
   "skill-hint",
   "meta-text",
   "attachment-skills",
-  "attachment-deferred-tools"
+  "attachment-deferred-tools",
+  // persona dispatch 来源分型（信封契约见 dispatch-format.ts）：
+  //   dispatch-task   派出去的任务包（首发 + 续派，续派靠信封 round 属性区分，不单开分型）
+  //   dispatch-result worker 干完回报注入发起方 session 的结果包
+  // 这两类跟其它 meta 的关键差别：**它们是一轮真实交互**，参与 turn 切分与分页计数
+  // （见 isDispatchUserMeta 的消费点），不是 CC 内部注入的辅助消息。
+  "dispatch-task",
+  "dispatch-result"
 ];
 var SKILL_SOURCE_VALUES = ["builtin", "global", "project", "plugin"];
 var AGENT_SOURCE_VALUES = [
@@ -24007,6 +24031,11 @@ var VisitorRecordSchema = external_exports.object({
 });
 var VisitorListResultSchema = external_exports.object({ visitors: external_exports.array(VisitorRecordSchema) });
 
+// ../protocol/src/dispatch-format.ts
+var INNER_TAG_NAMES = "clawd-dispatch-task|clawd-dispatch-result|brief|detail|files";
+var INNER_TAG_ESCAPE_RE = new RegExp(`<(\\\\*)(/?)(${INNER_TAG_NAMES})\\b`, "g");
+var INNER_TAG_UNESCAPE_RE = new RegExp(`<\\\\(\\\\*)(/?)(${INNER_TAG_NAMES})\\b`, "g");
+
 // src/tools/claude-history.ts
 var import_node_crypto = __toESM(require("crypto"), 1);
 var import_node_fs = __toESM(require("fs"), 1);
@@ -24644,6 +24673,11 @@ function log(msg, info) {
   } catch {
   }
 }
+function BRIEF_DESCRIBE(schema, what) {
+  return schema.describe(
+    `2-3 sentences on ${what}. This is what the user sees **without expanding**; they decide from it whether to read the detail. Mirror the detail's top-level structure: if the brief makes three points, the detail must have the three matching sections in the same order. Do not tell a different story from the detail. Always fill this in.`
+  );
+}
 async function handlePersonaDispatchToolCall(input, ctx) {
   const f = ctx.fetch ?? fetch;
   log("personaDispatch tool entered", {
@@ -24681,6 +24715,8 @@ async function handlePersonaDispatchToolCall(input, ctx) {
         // 续派时可省 targetPersona（daemon 从台账取）
         ...input.targetPersona ? { targetPersona: input.targetPersona } : {},
         prompt: input.prompt,
+        // brief（老板拍板 2026-08-25）：进台账 taskBrief + 任务包信封 <brief>
+        ...input.brief ? { brief: input.brief } : {},
         // 续派（spec 2026-07-21）：非空 = 把 prompt 打进该 dispatch 的原 worker session。
         ...input.dispatchId ? { dispatchId: input.dispatchId } : {},
         // 跨设备：非空时透传，daemon run handler 据此走 A 角色转发分支。
@@ -24801,10 +24837,12 @@ async function handlePersonaDispatchCompleteToolCall(input, ctx) {
   }
   const outcome = input.isFailure ? {
     kind: "failure",
-    reason: input.reason ?? "unspecified failure"
+    reason: input.reason ?? "unspecified failure",
+    ...input.brief ? { brief: input.brief } : {}
   } : {
     kind: "success",
     text: input.text ?? "",
+    ...input.brief ? { brief: input.brief } : {},
     filePaths: input.filePaths
   };
   const url = `${ctx.daemonUrl}/rpc/personaDispatch:complete`;
@@ -24873,6 +24911,10 @@ async function main() {
         prompt: external_exports.string().describe(
           "the task to perform, with the @persona/<id> token stripped out"
         ),
+        brief: BRIEF_DESCRIBE(
+          external_exports.string().optional(),
+          "what you are asking for and why it matters"
+        ),
         targetDeviceId: external_exports.string().optional().describe(
           "contact deviceId of the remote device when delegating cross-device (omit for a local persona)"
         ),
@@ -24911,6 +24953,10 @@ async function main() {
       description: "You were dispatched by owner. When you finish the task, call this tool with your result and any relevant file paths. On failure, set isFailure=true and provide a reason. After calling this, your session is done.",
       inputSchema: {
         text: external_exports.string().optional().describe("your result text (omit on failure)"),
+        brief: BRIEF_DESCRIBE(
+          external_exports.string().optional(),
+          "what happened \u2014 did it go smoothly, did anything break, what's the one thing the reader must know"
+        ),
         filePaths: external_exports.array(external_exports.string()).optional().describe("absolute paths to files you produced or modified"),
         isFailure: external_exports.boolean().optional(),
         reason: external_exports.string().optional().describe("failure reason (required when isFailure=true)")