@dbx-tools/appkit-web-search 0.9.69 → 0.9.71

package/lib/src/tool.js

@@ -26,7 +26,7 @@ import { createTool } from "@mastra/core/tools";
 import { approvalMatches, toApprovalPolicy, } from "./config.js";
 import { runWebFetch } from "./fetch.js";
 import { createWebSearchRuntime } from "./runtime.js";
-import { webFetchRequestSchema, webFetchResultSchema, webSearchRequestSchema, webSearchResultSchema, WEB_FETCH_TOOL_DESCRIPTION, WEB_SEARCH_TOOL_DESCRIPTION, } from "./schema.js";
+import { webFetchRequestSchema, webFetchResultSchema, webSearchToolRequestSchema, webSearchResultSchema, WEB_FETCH_TOOL_DESCRIPTION, WEB_SEARCH_TOOL_DESCRIPTION, } from "./schema.js";
 import { resolveWebSearchContext, runWebSearch } from "./search.js";
 /**
  * Validate a tool call's arguments at the runtime boundary. Mastra checks the
@@ -73,13 +73,13 @@ export function webSearchTool(opts = {}) {
     return createTool({
         id: opts.id ?? "web_search",
         description: WEB_SEARCH_TOOL_DESCRIPTION,
-        inputSchema: webSearchRequestSchema,
+        inputSchema: webSearchToolRequestSchema,
         outputSchema: webSearchResultSchema,
         // A search's result URLs aren't known before the call, so a pattern gate
         // is treated as "always gate".
         ...(gate.mode === "none" ? {} : { requireApproval: () => true }),
         execute: async (input) => {
-            const request = parseToolInput(webSearchRequestSchema, input);
+            const request = parseToolInput(webSearchToolRequestSchema, input);
             return runWebSearch(request, runtime, await resolveWebSearchContext());
         },
     });
@@ -116,4 +116,4 @@ export function webFetchTool(opts = {}) {
         },
     });
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tool.js","sourceRoot":"","sources":["../../src/tool.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The `web_search` and `web_fetch` Mastra tools.\n *\n * `web_search` is backed by the Databricks Model Serving native web-search\n * tool: it resolves its own web-search-capable model (see `search.ts`) and\n * calls the workspace serving endpoint under the caller's OBO scope, so the\n * search runs as the requesting user and independently of the agent's chat\n * model. `web_fetch` reads a page via got-scraping.\n *\n * Both are read-only and run without approval by default; each accepts an\n * optional {@link ApprovalGate} (`approval`) that maps onto Mastra's\n * `requireApproval`. `true` gates every call; a URL-pattern (or {@link OneOrMany}\n * list) gates only calls whose URL matches - for `web_fetch` that is evaluated\n * against the target URL, while `web_search` (whose result URLs aren't known\n * before the call) treats a pattern gate as \"always gate\". `approval` falls\n * back to the standalone runtime's `approval` config when a tool omits its own.\n *\n * App-integrated agents should consume the plugin's native toolkit so calls\n * retain that plugin's policy and executor. These factories are the standalone\n * Mastra surface and capture an explicit runtime or isolated config.\n *\n * @module\n */\n\nimport { ValidationError } from \"@databricks/appkit\";\nimport { createTool } from \"@mastra/core/tools\";\nimport type { z } from \"zod\";\nimport {\n  approvalMatches,\n  toApprovalPolicy,\n  type ApprovalGate,\n  type ApprovalPolicy,\n  type WebSearchPluginConfig,\n} from \"./config.ts\";\nimport { runWebFetch } from \"./fetch.ts\";\nimport { createWebSearchRuntime, type WebSearchRuntime } from \"./runtime.ts\";\nimport {\n  webFetchRequestSchema,\n  webFetchResultSchema,\n  webSearchRequestSchema,\n  webSearchResultSchema,\n  WEB_FETCH_TOOL_DESCRIPTION,\n  WEB_SEARCH_TOOL_DESCRIPTION,\n} from \"./schema.ts\";\nimport { resolveWebSearchContext, runWebSearch } from \"./search.ts\";\n\n/**\n * Validate a tool call's arguments at the runtime boundary. Mastra checks the\n * input schema before dispatch, but the argument still arrives typed as\n * `unknown` and the model is the one filling it in. The rejected value is not\n * echoed back.\n */\nfunction parseToolInput<S extends z.ZodType>(schema: S, input: unknown): z.infer<S> {\n  const parsed = schema.safeParse(input);\n  if (!parsed.success) {\n    throw ValidationError.invalidValue(\"input\", input, \"arguments matching the tool's schema\");\n  }\n  return parsed.data;\n}\n\n/** Options shared by both web tools. */\nexport interface WebSearchToolOptions {\n  /** Override the tool id. */\n  id?: string;\n  /** Isolated runtime used by this standalone tool. Mutually exclusive with `config`. */\n  runtime?: WebSearchRuntime;\n  /** Config used to create an isolated direct-execution runtime. */\n  config?: WebSearchPluginConfig;\n  /**\n   * Approval gate for this tool, overriding the runtime's `approval`. `true`\n   * gates every call; a URL-pattern (or list) gates only matching calls;\n   * omit / `false` for no approval. See {@link ApprovalGate}.\n   */\n  approval?: ApprovalGate | ApprovalPolicy;\n}\n\n/** Resolve the isolated runtime captured by one standalone tool factory. */\nfunction toolRuntime(opts: WebSearchToolOptions): WebSearchRuntime {\n  if (opts.runtime && opts.config) {\n    throw new TypeError(\"web-search tool options accept either runtime or config, not both\");\n  }\n  return opts.runtime ?? createWebSearchRuntime(opts.config);\n}\n\n/** Resolve the effective gate: explicit tool option, else the runtime default. */\nfunction effectiveGate(opts: WebSearchToolOptions, runtime: WebSearchRuntime): ApprovalPolicy {\n  return opts.approval === undefined ? runtime.config.approval : toApprovalPolicy(opts.approval);\n}\n\n/**\n * Build the `web_search` tool. Spread it into the agents that should be able\n * to search the web.\n *\n * @example\n * ```ts\n * import { webSearchTool } from \"@dbx-tools/appkit-web-search\";\n * import { createAgent } from \"@dbx-tools/appkit-mastra\";\n *\n * const researcher = createAgent({\n *   instructions: \"...\",\n *   tools: () => ({ web_search: webSearchTool() }),\n * });\n * ```\n */\nexport function webSearchTool(opts: WebSearchToolOptions = {}) {\n  const runtime = toolRuntime(opts);\n  const gate = effectiveGate(opts, runtime);\n  return createTool({\n    id: opts.id ?? \"web_search\",\n    description: WEB_SEARCH_TOOL_DESCRIPTION,\n    inputSchema: webSearchRequestSchema,\n    outputSchema: webSearchResultSchema,\n    // A search's result URLs aren't known before the call, so a pattern gate\n    // is treated as \"always gate\".\n    ...(gate.mode === \"none\" ? {} : { requireApproval: () => true }),\n    execute: async (input) => {\n      const request = parseToolInput(webSearchRequestSchema, input);\n      return runWebSearch(request, runtime, await resolveWebSearchContext());\n    },\n  });\n}\n\n/**\n * Build the `web_fetch` tool. Spread it into the agents that should be able\n * to read a page's contents.\n *\n * @example\n * ```ts\n * import { webFetchTool } from \"@dbx-tools/appkit-web-search\";\n *\n * tools: () => ({ web_fetch: webFetchTool({ approval: \"*.internal.example.com\" }) })\n * ```\n */\nexport function webFetchTool(opts: WebSearchToolOptions = {}) {\n  const runtime = toolRuntime(opts);\n  const gate = effectiveGate(opts, runtime);\n  return createTool({\n    id: opts.id ?? \"web_fetch\",\n    description: WEB_FETCH_TOOL_DESCRIPTION,\n    inputSchema: webFetchRequestSchema,\n    outputSchema: webFetchResultSchema,\n    // A fetch knows its single target URL, so a pattern gate is evaluated\n    // precisely against it.\n    ...(gate.mode === \"none\"\n      ? {}\n      : {\n          requireApproval: (input: unknown) =>\n            gate.mode === \"always\" ||\n            approvalMatches(gate, [parseToolInput(webFetchRequestSchema, input).url]),\n        }),\n    execute: async (input) => {\n      return runWebFetch(parseToolInput(webFetchRequestSchema, input), runtime);\n    },\n  });\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tool.js","sourceRoot":"","sources":["../../src/tool.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The `web_search` and `web_fetch` Mastra tools.\n *\n * `web_search` is backed by the Databricks Model Serving native web-search\n * tool: it resolves its own web-search-capable model (see `search.ts`) and\n * calls the workspace serving endpoint under the caller's OBO scope, so the\n * search runs as the requesting user and independently of the agent's chat\n * model. `web_fetch` reads a page via got-scraping.\n *\n * Both are read-only and run without approval by default; each accepts an\n * optional {@link ApprovalGate} (`approval`) that maps onto Mastra's\n * `requireApproval`. `true` gates every call; a URL-pattern (or {@link OneOrMany}\n * list) gates only calls whose URL matches - for `web_fetch` that is evaluated\n * against the target URL, while `web_search` (whose result URLs aren't known\n * before the call) treats a pattern gate as \"always gate\". `approval` falls\n * back to the standalone runtime's `approval` config when a tool omits its own.\n *\n * App-integrated agents should consume the plugin's native toolkit so calls\n * retain that plugin's policy and executor. These factories are the standalone\n * Mastra surface and capture an explicit runtime or isolated config.\n *\n * @module\n */\n\nimport { ValidationError } from \"@databricks/appkit\";\nimport { createTool } from \"@mastra/core/tools\";\nimport type { z } from \"zod\";\nimport {\n  approvalMatches,\n  toApprovalPolicy,\n  type ApprovalGate,\n  type ApprovalPolicy,\n  type WebSearchPluginConfig,\n} from \"./config.ts\";\nimport { runWebFetch } from \"./fetch.ts\";\nimport { createWebSearchRuntime, type WebSearchRuntime } from \"./runtime.ts\";\nimport {\n  webFetchRequestSchema,\n  webFetchResultSchema,\n  webSearchToolRequestSchema,\n  webSearchResultSchema,\n  WEB_FETCH_TOOL_DESCRIPTION,\n  WEB_SEARCH_TOOL_DESCRIPTION,\n} from \"./schema.ts\";\nimport { resolveWebSearchContext, runWebSearch } from \"./search.ts\";\n\n/**\n * Validate a tool call's arguments at the runtime boundary. Mastra checks the\n * input schema before dispatch, but the argument still arrives typed as\n * `unknown` and the model is the one filling it in. The rejected value is not\n * echoed back.\n */\nfunction parseToolInput<S extends z.ZodType>(schema: S, input: unknown): z.infer<S> {\n  const parsed = schema.safeParse(input);\n  if (!parsed.success) {\n    throw ValidationError.invalidValue(\"input\", input, \"arguments matching the tool's schema\");\n  }\n  return parsed.data;\n}\n\n/** Options shared by both web tools. */\nexport interface WebSearchToolOptions {\n  /** Override the tool id. */\n  id?: string;\n  /** Isolated runtime used by this standalone tool. Mutually exclusive with `config`. */\n  runtime?: WebSearchRuntime;\n  /** Config used to create an isolated direct-execution runtime. */\n  config?: WebSearchPluginConfig;\n  /**\n   * Approval gate for this tool, overriding the runtime's `approval`. `true`\n   * gates every call; a URL-pattern (or list) gates only matching calls;\n   * omit / `false` for no approval. See {@link ApprovalGate}.\n   */\n  approval?: ApprovalGate | ApprovalPolicy;\n}\n\n/** Resolve the isolated runtime captured by one standalone tool factory. */\nfunction toolRuntime(opts: WebSearchToolOptions): WebSearchRuntime {\n  if (opts.runtime && opts.config) {\n    throw new TypeError(\"web-search tool options accept either runtime or config, not both\");\n  }\n  return opts.runtime ?? createWebSearchRuntime(opts.config);\n}\n\n/** Resolve the effective gate: explicit tool option, else the runtime default. */\nfunction effectiveGate(opts: WebSearchToolOptions, runtime: WebSearchRuntime): ApprovalPolicy {\n  return opts.approval === undefined ? runtime.config.approval : toApprovalPolicy(opts.approval);\n}\n\n/**\n * Build the `web_search` tool. Spread it into the agents that should be able\n * to search the web.\n *\n * @example\n * ```ts\n * import { webSearchTool } from \"@dbx-tools/appkit-web-search\";\n * import { createAgent } from \"@dbx-tools/appkit-mastra\";\n *\n * const researcher = createAgent({\n *   instructions: \"...\",\n *   tools: () => ({ web_search: webSearchTool() }),\n * });\n * ```\n */\nexport function webSearchTool(opts: WebSearchToolOptions = {}) {\n  const runtime = toolRuntime(opts);\n  const gate = effectiveGate(opts, runtime);\n  return createTool({\n    id: opts.id ?? \"web_search\",\n    description: WEB_SEARCH_TOOL_DESCRIPTION,\n    inputSchema: webSearchToolRequestSchema,\n    outputSchema: webSearchResultSchema,\n    // A search's result URLs aren't known before the call, so a pattern gate\n    // is treated as \"always gate\".\n    ...(gate.mode === \"none\" ? {} : { requireApproval: () => true }),\n    execute: async (input) => {\n      const request = parseToolInput(webSearchToolRequestSchema, input);\n      return runWebSearch(request, runtime, await resolveWebSearchContext());\n    },\n  });\n}\n\n/**\n * Build the `web_fetch` tool. Spread it into the agents that should be able\n * to read a page's contents.\n *\n * @example\n * ```ts\n * import { webFetchTool } from \"@dbx-tools/appkit-web-search\";\n *\n * tools: () => ({ web_fetch: webFetchTool({ approval: \"*.internal.example.com\" }) })\n * ```\n */\nexport function webFetchTool(opts: WebSearchToolOptions = {}) {\n  const runtime = toolRuntime(opts);\n  const gate = effectiveGate(opts, runtime);\n  return createTool({\n    id: opts.id ?? \"web_fetch\",\n    description: WEB_FETCH_TOOL_DESCRIPTION,\n    inputSchema: webFetchRequestSchema,\n    outputSchema: webFetchResultSchema,\n    // A fetch knows its single target URL, so a pattern gate is evaluated\n    // precisely against it.\n    ...(gate.mode === \"none\"\n      ? {}\n      : {\n          requireApproval: (input: unknown) =>\n            gate.mode === \"always\" ||\n            approvalMatches(gate, [parseToolInput(webFetchRequestSchema, input).url]),\n        }),\n    execute: async (input) => {\n      return runWebFetch(parseToolInput(webFetchRequestSchema, input), runtime);\n    },\n  });\n}\n"]}

package/package.json

@@ -27,12 +27,12 @@
   },
   "dependencies": {
     "@databricks/appkit": "0.81.0",
-    "@dbx-tools/appkit": "^0.9.69",
-    "@dbx-tools/core": "^0.9.69",
-    "@dbx-tools/model": "^0.9.69",
-    "@dbx-tools/path": "^0.9.69",
-    "@dbx-tools/shared-core": "^0.9.69",
-    "@dbx-tools/shared-model": "^0.9.69",
+    "@dbx-tools/appkit": "^0.9.71",
+    "@dbx-tools/core": "^0.9.71",
+    "@dbx-tools/model": "^0.9.71",
+    "@dbx-tools/path": "^0.9.71",
+    "@dbx-tools/shared-core": "^0.9.71",
+    "@dbx-tools/shared-model": "^0.9.71",
     "@mastra/core": "1.71.0",
     "cheerio": "^1.2.0",
     "entities": "^4.5.0",
@@ -102,7 +102,7 @@
       "./package.json": "./package.json"
     }
   },
-  "version": "0.9.69",
+  "version": "0.9.71",
   "types": "./lib/index.d.ts",
   "dbxToolsConfig": {
     "tags": [

package/src/config.ts

@@ -88,18 +88,11 @@ export const SERVING_ENDPOINT_ENV = "DATABRICKS_SERVING_ENDPOINT_NAME";
 export type ModelSource = "config" | typeof MODEL_ENV | typeof SERVING_ENDPOINT_ENV | "none";
 
 /**
- * Default web-search model preference, tried in order when no model is
- * pinned. Gemini first, then GPT - both support the native web-search tool;
- * a workspace typically has at least one. Each is fuzzy-matched against the
- * live catalogue, so a close variant (e.g. `databricks-gemini-3-1-pro`) is
- * picked when the exact id isn't present.
+ * Default web-search family preference, tried in order when no model is
+ * pinned. Each query selects the highest-ranked deployed model in that family
+ * after model-owned web-search capability filtering.
  */
-export const DEFAULT_MODEL_FALLBACKS: readonly string[] = [
-  "databricks-gemini-3-pro",
-  "databricks-gemini-2-5-pro",
-  "databricks-gpt-5",
-  "databricks-gpt-5-mini",
-];
+export const DEFAULT_MODEL_FALLBACKS: readonly string[] = ["gemini", "gpt"];
 
 /** Default cap on the number of citations returned from a single search. */
 export const DEFAULT_MAX_CITATIONS = 10;
@@ -108,17 +101,14 @@ export const DEFAULT_MAX_CITATIONS = 10;
 export const DEFAULT_FETCH_MAX_LENGTH = 50_000;
 
 /** Default per-request network timeout (ms) for search + fetch. */
-export const DEFAULT_TIMEOUT_MS = 30_000;
+export const DEFAULT_TIMEOUT_MS = 60_000;
 
 /** AppKit config accepted by the web-search plugin. */
 export interface WebSearchPluginConfig extends BasePluginConfig {
   /**
-   * The web-search model to use by default: a Databricks serving endpoint
-   * name (`"databricks-gemini-3-pro"`), a loose name (`"gemini"`, `"gpt"`),
-   * or a capability class. Fuzzy-matched against the live catalogue. Falls
-   * back to `WEB_SEARCH_MODEL`, then `DATABRICKS_SERVING_ENDPOINT_NAME`, then
-   * the {@link modelFallbacks} order. Chosen independently of the calling
-   * agent's chat model.
+   * GPT preference used when no capable Gemini is available. Accepts a
+   * Databricks serving endpoint name or loose family search and falls back to
+   * `WEB_SEARCH_MODEL`, then `DATABRICKS_SERVING_ENDPOINT_NAME`.
    */
   model?: string;
   /**
@@ -129,9 +119,9 @@ export interface WebSearchPluginConfig extends BasePluginConfig {
    */
   modelFallbacks?: string | string[];
   /**
-   * Provider -> tool-spec override map, merged over the built-in
+   * Provider -> request-fragment override map, merged over the built-in
    * {@link WEB_SEARCH_PROVIDERS} defaults. Keyed by provider family
-   * (`"openai"`, `"gemini"`); each value may override the `tool` entry
+   * (`"openai"`, `"gemini"`); each value may override the `request` fragment
    * and/or the `api` surface. Use to change the tool shape as the platform
    * evolves without a code change. Falls back to `WEB_SEARCH_TOOLS` parsed as
    * JSON. This is the `WEB_SEARCH_TOOLS` setting.
@@ -203,7 +193,7 @@ export interface ResolvedWebSearchConfig {
   modelSource: ModelSource;
   /** Ordered fallback model candidates (Gemini, then GPT, then a floor). */
   modelFallbacks: readonly string[];
-  /** Provider -> tool-spec override map, merged over the built-in defaults. */
+  /** Provider -> request-fragment override map, merged over the built-in defaults. */
   webSearchTools: Record<string, unknown>;
   /** Whether to fuzzy-match loose model names. */
   fuzzy: boolean;
@@ -240,7 +230,7 @@ export const WEB_SEARCH_CONFIG_SCHEMA: JSONSchema7 = {
     webSearchTools: {
       type: "object",
       description:
-        'Provider -> tool-spec override map merged over the built-in defaults (openai -> {"type":"web_search"}, gemini -> {"google_search":{}}). Env: WEB_SEARCH_TOOLS (JSON).',
+        'Provider -> request-fragment override map merged over the built-in defaults (openai -> {"tools":[{"type":"web_search"}]}, gemini -> {"google_search":{}}). Env: WEB_SEARCH_TOOLS (JSON).',
     },
     modelFuzzyMatch: {
       type: "boolean",
@@ -312,7 +302,7 @@ function parseToolsEnv(): Record<string, unknown> {
   const parsed = json.parseRecord(raw);
   if (!parsed) {
     throw new ConfigurationError(
-      "WEB_SEARCH_TOOLS must be a JSON object mapping a provider family to its tool spec",
+      "WEB_SEARCH_TOOLS must be a JSON object mapping a provider family to its request fragment",
       { context: { envVar: "WEB_SEARCH_TOOLS" } },
     );
   }

package/src/fetch.ts

@@ -78,6 +78,9 @@ export async function runWebFetch(
     async (executeSignal): Promise<FetchedPage> => {
       const response = await gotScraping({
         url: request.url,
+        // Bun's node:http2 reports default-port origins with :443 while
+        // http2-wrapper compares them against URL-normalized origins.
+        http2: false,
         // got's own timeout aborts the socket and reports which phase timed
         // out; the interceptor timeout bounds the whole attempt around it.
         timeout: { request: config.timeoutMs },

package/src/plugin.ts

@@ -23,6 +23,7 @@ import {
 } from "@databricks/appkit";
 import { defineTool, type ToolRegistry } from "@databricks/appkit/beta";
 import { ToolRegistryPlugin } from "@dbx-tools/appkit";
+import type { AgentToolExecutionContext } from "@dbx-tools/appkit/tool-provider";
 import { log, stringUtils } from "@dbx-tools/shared-core";
 import {
   MODEL_ENV,
@@ -34,7 +35,7 @@ import { runWebFetch } from "./fetch.ts";
 import { createWebSearchRuntime, type WebSearchRuntime } from "./runtime.ts";
 import {
   webFetchRequestSchema,
-  webSearchRequestSchema,
+  webSearchToolRequestSchema,
   WEB_FETCH_TOOL_DESCRIPTION,
   WEB_SEARCH_TOOL_DESCRIPTION,
 } from "./schema.ts";
@@ -149,10 +150,10 @@ export class WebSearchPlugin extends ToolRegistryPlugin<WebSearchPluginConfig> {
   protected readonly toolRegistry: ToolRegistry = {
     web_search: defineTool({
       description: WEB_SEARCH_TOOL_DESCRIPTION,
-      schema: webSearchRequestSchema,
+      schema: webSearchToolRequestSchema,
       annotations: { effect: "read", requiresUserContext: true },
       autoInheritable: false,
-      execute: async (args, signal) => this.search(webSearchRequestSchema.parse(args), signal),
+      execute: async (args, signal) => this.search(webSearchToolRequestSchema.parse(args), signal),
     }),
     web_fetch: defineTool({
       description: WEB_FETCH_TOOL_DESCRIPTION,
@@ -163,6 +164,25 @@ export class WebSearchPlugin extends ToolRegistryPlugin<WebSearchPluginConfig> {
     }),
   };
 
+  /** Dispatch with the actual calling model and optional host progress sink. */
+  override executeAgentTool(
+    name: string,
+    args: unknown,
+    signal?: AbortSignal,
+    context?: AgentToolExecutionContext,
+  ): Promise<unknown> {
+    if (name !== "web_search") return super.executeAgentTool(name, args, signal, context);
+    const request = webSearchToolRequestSchema.parse(args);
+    return this.search(
+      {
+        ...request,
+        ...(context?.model ? { model: context.model } : {}),
+      },
+      signal,
+      context?.writeProgress,
+    );
+  }
+
   /**
    * Log the effective policy so an active allow-list and caps are obvious at
    * boot. Runtime construction already resolved config and captured this
@@ -213,8 +233,18 @@ export class WebSearchPlugin extends ToolRegistryPlugin<WebSearchPluginConfig> {
     };
   }
 
-  private async search(request: WebSearchRequest, signal?: AbortSignal): Promise<WebSearchResult> {
-    return runWebSearch(request, this.runtime, await resolveWebSearchContext(), signal);
+  private async search(
+    request: WebSearchRequest,
+    signal?: AbortSignal,
+    writeProgress?: AgentToolExecutionContext["writeProgress"],
+  ): Promise<WebSearchResult> {
+    return runWebSearch(
+      request,
+      this.runtime,
+      await resolveWebSearchContext(),
+      signal,
+      writeProgress,
+    );
   }
 
   private async fetch(request: WebFetchRequest, signal?: AbortSignal): Promise<WebFetchResult> {

package/src/provider.ts

@@ -10,7 +10,7 @@
  * - OpenAI GPT models, via the Responses API (`/serving-endpoints/responses`):
  *   `tools: [{ "type": "web_search" }]`
  * - Google Gemini models, via Chat Completions
- *   (`/serving-endpoints/chat/completions`): `tools: [{ "google_search": {} }]`
+ *   (`/serving-endpoints/chat/completions`): top-level `"google_search": {}`
  *
  * (Anthropic exposes it over MCP, which needs a different call shape; only
  * GPT + Gemini are wired here, matching what the platform supports today.)
@@ -24,22 +24,28 @@
  */
 
 import { ValidationError } from "@databricks/appkit";
+import { metadata, policy } from "@dbx-tools/model";
+import type { ServingEndpointSummary } from "@dbx-tools/shared-model";
 import { z } from "zod";
 
 /** A web-search-capable model provider family. */
 export type WebSearchProvider = "openai" | "gemini";
 
+/** Serialized provider request fragment for native web search. */
+export const WebSearchProviderSpecSchema = z
+  .object({
+    api: z
+      .enum(["responses", "chat"])
+      .describe("Databricks serving API that accepts the provider request."),
+    request: z
+      .record(z.string(), z.unknown())
+      .describe("Provider-specific fields merged into the serving request body."),
+  })
+  .strict()
+  .describe("Native web-search request contract for one provider family.");
+
 /** How a provider's native web-search call is shaped. */
-export interface WebSearchProviderSpec {
-  /**
-   * Which serving REST surface to call. `"responses"` posts to
-   * `/serving-endpoints/responses` (OpenAI Responses API); `"chat"` posts to
-   * `/serving-endpoints/chat/completions`.
-   */
-  api: "responses" | "chat";
-  /** The tool entry appended to the request's `tools` array. */
-  tool: Record<string, unknown>;
-}
+export type WebSearchProviderSpec = z.infer<typeof WebSearchProviderSpecSchema>;
 
 /**
  * Built-in provider -> tool-spec map. Operators can override or extend this
@@ -47,30 +53,33 @@ export interface WebSearchProviderSpec {
  * `WEB_SEARCH_TOOLS`), which is merged over these defaults.
  */
 export const WEB_SEARCH_PROVIDERS: Readonly<Record<WebSearchProvider, WebSearchProviderSpec>> = {
-  openai: { api: "responses", tool: { type: "web_search" } },
-  gemini: { api: "chat", tool: { google_search: {} } },
+  openai: { api: "responses", request: { tools: [{ type: "web_search" }] } },
+  gemini: { api: "chat", request: { google_search: {} } },
 };
 
 /**
- * Detect the web-search provider family for an endpoint id, or `null` when
- * the model is not one of the web-search-capable families. Anthropic
- * (`opus`/`sonnet`/`haiku`) is intentionally excluded - it needs an MCP call
- * shape this module doesn't implement - so a Claude endpoint returns `null`
- * and is treated as unsupported.
+ * Map a model-owned family value to its native web-search provider contract.
  */
-export function detectWebSearchProvider(modelId: string): WebSearchProvider | null {
-  const n = modelId.toLowerCase();
-  // gpt-oss open-weights don't carry the hosted web-search tool; only the
-  // hosted GPT family (Responses API) does. Both contain "gpt", so exclude
-  // the open-weights explicitly.
-  if (n.includes("gpt") && !n.includes("gpt-oss")) return "openai";
-  if (n.includes("gemini")) return "gemini";
-  return null;
+export function webSearchProviderForFamily(
+  family: policy.ModelFamily | undefined,
+): WebSearchProvider | null {
+  switch (family) {
+    case policy.ModelFamily.Gpt:
+      return "openai";
+    case policy.ModelFamily.Gemini:
+      return "gemini";
+    default:
+      return null;
+  }
 }
 
-/** Whether `modelId` is a web-search-capable model. */
-export function supportsWebSearch(modelId: string): boolean {
-  return detectWebSearchProvider(modelId) !== null;
+/** Whether a model has both native capability and a supported provider contract. */
+export function supportsWebSearch(model: string | ServingEndpointSummary): boolean {
+  const identity = typeof model === "string" ? model : (model.modelServiceName ?? model.name);
+  return (
+    webSearchProviderForFamily(policy.modelFamily(identity)) !== null &&
+    metadata.modelCapabilitiesFor(model).webSearch
+  );
 }
 
 /**
@@ -78,16 +87,15 @@ export function supportsWebSearch(modelId: string): boolean {
  * parsed JSON (config or `WEB_SEARCH_TOOLS`), so it is validated rather than
  * asserted.
  */
-const providerOverrideSchema = z.object({
-  api: z.enum(["responses", "chat"]).optional(),
-  tool: z.record(z.string(), z.unknown()).optional(),
-});
+const providerOverrideSchema = WebSearchProviderSpecSchema.partial()
+  .strict()
+  .describe("Partial native web-search provider override.");
 
 /**
  * Resolve the effective {@link WebSearchProviderSpec} for a provider: the
  * built-in default, with any operator override (the `webSearchTools` map,
  * keyed by provider) shallow-merged over it. An override may replace just the
- * `tool` (the common case - a new tool type) or also the `api`. An override
+ * `request` fragment or also the `api`. An override
  * that is not one of those two fields is a deployment mistake that would
  * otherwise be silently dropped, so it throws.
  */
@@ -103,11 +111,11 @@ export function webSearchToolSpec(
     throw ValidationError.invalidValue(
       `webSearchTools.${provider}`,
       raw,
-      'an object with an optional "api" ("responses" | "chat") and an optional "tool" object',
+      'an object with an optional "api" ("responses" | "chat") and an optional "request" object',
     );
   }
   return {
     api: parsed.data.api ?? base.api,
-    tool: parsed.data.tool ?? base.tool,
+    request: parsed.data.request ?? base.request,
   };
 }

package/src/runtime.ts

@@ -10,6 +10,7 @@
 
 import type { ExecutionResult } from "@databricks/appkit";
 import { pluginExecution } from "@dbx-tools/appkit";
+import { policy } from "@dbx-tools/model";
 import { execution, log } from "@dbx-tools/shared-core";
 import {
   resolveWebSearchConfig,
@@ -34,6 +35,8 @@ export type WebSearchExecutor = <T>(
 export interface WebSearchRuntime {
   config: ResolvedWebSearchConfig;
   execute: WebSearchExecutor;
+  /** Provider-family cooldown deadlines learned from workspace failures. */
+  familyCooldowns: Map<policy.ModelFamily, number>;
 }
 
 /** Runtime-aware operation input, retaining resolved-config compatibility. */
@@ -51,7 +54,7 @@ export function createWebSearchRuntime(
   overrides?: WebSearchPluginConfig,
   execute: WebSearchExecutor = directExecute,
 ): WebSearchRuntime {
-  return { config: resolveWebSearchConfig(overrides), execute };
+  return { config: resolveWebSearchConfig(overrides), execute, familyCooldowns: new Map() };
 }
 
 /** Build an isolated runtime from config that has already been resolved. */
@@ -59,7 +62,7 @@ export function createResolvedWebSearchRuntime(
   config: ResolvedWebSearchConfig,
   execute: WebSearchExecutor = directExecute,
 ): WebSearchRuntime {
-  return { config, execute };
+  return { config, execute, familyCooldowns: new Map() };
 }
 
 /** Normalize an explicit runtime or legacy resolved config for one operation. */

package/src/schema.ts

@@ -54,12 +54,9 @@ export const webSearchRequestSchema = z.object({
     .optional()
     .describe(
       stringUtils.toDescription(`
-        Optional web-search-capable model to use (a Databricks serving
-        endpoint name like "databricks-gemini-3-pro", a loose name like "gpt"
-        or "gemini", or a capability class). Defaults to the plugin's
-        configured web-search model. The web-search tool resolves its own
-        model independently of the calling agent's chat model, since not
-        every chat model supports web search.
+        Optional calling-model preference. The tool always tries the highest
+        web-search-capable Gemini first. When Gemini is unavailable, a matching
+        GPT endpoint wins before the highest-ranked GPT fallback.
       `),
     ),
 });
@@ -67,6 +64,14 @@ export const webSearchRequestSchema = z.object({
 /** A validated `web_search` request. */
 export type WebSearchRequest = z.infer<typeof webSearchRequestSchema>;
 
+/** Model-facing `web_search` input; the host owns model selection. */
+export const webSearchToolRequestSchema = webSearchRequestSchema
+  .omit({ model: true })
+  .describe("Model-facing web-search input with host-owned model selection.");
+
+/** Model-facing `web_search` request. */
+export type WebSearchToolRequest = z.infer<typeof webSearchToolRequestSchema>;
+
 /** Schema for a single source the model cited while answering. */
 export const webSearchCitationSchema = z.object({
   url: z.string().describe("The source URL the answer drew on."),