fix(acp): avoid inline delivery for oneshot run spawns (#39014)

* fix(acp): scope inline delivery to session spawns

* test(acp): cover run and session delivery behavior

* Changelog: add ACP run delivery bootstrap fix

---------

Co-authored-by: 徐善 <samxu633@gmail.com>
Co-authored-by: Vincent Koc <vincentkoc@ieee.org>

src/agents/acp-spawn.test.ts

@@ -310,6 +310,33 @@ describe("spawnAcpDirect", () => {
     );
   });
 
+  it("does not inline delivery for fresh oneshot ACP runs", async () => {
+    const result = await spawnAcpDirect(
+      {
+        task: "Investigate flaky tests",
+        agentId: "codex",
+        mode: "run",
+      },
+      {
+        agentSessionKey: "agent:main:telegram:direct:6098642967",
+        agentChannel: "telegram",
+        agentAccountId: "default",
+        agentTo: "telegram:6098642967",
+        agentThreadId: "1",
+      },
+    );
+
+    expect(result.status).toBe("accepted");
+    expect(result.mode).toBe("run");
+    const agentCall = hoisted.callGatewayMock.mock.calls
+      .map((call: unknown[]) => call[0] as { method?: string; params?: Record<string, unknown> })
+      .find((request) => request.method === "agent");
+    expect(agentCall?.params?.deliver).toBe(false);
+    expect(agentCall?.params?.channel).toBeUndefined();
+    expect(agentCall?.params?.to).toBeUndefined();
+    expect(agentCall?.params?.threadId).toBeUndefined();
+  });
+
   it("includes cwd in ACP thread intro banner when provided at spawn time", async () => {
     const result = await spawnAcpDirect(
       {
@@ -540,6 +567,32 @@ describe("spawnAcpDirect", () => {
     expect(notifyOrder[0] > agentCallOrder).toBe(true);
   });
 
+  it("keeps inline delivery for thread-bound ACP session mode", async () => {
+    const result = await spawnAcpDirect(
+      {
+        task: "Investigate flaky tests",
+        agentId: "codex",
+        mode: "session",
+        thread: true,
+      },
+      {
+        agentSessionKey: "agent:main:telegram:group:-1003342490704:topic:2",
+        agentChannel: "telegram",
+        agentAccountId: "default",
+        agentTo: "telegram:-1003342490704",
+        agentThreadId: "2",
+      },
+    );
+
+    expect(result.status).toBe("accepted");
+    expect(result.mode).toBe("session");
+    const agentCall = hoisted.callGatewayMock.mock.calls
+      .map((call: unknown[]) => call[0] as { method?: string; params?: Record<string, unknown> })
+      .find((request) => request.method === "agent");
+    expect(agentCall?.params?.deliver).toBe(true);
+    expect(agentCall?.params?.channel).toBe("telegram");
+  });
+
   it("disposes pre-registered parent relay when initial ACP dispatch fails", async () => {
     const relayHandle = createRelayHandle();
     hoisted.startAcpSpawnParentStreamRelayMock.mockReturnValueOnce(relayHandle);

src/agents/acp-spawn.ts

@@ -440,7 +440,10 @@ export async function spawnAcpDirect(
     ? `channel:${boundThreadId}`
     : requesterOrigin?.to?.trim() || (deliveryThreadId ? `channel:${deliveryThreadId}` : undefined);
   const hasDeliveryTarget = Boolean(requesterOrigin?.channel && inferredDeliveryTo);
-  const deliverToBoundTarget = hasDeliveryTarget && !streamToParentRequested;
+  // Fresh one-shot ACP runs should bootstrap the worker first, then let higher layers
+  // decide how to relay status. Inline delivery is reserved for thread-bound sessions.
+  const useInlineDelivery =
+    hasDeliveryTarget && spawnMode === "session" && !streamToParentRequested;
   const childIdem = crypto.randomUUID();
   let childRunId: string = childIdem;
   const streamLogPath =
@@ -467,12 +470,12 @@ export async function spawnAcpDirect(
       params: {
         message: params.task,
         sessionKey,
-        channel: hasDeliveryTarget ? requesterOrigin?.channel : undefined,
-        to: hasDeliveryTarget ? inferredDeliveryTo : undefined,
-        accountId: hasDeliveryTarget ? (requesterOrigin?.accountId ?? undefined) : undefined,
-        threadId: hasDeliveryTarget ? deliveryThreadId : undefined,
+        channel: useInlineDelivery ? requesterOrigin?.channel : undefined,
+        to: useInlineDelivery ? inferredDeliveryTo : undefined,
+        accountId: useInlineDelivery ? (requesterOrigin?.accountId ?? undefined) : undefined,
+        threadId: useInlineDelivery ? deliveryThreadId : undefined,
         idempotencyKey: childIdem,
-        deliver: deliverToBoundTarget,
+        deliver: useInlineDelivery,
         label: params.label || undefined,
       },
       timeoutMs: 10_000,