Restrict native tools (web_search) to Direct Message contexts only (#432)

* Add WithToolsDisabled to LanguageModelConfig, add checks in relevant providers

* Fix TestThreadsAnalyze to expect WithToolsDisabled option

The test was failing because ChatCompletion now receives an additional
variadic options parameter (WithToolsDisabled). Updated the mock
expectation to accept both arguments.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>

Author: nickmisasi

anthropic/anthropic.go

@@ -202,7 +202,11 @@ func (a *Anthropic) streamChatWithTools(state messageState) {
 		Model:     anthropicSDK.Model(state.config.Model),
 		MaxTokens: int64(state.config.MaxGeneratedTokens),
 		Messages:  state.messages,
-		Tools:     convertTools(state.tools),
+	}
+
+	// Only add tools if not explicitly disabled
+	if !state.config.ToolsDisabled {
+		params.Tools = convertTools(state.tools)
 	}
 
 	// Only include system message if it's non-empty
@@ -213,8 +217,8 @@ func (a *Anthropic) streamChatWithTools(state messageState) {
 		}}
 	}
 
-	// Add native tools if enabled
-	if a.isNativeToolEnabled("web_search") {
+	// Add native tools if not explicitly disabled
+	if !state.config.ToolsDisabled && a.isNativeToolEnabled("web_search") {
 		// Add web search as a native tool
 		webSearchTool := anthropicSDK.WebSearchTool20250305Param{
 			Name: "web_search",

api/api_llm_bridge.go

@@ -104,6 +104,8 @@ func (a *API) convertRequestToLLMOptions(req bridgeclient.CompletionRequest) ([]
 		})
 	}
 
+	// Plugin bridge requests do not allow tools to be enabled
+	options = append(options, llm.WithToolsDisabled())
 	return options, nil
 }
 

channels/channels.go

@@ -91,7 +91,7 @@ func (c *Channels) Interval(
 		Context: context,
 	}
 
-	resultStream, err := c.llm.ChatCompletion(completionRequest)
+	resultStream, err := c.llm.ChatCompletion(completionRequest, llm.WithToolsDisabled())
 	if err != nil {
 		return nil, err
 	}

conversations/conversations.go

@@ -121,7 +121,12 @@ func (c *Conversations) ProcessUserRequestWithContext(bot *bots.Bot, postingUser
 		Posts:   posts,
 		Context: context,
 	}
-	result, err := bot.LLM().ChatCompletion(completionRequest)
+	isDM := mmapi.IsDMWith(bot.GetMMBot().UserId, channel)
+	var opts []llm.LanguageModelOption
+	if !isDM {
+		opts = append(opts, llm.WithToolsDisabled())
+	}
+	result, err := bot.LLM().ChatCompletion(completionRequest, opts...)
 	if err != nil {
 		return nil, err
 	}

llm/language_model.go

@@ -37,6 +37,7 @@ type LanguageModelConfig struct {
 	MaxGeneratedTokens int
 	EnableVision       bool
 	JSONOutputFormat   *jsonschema.Schema
+	ToolsDisabled      bool
 }
 
 type LanguageModelOption func(*LanguageModelConfig)
@@ -57,4 +58,10 @@ func WithJSONOutput[T any]() LanguageModelOption {
 	}
 }
 
+func WithToolsDisabled() LanguageModelOption {
+	return func(cfg *LanguageModelConfig) {
+		cfg.ToolsDisabled = true
+	}
+}
+
 type LanguageModelWrapper func(LanguageModel) LanguageModel

meetings/meeting_summarization.go

@@ -347,7 +347,7 @@ func (s *Service) SummarizeTranscription(bot *bots.Bot, transcription *subtitles
 		Context: context,
 	}
 
-	summaryStream, err := bot.LLM().ChatCompletion(completionRequest)
+	summaryStream, err := bot.LLM().ChatCompletion(completionRequest, llm.WithToolsDisabled())
 	if err != nil {
 		return nil, fmt.Errorf("unable to get meeting summary: %w", err)
 	}

openai/openai.go

@@ -145,9 +145,10 @@ func NewCompatibleEmbeddings(config Config, httpClient *http.Client) *OpenAI {
 	}
 }
 
-func modifyCompletionRequestWithRequest(params openai.ChatCompletionNewParams, internalRequest llm.CompletionRequest) openai.ChatCompletionNewParams {
+func modifyCompletionRequestWithRequest(params openai.ChatCompletionNewParams, internalRequest llm.CompletionRequest, cfg llm.LanguageModelConfig) openai.ChatCompletionNewParams {
 	params.Messages = postsToChatCompletionMessages(internalRequest.Posts)
-	if internalRequest.Context.Tools != nil {
+	// Only add tools if not explicitly disabled
+	if !cfg.ToolsDisabled && internalRequest.Context.Tools != nil {
 		params.Tools = toolsToOpenAITools(internalRequest.Context.Tools.GetTools())
 	}
 	return params
@@ -318,10 +319,10 @@ type ToolBufferElement struct {
 	args strings.Builder
 }
 
-func (s *OpenAI) streamResultToChannels(params openai.ChatCompletionNewParams, llmContext *llm.Context, output chan<- llm.TextStreamEvent) {
+func (s *OpenAI) streamResultToChannels(params openai.ChatCompletionNewParams, llmContext *llm.Context, cfg llm.LanguageModelConfig, output chan<- llm.TextStreamEvent) {
 	// Route to Responses API or Completions API based on configuration
 	if s.config.UseResponsesAPI {
-		s.streamResponsesAPIToChannels(params, llmContext, output)
+		s.streamResponsesAPIToChannels(params, llmContext, cfg, output)
 	} else {
 		s.streamCompletionsAPIToChannels(params, llmContext, output)
 	}
@@ -484,7 +485,7 @@ func (s *OpenAI) streamCompletionsAPIToChannels(params openai.ChatCompletionNewP
 }
 
 // streamResponsesAPIToChannels uses the new Responses API for streaming
-func (s *OpenAI) streamResponsesAPIToChannels(params openai.ChatCompletionNewParams, llmContext *llm.Context, output chan<- llm.TextStreamEvent) {
+func (s *OpenAI) streamResponsesAPIToChannels(params openai.ChatCompletionNewParams, llmContext *llm.Context, cfg llm.LanguageModelConfig, output chan<- llm.TextStreamEvent) {
 	ctx, cancel := context.WithCancelCause(context.Background())
 	defer cancel(nil)
 
@@ -510,7 +511,7 @@ func (s *OpenAI) streamResponsesAPIToChannels(params openai.ChatCompletionNewPar
 	}()
 
 	// Convert ChatCompletionNewParams to ResponseNewParams
-	responseParams := s.convertToResponseParams(params, llmContext)
+	responseParams := s.convertToResponseParams(params, llmContext, cfg)
 
 	// Create a streaming request
 	stream := s.client.Responses.NewStreaming(ctx, responseParams)
@@ -843,7 +844,7 @@ func (s *OpenAI) streamResponsesAPIToChannels(params openai.ChatCompletionNewPar
 
 // convertToResponseParams converts ChatCompletionNewParams to ResponseNewParams
 // This is a simplified conversion that handles the basic use cases
-func (s *OpenAI) convertToResponseParams(params openai.ChatCompletionNewParams, llmContext *llm.Context) responses.ResponseNewParams {
+func (s *OpenAI) convertToResponseParams(params openai.ChatCompletionNewParams, llmContext *llm.Context, cfg llm.LanguageModelConfig) responses.ResponseNewParams {
 	result := responses.ResponseNewParams{}
 
 	// Convert model - directly assign as it's the same type
@@ -988,8 +989,8 @@ func (s *OpenAI) convertToResponseParams(params openai.ChatCompletionNewParams,
 		}
 	}
 
-	// Add native tools if enabled
-	if len(s.config.EnabledNativeTools) > 0 {
+	// Add native tools if not explicitly disabled
+	if !cfg.ToolsDisabled && len(s.config.EnabledNativeTools) > 0 {
 		for _, nativeTool := range s.config.EnabledNativeTools {
 			if nativeTool == "web_search" {
 				// Add web search as a built-in tool
@@ -1026,11 +1027,11 @@ func (s *OpenAI) convertToResponseParams(params openai.ChatCompletionNewParams,
 	return result
 }
 
-func (s *OpenAI) streamResult(params openai.ChatCompletionNewParams, llmContext *llm.Context) (*llm.TextStreamResult, error) {
+func (s *OpenAI) streamResult(params openai.ChatCompletionNewParams, llmContext *llm.Context, cfg llm.LanguageModelConfig) (*llm.TextStreamResult, error) {
 	eventStream := make(chan llm.TextStreamEvent)
 	go func() {
 		defer close(eventStream)
-		s.streamResultToChannels(params, llmContext, eventStream)
+		s.streamResultToChannels(params, llmContext, cfg, eventStream)
 	}()
 
 	return &llm.TextStreamResult{Stream: eventStream}, nil
@@ -1101,16 +1102,17 @@ func getModelConstant(model string) shared.ChatModel {
 }
 
 func (s *OpenAI) ChatCompletion(request llm.CompletionRequest, opts ...llm.LanguageModelOption) (*llm.TextStreamResult, error) {
-	params := s.completionRequestFromConfig(s.createConfig(opts))
-	params = modifyCompletionRequestWithRequest(params, request)
+	cfg := s.createConfig(opts)
+	params := s.completionRequestFromConfig(cfg)
+	params = modifyCompletionRequestWithRequest(params, request, cfg)
 	params.StreamOptions.IncludeUsage = openai.Bool(true)
 
 	if s.config.SendUserID {
 		if request.Context.RequestingUser != nil {
 			params.User = openai.String(request.Context.RequestingUser.Id)
 		}
 	}
-	return s.streamResult(params, request.Context)
+	return s.streamResult(params, request.Context, cfg)
 }
 
 func (s *OpenAI) ChatCompletionNoStream(request llm.CompletionRequest, opts ...llm.LanguageModelOption) (string, error) {

openai/openai_test.go

@@ -811,7 +811,10 @@ func TestReasoningEffortConfiguration(t *testing.T) {
 			}
 
 			// Call the actual function that handles reasoning configuration
-			result := oai.convertToResponseParams(chatParams, &llm.Context{})
+			result := oai.convertToResponseParams(chatParams, &llm.Context{}, llm.LanguageModelConfig{
+				Model:              "gpt-4o",
+				MaxGeneratedTokens: 8192,
+			})
 
 			if !tt.shouldSetReasoning {
 				// When reasoning is disabled, Reasoning should be empty

threads/threads.go

@@ -52,7 +52,7 @@ func (t *Threads) Analyze(postIDToAnalyze string, context *llm.Context, promptNa
 		Posts:   posts,
 		Context: context,
 	}
-	analysisStream, err := t.llm.ChatCompletion(completionReqest)
+	analysisStream, err := t.llm.ChatCompletion(completionReqest, llm.WithToolsDisabled())
 	if err != nil {
 		return nil, err
 	}

threads/threads_test.go

@@ -102,7 +102,7 @@ func TestThreadsAnalyze(t *testing.T) {
 			}
 
 			if tc.expectedLLMCalls > 0 {
-				mockLLM.EXPECT().ChatCompletion(mock.Anything).Return(&llm.TextStreamResult{}, tc.llmError)
+				mockLLM.EXPECT().ChatCompletion(mock.Anything, mock.Anything).Return(&llm.TextStreamResult{}, tc.llmError)
 			}
 
 			threadService := threads.New(mockLLM, prompts, mockClient)