Revert delivery guard fold to avoid sibling branch collision

Revert 974e96d: sibling cl-7949-tui-micro-inlines renames queued-delivery.ts, so this branch keeps deliver-agent-message.ts separate to merge cleanly.

Author: TheGreatAxios

src/tui/deliver-agent-message.test.ts

@@ -3,7 +3,7 @@ import { AgentClosedError } from "@intx/agent";
 import {
   deliverAgentMessage,
   deliveryResultNotice,
-} from "./queued-delivery.js";
+} from "./deliver-agent-message.js";
 
 describe("deliverAgentMessage", () => {
   test("reports session-unavailable without calling deliver when rebuild failed", async () => {

src/tui/deliver-agent-message.ts

@@ -0,0 +1,95 @@
+/**
+ * Guards a queued/steer deliver against a mid-rebuild or closed agent. The shell
+ * paints the delivered row and pops the queue item before this runs, so the
+ * caller must settle ownership from the structured result — a swallowed failure
+ * here means the transcript claims delivery for a message that never reached
+ * the agent.
+ */
+import { AgentClosedError } from "@intx/agent";
+
+export type AgentDeliveryNotDeliveredReason =
+  | "agent-closed"
+  | "session-unavailable"
+  | "superseded"
+  | "preparation-failed";
+
+export type AgentDeliveryResult =
+  | { readonly status: "accepted" }
+  | {
+      readonly status: "not-delivered";
+      readonly reason: AgentDeliveryNotDeliveredReason;
+      readonly detail: string;
+    }
+  | {
+      readonly status: "uncertain";
+      readonly detail: string;
+    };
+
+export interface DeliverAgentMessageDeps {
+  getFatalBuildError: () => Error | null;
+  deliverToLiveAgent: () => void;
+}
+
+export async function deliverAgentMessage(
+  deps: DeliverAgentMessageDeps,
+): Promise<AgentDeliveryResult> {
+  const fatal = deps.getFatalBuildError();
+  if (fatal !== null) {
+    return {
+      status: "not-delivered",
+      reason: "session-unavailable",
+      detail: fatal.message,
+    };
+  }
+  try {
+    deps.deliverToLiveAgent();
+    return { status: "accepted" };
+  } catch (err) {
+    if (err instanceof AgentClosedError) {
+      return {
+        status: "not-delivered",
+        reason: "agent-closed",
+        detail: err.message,
+      };
+    }
+    return {
+      status: "uncertain",
+      detail: err instanceof Error ? err.message : String(err),
+    };
+  }
+}
+
+/** Operator-facing copy for a settled delivery that did not accept. */
+export function deliveryResultNotice(
+  result: Exclude<AgentDeliveryResult, { status: "accepted" }>,
+  disposition: "restored" | "deferred" | "none" = "none",
+): string {
+  if (result.status === "uncertain") {
+    const base = `Delivery failed: ${result.detail}. Delivery status is uncertain; review the transcript before sending again.`;
+    return appendDisposition(base, disposition);
+  }
+  if (result.reason === "agent-closed") {
+    if (disposition === "restored") {
+      return "Message not delivered because the agent closed. It is back in the prompt; press Enter to send it.";
+    }
+    if (disposition === "deferred") {
+      return "Message not delivered because the agent closed. Your current draft is unchanged; the message will return to the prompt after you send it.";
+    }
+    return "Message not delivered because the agent closed.";
+  }
+  const base = `Message not delivered: ${result.detail}`;
+  return appendDisposition(base, disposition);
+}
+
+function appendDisposition(
+  base: string,
+  disposition: "restored" | "deferred" | "none",
+): string {
+  if (disposition === "restored") {
+    return `${base} It is back in the prompt; press Enter to send it.`;
+  }
+  if (disposition === "deferred") {
+    return `${base} Your current draft is unchanged; the message will return to the prompt after you send it.`;
+  }
+  return base;
+}

src/tui/queued-delivery-hop.test.ts

@@ -14,7 +14,7 @@ import {
 } from "./queued-delivery.js";
 import { createSessionOperationQueue } from "./session-operation-queue.js";
 import { badgeCount, type QueueItem } from "./session-queue";
-import type { AgentDeliveryResult } from "./queued-delivery.js";
+import type { AgentDeliveryResult } from "./deliver-agent-message.js";
 
 function lastHopPort(bridgeRef: { current: SessionBridge | undefined }) {
   const sends: string[] = [];

src/tui/queued-delivery.test.ts

@@ -7,9 +7,9 @@ import {
   createLiveSteerDeliver,
   routeQueuedDelivery,
   SESSION_IDENTITY_ABORT_REASON,
-  type AgentDeliveryResult,
 } from "./queued-delivery.js";
 import { createSessionOperationQueue } from "./session-operation-queue.js";
+import type { AgentDeliveryResult } from "./deliver-agent-message.js";
 
 const image: PendingImageAttachment = {
   id: "img-1",

src/tui/queued-delivery.ts

@@ -7,104 +7,12 @@
  * parent tool.boundary. Leftover steers at idle, idle-with-fleet, or
  * post-interrupt share the send path (sendQueue, inFlight, token refresh).
  */
-import { AgentClosedError } from "@intx/agent";
 import type { PendingImageAttachment } from "./image-attachments.js";
+import type { AgentDeliveryResult } from "./deliver-agent-message.js";
 import type { ProductHostDeliver } from "./product-host.js";
 import { ASK_DIRECTOR_WAKE_PREFIX } from "../subagent/fleet-report.js";
 import { MAILBOX_MAIL_WAKE_PREFIX } from "../subagent/mailbox-mail-drive.js";
 
-export type AgentDeliveryNotDeliveredReason =
-  | "agent-closed"
-  | "session-unavailable"
-  | "superseded"
-  | "preparation-failed";
-
-export type AgentDeliveryResult =
-  | { readonly status: "accepted" }
-  | {
-      readonly status: "not-delivered";
-      readonly reason: AgentDeliveryNotDeliveredReason;
-      readonly detail: string;
-    }
-  | {
-      readonly status: "uncertain";
-      readonly detail: string;
-    };
-
-export interface DeliverAgentMessageDeps {
-  getFatalBuildError: () => Error | null;
-  deliverToLiveAgent: () => void;
-}
-
-/**
- * Guards a queued/steer deliver against a mid-rebuild or closed agent. The
- * shell paints the delivered row and pops the queue item before this runs, so
- * the caller must settle ownership from the structured result.
- */
-export async function deliverAgentMessage(
-  deps: DeliverAgentMessageDeps,
-): Promise<AgentDeliveryResult> {
-  const fatal = deps.getFatalBuildError();
-  if (fatal !== null) {
-    return {
-      status: "not-delivered",
-      reason: "session-unavailable",
-      detail: fatal.message,
-    };
-  }
-  try {
-    deps.deliverToLiveAgent();
-    return { status: "accepted" };
-  } catch (err) {
-    if (err instanceof AgentClosedError) {
-      return {
-        status: "not-delivered",
-        reason: "agent-closed",
-        detail: err.message,
-      };
-    }
-    return {
-      status: "uncertain",
-      detail: err instanceof Error ? err.message : String(err),
-    };
-  }
-}
-
-/** Operator-facing copy for a settled delivery that did not accept. */
-export function deliveryResultNotice(
-  result: Exclude<AgentDeliveryResult, { status: "accepted" }>,
-  disposition: "restored" | "deferred" | "none" = "none",
-): string {
-  if (result.status === "uncertain") {
-    const base = `Delivery failed: ${result.detail}. Delivery status is uncertain; review the transcript before sending again.`;
-    return appendDisposition(base, disposition);
-  }
-  if (result.reason === "agent-closed") {
-    if (disposition === "restored") {
-      return "Message not delivered because the agent closed. It is back in the prompt; press Enter to send it.";
-    }
-    if (disposition === "deferred") {
-      return "Message not delivered because the agent closed. Your current draft is unchanged; the message will return to the prompt after you send it.";
-    }
-    return "Message not delivered because the agent closed.";
-  }
-  const base = `Message not delivered: ${result.detail}`;
-  return appendDisposition(base, disposition);
-}
-
-function appendDisposition(
-  base: string,
-  disposition: "restored" | "deferred" | "none",
-): string {
-  if (disposition === "restored") {
-    return `${base} It is back in the prompt; press Enter to send it.`;
-  }
-  if (disposition === "deferred") {
-    return `${base} Your current draft is unchanged; the message will return to the prompt after you send it.`;
-  }
-  return base;
-}
-
 export type DeliverySettle = (result: AgentDeliveryResult) => void;
 type MaybeAsyncDeliveryResult =
   | Promise<AgentDeliveryResult>

src/tui/runner/session.ts

@@ -94,7 +94,7 @@ import {
   deliverAgentMessage,
   deliveryResultNotice,
   type AgentDeliveryResult,
-} from "../queued-delivery.js";
+} from "../deliver-agent-message.js";
 import { createProviderFailureAttemptTracker } from "../provider/failure-attempt.js";
 import { getTelemetry, liveTelemetry } from "../../telemetry/singleton.js";
 import {

src/tui/runner/state.ts

@@ -32,7 +32,7 @@ import type { ProviderFailureAttempt } from "../provider/failure-attempt.js";
 import type { ScopedApproval } from "../../permission/admin.js";
 import type { ConnectedMcpServer, RunState } from "../../session/state.js";
 import type { PendingImageAttachment } from "../image-attachments.js";
-import type { AgentDeliveryResult } from "../queued-delivery.js";
+import type { AgentDeliveryResult } from "../deliver-agent-message.js";
 import type { SubmitOutcome } from "./submit.js";
 import type { mountRunnerHost } from "./host.js";
 import { EventEmitter } from "node:events";

src/tui/runner/submit.ts

@@ -35,8 +35,8 @@ import {
   createLeftoverSend,
   createLiveSteerDeliver,
   routeQueuedDelivery,
-  type AgentDeliveryResult,
 } from "../queued-delivery.js";
+import type { AgentDeliveryResult } from "../deliver-agent-message.js";
 import type { InferenceAttemptIdentity } from "./state.js";
 import { tuiSendFailureMessage } from "./send-failure-message.js";
 import type { ProviderFailureAttempt } from "../provider/failure-attempt.js";

src/tui/runtime-bridge.ts

@@ -71,8 +71,8 @@ import {
 import {
   deliveryResultNotice,
   type AgentDeliveryResult,
-  type DeliverySettle,
-} from "./queued-delivery.js";
+} from "./deliver-agent-message.js";
+import type { DeliverySettle } from "./queued-delivery.js";
 import { toolCallRow } from "./diff.js";
 import { toolResultRow } from "./mcp-view.js";
 import {