Skip to content

armgit / eve

Public Imported from GitHub
0

The Open Framework for Building Agents

Fix dynamic provider web search backend selection (#3622)

e0-gh-vercel-connect[bot]dcb995ca25bf
diff --git a/.changeset/dynamic-provider-web-search.md b/.changeset/dynamic-provider-web-search.md
new file mode 100644
index 000000000..9bf37c031
--- /dev/null
+++ b/.changeset/dynamic-provider-web-search.md
@@ -0,0 +1,5 @@
+---
+"eve": patch
+---
+
+Select web search backends using the resolved model provider so dynamic models from non-Gateway providers do not receive AI Gateway tools.
diff --git a/packages/eve/src/harness/provider-tools.test.ts b/packages/eve/src/harness/provider-tools.test.ts
index 1329bc0b4..f96f934f3 100644
--- a/packages/eve/src/harness/provider-tools.test.ts
+++ b/packages/eve/src/harness/provider-tools.test.ts
@@ -92,6 +92,11 @@ describe("resolveWebSearchBackend", () => {
expect(resolveWebSearchBackend(ref)).toBe("exa");
});
+ it("does not use a Gateway backend for a live model from another provider", () => {
+ const ref: RuntimeModelReference = { id: "openrouter/openai/gpt-5" };
+ expect(resolveWebSearchBackend(ref, "exa", "openrouter.chat")).toBeNull();
+ });
+
it("returns the configured Parallel provider for a gateway model", () => {
const ref: RuntimeModelReference = { id: "openai/gpt-5.4" };
expect(resolveWebSearchBackend(ref, "parallel")).toBe("parallel");
diff --git a/packages/eve/src/harness/provider-tools.ts b/packages/eve/src/harness/provider-tools.ts
index 6983b5faa..e7fa22126 100644
--- a/packages/eve/src/harness/provider-tools.ts
+++ b/packages/eve/src/harness/provider-tools.ts
@@ -76,17 +76,24 @@ export function resolveWebSearchOutputSchema(backend: WebSearchBackend): JsonObj
* - Direct/BYO Anthropic models: native Anthropic search
* - Direct/BYO Google models: native Google search grounding
* - Other BYO models: not available (returns `null`)
+ *
+ * `modelProvider` is the provider of the resolved AI SDK model. It is needed
+ * for live dynamic selections because their runtime reference has no source
+ * metadata to distinguish a direct provider from AI Gateway.
*/
export function resolveWebSearchBackend(
modelRef: RuntimeModelReference,
gatewayProvider: WebSearchProvider = "exa",
+ modelProvider?: string,
): WebSearchBackend | null {
- if (modelRef.source === undefined) {
+ const providerId =
+ modelProvider?.split(".")[0] ??
+ (modelRef.source === undefined ? "gateway" : (modelRef.id.split("/")[0] ?? ""));
+
+ if (providerId === "gateway") {
return gatewayProvider;
}
- const providerId = modelRef.id.split("/")[0] ?? "";
-
if (providerId === "openai" || providerId.startsWith("openai.")) {
return "openai";
}
@@ -95,7 +102,7 @@ export function resolveWebSearchBackend(
return "anthropic";
}
- if (providerId.startsWith("google.")) {
+ if (providerId === "google" || providerId.startsWith("google.")) {
return "google";
}
diff --git a/packages/eve/src/harness/tool-loop.ts b/packages/eve/src/harness/tool-loop.ts
index 66ba6bea6..8d519b749 100644
--- a/packages/eve/src/harness/tool-loop.ts
+++ b/packages/eve/src/harness/tool-loop.ts
@@ -19,7 +19,7 @@ import {
import type { SessionAuthContext } from "#channel/types.js";
import { resolveInstalledPackageInfo } from "#internal/application/package.js";
import { readClientContext } from "#internal/client-context.js";
-import { resolveProviderHeaders } from "#internal/gateway.js";
+import { resolveModelProvider, resolveProviderHeaders } from "#internal/gateway.js";
import { createErrorId, createLogger, formatError, logError } from "#internal/logging.js";
import { formatLanguageModelGatewayId } from "#internal/runtime-model.js";
import { contextStorage } from "#context/container.js";
@@ -1384,6 +1384,7 @@ export function createToolLoopHarness(config: ToolLoopHarnessConfig): StepFn {
approvedTools,
disabledProviderTools: opts.disabledProviderTools,
modelReference: requireSessionModelReference(session),
+ modelProvider: resolveModelProvider(model),
tools: advertisedHarnessTools,
});
diff --git a/packages/eve/src/harness/tools.test.ts b/packages/eve/src/harness/tools.test.ts
index 87cba5f58..a2999dd3a 100644
--- a/packages/eve/src/harness/tools.test.ts
+++ b/packages/eve/src/harness/tools.test.ts
@@ -499,8 +499,8 @@ describe("buildToolSet", () => {
});
it.each([
- [{ id: "openai/gpt-5.4" }, WEB_SEARCH_EXA_OUTPUT_SCHEMA],
- [{ id: "anthropic/claude-opus-4.6" }, WEB_SEARCH_EXA_OUTPUT_SCHEMA],
+ [{ id: "openai/gpt-5.4" }, "gateway.chat", WEB_SEARCH_EXA_OUTPUT_SCHEMA],
+ [{ id: "anthropic/claude-opus-4.6" }, "gateway.chat", WEB_SEARCH_EXA_OUTPUT_SCHEMA],
[
{
id: "openai.chat/gpt-5.4",
@@ -511,6 +511,7 @@ describe("buildToolSet", () => {
sourceKind: "module",
},
},
+ "openai.chat",
WEB_SEARCH_OPENAI_OUTPUT_SCHEMA,
],
[
@@ -523,6 +524,7 @@ describe("buildToolSet", () => {
sourceKind: "module",
},
},
+ "anthropic.messages",
WEB_SEARCH_ANTHROPIC_OUTPUT_SCHEMA,
],
[
@@ -535,12 +537,13 @@ describe("buildToolSet", () => {
sourceKind: "module",
},
},
+ "google.generative-ai",
WEB_SEARCH_GOOGLE_OUTPUT_SCHEMA,
],
- [{ id: "mistral/mistral-large" }, WEB_SEARCH_EXA_OUTPUT_SCHEMA],
- ] satisfies Array<readonly [RuntimeModelReference, JsonObject]>)(
+ [{ id: "mistral/mistral-large" }, "gateway.chat", WEB_SEARCH_EXA_OUTPUT_SCHEMA],
+ ] satisfies Array<readonly [RuntimeModelReference, string, JsonObject]>)(
"injects the selected web_search provider output schema",
- async (modelReference, expectedOutputSchema) => {
+ async (modelReference, modelProvider, expectedOutputSchema) => {
const tools: HarnessToolMap = new Map<string, HarnessToolDefinition>([
[
"web_search",
@@ -558,6 +561,7 @@ describe("buildToolSet", () => {
const result = await buildToolSetWithProviderTools({
modelReference,
+ modelProvider,
tools,
});
@@ -583,6 +587,7 @@ describe("buildToolSet", () => {
const result = await buildToolSetWithProviderTools({
modelReference: { id: "openai/gpt-5.4" },
+ modelProvider: "gateway.chat",
tools,
});
@@ -615,6 +620,7 @@ describe("buildToolSet", () => {
sourceKind: "module",
},
},
+ modelProvider: "some-provider",
tools,
});
diff --git a/packages/eve/src/harness/tools.ts b/packages/eve/src/harness/tools.ts
index f5ec5b0a0..dab009d26 100644
--- a/packages/eve/src/harness/tools.ts
+++ b/packages/eve/src/harness/tools.ts
@@ -227,6 +227,7 @@ export async function buildToolSetWithProviderTools(input: {
readonly approvedTools?: ReadonlySet<string>;
readonly disabledProviderTools?: ReadonlySet<string>;
readonly modelReference: RuntimeModelReference;
+ readonly modelProvider?: string;
readonly tools: HarnessToolMap;
}): Promise<ToolSet> {
const disabled = input.disabledProviderTools;
@@ -245,7 +246,11 @@ export async function buildToolSetWithProviderTools(input: {
definition.execute === undefined &&
!disabled?.has(definition.name)
) {
- const backend = resolveWebSearchBackend(input.modelReference, handling.provider);
+ const backend = resolveWebSearchBackend(
+ input.modelReference,
+ handling.provider,
+ input.modelProvider,
+ );
if (backend === null) {
delete tools[definition.name];
} else {
diff --git a/packages/eve/src/internal/gateway.test.ts b/packages/eve/src/internal/gateway.test.ts
index 494168375..737ce10d7 100644
--- a/packages/eve/src/internal/gateway.test.ts
+++ b/packages/eve/src/internal/gateway.test.ts
@@ -1,3 +1,4 @@
+import type { LanguageModel } from "ai";
import { MockLanguageModelV3 } from "ai/test";
import { describe, expect, it, vi } from "vitest";
@@ -5,6 +6,8 @@ import {
AI_GATEWAY_MODELS_CATALOG_URL,
AI_GATEWAY_MODELS_URL,
vercelGatewayFetch,
+ isGatewayModel,
+ resolveModelProvider,
resolveProviderHeaders,
} from "#internal/gateway.js";
@@ -55,3 +58,30 @@ describe("resolveProviderHeaders", () => {
expect(resolveProviderHeaders(model)).toBeUndefined();
});
});
+
+describe("resolveModelProvider", () => {
+ it("normalizes bare model ids to the Gateway provider", () => {
+ expect(resolveModelProvider("anthropic/claude-sonnet-4-5")).toBe("gateway");
+ });
+
+ it("preserves the provider reported by model instances", () => {
+ const gatewayModel = new MockLanguageModelV3({
+ provider: "gateway.language-model",
+ modelId: "anthropic/claude-sonnet-4-5",
+ });
+ const directModel = new MockLanguageModelV3({
+ provider: "anthropic.messages",
+ modelId: "claude-sonnet-4-5",
+ });
+
+ expect(resolveModelProvider(gatewayModel)).toBe("gateway.language-model");
+ expect(resolveModelProvider(directModel)).toBe("anthropic.messages");
+ });
+
+ it("tolerates provider-less test doubles", () => {
+ const model = {} as LanguageModel;
+
+ expect(resolveModelProvider(model)).toBeUndefined();
+ expect(isGatewayModel(model)).toBe(false);
+ });
+});
diff --git a/packages/eve/src/internal/gateway.ts b/packages/eve/src/internal/gateway.ts
index e5db5ba06..dc401ae12 100644
--- a/packages/eve/src/internal/gateway.ts
+++ b/packages/eve/src/internal/gateway.ts
@@ -29,8 +29,13 @@ export function resolveProviderHeaders(model: LanguageModel): Record<string, str
return Object.fromEntries(appendPackageUserAgent(new Headers()));
}
+/** Provider identity reported by the model, normalized for bare Gateway ids. */
+export function resolveModelProvider(model: LanguageModel): string | undefined {
+ return typeof model === "string" ? "gateway" : model.provider;
+}
+
export function isGatewayModel(model: LanguageModel): boolean {
- return typeof model === "string" || model.provider?.split(".")[0] === "gateway";
+ return resolveModelProvider(model)?.split(".")[0] === "gateway";
}
/** Groups Gateway generations under the same identity used by eve's agent spans. */