diff --git a/internal/config/load.go b/internal/config/load.go
index bdfd6328c8cabb1ea57afcd1f6e7e94645fd93e5..9ac5411f0b1697ce96453c72a01defe219c19a37 100644
--- a/internal/config/load.go
+++ b/internal/config/load.go
@@ -381,7 +381,7 @@ func (c *Config) applyLSPDefaults() {
 func (c *Config) defaultModelSelection(knownProviders []catwalk.Provider) (largeModel SelectedModel, smallModel SelectedModel, err error) {
 	if len(knownProviders) == 0 && c.Providers.Len() == 0 {
 		err = fmt.Errorf("no providers configured, please configure at least one provider")
-		return
+		return largeModel, smallModel, err
 	}
 
 	// Use the first provider enabled based on the known providers order
@@ -394,7 +394,7 @@ func (c *Config) defaultModelSelection(knownProviders []catwalk.Provider) (large
 		defaultLargeModel := c.GetModel(string(p.ID), p.DefaultLargeModelID)
 		if defaultLargeModel == nil {
 			err = fmt.Errorf("default large model %s not found for provider %s", p.DefaultLargeModelID, p.ID)
-			return
+			return largeModel, smallModel, err
 		}
 		largeModel = SelectedModel{
 			Provider:        string(p.ID),
@@ -406,7 +406,7 @@ func (c *Config) defaultModelSelection(knownProviders []catwalk.Provider) (large
 		defaultSmallModel := c.GetModel(string(p.ID), p.DefaultSmallModelID)
 		if defaultSmallModel == nil {
 			err = fmt.Errorf("default small model %s not found for provider %s", p.DefaultSmallModelID, p.ID)
-			return
+			return largeModel, smallModel, err
 		}
 		smallModel = SelectedModel{
 			Provider:        string(p.ID),
@@ -414,7 +414,7 @@ func (c *Config) defaultModelSelection(knownProviders []catwalk.Provider) (large
 			MaxTokens:       defaultSmallModel.DefaultMaxTokens,
 			ReasoningEffort: defaultSmallModel.DefaultReasoningEffort,
 		}
-		return
+		return largeModel, smallModel, err
 	}
 
 	enabledProviders := c.EnabledProviders()
@@ -424,13 +424,13 @@ func (c *Config) defaultModelSelection(knownProviders []catwalk.Provider) (large
 
 	if len(enabledProviders) == 0 {
 		err = fmt.Errorf("no providers configured, please configure at least one provider")
-		return
+		return largeModel, smallModel, err
 	}
 
 	providerConfig := enabledProviders[0]
 	if len(providerConfig.Models) == 0 {
 		err = fmt.Errorf("provider %s has no models configured", providerConfig.ID)
-		return
+		return largeModel, smallModel, err
 	}
 	defaultLargeModel := c.GetModel(providerConfig.ID, providerConfig.Models[0].ID)
 	largeModel = SelectedModel{
@@ -444,7 +444,7 @@ func (c *Config) defaultModelSelection(knownProviders []catwalk.Provider) (large
 		Model:     defaultSmallModel.ID,
 		MaxTokens: defaultSmallModel.DefaultMaxTokens,
 	}
-	return
+	return largeModel, smallModel, err
 }
 
 func (c *Config) configureSelectedModels(knownProviders []catwalk.Provider) error {
diff --git a/internal/llm/provider/anthropic.go b/internal/llm/provider/anthropic.go
index 3fffd6b35fe6ee8b6a765e2e5b815ad36a5b6a55..a5355b09e235d791d178a445ba98095974acbef4 100644
--- a/internal/llm/provider/anthropic.go
+++ b/internal/llm/provider/anthropic.go
@@ -175,7 +175,7 @@ func (a *anthropicClient) convertMessages(messages []message.Message) (anthropic
 			anthropicMessages = append(anthropicMessages, anthropic.NewUserMessage(results...))
 		}
 	}
-	return
+	return anthropicMessages
 }
 
 func (a *anthropicClient) convertTools(tools []tools.BaseTool) []anthropic.ToolUnionParam {
diff --git a/internal/llm/provider/openai.go b/internal/llm/provider/openai.go
index 8d49062044af2c3c2e8663d8d281d0e27ac1a1b1..8df3989abbacbb7e46c59a0c750df8a7879789c1 100644
--- a/internal/llm/provider/openai.go
+++ b/internal/llm/provider/openai.go
@@ -178,7 +178,7 @@ func (o *openaiClient) convertMessages(messages []message.Message) (openaiMessag
 		}
 	}
 
-	return
+	return openaiMessages
 }
 
 func (o *openaiClient) convertTools(tools []tools.BaseTool) []openai.ChatCompletionToolParam {
diff --git a/internal/llm/provider/provider.go b/internal/llm/provider/provider.go
index 28562f2f484a75c445d9eaa21ce90af4ef5ca613..3705645517cd10803ede285f8d2935f43575b746 100644
--- a/internal/llm/provider/provider.go
+++ b/internal/llm/provider/provider.go
@@ -98,7 +98,7 @@ func (p *baseProvider[C]) cleanMessages(messages []message.Message) (cleaned []m
 		}
 		cleaned = append(cleaned, msg)
 	}
-	return
+	return cleaned
 }
 
 func (p *baseProvider[C]) SendMessages(ctx context.Context, messages []message.Message, tools []tools.BaseTool) (*ProviderResponse, error) {
diff --git a/internal/shell/shell.go b/internal/shell/shell.go
index ef3abf8d30d37490e452478abe38ef39efd8a7fa..5a10be9537714162e4d5ed25360b42690395793f 100644
--- a/internal/shell/shell.go
+++ b/internal/shell/shell.go
@@ -207,7 +207,7 @@ func splitArgsFlags(parts []string) (args []string, flags []string) {
 			args = append(args, part)
 		}
 	}
-	return
+	return args, flags
 }
 
 func (s *Shell) blockHandler() func(next interp.ExecHandlerFunc) interp.ExecHandlerFunc {
diff --git a/internal/tui/exp/diffview/diffview.go b/internal/tui/exp/diffview/diffview.go
index eaea2837fcaa7522294143f0385bcbb0879316bd..cda4b74b28843beda36bda17c4fbf29137017422 100644
--- a/internal/tui/exp/diffview/diffview.go
+++ b/internal/tui/exp/diffview/diffview.go
@@ -408,7 +408,7 @@ func (dv *DiffView) renderUnified() string {
 		content = ansi.GraphemeWidth.Cut(content, dv.xOffset, len(content))
 		content = ansi.Truncate(content, dv.codeWidth, "…")
 		leadingEllipsis = dv.xOffset > 0 && strings.TrimSpace(content) != ""
-		return
+		return content, leadingEllipsis
 	}
 
 outer:
@@ -531,7 +531,7 @@ func (dv *DiffView) renderSplit() string {
 		content = ansi.GraphemeWidth.Cut(content, dv.xOffset, len(content))
 		content = ansi.Truncate(content, dv.codeWidth, "…")
 		leadingEllipsis = dv.xOffset > 0 && strings.TrimSpace(content) != ""
-		return
+		return content, leadingEllipsis
 	}
 
 outer:
@@ -716,7 +716,7 @@ func (dv *DiffView) hunkShownLines(h *udiff.Hunk) (before, after int) {
 			before++
 		}
 	}
-	return
+	return before, after
 }
 
 func (dv *DiffView) lineStyleForType(t udiff.OpKind) LineStyle {
diff --git a/internal/tui/exp/diffview/split.go b/internal/tui/exp/diffview/split.go
index ed4fedb543e7ea34f72f20e3c255a85706a4abcf..5a0f13116160b8c7178293944e3a45e4fcb7d8d3 100644
--- a/internal/tui/exp/diffview/split.go
+++ b/internal/tui/exp/diffview/split.go
@@ -69,5 +69,5 @@ func hunkToSplit(h *udiff.Hunk) (sh splitHunk) {
 		sh.lines = append(sh.lines, &sl)
 	}
 
-	return
+	return sh
 }
diff --git a/internal/tui/exp/list/list.go b/internal/tui/exp/list/list.go
index 8995e0360a6a72868d0819214a410257d1c8fa2b..fd789f90b89b016abb9b9fb5c79227da7ef30fd9 100644
--- a/internal/tui/exp/list/list.go
+++ b/internal/tui/exp/list/list.go
@@ -1372,7 +1372,7 @@ func (l *list[T]) findWordBoundaries(col, line int) (startCol, endCol int) {
 	if startCol == -1 {
 		return 0, 0
 	}
-	return
+	return startCol, endCol
 }
 
 func (l *list[T]) findParagraphBoundaries(line int) (startLine, endLine int, found bool) {