fix(plugins): skip broken web provider factories

vincentkoc · vincentkoc · commit 84449cf961d6 · 2026-06-01T07:51:39.000+02:00
diff --git a/src/plugins/web-provider-public-artifacts.explicit-fast-path.test.ts b/src/plugins/web-provider-public-artifacts.explicit-fast-path.test.ts
@@ -144,12 +144,12 @@ describe("web provider public artifacts explicit fast path", () => {
     expect(loadPluginManifestRegistryMock).not.toHaveBeenCalled();
   });
 
-  it("throws when every matching bundled web provider factory fails", () => {
-    expect(() =>
+  it("skips plugins whose bundled web provider factories all fail", () => {
+    expect(
       resolveBundledWebSearchProvidersFromPublicArtifacts({
         onlyPluginIds: ["fuzzplugin"],
       }),
-    ).toThrow("Unable to initialize web providers for plugin fuzzplugin");
+    ).toEqual([]);
 
     expect(loadBundledPluginPublicArtifactModuleSyncMock).toHaveBeenCalledWith({
       dirName: "fuzzplugin",
@@ -158,6 +158,26 @@ describe("web provider public artifacts explicit fast path", () => {
     expect(loadPluginManifestRegistryMock).not.toHaveBeenCalled();
   });
 
+  it("keeps healthy bundled web providers when another selected plugin factory fails", () => {
+    const provider = expectSingleProvider(
+      resolveBundledWebSearchProvidersFromPublicArtifacts({
+        onlyPluginIds: ["fuzzplugin", "brave"],
+      }),
+    );
+
+    expect(provider.pluginId).toBe("brave");
+    expect(provider.id).toBe("brave");
+    expect(loadBundledPluginPublicArtifactModuleSyncMock).toHaveBeenCalledWith({
+      dirName: "brave",
+      artifactBasename: "web-search-contract-api.js",
+    });
+    expect(loadBundledPluginPublicArtifactModuleSyncMock).toHaveBeenCalledWith({
+      dirName: "fuzzplugin",
+      artifactBasename: "web-search-contract-api.js",
+    });
+    expect(loadPluginManifestRegistryMock).not.toHaveBeenCalled();
+  });
+
   it("resolves bundled runtime web search providers by explicit plugin id", () => {
     const provider = expectSingleProvider(
       resolveExplicitRuntimeWebSearchProviders({
diff --git a/src/plugins/web-provider-public-artifacts.explicit.ts b/src/plugins/web-provider-public-artifacts.explicit.ts
@@ -57,9 +57,9 @@ function collectProviderFactories<TProvider>(params: {
   mod: Record<string, unknown>;
   suffix: string;
   isProvider: (value: unknown) => value is TProvider;
-}): { providers: TProvider[]; errors: unknown[] } {
+}): { providers: TProvider[]; failedFactoryCount: number } {
   const providers: TProvider[] = [];
-  const errors: unknown[] = [];
+  let failedFactoryCount = 0;
   for (const [name, exported] of Object.entries(params.mod).toSorted(([left], [right]) =>
     left.localeCompare(right),
   )) {
@@ -74,24 +74,15 @@ function collectProviderFactories<TProvider>(params: {
     let candidate: unknown;
     try {
       candidate = exported();
-    } catch (error) {
-      errors.push(error);
+    } catch {
+      failedFactoryCount += 1;
       continue;
     }
     if (params.isProvider(candidate)) {
       providers.push(candidate);
     }
   }
-  return { providers, errors };
-}
-
-function unableToInitializeProviderError(params: {
-  pluginId: string;
-  errors: readonly unknown[];
-}): Error {
-  return new Error(`Unable to initialize web providers for plugin ${params.pluginId}`, {
-    cause: params.errors.length === 1 ? params.errors[0] : new AggregateError(params.errors),
-  });
+  return { providers, failedFactoryCount };
 }
 
 function tryLoadBundledPublicArtifactModule(params: {
@@ -135,17 +126,17 @@ function loadBundledProviderEntriesFromDir<TProvider extends object>(params: {
   if (!mod) {
     return null;
   }
-  const { providers, errors } = collectProviderFactories({
+  const { providers, failedFactoryCount } = collectProviderFactories({
     mod,
     suffix: params.suffix,
     isProvider: params.isProvider,
   });
   if (providers.length === 0) {
-    if (errors.length > 0) {
-      throw unableToInitializeProviderError({
-        pluginId: params.pluginId,
-        errors,
-      });
+    if (failedFactoryCount > 0) {
+      // A broken plugin-owned provider factory must not poison startup for
+      // other providers. Treat the plugin as unavailable and let callers keep
+      // resolving the remaining active provider set.
+      return [];
     }
     return null;
   }
