From 3240cccb8ae3f11062da0ae1aed1428e432139dc Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sat, 2 May 2026 15:00:50 +0100
Subject: [PATCH] fix(plugins): expose startup tool registry in catalog

---
 src/plugins/tools.ts | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/plugins/tools.ts b/src/plugins/tools.ts
index 580daddb07b..bcad128496c 100644
--- a/src/plugins/tools.ts
+++ b/src/plugins/tools.ts
@@ -602,13 +602,24 @@ function resolvePluginToolRegistry(params: {
   loadOptions: PluginLoadOptions;
   onlyPluginIds?: readonly string[];
 }) {
-  return getLoadedRuntimePluginRegistry({
+  const lookup = {
     env: params.loadOptions.env,
     loadOptions: params.loadOptions,
     workspaceDir: params.loadOptions.workspaceDir,
     requiredPluginIds: params.onlyPluginIds,
-    surface: "channel",
-  });
+  };
+  return (
+    getLoadedRuntimePluginRegistry({
+      ...lookup,
+      surface: "channel",
+    }) ??
+    getLoadedRuntimePluginRegistry({
+      env: lookup.env,
+      workspaceDir: lookup.workspaceDir,
+      requiredPluginIds: lookup.requiredPluginIds,
+      surface: "active",
+    })
+  );
 }
 
 function resolvePluginToolLoadState(params: {