refactor: remove bundled channel discovery leaks

Author: steipete

src/agents/openai-ws-stream.test.ts

@@ -512,7 +512,9 @@ describe("convertTools", () => {
         parameters: { type: "object", properties: {}, additionalProperties: false },
       },
     ];
-    const result = convertTools(tools as Parameters<typeof convertTools>[0], { strict: true });
+    const result = convertTools(tools as unknown as Parameters<typeof convertTools>[0], {
+      strict: true,
+    });
 
     expect(result[0]).toEqual({
       type: "function",
@@ -540,7 +542,9 @@ describe("convertTools", () => {
         },
       },
     ];
-    const result = convertTools(tools as Parameters<typeof convertTools>[0], { strict: true });
+    const result = convertTools(tools as unknown as Parameters<typeof convertTools>[0], {
+      strict: true,
+    });
 
     expect(result[0]).toEqual({
       type: "function",

src/channels/chat-meta-shared.ts

@@ -1,4 +1,4 @@
-import { listBundledPluginMetadata } from "../plugins/bundled-plugin-metadata.js";
+import { listChannelCatalogEntries } from "../plugins/channel-catalog-registry.js";
 import type { PluginPackageChannel } from "../plugins/manifest.js";
 import { CHAT_CHANNEL_ORDER, type ChatChannelId } from "./ids.js";
 import type { ChannelMeta } from "./plugins/types.js";
@@ -64,14 +64,8 @@ function toChatChannelMeta(params: {
 export function buildChatChannelMetaById(): Record<ChatChannelId, ChatChannelMeta> {
   const entries = new Map<ChatChannelId, ChatChannelMeta>();
 
-  for (const entry of listBundledPluginMetadata({
-    includeChannelConfigs: true,
-    includeSyntheticChannelConfigs: false,
-  })) {
-    const channel =
-      entry.packageManifest && "channel" in entry.packageManifest
-        ? entry.packageManifest.channel
-        : undefined;
+  for (const entry of listChannelCatalogEntries({ origin: "bundled" })) {
+    const channel = entry.channel;
     if (!channel) {
       continue;
     }

src/channels/ids.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { listBundledPluginMetadata } from "../plugins/bundled-plugin-metadata.js";
+import { listChannelCatalogEntries } from "../plugins/channel-catalog-registry.js";
 import {
   CHAT_CHANNEL_ALIASES,
   CHAT_CHANNEL_ORDER,
@@ -10,14 +10,8 @@ import {
 function collectBundledChatChannelAliases(): Record<string, ChatChannelId> {
   const aliases = new Map<string, ChatChannelId>();
 
-  for (const entry of listBundledPluginMetadata({
-    includeChannelConfigs: true,
-    includeSyntheticChannelConfigs: false,
-  })) {
-    const channel =
-      entry.packageManifest && "channel" in entry.packageManifest
-        ? entry.packageManifest.channel
-        : undefined;
+  for (const entry of listChannelCatalogEntries({ origin: "bundled" })) {
+    const channel = entry.channel;
     const rawId = channel?.id?.trim();
     if (!rawId || !CHAT_CHANNEL_ORDER.includes(rawId)) {
       continue;

src/channels/ids.ts

@@ -1,4 +1,4 @@
-import { listBundledPluginMetadata } from "../plugins/bundled-plugin-metadata.js";
+import { listChannelCatalogEntries } from "../plugins/channel-catalog-registry.js";
 
 export type ChatChannelId = string;
 
@@ -14,17 +14,10 @@ function normalizeChannelKey(raw?: string | null): string | undefined {
 }
 
 function listBundledChatChannelEntries(): BundledChatChannelEntry[] {
-  return listBundledPluginMetadata({
-    includeChannelConfigs: false,
-    includeSyntheticChannelConfigs: false,
-  })
-    .flatMap((entry) => {
-      const channel =
-        entry.packageManifest && "channel" in entry.packageManifest
-          ? entry.packageManifest.channel
-          : undefined;
-      const id = normalizeChannelKey(channel?.id);
-      if (!channel || !id) {
+  return listChannelCatalogEntries({ origin: "bundled" })
+    .flatMap(({ channel }) => {
+      const id = normalizeChannelKey(channel.id);
+      if (!id) {
         return [];
       }
       const aliases = (channel.aliases ?? [])

src/channels/plugins/bundled-ids.ts

@@ -1,11 +1,7 @@
-import { listBundledPluginMetadata } from "../../plugins/bundled-plugin-metadata.js";
+import { listChannelCatalogEntries } from "../../plugins/channel-catalog-registry.js";
 
-export const BUNDLED_CHANNEL_PLUGIN_IDS = listBundledPluginMetadata({
-  includeChannelConfigs: false,
-  includeSyntheticChannelConfigs: false,
-})
-  .filter(({ manifest }) => Array.isArray(manifest.channels) && manifest.channels.length > 0)
-  .map(({ manifest }) => manifest.id)
+export const BUNDLED_CHANNEL_PLUGIN_IDS = listChannelCatalogEntries({ origin: "bundled" })
+  .map((entry) => entry.pluginId)
   .toSorted((left, right) => left.localeCompare(right));
 
 export function listBundledChannelPluginIds(): string[] {

src/channels/plugins/bundled.ts

@@ -8,7 +8,6 @@ import type {
   BundledChannelEntryContract,
   BundledChannelSetupEntryContract,
 } from "../../plugin-sdk/channel-entry-contract.js";
-import { discoverOpenClawPlugins } from "../../plugins/discovery.js";
 import { loadPluginManifestRegistry } from "../../plugins/manifest-registry.js";
 import type { PluginRuntime } from "../../plugins/runtime/types.js";
 import {
@@ -24,20 +23,6 @@ type GeneratedBundledChannelEntry = {
   setupEntry?: BundledChannelSetupEntryContract;
 };
 
-type BundledChannelDiscoveryCandidate = {
-  rootDir: string;
-  packageManifest?: {
-    extensions?: string[];
-  };
-};
-
-const BUNDLED_CHANNEL_ENTRY_BASENAMES = [
-  "channel-entry.ts",
-  "channel-entry.mts",
-  "channel-entry.js",
-  "channel-entry.mjs",
-] as const;
-
 const log = createSubsystemLogger("channels");
 const nodeRequire = createRequire(import.meta.url);
 
@@ -155,53 +140,19 @@ function resolveCompiledBundledModulePath(modulePath: string): string {
     : modulePath;
 }
 
-function resolvePreferredBundledChannelSource(
-  candidate: BundledChannelDiscoveryCandidate,
-  manifest: ReturnType<typeof loadPluginManifestRegistry>["plugins"][number],
-): string {
-  for (const basename of BUNDLED_CHANNEL_ENTRY_BASENAMES) {
-    const preferred = resolveCompiledBundledModulePath(path.resolve(candidate.rootDir, basename));
-    if (fs.existsSync(preferred)) {
-      return preferred;
-    }
-  }
-  const declaredEntry = candidate.packageManifest?.extensions?.find(
-    (entry): entry is string => typeof entry === "string" && entry.trim().length > 0,
-  );
-  if (declaredEntry) {
-    return resolveCompiledBundledModulePath(path.resolve(candidate.rootDir, declaredEntry));
-  }
-  return resolveCompiledBundledModulePath(manifest.source);
-}
-
 function loadGeneratedBundledChannelEntries(): readonly GeneratedBundledChannelEntry[] {
-  const discovery = discoverOpenClawPlugins({ cache: false });
-  const manifestRegistry = loadPluginManifestRegistry({
-    cache: false,
-    config: {},
-    candidates: discovery.candidates,
-    diagnostics: discovery.diagnostics,
-  });
-  const manifestByRoot = new Map(
-    manifestRegistry.plugins.map((plugin) => [plugin.rootDir, plugin] as const),
-  );
-  const seenIds = new Set<string>();
+  const manifestRegistry = loadPluginManifestRegistry({ cache: false, config: {} });
   const entries: GeneratedBundledChannelEntry[] = [];
 
-  for (const candidate of discovery.candidates) {
-    const manifest = manifestByRoot.get(candidate.rootDir);
-    if (!manifest || manifest.origin !== "bundled" || manifest.channels.length === 0) {
-      continue;
-    }
-    if (seenIds.has(manifest.id)) {
+  for (const manifest of manifestRegistry.plugins) {
+    if (manifest.origin !== "bundled" || manifest.channels.length === 0) {
       continue;
     }
-    seenIds.add(manifest.id);
 
     try {
-      const sourcePath = resolvePreferredBundledChannelSource(candidate, manifest);
+      const sourcePath = resolveCompiledBundledModulePath(manifest.source);
       const entry = resolveChannelPluginModuleEntry(
-        loadBundledModule(sourcePath, candidate.rootDir),
+        loadBundledModule(sourcePath, manifest.rootDir),
       );
       if (!entry) {
         log.warn(
@@ -213,7 +164,7 @@ function loadGeneratedBundledChannelEntries(): readonly GeneratedBundledChannelE
         ? resolveChannelSetupModuleEntry(
             loadBundledModule(
               resolveCompiledBundledModulePath(manifest.setupSource),
-              candidate.rootDir,
+              manifest.rootDir,
             ),
           )
         : null;
@@ -225,7 +176,7 @@ function loadGeneratedBundledChannelEntries(): readonly GeneratedBundledChannelE
     } catch (error) {
       const detail = error instanceof Error ? error.message : String(error);
       log.warn(
-        `[channels] failed to load bundled channel ${manifest.id} from ${candidate.source}: ${detail}`,
+        `[channels] failed to load bundled channel ${manifest.id} from ${manifest.source}: ${detail}`,
       );
     }
   }