From 19ee6699d229a78a31daf5e63900f43e581904cc Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sat, 17 Jan 2026 04:33:12 +0000
Subject: [PATCH] refactor: clarify subagent announce origin

Co-authored-by: adam91holt <adam91holt@users.noreply.github.com>
---
 src/agents/subagent-announce.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/agents/subagent-announce.ts b/src/agents/subagent-announce.ts
index 781ed453c..6f0c3c11f 100644
--- a/src/agents/subagent-announce.ts
+++ b/src/agents/subagent-announce.ts
@@ -114,6 +114,15 @@ type AnnounceQueueState = {
 
 const ANNOUNCE_QUEUES = new Map<string, AnnounceQueueState>();
 
+type DeliveryContextSource = Parameters<typeof deliveryContextFromSession>[0];
+
+function resolveAnnounceOrigin(
+  entry?: DeliveryContextSource,
+  requesterOrigin?: DeliveryContext,
+): DeliveryContext | undefined {
+  return mergeDeliveryContext(deliveryContextFromSession(entry), requesterOrigin);
+}
+
 function getAnnounceQueue(
   key: string,
   settings: { mode: QueueMode; debounceMs?: number; cap?: number; dropPolicy?: QueueDropPolicy },
@@ -383,7 +392,7 @@ async function maybeQueueSubagentAnnounce(params: {
     queueSettings.mode === "steer-backlog" ||
     queueSettings.mode === "interrupt";
   if (isActive && (shouldFollowup || queueSettings.mode === "steer")) {
-    const origin = mergeDeliveryContext(deliveryContextFromSession(entry), params.requesterOrigin);
+    const origin = resolveAnnounceOrigin(entry, params.requesterOrigin);
     enqueueAnnounce(
       canonicalKey,
       {