From 7834cc14f0929ae346e8ef469d6510e499f04715 Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Tue, 7 Apr 2026 12:47:28 +0100
Subject: [PATCH] perf(plugins): share bundled public artifact loaders

---
 src/plugins/public-surface-loader.ts | 39 ++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/src/plugins/public-surface-loader.ts b/src/plugins/public-surface-loader.ts
index 7d34881fafbc..5a4e15e03b2f 100644
--- a/src/plugins/public-surface-loader.ts
+++ b/src/plugins/public-surface-loader.ts
@@ -26,6 +26,7 @@ const publicSurfaceLocations = new Map<
   } | null
 >();
 const jitiLoaders = new Map<string, ReturnType<typeof createJiti>>();
+const sharedBundledPublicSurfaceJitiLoaders = new Map<string, ReturnType<typeof createJiti>>();
 
 function createResolutionKey(params: { dirName: string; artifactBasename: string }): string {
   const bundledPluginsDir = resolveBundledPluginsDir();
@@ -71,6 +72,10 @@ function resolvePublicSurfaceLocation(params: {
 function getJiti(modulePath: string) {
   const tryNative =
     shouldPreferNativeJiti(modulePath) || modulePath.includes(`${path.sep}dist${path.sep}`);
+  const sharedLoader = getSharedBundledPublicSurfaceJiti(modulePath, tryNative);
+  if (sharedLoader) {
+    return sharedLoader;
+  }
   const aliasMap = buildPluginLoaderAliasMap(modulePath, process.argv[1], import.meta.url);
   const cacheKey = JSON.stringify({
     tryNative,
@@ -88,6 +93,39 @@ function getJiti(modulePath: string) {
   return loader;
 }
 
+function getSharedBundledPublicSurfaceJiti(
+  modulePath: string,
+  tryNative: boolean,
+): ReturnType<typeof createJiti> | null {
+  const bundledPluginsDir = resolveBundledPluginsDir();
+  const normalizedModulePath = path.resolve(modulePath);
+  const sharedRoots = [
+    bundledPluginsDir ? path.resolve(bundledPluginsDir) : null,
+    path.join(OPENCLAW_PACKAGE_ROOT, "extensions"),
+    path.join(OPENCLAW_PACKAGE_ROOT, "dist", "extensions"),
+    path.join(OPENCLAW_PACKAGE_ROOT, "dist-runtime", "extensions"),
+  ].filter((root): root is string => typeof root === "string");
+  const isBundledPublicSurface = sharedRoots.some(
+    (root) =>
+      normalizedModulePath === root || normalizedModulePath.startsWith(`${root}${path.sep}`),
+  );
+  if (!isBundledPublicSurface) {
+    return null;
+  }
+  const cacheKey = tryNative ? "bundled:native" : "bundled:source";
+  const cached = sharedBundledPublicSurfaceJitiLoaders.get(cacheKey);
+  if (cached) {
+    return cached;
+  }
+  const aliasMap = buildPluginLoaderAliasMap(modulePath, process.argv[1], import.meta.url);
+  const loader = createJiti(import.meta.url, {
+    ...buildPluginLoaderJitiOptions(aliasMap),
+    tryNative,
+  });
+  sharedBundledPublicSurfaceJitiLoaders.set(cacheKey, loader);
+  return loader;
+}
+
 export function loadBundledPluginPublicArtifactModuleSync<T extends object>(params: {
   dirName: string;
   artifactBasename: string;
@@ -136,4 +174,5 @@ export function resetBundledPluginPublicArtifactLoaderForTest(): void {
   loadedPublicSurfaceModules.clear();
   publicSurfaceLocations.clear();
   jitiLoaders.clear();
+  sharedBundledPublicSurfaceJitiLoaders.clear();
 }