From 78160b5f88134a32ece1108286bd3bbd2fca3c7c Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sat, 28 Mar 2026 00:11:00 +0000
Subject: [PATCH] fix: align discord registry and runtime test helpers

---
 extensions/discord/src/components-registry.ts  | 18 +++++-------------
 .../capability-provider-runtime.test.ts        |  2 +-
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/extensions/discord/src/components-registry.ts b/extensions/discord/src/components-registry.ts
index 294dfd35a55..1ed8ac4f7e2 100644
--- a/extensions/discord/src/components-registry.ts
+++ b/extensions/discord/src/components-registry.ts
@@ -1,3 +1,4 @@
+import { resolveGlobalMap } from "openclaw/plugin-sdk/global-singleton";
 import type { DiscordComponentEntry, DiscordModalEntry } from "./components.js";
 
 const DEFAULT_COMPONENT_TTL_MS = 30 * 60 * 1000;
@@ -7,24 +8,15 @@ const DISCORD_MODAL_ENTRIES_KEY = Symbol.for("openclaw.discord.modalEntries");
 let componentEntries: Map<string, DiscordComponentEntry> | undefined;
 let modalEntries: Map<string, DiscordModalEntry> | undefined;
 
-function resolveGlobalMap<T>(key: symbol): Map<string, T> {
-  const globalStore = globalThis as Record<PropertyKey, unknown>;
-  const existing = globalStore[key];
-  if (existing instanceof Map) {
-    return existing as Map<string, T>;
-  }
-  const created = new Map<string, T>();
-  globalStore[key] = created;
-  return created;
-}
-
 function getComponentEntries(): Map<string, DiscordComponentEntry> {
-  componentEntries ??= resolveGlobalMap<DiscordComponentEntry>(DISCORD_COMPONENT_ENTRIES_KEY);
+  componentEntries ??= resolveGlobalMap<string, DiscordComponentEntry>(
+    DISCORD_COMPONENT_ENTRIES_KEY,
+  );
   return componentEntries;
 }
 
 function getModalEntries(): Map<string, DiscordModalEntry> {
-  modalEntries ??= resolveGlobalMap<DiscordModalEntry>(DISCORD_MODAL_ENTRIES_KEY);
+  modalEntries ??= resolveGlobalMap<string, DiscordModalEntry>(DISCORD_MODAL_ENTRIES_KEY);
   return modalEntries;
 }
 
diff --git a/src/plugins/capability-provider-runtime.test.ts b/src/plugins/capability-provider-runtime.test.ts
index a859a23af38..480099f6b65 100644
--- a/src/plugins/capability-provider-runtime.test.ts
+++ b/src/plugins/capability-provider-runtime.test.ts
@@ -107,7 +107,7 @@ describe("resolvePluginCapabilityProviders", () => {
           origin: "workspace",
           contracts: {},
         },
-      ] as Array<Record<string, unknown>>,
+      ],
       diagnostics: [],
     });
     mocks.withBundledPluginAllowlistCompat.mockReturnValue(allowlistCompat);