From d8ed49f651825926aa783f2facb7439f03065a4b Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Sat, 25 Apr 2026 19:39:37 -0700
Subject: [PATCH] fix(plugins): keep config alias normalization cold

---
 src/plugins/config-state.ts | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/plugins/config-state.ts b/src/plugins/config-state.ts
index a72ed6ef224..cf040253d2d 100644
--- a/src/plugins/config-state.ts
+++ b/src/plugins/config-state.ts
@@ -3,6 +3,7 @@ import {
   normalizeOptionalLowercaseString,
   normalizeOptionalString,
 } from "../shared/string-coerce.js";
+import { listBundledPluginMetadata } from "./bundled-plugin-metadata.js";
 import {
   createEffectiveEnableStateResolver,
   createPluginEnableStateResolver,
@@ -19,7 +20,6 @@ import {
   normalizePluginsConfigWithResolver,
   type NormalizedPluginsConfig as SharedNormalizedPluginsConfig,
 } from "./config-normalization-shared.js";
-import { loadPluginManifestRegistry } from "./manifest-registry.js";
 import type { PluginOrigin } from "./plugin-origin.types.js";
 import { defaultSlotIdForKey } from "./slots.js";
 
@@ -52,24 +52,21 @@ function getBundledPluginAliasLookup(): ReadonlyMap<string, string> {
   }
 
   const lookup = new Map<string, string>();
-  for (const plugin of loadPluginManifestRegistry({ cache: true }).plugins) {
-    if (plugin.origin !== "bundled") {
-      continue;
-    }
-    const pluginId = normalizeOptionalLowercaseString(plugin.id);
+  for (const plugin of listBundledPluginMetadata({ includeChannelConfigs: false })) {
+    const pluginId = normalizeOptionalLowercaseString(plugin.manifest.id);
     if (pluginId) {
-      lookup.set(pluginId, plugin.id);
+      lookup.set(pluginId, plugin.manifest.id);
     }
-    for (const providerId of plugin.providers) {
+    for (const providerId of plugin.manifest.providers ?? []) {
       const normalizedProviderId = normalizeOptionalLowercaseString(providerId);
       if (normalizedProviderId) {
-        lookup.set(normalizedProviderId, plugin.id);
+        lookup.set(normalizedProviderId, plugin.manifest.id);
       }
     }
-    for (const legacyPluginId of plugin.legacyPluginIds ?? []) {
+    for (const legacyPluginId of plugin.manifest.legacyPluginIds ?? []) {
       const normalizedLegacyPluginId = normalizeOptionalLowercaseString(legacyPluginId);
       if (normalizedLegacyPluginId) {
-        lookup.set(normalizedLegacyPluginId, plugin.id);
+        lookup.set(normalizedLegacyPluginId, plugin.manifest.id);
       }
     }
   }