Plugins: reuse provider contract registry helpers

vincentkoc · vincentkoc · commit 77493753a491 · 2026-03-16T22:13:39.000-07:00
diff --git a/src/plugins/contracts/auth-choice.contract.test.ts b/src/plugins/contracts/auth-choice.contract.test.ts
@@ -12,7 +12,7 @@ import {
 import { createCapturedPluginRegistration } from "../../test-utils/plugin-registration.js";
 import { buildProviderPluginMethodChoice } from "../provider-wizard.js";
 import type { OpenClawPluginApi, ProviderPlugin } from "../types.js";
-import { providerContractRegistry } from "./registry.js";
+import { requireProviderContractProvider, uniqueProviderContractProviders } from "./registry.js";
 
 type ResolvePluginProviders =
   typeof import("../../commands/auth-choice.apply.plugin-provider.runtime.js").resolvePluginProviders;
@@ -102,11 +102,7 @@ describe("provider auth-choice contract", () => {
 
   beforeEach(() => {
     resolvePreferredProviderPluginProvidersMock.mockReset();
-    resolvePreferredProviderPluginProvidersMock.mockReturnValue([
-      ...new Map(
-        providerContractRegistry.map((entry) => [entry.provider.id, entry.provider]),
-      ).values(),
-    ]);
+    resolvePreferredProviderPluginProvidersMock.mockReturnValue(uniqueProviderContractProviders);
   });
 
   afterEach(async () => {
@@ -130,10 +126,7 @@ describe("provider auth-choice contract", () => {
       "modelstudio",
       "ollama",
     ].map((providerId) => {
-      const provider = requireProvider(
-        providerContractRegistry.map((entry) => entry.provider),
-        providerId,
-      );
+      const provider = requireProviderContractProvider(providerId);
       return {
         authChoice: buildProviderPluginMethodChoice(provider.id, provider.auth[0]?.id ?? "default"),
         expectedProvider: provider.id,
diff --git a/src/plugins/contracts/loader.contract.test.ts b/src/plugins/contracts/loader.contract.test.ts
@@ -2,7 +2,10 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 import { withBundledPluginAllowlistCompat } from "../bundled-compat.js";
 import { __testing as providerTesting } from "../providers.js";
 import { resolvePluginWebSearchProviders } from "../web-search-providers.js";
-import { providerContractRegistry, webSearchProviderContractRegistry } from "./registry.js";
+import {
+  providerContractPluginIds,
+  webSearchProviderContractRegistry,
+} from "./registry.js";
 
 function uniqueSortedPluginIds(values: string[]) {
   return [...new Set(values)].toSorted((left, right) => left.localeCompare(right));
@@ -19,7 +22,7 @@ describe("plugin loader contract", () => {
 
   it("keeps bundled provider compatibility wired to the provider registry", () => {
     const providerPluginIds = uniqueSortedPluginIds(
-      providerContractRegistry.map((entry) => normalizeProviderContractPluginId(entry.pluginId)),
+      providerContractPluginIds.map(normalizeProviderContractPluginId),
     );
     const compatPluginIds = providerTesting.resolveBundledProviderCompatPluginIds({
       config: {
@@ -46,7 +49,7 @@ describe("plugin loader contract", () => {
 
   it("keeps vitest bundled provider enablement wired to the provider registry", () => {
     const providerPluginIds = uniqueSortedPluginIds(
-      providerContractRegistry.map((entry) => normalizeProviderContractPluginId(entry.pluginId)),
+      providerContractPluginIds.map(normalizeProviderContractPluginId),
     );
     const compatConfig = providerTesting.withBundledProviderVitestCompat({
       config: undefined,
diff --git a/src/plugins/contracts/registry.contract.test.ts b/src/plugins/contracts/registry.contract.test.ts
@@ -4,6 +4,7 @@ import { resolvePluginWebSearchProviders } from "../web-search-providers.js";
 import {
   mediaUnderstandingProviderContractRegistry,
   pluginRegistrationContractRegistry,
+  providerContractPluginIds,
   providerContractRegistry,
   speechProviderContractRegistry,
   webSearchProviderContractRegistry,
@@ -92,11 +93,7 @@ describe("plugin contract registry", () => {
       .map((plugin) => plugin.id)
       .toSorted((left, right) => left.localeCompare(right));
 
-    expect(
-      [...new Set(providerContractRegistry.map((entry) => entry.pluginId))].toSorted(
-        (left, right) => left.localeCompare(right),
-      ),
-    ).toEqual(bundledProviderPluginIds);
+    expect(providerContractPluginIds).toEqual(bundledProviderPluginIds);
   });
 
   it("covers every bundled web search plugin from the shared resolver", () => {
