From 293cf057b996c90c256c90202524baf4397eb8e3 Mon Sep 17 00:00:00 2001
From: hobokenchicken <dustin@dustin.coffee>
Date: Fri, 17 Jul 2026 17:25:17 +0000
Subject: [PATCH] fix: restrict tool-heavy/swe-bench tagging to software
 development or agent-related tasks

---
 internal/server/routing_test.go | 71 ++++++++++++++++++++++++++++++++-
 internal/server/server.go       | 35 +++++++++++++++-
 2 files changed, 104 insertions(+), 2 deletions(-)

diff --git a/internal/server/routing_test.go b/internal/server/routing_test.go
index 4b91bdd4..4b39967c 100644
--- a/internal/server/routing_test.go
+++ b/internal/server/routing_test.go
@@ -1,6 +1,10 @@
 package server
 
-import "testing"
+import (
+	"testing"
+
+	"gophergate/internal/router"
+)
 
 func TestIsSoftwareDevelopment(t *testing.T) {
 	tests := []struct {
@@ -29,3 +33,68 @@ func TestIsSoftwareDevelopment(t *testing.T) {
 		}
 	}
 }
+
+func TestGetRouteCtxTags(t *testing.T) {
+	s := &Server{}
+	tests := []struct {
+		name         string
+		routeCtx     *router.RouteContext
+		expectedTags []string
+		mustContain  []string
+		mustExclude  []string
+	}{
+		{
+			name: "Standard query with tools",
+			routeCtx: &router.RouteContext{
+				UserMessage:         "Search the web for weather in Paris",
+				RequiresToolCalling: true,
+			},
+			mustExclude: []string{"tool-heavy", "swe-bench"},
+		},
+		{
+			name: "Coding query with tools",
+			routeCtx: &router.RouteContext{
+				UserMessage:           "Write a python script to parse logs",
+				RequiresToolCalling:   true,
+				IsSoftwareDevelopment: true,
+			},
+			mustContain: []string{"tool-heavy", "swe-bench"},
+		},
+		{
+			name: "Agent query with tools",
+			routeCtx: &router.RouteContext{
+				UserMessage:         "agent please orchestrate the multi-agent task",
+				RequiresToolCalling: true,
+			},
+			mustContain: []string{"tool-heavy", "swe-bench"},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tags := s.getRouteCtxTags(tt.routeCtx)
+
+			for _, expected := range tt.mustContain {
+				found := false
+				for _, tag := range tags {
+					if tag == expected {
+						found = true
+						break
+					}
+				}
+				if !found {
+					t.Errorf("expected tag %q to be present, but was not in %v", expected, tags)
+				}
+			}
+
+			for _, excluded := range tt.mustExclude {
+				for _, tag := range tags {
+					if tag == excluded {
+						t.Errorf("expected tag %q to be excluded, but was found in %v", excluded, tags)
+					}
+				}
+			}
+		})
+	}
+}
+
diff --git a/internal/server/server.go b/internal/server/server.go
index b6bd0f23..c36b6407 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -574,6 +574,31 @@ func (s *Server) handleChatCompletions(c *gin.Context) {
 		return
 	}
 
+	// Prune message history to sliding window if configured
+	if s.cfg.Server.MaxHistoryMessages > 0 && len(req.Messages) > s.cfg.Server.MaxHistoryMessages {
+		var systemMsgs []models.ChatMessage
+		var otherMsgs []models.ChatMessage
+		for _, msg := range req.Messages {
+			if msg.Role == "system" {
+				systemMsgs = append(systemMsgs, msg)
+			} else {
+				otherMsgs = append(otherMsgs, msg)
+			}
+		}
+
+		keepCount := s.cfg.Server.MaxHistoryMessages - len(systemMsgs)
+		if keepCount < 1 {
+			keepCount = 1
+		}
+		if len(otherMsgs) > keepCount {
+			startIndex := len(otherMsgs) - keepCount
+			otherMsgs = otherMsgs[startIndex:]
+			log.Printf("[DEBUG] Pruned message history: kept %d system messages and last %d messages (total %d out of %d)", 
+				len(systemMsgs), len(otherMsgs), len(systemMsgs)+len(otherMsgs), len(req.Messages))
+			req.Messages = append(systemMsgs, otherMsgs...)
+		}
+	}
+
 	// Strip common prefixes and prepare model ID
 	modelID := req.Model
 	prefixes := []string{"gemini/", "google/", "openai/", "deepseek/", "moonshot/", "grok/", "ollama/", "xiaomi/"}
@@ -1119,7 +1144,15 @@ func (s *Server) getRouteCtxTags(routeCtx *router.RouteContext) []string {
 		}
 	}
 
-	if routeCtx.RequiresToolCalling {
+	hasHeavyLogic := false
+	for _, tag := range tags {
+		if tag == "heavy-logic" {
+			hasHeavyLogic = true
+			break
+		}
+	}
+
+	if routeCtx.RequiresToolCalling && (routeCtx.IsSoftwareDevelopment || hasHeavyLogic) {
 		tags = append(tags, "tool-heavy", "multi-step-agent", "swe-bench")
 	}