test: speed up model fallback tests

steipete · steipete · commit e7f644c7b137 · 2026-05-27T04:06:03.000+01:00
diff --git a/src/agents/model-fallback.test.ts b/src/agents/model-fallback.test.ts
@@ -23,7 +23,7 @@ import {
   FallbackSummaryError,
   testing,
   runWithImageModelFallback,
-  runWithModelFallback,
+  runWithModelFallback as runWithModelFallbackBase,
 } from "./model-fallback.js";
 import { classifyEmbeddedPiRunResultForModelFallback } from "./pi-embedded-runner/result-fallback-classifier.js";
 import type { EmbeddedPiRunResult } from "./pi-embedded-runner/types.js";
@@ -166,6 +166,10 @@ vi.mock("./model-fallback-auth.runtime.js", () => authRuntimeMock.runtime);
 const makeCfg = makeModelFallbackCfg;
 let authTempRoot = "";
 let authTempCounter = 0;
+const emptyManifestPlugins = [] as const;
+
+const runWithModelFallback: typeof runWithModelFallbackBase = (params) =>
+  runWithModelFallbackBase({ manifestPlugins: emptyManifestPlugins, ...params });
 
 beforeAll(() => {
   setDefaultPluginMetadataSnapshot();
diff --git a/src/agents/model-fallback.ts b/src/agents/model-fallback.ts
@@ -732,23 +732,30 @@ function resolveFallbackCandidateCacheKey(
   }
   const workspaceDir = getActivePluginRegistryWorkspaceDirFromState();
   const env = process.env;
+  const pluginMetadata = getCurrentPluginMetadataSnapshot({
+    env,
+    workspaceDir,
+    allowWorkspaceScopedSnapshot: true,
+  });
+  const providerLoadMetadata = getCurrentPluginMetadataSnapshot({
+    config: params.cfg,
+    env,
+    workspaceDir,
+    allowWorkspaceScopedSnapshot: true,
+  });
   if (
     isPluginProvidersLoadInFlight({
       config: params.cfg,
       workspaceDir,
       env,
+      ...(providerLoadMetadata ? { pluginMetadataSnapshot: providerLoadMetadata } : {}),
       activate: false,
       bundledProviderAllowlistCompat: true,
       bundledProviderVitestCompat: true,
     })
   ) {
     return null;
   }
-  const pluginMetadata = getCurrentPluginMetadataSnapshot({
-    env,
-    workspaceDir,
-    allowWorkspaceScopedSnapshot: true,
-  });
   const registryState = getPluginRegistryState();
   return JSON.stringify({
     provider: params.provider,
