llmutils: remove remaining default-model wrappers in callers (task 413)

3 files changed, 5 insertions, 17 deletions

diff --git a/internal/hexaiaction/prompts.go b/internal/hexaiaction/prompts.go
index 2e4b52b..7c134c5 100644
--- a/internal/hexaiaction/prompts.go
+++ b/internal/hexaiaction/prompts.go
@@ -42,10 +42,6 @@ func canonicalProvider(name string) string {
 	return llmutils.CanonicalProvider(name)
 }
 
-func defaultModelForProvider(cfg appconfig.App, provider string) string {
-	return llmutils.DefaultModelForProvider(cfg, provider)
-}
-
 func selectActionTemperature(cfg appconfig.App, provider string, entry appconfig.SurfaceConfig, model string) (float64, bool) {
 	if entry.Temperature != nil {
 		return *entry.Temperature, true
@@ -193,7 +189,7 @@ func reqOptsFrom(cfg appconfig.App) requestArgs {
 	provider := canonicalProvider(cfg.Provider)
 	entries := cfg.CodeActionConfigs
 	if len(entries) == 0 {
-		entries = []appconfig.SurfaceConfig{{Provider: cfg.Provider, Model: strings.TrimSpace(defaultModelForProvider(cfg, provider))}}
+		entries = []appconfig.SurfaceConfig{{Provider: cfg.Provider, Model: strings.TrimSpace(llmutils.DefaultModelForProvider(cfg, provider))}}
 	}
 	primary := entries[0]
 	if strings.TrimSpace(primary.Provider) != "" {
@@ -201,7 +197,7 @@ func reqOptsFrom(cfg appconfig.App) requestArgs {
 	}
 	model := strings.TrimSpace(primary.Model)
 	if model == "" {
-		model = strings.TrimSpace(defaultModelForProvider(cfg, provider))
+		model = strings.TrimSpace(llmutils.DefaultModelForProvider(cfg, provider))
 	}
 	if strings.TrimSpace(primary.Model) != "" {
 		opts = append(opts, llm.WithModel(strings.TrimSpace(primary.Model)))
diff --git a/internal/hexaicli/run.go b/internal/hexaicli/run.go
index 4cb9e01..85a3fdd 100644
--- a/internal/hexaicli/run.go
+++ b/internal/hexaicli/run.go
@@ -95,7 +95,7 @@ func buildCLIRequest(entry appconfig.SurfaceConfig, provider string, cfg appconf
 			model = strings.TrimSpace(client.DefaultModel())
 		}
 		if model == "" {
-			model = strings.TrimSpace(defaultModelForProvider(cfg, provider))
+			model = strings.TrimSpace(llmutils.DefaultModelForProvider(cfg, provider))
 		}
 	}
 	if entry.Model != "" {
@@ -128,10 +128,6 @@ func canonicalProvider(name string) string {
 	return llmutils.CanonicalProvider(name)
 }
 
-func defaultModelForProvider(cfg appconfig.App, provider string) string {
-	return llmutils.DefaultModelForProvider(cfg, provider)
-}
-
 // Run executes the Hexai CLI behavior given arguments and I/O streams.
 // It assumes flags have already been parsed by the caller.
 func Run(ctx context.Context, args []string, stdin io.Reader, stdout, stderr io.Writer) error {
diff --git a/internal/lsp/handlers_utils.go b/internal/lsp/handlers_utils.go
index 1f6acfe..adc3b7e 100644
--- a/internal/lsp/handlers_utils.go
+++ b/internal/lsp/handlers_utils.go
@@ -63,7 +63,7 @@ func (s *Server) buildRequestSpecs(surface surfaceKind) []requestSpec {
 		provider = canonicalProvider(provider)
 		fallbackModel := entry.Model
 		if fallbackModel == "" {
-			fallbackModel = strings.TrimSpace(resolveDefaultModel(cfg, provider))
+			fallbackModel = strings.TrimSpace(llmutils.DefaultModelForProvider(cfg, provider))
 		}
 		opts := []llm.RequestOption{llm.WithMaxTokens(maxTokens)}
 		if entry.Model != "" {
@@ -88,7 +88,7 @@ func (s *Server) primaryRequestSpec(surface surfaceKind) requestSpec {
 	if len(specs) == 0 {
 		cfg := s.currentConfig()
 		provider := canonicalProvider(cfg.Provider)
-		fallback := strings.TrimSpace(resolveDefaultModel(cfg, provider))
+		fallback := strings.TrimSpace(llmutils.DefaultModelForProvider(cfg, provider))
 		return requestSpec{provider: provider, fallbackModel: fallback, options: []llm.RequestOption{llm.WithMaxTokens(s.maxTokens())}}
 	}
 	return specs[0]
@@ -103,10 +103,6 @@ func canonicalProvider(name string) string {
 	return llmutils.CanonicalProvider(name)
 }
 
-func resolveDefaultModel(cfg appconfig.App, provider string) string {
-	return llmutils.DefaultModelForProvider(cfg, provider)
-}
-
 func surfaceConfigsFor(cfg appconfig.App, surface surfaceKind) []appconfig.SurfaceConfig {
 	switch surface {
 	case surfaceCompletion: