diff --git a/src/workspaces/officerdev/src/apps/CommandHQ/CommandHqDetail.tsx b/src/workspaces/officerdev/src/apps/CommandHQ/CommandHqDetail.tsx
index 52008275..ed93cab0 100644
--- a/src/workspaces/officerdev/src/apps/CommandHQ/CommandHqDetail.tsx
+++ b/src/workspaces/officerdev/src/apps/CommandHQ/CommandHqDetail.tsx
@@ -99,7 +99,11 @@ function NewCommander({
           New commander
         </div>
       )}
-      <EmbeddableChat chat={chat} sessionId={undefined} className="min-h-0 flex-1" />
+      {/* `context` is a prop of EmbeddableChat, and it is NOT the `context` handed to `useChat` above.
+          `useEmbeddableChat(params)` builds the manager from these props, and `manager.context` is what the
+          composer reads to decide whether to offer "exit and hand back, then re-arm". Passing it to the hook
+          and not to the component left that radio hidden inside a commander — the one place it exists for. */}
+      <EmbeddableChat chat={chat} sessionId={undefined} context="command-hq" className="min-h-0 flex-1" />
     </div>
   );
 }
@@ -293,6 +297,7 @@ function ResumedCommander({ sessionId, resume }: { sessionId: string; resume: Re
       <EmbeddableChat
         chat={chat}
         sessionId={undefined}
+        context="command-hq"
         panelId={`command-hq:${sessionId}`}
         className="min-h-0 flex-1"
       />