refactor(providers): remove WithoutWebSearchSources

The opt-out was added because vercel/ai#18507 reported that Bedrock
Mantle rejects web_search_call.action.sources. Mantle now accepts the
include in us-east-1 and us-west-2. The one other host found to reject
it, vLLM, cannot run a web_search tool, so turning web search off loses
nothing there. Nothing calls the option.

Author: mafredri

providers/openai/openai.go

@@ -38,7 +38,6 @@ type options struct {
 	sdkOptions           []option.RequestOption
 	objectMode           fantasy.ObjectMode
 	languageModelOptions []LanguageModelOption
-	skipWebSearchSources bool
 }
 
 // Option defines a function that configures OpenAI provider options.
@@ -137,16 +136,6 @@ func WithUseResponsesAPI() Option {
 	}
 }
 
-// WithoutWebSearchSources stops Responses requests with a web search tool
-// from automatically including web_search_call.action.sources. Use it for
-// Responses-compatible backends that reject that include, such as Bedrock
-// Mantle. A caller can still request it through ResponsesProviderOptions.Include.
-func WithoutWebSearchSources() Option {
-	return func(o *options) {
-		o.skipWebSearchSources = true
-	}
-}
-
 // WithResponsesAPIFunc sets a custom filter for which models use the Responses API.
 // When set, this function is called instead of the default IsResponsesModel().
 func WithResponsesAPIFunc(fn func(modelID string) bool) Option {
@@ -215,7 +204,7 @@ func (o *provider) LanguageModel(_ context.Context, modelID string) (fantasy.Lan
 		if objectMode == fantasy.ObjectModeJSON {
 			objectMode = fantasy.ObjectModeAuto
 		}
-		return newResponsesLanguageModel(modelID, o.options.name, client, objectMode, o.options.reasoningModelFunc, o.options.skipWebSearchSources), nil
+		return newResponsesLanguageModel(modelID, o.options.name, client, objectMode, o.options.reasoningModelFunc), nil
 	}
 
 	languageModelOptions := append([]LanguageModelOption{}, o.options.languageModelOptions...)

providers/openai/responses_language_model.go

@@ -24,23 +24,21 @@ import (
 const topLogprobsMax = 20
 
 type responsesLanguageModel struct {
-	provider             string
-	modelID              string
-	client               openai.Client
-	objectMode           fantasy.ObjectMode
-	reasoningModelFunc   func(modelID string) bool
-	skipWebSearchSources bool
+	provider           string
+	modelID            string
+	client             openai.Client
+	objectMode         fantasy.ObjectMode
+	reasoningModelFunc func(modelID string) bool
 }
 
 // newResponsesLanguageModel implements a responses api model.
-func newResponsesLanguageModel(modelID string, provider string, client openai.Client, objectMode fantasy.ObjectMode, reasoningModelFunc func(modelID string) bool, skipWebSearchSources bool) responsesLanguageModel {
+func newResponsesLanguageModel(modelID string, provider string, client openai.Client, objectMode fantasy.ObjectMode, reasoningModelFunc func(modelID string) bool) responsesLanguageModel {
 	return responsesLanguageModel{
-		modelID:              modelID,
-		provider:             provider,
-		client:               client,
-		objectMode:           objectMode,
-		reasoningModelFunc:   reasoningModelFunc,
-		skipWebSearchSources: skipWebSearchSources,
+		modelID:            modelID,
+		provider:           provider,
+		client:             client,
+		objectMode:         objectMode,
+		reasoningModelFunc: reasoningModelFunc,
 	}
 }
 
@@ -366,7 +364,7 @@ func (o responsesLanguageModel) prepareParams(call fantasy.Call) (*responses.Res
 		params.ToolChoice = toolChoice
 	}
 
-	if !o.skipWebSearchSources && hasResponsesWebSearchTool(tools) && !slices.Contains(include, IncludeWebSearchCallActionSources) {
+	if hasResponsesWebSearchTool(tools) && !slices.Contains(include, IncludeWebSearchCallActionSources) {
 		include = append(include, IncludeWebSearchCallActionSources)
 	}
 

providers/openai/responses_options.go

@@ -174,8 +174,7 @@ const (
 	IncludeMessageOutputTextLogprobs IncludeType = "message.output_text.logprobs"
 	// IncludeWebSearchCallActionSources includes the pages a web search
 	// found in web_search_call action.sources. Requests with a web
-	// search tool add it automatically unless the provider was created with
-	// WithoutWebSearchSources.
+	// search tool add it automatically.
 	IncludeWebSearchCallActionSources IncludeType = "web_search_call.action.sources"
 )
 

providers/openai/responses_web_search_test.go

@@ -448,59 +448,4 @@ func TestResponsesWebSearchSourcesInclude(t *testing.T) {
 		requireWebSearchSourcesInclude(t, server.calls[0].body)
 		require.Contains(t, server.calls[0].body["include"], string(IncludeReasoningEncryptedContent))
 	})
-
-	newOptedOutModel := func(t *testing.T, serverURL string) fantasy.LanguageModel {
-		t.Helper()
-		provider, err := New(
-			WithAPIKey("test-api-key"),
-			WithBaseURL(serverURL),
-			WithUseResponsesAPI(),
-			WithoutWebSearchSources(),
-		)
-		require.NoError(t, err)
-		model, err := provider.LanguageModel(context.Background(), "gpt-4.1")
-		require.NoError(t, err)
-		return model
-	}
-
-	t.Run("NotRequestedWhenProviderOptsOut", func(t *testing.T) {
-		t.Parallel()
-
-		server := newMockServer()
-		defer server.close()
-		server.response = mockResponsesWebSearchResponse()
-
-		model := newOptedOutModel(t, server.server.URL)
-		_, err := model.Generate(context.Background(), fantasy.Call{
-			Prompt: testPrompt,
-			Tools:  []fantasy.Tool{WebSearchTool(nil)},
-		})
-		require.NoError(t, err)
-		require.Len(t, server.calls, 1)
-
-		include, _ := server.calls[0].body["include"].([]any)
-		require.NotContains(t, include, string(IncludeWebSearchCallActionSources))
-	})
-
-	t.Run("CallerIncludeSentWhenProviderOptsOut", func(t *testing.T) {
-		t.Parallel()
-
-		server := newMockServer()
-		defer server.close()
-		server.response = mockResponsesWebSearchResponse()
-
-		model := newOptedOutModel(t, server.server.URL)
-		_, err := model.Generate(context.Background(), fantasy.Call{
-			Prompt: testPrompt,
-			Tools:  []fantasy.Tool{WebSearchTool(nil)},
-			ProviderOptions: fantasy.ProviderOptions{
-				Name: &ResponsesProviderOptions{
-					Include: []IncludeType{IncludeWebSearchCallActionSources},
-				},
-			},
-		})
-		require.NoError(t, err)
-		require.Len(t, server.calls, 1)
-		requireWebSearchSourcesInclude(t, server.calls[0].body)
-	})
 }

providers/openaicompat/openaicompat.go

@@ -123,15 +123,6 @@ func WithUseResponsesAPI() Option {
 	}
 }
 
-// WithoutWebSearchSources stops Responses requests with a web search tool
-// from automatically including web_search_call.action.sources, which some
-// compatible backends, such as Bedrock Mantle, reject.
-func WithoutWebSearchSources() Option {
-	return func(o *options) {
-		o.openaiOptions = append(o.openaiOptions, openai.WithoutWebSearchSources())
-	}
-}
-
 // WithResponsesAPIFunc sets a custom filter for which models use the Responses API.
 func WithResponsesAPIFunc(fn func(modelID string) bool) Option {
 	return func(o *options) {