@@ -666,7 +666,9 @@ sends at once (the parent it was steering has stopped), and the last lane
 terminalizing releases the hold, drains follow-ups, and returns the session
 to idle — unless todo/doing tasks remain, in which case a system
 continuation starts before the fleet-0 event so the run stays busy and
-follow-ups wait one more turn.
+follow-ups wait one more turn. The mail and that fleet-dry continuation
+are runtime-to-agent traffic — the fleet board owns worker status — so
+neither paints a transcript row, and neither rehydrates as one.
 
 Interrupting (Ctrl+C) never discards a queued or steered message. It used to
 — the transcript literally said `interrupt — discarded N pending`, and an
 
@@ -17,6 +17,15 @@ export const FLEET_DRY_REPORT_CHARS = 8_192;
 export const FLEET_DRY_CONTINUATION_PREFIX =
   "The fleet has gone dry. Remaining open tasks:";
 
+/**
+ * Whether inbound text is the fleet-dry open-task continuation. Same class
+ * as mailbox mail: internal runtime→agent traffic whose report-JSON payload
+ * is model-facing, so the transcript never paints it.
+ */
+export function isFleetDryContinuationText(text: string): boolean {
+  return text.startsWith(FLEET_DRY_CONTINUATION_PREFIX);
+}
+
 export interface FleetDryMailboxRecord {
   readonly status: WaitJSONStatus;
   readonly collected?: boolean;
 
@@ -25,6 +25,17 @@ export function mailboxMailWakeLine(): string {
   return `${MAILBOX_MAIL_WAKE_PREFIX} — occupancy delivered these worker reports (do not call wait_agents for these agent_ids):`;
 }
 
+/**
+ * Whether inbound text is occupancy's mailbox mail. Internal runtime→agent
+ * traffic — the fleet board already owns worker status and the payload is
+ * model-facing report JSON, so the transcript never paints it. Persisted
+ * turns carry no message flags, so both the live event map and history
+ * hydration must recognise it by content.
+ */
+export function isMailboxMailText(text: string): boolean {
+  return text.startsWith(mailboxMailWakeLine());
+}
+
 function isPromiseLike(value: unknown): value is Promise<unknown> {
   return typeof value === "object" && value !== null && "then" in value;
 }
 
@@ -1,4 +1,6 @@
 import { describe, expect, test } from "bun:test";
+import { buildFleetDryContinuationPrompt } from "../subagent/fleet-dry-drive.js";
+import { buildMailboxMailPrompt } from "../subagent/mailbox-mail-drive.js";
 import {
   EMPTY_PLAN_DETAIL,
   EMPTY_VIEW_DETAIL,
@@ -165,6 +167,27 @@ describe("rowFromHistoryBlock", () => {
     });
   });
 
+  test("persisted occupancy wakes do not rehydrate as user rows", () => {
+    // Both were system-originated inbounds; persisted turns carry no flags, so
+    // the content prefix is the only thing that keeps them out of a resumed
+    // transcript.
+    const mail = buildMailboxMailPrompt([
+      { agent_id: "w1", status: "done", report: "audit clean" },
+    ]);
+    expect(rowFromHistoryBlock({ type: "user", content: mail })).toBeNull();
+
+    const dry = buildFleetDryContinuationPrompt(
+      [{ id: "t1", title: "ship it", status: "todo" }],
+      [],
+    );
+    expect(rowFromHistoryBlock({ type: "user", content: dry })).toBeNull();
+    // Ordinary operator text is untouched.
+    expect(rowFromHistoryBlock({ type: "user", content: "hi" })).toEqual({
+      role: "user",
+      text: "hi",
+    });
+  });
+
   test("a tasks block no longer hydrates a row at all", () => {
     // Task state is live panel state, not conversation history. Nothing writes
     // this block any more, and an old session carrying one must not paint a
 
@@ -11,6 +11,8 @@ import { toolResultRow } from "./mcp-view.js";
 import type { StreamRow } from "./stream.js";
 import { TOOL_DETAIL_WIDTH } from "./tool-args.js";
 import { pushToolCall, pushToolResult } from "./tool-rows.js";
+import { isFleetDryContinuationText } from "../subagent/fleet-dry-drive.js";
+import { isMailboxMailText } from "../subagent/mailbox-mail-drive.js";
 
 /**
  * Loose content-block shape from `history.hydrate` / turns-to-blocks.
@@ -119,8 +121,15 @@ function planText(steps: unknown): string {
  */
 export function rowFromHistoryBlock(block: HistoryBlock): StreamRow | null {
   switch (block.type) {
-    case "user":
-      return { role: "user", text: block.content ?? "" };
+    case "user": {
+      const content = block.content ?? "";
+      // Occupancy wakes persist as user-role turns; they were never operator
+      // text, so a resumed transcript must not repaint them as such.
+      if (isMailboxMailText(content) || isFleetDryContinuationText(content)) {
+        return null;
+      }
+      return { role: "user", text: content };
+    }
     case "text":
     case "reply":
       return { role: "assistant", text: block.content ?? "" };
 
@@ -1601,7 +1601,7 @@ describe("fleet-dry open-task drive (CL-7540)", () => {
     bridge.handle({ type: "inference.done", data: {} });
   }
 
-  test("dry+open: fleet-0 settle drives once, keeps the run busy, and paints the prompt as system", async () => {
+  test("dry+open: fleet-0 settle drives once and keeps the run busy without painting the prompt", async () => {
     await withTestRenderer(
       async (h) => {
         const shell = createAppShell(h.renderer, {
@@ -1639,11 +1639,13 @@ describe("fleet-dry open-task drive (CL-7540)", () => {
           expect(shell.streamLog.filter((r) => r.role === "user").length).toBe(
             userRowsBefore,
           );
+          // The continuation is runtime→agent traffic — the fleet board owns
+          // worker status, so its prompt paints no transcript row.
           expect(
             shell.streamLog.filter(
               (r) => r.role === "system" && r.text === prompt,
             ),
-          ).toHaveLength(1);
+          ).toHaveLength(0);
           settleToollessTurn(bridge);
           expect(drives).toBe(1);
         } finally {
@@ -2060,11 +2062,13 @@ describe("fleet-dry open-task drive (CL-7540)", () => {
           expect(shell.streamLog.filter((r) => r.role === "user").length).toBe(
             userRowsAfterSubmit,
           );
+          // Fleet-dry continuations are internal runtime→agent traffic and
+          // paint no row; the abort must not have swallowed the inbound.
           expect(
             shell.streamLog.filter(
               (r) => r.role === "system" && r.text === occupancy,
             ),
-          ).toHaveLength(1);
+          ).toHaveLength(0);
         } finally {
           bridge.dispose();
           shell.dispose();
 
@@ -1,6 +1,12 @@
 import { describe, expect, test } from "bun:test";
 import { OPERATOR_ORIGINATED_FLAG } from "../agent/message-provenance.js";
-import { buildShellBackgroundMessage } from "../session/runtime-assembly.js";
+import {
+  buildFleetDryContinuationMessage,
+  buildMailboxMailMessage,
+  buildShellBackgroundMessage,
+} from "../session/runtime-assembly.js";
+import { buildFleetDryContinuationPrompt } from "../subagent/fleet-dry-drive.js";
+import { buildMailboxMailPrompt } from "../subagent/mailbox-mail-drive.js";
 import { suppressProviderFailurePresentation } from "./provider/failure-attempt.js";
 import {
   createStreamMapContext,
@@ -49,6 +55,45 @@ describe("mapProductionEvent", () => {
     ).toEqual([{ type: "system", text: message.content ?? "" }]);
   });
 
+  test("mailbox mail wake paints no transcript row", () => {
+    const prompt = buildMailboxMailPrompt([
+      { agent_id: "w1", status: "done", report: "audit clean" },
+    ]);
+    expect(
+      mapProductionEvent({
+        type: "message.received",
+        data: { message: buildMailboxMailMessage(prompt) },
+      }),
+    ).toEqual([]);
+  });
+
+  test("fleet-dry continuation paints no transcript row", () => {
+    const prompt = buildFleetDryContinuationPrompt(
+      [{ id: "t1", title: "ship it", status: "todo" }],
+      [{ agent_id: "w1", status: "done" }],
+    );
+    expect(
+      mapProductionEvent({
+        type: "message.received",
+        data: { message: buildFleetDryContinuationMessage(prompt) },
+      }),
+    ).toEqual([]);
+  });
+
+  test("operator-originated text matching a wake prefix still paints", () => {
+    const content = buildMailboxMailPrompt([
+      { agent_id: "w1", status: "done" },
+    ]);
+    expect(
+      mapProductionEvent({
+        type: "message.received",
+        data: {
+          message: { content, flags: [OPERATOR_ORIGINATED_FLAG] },
+        },
+      }),
+    ).toEqual([{ type: "user", text: content }]);
+  });
+
   test("inference.start → busy run", () => {
     expect(mapProductionEvent({ type: "inference.start" })).toEqual([
       { type: "attempt", action: "mark" },
 
@@ -10,6 +10,8 @@ import {
   stripTerminalControlSequences,
 } from "../util/control-char-strip.js";
 import { isOperatorOriginated } from "../agent/message-provenance.js";
+import { isFleetDryContinuationText } from "../subagent/fleet-dry-drive.js";
+import { isMailboxMailText } from "../subagent/mailbox-mail-drive.js";
 import { isReactorErrorFatal } from "../agent/reactor-events.js";
 import { terminalProviderFailureMessage } from "../inference-error-message.js";
 import {
@@ -368,15 +370,17 @@ function mapEvent(
       // retry retracting across it would erase operator or system text.
       const disarmed = disarmAttempt(ctx);
       if (full.trim().length === 0) return disarmed;
-      return [
-        ...disarmed,
-        {
-          type: isOperatorOriginated(inboundMessageFlags(message))
-            ? "user"
-            : "system",
-          text: full,
-        },
-      ];
+      const operator = isOperatorOriginated(inboundMessageFlags(message));
+      // Occupancy wakes (mailbox mail, fleet-dry continuation) are
+      // runtime→agent traffic: the fleet board already owns worker status,
+      // and the payload is model-facing report JSON — no transcript row.
+      if (
+        !operator &&
+        (isMailboxMailText(content) || isFleetDryContinuationText(content))
+      ) {
+        return disarmed;
+      }
+      return [...disarmed, { type: operator ? "user" : "system", text: full }];
     }
 
     case "inference.start": {