From 3d8b0978f6bdb5e2ff1bdfa32a1cbf4a60f56fac Mon Sep 17 00:00:00 2001 From: Raphael Amorim Date: Thu, 21 Aug 2025 00:56:06 +0200 Subject: [PATCH] fix: revert sliding window for now --- internal/config/config.go | 1 - internal/config/load.go | 3 --- internal/llm/agent/agent.go | 9 +-------- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/internal/config/config.go b/internal/config/config.go index 8665249a87167932292de06bb9e5c4908d0fdb08..7fef3b11d9b08f60d1ee9554bed27fd142536f7a 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -143,7 +143,6 @@ type Options struct { DebugLSP bool `json:"debug_lsp,omitempty" jsonschema:"description=Enable debug logging for LSP servers,default=false"` DisableAutoSummarize bool `json:"disable_auto_summarize,omitempty" jsonschema:"description=Disable automatic conversation summarization,default=false"` DataDirectory string `json:"data_directory,omitempty" jsonschema:"description=Directory for storing application data (relative to working directory),default=.crush,example=.crush"` // Relative to the cwd - MaxMessages int `json:"max_messages,omitempty" jsonschema:"description=Maximum number of messages to keep in context (sliding window),default=50,minimum=10,maximum=200"` } type MCPs map[string]MCPConfig diff --git a/internal/config/load.go b/internal/config/load.go index a4aabbdf008d426181f0fc8fb8d90a0aa49959c0..12defe528334dba0a0c93463310ffbd3d9226a56 100644 --- a/internal/config/load.go +++ b/internal/config/load.go @@ -315,9 +315,6 @@ func (c *Config) setDefaults(workingDir string) { if c.Options.DataDirectory == "" { c.Options.DataDirectory = filepath.Join(workingDir, defaultDataDirectory) } - if c.Options.MaxMessages < 10 { - c.Options.MaxMessages = 50 - } if c.Providers == nil { c.Providers = csync.NewMap[string, ProviderConfig]() } diff --git a/internal/llm/agent/agent.go b/internal/llm/agent/agent.go index fb25d365634f6c0c544e9183b4e34d5f86907c03..eef57694c75fd904e7d26cc1b695ab665e154bba 100644 --- a/internal/llm/agent/agent.go +++ b/internal/llm/agent/agent.go @@ -355,8 +355,8 @@ func (a *agent) Run(ctx context.Context, sessionID string, content string, attac } genCtx, cancel := context.WithCancel(ctx) - a.activeRequests.Set(sessionID, cancel) + a.activeRequests.Set(sessionID, cancel) go func() { slog.Debug("Request started", "sessionID", sessionID) defer log.RecoverPanic("agent.Run", func() { @@ -388,13 +388,6 @@ func (a *agent) processGeneration(ctx context.Context, sessionID, content string return a.err(fmt.Errorf("failed to list messages: %w", err)) } - // sliding window to limit message history - maxMessagesInContext := cfg.Options.MaxMessages - if maxMessagesInContext > 0 && len(msgs) > maxMessagesInContext { - // Keep the first message (usually system/context) and the last N-1 messages - msgs = append(msgs[:1], msgs[len(msgs)-maxMessagesInContext+1:]...) - } - if len(msgs) == 0 { // Use a context with timeout for title generation titleCtx, titleCancel := context.WithTimeout(context.Background(), 30*time.Second)