fix: normalize subagent announce delivery origin

Co-authored-by: Adam Holt <mail@adamholt.co.nz>

src/commands/agent.delivery.test.ts

@@ -101,4 +101,44 @@ describe("deliverAgentCommandResult", () => {
       expect.objectContaining({ accountId: "legacy" }),
     );
   });
+
+  it("does not infer accountId for explicit delivery targets", async () => {
+    const cfg = {} as ClawdbotConfig;
+    const deps = {} as CliDeps;
+    const runtime = {
+      log: vi.fn(),
+      error: vi.fn(),
+    } as unknown as RuntimeEnv;
+    const sessionEntry = {
+      lastAccountId: "legacy",
+    } as SessionEntry;
+    const result = {
+      payloads: [{ text: "hi" }],
+      meta: {},
+    };
+
+    const { deliverAgentCommandResult } = await import("./agent/delivery.js");
+    await deliverAgentCommandResult({
+      cfg,
+      deps,
+      runtime,
+      opts: {
+        message: "hello",
+        deliver: true,
+        channel: "whatsapp",
+        to: "+15551234567",
+        deliveryTargetMode: "explicit",
+      },
+      sessionEntry,
+      result,
+      payloads: result.payloads,
+    });
+
+    expect(mocks.resolveOutboundTarget).toHaveBeenCalledWith(
+      expect.objectContaining({ accountId: undefined, mode: "explicit" }),
+    );
+    expect(mocks.deliverOutboundPayloads).toHaveBeenCalledWith(
+      expect.objectContaining({ accountId: undefined }),
+    );
+  });
 });

src/commands/agent/delivery.ts

@@ -26,6 +26,19 @@ type RunResult = Awaited<
   ReturnType<(typeof import("../../agents/pi-embedded.js"))["runEmbeddedPiAgent"]>
 >;
 
+function resolveDeliveryAccountId(params: {
+  opts: AgentCommandOpts;
+  sessionEntry?: SessionEntry;
+  targetMode: ChannelOutboundTargetMode;
+}) {
+  return (
+    normalizeAccountId(params.opts.accountId) ??
+    (params.targetMode === "implicit"
+      ? normalizeAccountId(params.sessionEntry?.lastAccountId)
+      : undefined)
+  );
+}
+
 export async function deliverAgentCommandResult(params: {
   cfg: ClawdbotConfig;
   deps: CliDeps;
@@ -49,9 +62,7 @@ export async function deliverAgentCommandResult(params: {
 
   const targetMode: ChannelOutboundTargetMode =
     opts.deliveryTargetMode ?? (opts.to ? "explicit" : "implicit");
-  const resolvedAccountId =
-    normalizeAccountId(opts.accountId) ??
-    (targetMode === "implicit" ? normalizeAccountId(sessionEntry?.lastAccountId) : undefined);
+  const resolvedAccountId = resolveDeliveryAccountId({ opts, sessionEntry, targetMode });
   const resolvedTarget =
     deliver && isDeliveryChannelKnown && deliveryChannel
       ? resolveOutboundTarget({