From a744a48a0d693852417f0059e9c7ff09245478c4 Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Wed, 11 Mar 2026 19:49:36 -0400
Subject: [PATCH] Agents: share embedded run runtime state

---
 src/agents/pi-embedded-runner/runs.ts | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/agents/pi-embedded-runner/runs.ts b/src/agents/pi-embedded-runner/runs.ts
index 6b62b9b59ed..88342b4687a 100644
--- a/src/agents/pi-embedded-runner/runs.ts
+++ b/src/agents/pi-embedded-runner/runs.ts
@@ -11,12 +11,27 @@ type EmbeddedPiQueueHandle = {
   abort: () => void;
 };
 
-const ACTIVE_EMBEDDED_RUNS = new Map<string, EmbeddedPiQueueHandle>();
 type EmbeddedRunWaiter = {
   resolve: (ended: boolean) => void;
   timer: NodeJS.Timeout;
 };
-const EMBEDDED_RUN_WAITERS = new Map<string, Set<EmbeddedRunWaiter>>();
+
+/**
+ * Use global singleton state so busy/streaming checks stay consistent even
+ * when the bundler emits multiple copies of this module into separate chunks.
+ */
+const _g = globalThis as typeof globalThis & {
+  __openclaw_embedded_run_state__?: {
+    activeRuns: Map<string, EmbeddedPiQueueHandle>;
+    waiters: Map<string, Set<EmbeddedRunWaiter>>;
+  };
+};
+const embeddedRunState = (_g.__openclaw_embedded_run_state__ ??= {
+  activeRuns: new Map<string, EmbeddedPiQueueHandle>(),
+  waiters: new Map<string, Set<EmbeddedRunWaiter>>(),
+});
+const ACTIVE_EMBEDDED_RUNS = embeddedRunState.activeRuns;
+const EMBEDDED_RUN_WAITERS = embeddedRunState.waiters;
 
 export function queueEmbeddedPiMessage(sessionId: string, text: string): boolean {
   const handle = ACTIVE_EMBEDDED_RUNS.get(sessionId);