chore: unifying logic, removing HasInjectableTools from interface

Signed-off-by: Danny Kopping <danny@coder.com>

Author: dannykopping

intercept/chatcompletions/base.go

@@ -103,14 +103,12 @@ func (i *interceptionBase) newErrorResponse(err error) map[string]any {
 }
 
 func (i *interceptionBase) injectTools() {
-	if i.req == nil || i.mcpProxy == nil {
+	if i.req == nil || i.mcpProxy == nil || !i.hasInjectableTools() {
 		return
 	}
 
 	// Disable parallel tool calls when injectable tools are present to simplify the inner agentic loop.
-	if i.HasInjectableTools() {
-		i.req.ParallelToolCalls = openai.Bool(false)
-	}
+	i.req.ParallelToolCalls = openai.Bool(false)
 
 	// Inject tools.
 	for _, tool := range i.mcpProxy.ListTools() {
@@ -176,7 +174,7 @@ func (i *interceptionBase) writeUpstreamError(w http.ResponseWriter, oaiErr *err
 	}
 }
 
-func (i *interceptionBase) HasInjectableTools() bool {
+func (i *interceptionBase) hasInjectableTools() bool {
 	return i.mcpProxy != nil && len(i.mcpProxy.ListTools()) > 0
 }
 

intercept/interceptor.go

@@ -34,7 +34,4 @@ type Interceptor interface {
 	// by the model, so any single tool call ID is sufficient to identify the
 	// parent interception.
 	CorrelatingToolCallID() *string
-	// HasInjectableTools returns true if an [mcp.ServerProxier] has been provided
-	// and contains tools which must be injected into requests.
-	HasInjectableTools() bool
 }

intercept/messages/base.go

@@ -101,7 +101,7 @@ func (s *interceptionBase) baseTraceAttributes(r *http.Request, streaming bool)
 }
 
 func (i *interceptionBase) injectTools() {
-	if i.req == nil || i.mcpProxy == nil || !i.HasInjectableTools() {
+	if i.req == nil || i.mcpProxy == nil || !i.hasInjectableTools() {
 		return
 	}
 
@@ -314,7 +314,7 @@ func (i *interceptionBase) writeUpstreamError(w http.ResponseWriter, antErr *Err
 	}
 }
 
-func (i *interceptionBase) HasInjectableTools() bool {
+func (i *interceptionBase) hasInjectableTools() bool {
 	return i.mcpProxy != nil && len(i.mcpProxy.ListTools()) > 0
 }
 

intercept/responses/base.go

@@ -326,7 +326,7 @@ func (i *responsesInterceptionBase) recordTokenUsage(ctx context.Context, respon
 	}
 }
 
-func (i *responsesInterceptionBase) HasInjectableTools() bool {
+func (i *responsesInterceptionBase) hasInjectableTools() bool {
 	return i.mcpProxy != nil && len(i.mcpProxy.ListTools()) > 0
 }
 

intercept/responses/injected_tools.go

@@ -16,7 +16,7 @@ import (
 )
 
 func (i *responsesInterceptionBase) injectTools() {
-	if i.req == nil || i.mcpProxy == nil || !i.HasInjectableTools() {
+	if i.req == nil || i.mcpProxy == nil || !i.hasInjectableTools() {
 		return
 	}