fix(codex): share harness task scope registry

steipete · steipete · commit bbc4a50eb444 · 2026-05-22T15:10:39.000+01:00
diff --git a/extensions/codex/src/app-server/native-subagent-monitor.test.ts b/extensions/codex/src/app-server/native-subagent-monitor.test.ts
@@ -1,9 +1,11 @@
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
-import type { AgentHarnessTaskRecord } from "openclaw/plugin-sdk/agent-harness-task-runtime";
+import type {
+  AgentHarnessTaskRecord,
+  AgentHarnessTaskRuntimeScope,
+} from "openclaw/plugin-sdk/agent-harness-task-runtime";
 import { describe, expect, it, vi } from "vitest";
-import { createAgentHarnessTaskRuntimeScope } from "../../../../src/tasks/agent-harness-task-runtime-scope.js";
 import {
   CodexNativeSubagentMonitor,
   registerCodexNativeSubagentMonitor,
@@ -70,7 +72,7 @@ function createRuntime() {
 }
 
 function createTaskScope(requesterSessionKey = "agent:main:discord:channel:C123") {
-  return createAgentHarnessTaskRuntimeScope({ requesterSessionKey });
+  return { requesterSessionKey } as AgentHarnessTaskRuntimeScope;
 }
 
 async function notifyChildStarted(
diff --git a/src/tasks/agent-harness-task-runtime-scope.ts b/src/tasks/agent-harness-task-runtime-scope.ts
@@ -1,7 +1,23 @@
 import { normalizeDeliveryContext } from "../utils/delivery-context.shared.js";
 import type { DeliveryContext } from "../utils/delivery-context.types.js";
 
-const hostIssuedScopes = new WeakSet<object>();
+const scopeRegistryKey = Symbol.for("openclaw.agentHarnessTaskRuntimeScope.registry");
+
+type ScopeRegistry = {
+  hostIssuedScopes: WeakSet<object>;
+};
+
+type GlobalWithScopeRegistry = typeof globalThis & {
+  [scopeRegistryKey]?: ScopeRegistry;
+};
+
+function getScopeRegistry(): ScopeRegistry {
+  const globalState = globalThis as GlobalWithScopeRegistry;
+  globalState[scopeRegistryKey] ??= {
+    hostIssuedScopes: new WeakSet<object>(),
+  };
+  return globalState[scopeRegistryKey];
+}
 
 export type AgentHarnessTaskRuntimeScope = {
   readonly requesterSessionKey: string;
@@ -21,14 +37,14 @@ export function createAgentHarnessTaskRuntimeScope(params: {
     requesterSessionKey,
     ...(requesterOrigin ? { requesterOrigin } : {}),
   };
-  hostIssuedScopes.add(scope);
+  getScopeRegistry().hostIssuedScopes.add(scope);
   return scope;
 }
 
 export function assertAgentHarnessTaskRuntimeScope(
   scope: AgentHarnessTaskRuntimeScope,
 ): AgentHarnessTaskRuntimeScope {
-  if (!hostIssuedScopes.has(scope)) {
+  if (!getScopeRegistry().hostIssuedScopes.has(scope)) {
     throw new Error("Agent harness task runtime requires a host-issued scope");
   }
   return scope;
