From 969a3757b96460a581f8592ab3936d8dec196c80 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sun, 26 Apr 2026 04:10:43 +0100
Subject: [PATCH] test: harden plugin registry mocks

---
 src/cli/plugins-cli-test-helpers.ts               | 1 +
 src/commands/agents.bind.commands.test.ts         | 1 +
 src/commands/channel-setup/discovery.test.ts      | 1 +
 src/commands/channels.logs.test.ts                | 1 +
 src/commands/models/list.provider-catalog.test.ts | 1 +
 src/plugins/bundle-commands.test.ts               | 9 ++++++++-
 6 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/cli/plugins-cli-test-helpers.ts b/src/cli/plugins-cli-test-helpers.ts
index 0c0366c9044..a02fd04110b 100644
--- a/src/cli/plugins-cli-test-helpers.ts
+++ b/src/cli/plugins-cli-test-helpers.ts
@@ -269,6 +269,7 @@ vi.mock("../plugins/status.js", () => ({
 }));
 
 vi.mock("../plugins/plugin-registry.js", () => ({
+  loadPluginManifestRegistryForPluginRegistry: () => ({ diagnostics: [], plugins: [] }),
   inspectPluginRegistry: ((
     ...args: Parameters<(typeof import("../plugins/plugin-registry.js"))["inspectPluginRegistry"]>
   ) =>
diff --git a/src/commands/agents.bind.commands.test.ts b/src/commands/agents.bind.commands.test.ts
index 851da905062..1a95b906b2b 100644
--- a/src/commands/agents.bind.commands.test.ts
+++ b/src/commands/agents.bind.commands.test.ts
@@ -34,6 +34,7 @@ vi.mock("../config/bindings.js", () => ({
 }));
 
 vi.mock("../plugins/plugin-registry.js", () => ({
+  loadPluginManifestRegistryForPluginRegistry: () => ({ diagnostics: [], plugins: [] }),
   loadPluginRegistrySnapshot: pluginRegistryMocks.loadPluginRegistrySnapshot,
   listPluginContributionIds: pluginRegistryMocks.listPluginContributionIds,
 }));
diff --git a/src/commands/channel-setup/discovery.test.ts b/src/commands/channel-setup/discovery.test.ts
index 04aa5a357ea..99da65d0fc4 100644
--- a/src/commands/channel-setup/discovery.test.ts
+++ b/src/commands/channel-setup/discovery.test.ts
@@ -18,6 +18,7 @@ const applyPluginAutoEnable = vi.hoisted(() =>
 );
 
 vi.mock("../../plugins/plugin-registry.js", () => ({
+  loadPluginManifestRegistryForPluginRegistry: () => ({ diagnostics: [], plugins: [] }),
   loadPluginRegistrySnapshot: (...args: unknown[]) => loadPluginRegistrySnapshot(...args),
   listPluginContributionIds: (args: unknown) => listPluginContributionIds(args),
 }));
diff --git a/src/commands/channels.logs.test.ts b/src/commands/channels.logs.test.ts
index 571aadc75f4..59f67698ce9 100644
--- a/src/commands/channels.logs.test.ts
+++ b/src/commands/channels.logs.test.ts
@@ -11,6 +11,7 @@ const pluginRegistryMocks = vi.hoisted(() => ({
 }));
 
 vi.mock("../plugins/plugin-registry.js", () => ({
+  loadPluginManifestRegistryForPluginRegistry: () => ({ diagnostics: [], plugins: [] }),
   loadPluginRegistrySnapshot: pluginRegistryMocks.loadPluginRegistrySnapshot,
   listPluginContributionIds: pluginRegistryMocks.listPluginContributionIds,
 }));
diff --git a/src/commands/models/list.provider-catalog.test.ts b/src/commands/models/list.provider-catalog.test.ts
index 32d99d73390..e599126a945 100644
--- a/src/commands/models/list.provider-catalog.test.ts
+++ b/src/commands/models/list.provider-catalog.test.ts
@@ -16,6 +16,7 @@ const providerDiscoveryMocks = vi.hoisted(() => ({
 }));
 
 vi.mock("../../plugins/plugin-registry.js", () => ({
+  loadPluginManifestRegistryForPluginRegistry: () => ({ diagnostics: [], plugins: [] }),
   loadPluginRegistrySnapshot: providerDiscoveryMocks.loadPluginRegistrySnapshot,
   resolvePluginContributionOwners: providerDiscoveryMocks.resolvePluginContributionOwners,
   resolveProviderOwners: providerDiscoveryMocks.resolveProviderOwners,
diff --git a/src/plugins/bundle-commands.test.ts b/src/plugins/bundle-commands.test.ts
index eb5a106ccfd..bac633436ae 100644
--- a/src/plugins/bundle-commands.test.ts
+++ b/src/plugins/bundle-commands.test.ts
@@ -13,10 +13,17 @@ vi.mock("./manifest-registry.js", () => ({
   loadPluginManifestRegistry: () => ({ diagnostics: [], plugins: mocks.plugins }),
 }));
 
-vi.mock("./config-state.js", () => ({
+vi.mock("./config-state.js", async (importOriginal) => ({
+  ...(await importOriginal<typeof import("./config-state.js")>()),
   hasExplicitPluginConfig: (plugins?: { entries?: Record<string, unknown> }) =>
     Boolean(plugins?.entries && Object.keys(plugins.entries).length > 0),
   normalizePluginsConfig: (plugins?: unknown) => plugins,
+  resolveEffectiveEnableState: (params: {
+    config?: { entries?: Record<string, { enabled?: boolean }> };
+    id: string;
+  }) => ({
+    enabled: params.config?.entries?.[params.id]?.enabled !== false,
+  }),
   resolveEffectivePluginActivationState: (params: {
     config?: { entries?: Record<string, { enabled?: boolean }> };
     id: string;