summaryrefslogtreecommitdiff
path: root/internal/lsp
diff options
context:
space:
mode:
Diffstat (limited to 'internal/lsp')
-rw-r--r--internal/lsp/handlers.go12
-rw-r--r--internal/lsp/handlers_completion.go196
-rw-r--r--internal/lsp/handlers_document.go5
-rw-r--r--internal/lsp/handlers_utils.go129
-rw-r--r--internal/lsp/llm_request_opts_test.go41
-rw-r--r--internal/lsp/provider_native_success_test.go9
-rw-r--r--internal/lsp/server.go22
7 files changed, 265 insertions, 149 deletions
diff --git a/internal/lsp/handlers.go b/internal/lsp/handlers.go
index c1a637f..94b6348 100644
--- a/internal/lsp/handlers.go
+++ b/internal/lsp/handlers.go
@@ -343,13 +343,15 @@ func (s *Server) isTriggerEvent(p CompletionParams, current string) bool {
return false
}
-func (s *Server) makeCompletionItems(cleaned string, inParams bool, current string, p CompletionParams, docStr string) []CompletionItem {
+func (s *Server) makeCompletionItems(cleaned string, inParams bool, current string, p CompletionParams, docStr string, detail string, sortPrefix string) []CompletionItem {
te, filter := computeTextEditAndFilter(cleaned, inParams, current, p)
rm := s.collectPromptRemovalEdits(p.TextDocument.URI)
label := labelForCompletion(cleaned, filter)
- detail := "Hexai LLM completion"
- if client := s.currentLLMClient(); client != nil {
- detail = "Hexai " + client.Name() + ":" + client.DefaultModel()
+ if strings.TrimSpace(detail) == "" {
+ detail = "Hexai LLM completion"
+ }
+ if sortPrefix == "" {
+ sortPrefix = "0000"
}
return []CompletionItem{{
Label: label,
@@ -359,7 +361,7 @@ func (s *Server) makeCompletionItems(cleaned string, inParams bool, current stri
FilterText: strings.TrimLeft(filter, " \t"),
TextEdit: te,
AdditionalTextEdits: rm,
- SortText: "0000",
+ SortText: sortPrefix,
Documentation: docStr,
}}
}
diff --git a/internal/lsp/handlers_completion.go b/internal/lsp/handlers_completion.go
index d115741..237d34d 100644
--- a/internal/lsp/handlers_completion.go
+++ b/internal/lsp/handlers_completion.go
@@ -6,6 +6,7 @@ import (
"encoding/json"
"fmt"
"strings"
+ "sync"
"time"
"codeberg.org/snonux/hexai/internal/llm"
@@ -94,17 +95,48 @@ func (s *Server) tryLLMCompletion(p CompletionParams, above, current, below, fun
if handled {
return items, true
}
-
- spec := s.buildRequestSpec(surfaceCompletion)
- client := s.clientFor(spec)
- if client == nil {
+ specs := s.buildRequestSpecs(surfaceCompletion)
+ if len(specs) == 0 {
return nil, false
}
- if items, ok := s.tryProviderNativeCompletion(spec, client, current, p, above, below, funcCtx, docStr, hasExtra, extraText, plan.inParams); ok {
- return items, true
+ type jobResult struct {
+ items []CompletionItem
+ ok bool
}
-
- return s.executeChatCompletion(ctx, plan, spec, client)
+ results := make([]jobResult, len(specs))
+ var wg sync.WaitGroup
+ var mu sync.Mutex
+ s.waitForDebounce(ctx)
+ if !s.waitForThrottle(ctx) {
+ return nil, false
+ }
+ for _, spec := range specs {
+ spec := spec
+ client := s.clientFor(spec)
+ if client == nil {
+ continue
+ }
+ wg.Add(1)
+ go func(idx int, spec requestSpec, client llm.Client) {
+ defer wg.Done()
+ items, ok := s.runCompletionForSpec(ctx, plan, spec, client)
+ mu.Lock()
+ results[idx] = jobResult{items: items, ok: ok}
+ mu.Unlock()
+ }(spec.index, spec, client)
+ }
+ wg.Wait()
+ accumulated := make([]CompletionItem, 0)
+ for _, res := range results {
+ if !res.ok {
+ continue
+ }
+ accumulated = append(accumulated, res.items...)
+ }
+ if len(accumulated) == 0 {
+ return nil, false
+ }
+ return accumulated, true
}
func (s *Server) prepareCompletionPlan(p CompletionParams, above, current, below, funcCtx, docStr string, hasExtra bool, extraText string) (completionPlan, []CompletionItem, bool) {
@@ -130,12 +162,6 @@ func (s *Server) prepareCompletionPlan(p CompletionParams, above, current, below
plan.inParams = inParamList(current, p.Position.Character)
plan.manualInvoke = parseManualInvoke(p.Context)
plan.cacheKey = s.completionCacheKey(p, above, current, below, funcCtx, plan.inParams, hasExtra, extraText)
- if cleaned, ok := s.completionCacheGet(plan.cacheKey); ok && strings.TrimSpace(cleaned) != "" {
- logging.Logf("lsp ", "completion cache hit uri=%s line=%d char=%d preview=%s%s%s",
- p.TextDocument.URI, p.Position.Line, p.Position.Character,
- logging.AnsiGreen, logging.PreviewForLog(cleaned), logging.AnsiBase)
- return plan, s.makeCompletionItems(cleaned, plan.inParams, current, p, docStr), true
- }
if isBareDoubleOpen(current, openChar, closeChar) || isBareDoubleOpen(below, openChar, closeChar) {
logging.Logf("lsp ", "%scompletion skip=empty-double-semicolon line=%d char=%d current=%q%s", logging.AnsiYellow, p.Position.Line, p.Position.Character, trimLen(current), logging.AnsiBase)
return plan, []CompletionItem{}, true
@@ -147,38 +173,58 @@ func (s *Server) prepareCompletionPlan(p CompletionParams, above, current, below
return plan, nil, false
}
-func (s *Server) executeChatCompletion(ctx context.Context, plan completionPlan, spec requestSpec, client llm.Client) ([]CompletionItem, bool) {
+func (s *Server) runCompletionForSpec(ctx context.Context, plan completionPlan, spec requestSpec, client llm.Client) ([]CompletionItem, bool) {
+ sortPrefix := fmt.Sprintf("%04d", spec.index)
+ modelKey := spec.effectiveModel(client.DefaultModel())
+ providerKey := spec.provider
+ if providerKey == "" {
+ providerKey = canonicalProvider(client.Name())
+ }
+ cacheKey := plan.cacheKey + "|" + providerKey + ":" + modelKey
+ if cached, ok := s.completionCacheGet(cacheKey); ok && strings.TrimSpace(cached) != "" {
+ logging.Logf("lsp ", "completion cache hit uri=%s line=%d char=%d preview=%s%s%s",
+ plan.params.TextDocument.URI, plan.params.Position.Line, plan.params.Position.Character,
+ logging.AnsiGreen, logging.PreviewForLog(cached), logging.AnsiBase)
+ detail := fmt.Sprintf("Hexai %s:%s", client.Name(), modelKey)
+ items := s.makeCompletionItems(cached, plan.inParams, plan.current, plan.params, plan.docStr, detail, sortPrefix)
+ return items, true
+ }
+ if items, ok := s.tryProviderNativeCompletion(ctx, plan, spec, client, sortPrefix); ok {
+ return items, true
+ }
+ return s.executeChatCompletion(ctx, plan, spec, client, sortPrefix)
+}
+
+func (s *Server) executeChatCompletion(ctx context.Context, plan completionPlan, spec requestSpec, client llm.Client, sortPrefix string) ([]CompletionItem, bool) {
messages := s.buildCompletionMessages(plan.inlinePrompt, plan.hasExtra, plan.extraText, plan.inParams, plan.params, plan.above, plan.current, plan.below, plan.funcCtx)
sentSize := 0
for _, m := range messages {
sentSize += len(m.Content)
}
s.incSentCounters(sentSize)
- opts := spec.options
- s.waitForDebounce(ctx)
- if !s.waitForThrottle(ctx) {
- return nil, false
- }
- modelUsed := spec.effectiveModel()
- if strings.TrimSpace(modelUsed) == "" {
- modelUsed = client.DefaultModel()
- }
- logging.Logf("lsp ", "completion llm=requesting model=%s", modelUsed)
- text, err := client.Chat(ctx, messages, opts...)
+ text, err := client.Chat(ctx, messages, spec.options...)
if err != nil {
logging.Logf("lsp ", "llm completion error: %v", err)
- s.logLLMStats(modelUsed)
+ s.logLLMStats("")
return nil, false
}
s.incRecvCounters(len(text))
+ modelUsed := spec.effectiveModel(client.DefaultModel())
+ _ = stats.Update(ctx, client.Name(), modelUsed, sentSize, len(text))
s.logLLMStats(modelUsed)
trimmed := strings.TrimSpace(text)
cleaned := s.postProcessCompletion(trimmed, plan.current[:plan.params.Position.Character], plan.current)
if cleaned == "" {
return nil, false
}
- s.completionCachePut(plan.cacheKey, cleaned)
- items := s.makeCompletionItems(cleaned, plan.inParams, plan.current, plan.params, plan.docStr)
+ detail := fmt.Sprintf("Hexai %s:%s", client.Name(), modelUsed)
+ providerKey := spec.provider
+ if providerKey == "" {
+ providerKey = canonicalProvider(client.Name())
+ }
+ cacheKey := plan.cacheKey + "|" + providerKey + ":" + modelUsed
+ s.completionCachePut(cacheKey, cleaned)
+ items := s.makeCompletionItems(cleaned, plan.inParams, plan.current, plan.params, plan.docStr, detail, sortPrefix)
return items, true
}
@@ -260,79 +306,75 @@ func (s *Server) prefixHeuristicAllows(inlinePrompt bool, current string, p Comp
}
// tryProviderNativeCompletion attempts provider-native completion and returns items when successful.
-func (s *Server) tryProviderNativeCompletion(spec requestSpec, client llm.Client, current string, p CompletionParams, above, below, funcCtx, docStr string, hasExtra bool, extraText string, inParams bool) ([]CompletionItem, bool) {
+func (s *Server) tryProviderNativeCompletion(ctx context.Context, plan completionPlan, spec requestSpec, client llm.Client, sortPrefix string) ([]CompletionItem, bool) {
cc, ok := client.(llm.CodeCompleter)
if !ok {
return nil, false
}
+ current := plan.current
+ p := plan.params
before, after := s.docBeforeAfter(p.TextDocument.URI, p.Position)
path := strings.TrimPrefix(p.TextDocument.URI, "file://")
- // Build provider-native prompt from template
cfg := s.currentConfig()
_, _, openChar, closeChar := s.inlineMarkers()
prompt := renderTemplate(cfg.PromptNativeCompletion, map[string]string{
"path": path,
"before": before,
})
- lang := ""
provider := spec.provider
if provider == "" {
provider = canonicalProvider(cfg.Provider)
}
logging.Logf("lsp ", "completion path=codex provider=%s uri=%s", provider, path)
- ctx2, cancel2 := context.WithTimeout(context.Background(), 15*time.Second)
+ ctx2, cancel2 := context.WithTimeout(ctx, 15*time.Second)
defer cancel2()
-
- // Debounce and throttle prior to provider-native call
- s.waitForDebounce(ctx2)
- if !s.waitForThrottle(ctx2) {
- return nil, false
- }
- // Count approximate payload sizes: prompt+after sent; first suggestion received
sentBytes := len(prompt) + len(after)
- modelUsed := spec.effectiveModel()
- if strings.TrimSpace(modelUsed) == "" {
- modelUsed = client.DefaultModel()
- }
+ modelUsed := spec.effectiveModel(client.DefaultModel())
tempVal := 0.0
- if val, ok := chooseSurfaceTemperature(surfaceCompletion, cfg, provider, spec.modelOverride, spec.fallbackModel); ok {
+ if val, ok := chooseSurfaceTemperature(surfaceCompletion, cfg, spec.entry, provider, modelUsed); ok {
tempVal = val
}
- suggestions, err := cc.CodeCompletion(ctx2, prompt, after, 1, lang, tempVal)
- if err == nil && len(suggestions) > 0 {
- // Update counters and heartbeat
- s.incSentCounters(sentBytes)
- s.incRecvCounters(len(suggestions[0]))
- // Contribute to global stats (provider-native path)
- if client != nil {
- _ = stats.Update(ctx2, client.Name(), modelUsed, sentBytes, len(suggestions[0]))
+ suggestions, err := cc.CodeCompletion(ctx2, prompt, after, 1, "", tempVal)
+ if err != nil || len(suggestions) == 0 {
+ if err != nil {
+ logging.Logf("lsp ", "completion path=codex error=%v (falling back)", err)
}
- s.logLLMStats(modelUsed)
- cleaned := strings.TrimSpace(suggestions[0])
- if cleaned != "" {
- cleaned = stripDuplicateAssignmentPrefix(current[:p.Position.Character], cleaned)
- if cleaned != "" {
- cleaned = stripDuplicateGeneralPrefix(current[:p.Position.Character], cleaned)
- }
- if cleaned != "" && hasDoubleOpenTrigger(current, openChar, closeChar) {
- indent := leadingIndent(current)
- if indent != "" {
- cleaned = applyIndent(indent, cleaned)
- }
- }
- if strings.TrimSpace(cleaned) != "" {
- key := s.completionCacheKey(p, above, current, below, funcCtx, inParams, hasExtra, extraText)
- s.completionCachePut(key, cleaned)
- return s.makeCompletionItems(cleaned, inParams, current, p, docStr), true
- }
+ return nil, false
+ }
+ s.incSentCounters(sentBytes)
+ s.incRecvCounters(len(suggestions[0]))
+ _ = stats.Update(ctx2, client.Name(), modelUsed, sentBytes, len(suggestions[0]))
+ s.logLLMStats(modelUsed)
+ cleaned := strings.TrimSpace(suggestions[0])
+ if cleaned == "" {
+ return nil, false
+ }
+ cleaned = stripDuplicateAssignmentPrefix(current[:p.Position.Character], cleaned)
+ if cleaned == "" {
+ return nil, false
+ }
+ cleaned = stripDuplicateGeneralPrefix(current[:p.Position.Character], cleaned)
+ if cleaned == "" {
+ return nil, false
+ }
+ if strings.TrimSpace(cleaned) != "" && hasDoubleOpenTrigger(current, openChar, closeChar) {
+ indent := leadingIndent(current)
+ if indent != "" {
+ cleaned = applyIndent(indent, cleaned)
}
- } else if err != nil {
- logging.Logf("lsp ", "completion path=codex error=%v (falling back to chat)", err)
- // Still emit a heartbeat for visibility, even on error
- s.incSentCounters(sentBytes)
- s.logLLMStats(modelUsed)
}
- return nil, false
+ if strings.TrimSpace(cleaned) == "" {
+ return nil, false
+ }
+ detail := fmt.Sprintf("Hexai %s:%s", client.Name(), modelUsed)
+ providerKey := provider
+ if providerKey == "" {
+ providerKey = canonicalProvider(client.Name())
+ }
+ cacheKey := plan.cacheKey + "|" + providerKey + ":" + modelUsed
+ s.completionCachePut(cacheKey, cleaned)
+ items := s.makeCompletionItems(cleaned, plan.inParams, current, p, plan.docStr, detail, sortPrefix)
+ return items, true
}
// waitForDebounce sleeps until there has been no input activity for at least
diff --git a/internal/lsp/handlers_document.go b/internal/lsp/handlers_document.go
index f8ed9ed..9325877 100644
--- a/internal/lsp/handlers_document.go
+++ b/internal/lsp/handlers_document.go
@@ -172,10 +172,7 @@ func (s *Server) detectAndHandleChat(uri string) {
if client == nil {
return
}
- modelUsed := spec.effectiveModel()
- if strings.TrimSpace(modelUsed) == "" {
- modelUsed = client.DefaultModel()
- }
+ modelUsed := spec.effectiveModel(client.DefaultModel())
logging.Logf("lsp ", "chat llm=requesting model=%s", modelUsed)
text, err := s.chatWithStats(ctx, surfaceChat, spec, msgs)
if err != nil {
diff --git a/internal/lsp/handlers_utils.go b/internal/lsp/handlers_utils.go
index c8d2d24..2748a60 100644
--- a/internal/lsp/handlers_utils.go
+++ b/internal/lsp/handlers_utils.go
@@ -25,41 +25,79 @@ const (
type requestSpec struct {
provider string
- modelOverride string
+ entry appconfig.SurfaceConfig
fallbackModel string
options []llm.RequestOption
+ index int
}
-func (r requestSpec) effectiveModel() string {
- if s := strings.TrimSpace(r.modelOverride); s != "" {
- return s
+func (r requestSpec) modelOverride() string { return strings.TrimSpace(r.entry.Model) }
+
+func (r requestSpec) effectiveModel(defaultModel string) string {
+ if m := strings.TrimSpace(r.entry.Model); m != "" {
+ return m
+ }
+ if f := strings.TrimSpace(r.fallbackModel); f != "" {
+ return f
}
- return strings.TrimSpace(r.fallbackModel)
+ return strings.TrimSpace(defaultModel)
}
-func (s *Server) buildRequestSpec(surface surfaceKind) requestSpec {
+func (s *Server) buildRequestSpecs(surface surfaceKind) []requestSpec {
cfg := s.currentConfig()
- providerOverride := strings.TrimSpace(surfaceProviderFromConfig(cfg, surface))
- provider := canonicalProvider(cfg.Provider)
- if providerOverride != "" {
- provider = canonicalProvider(providerOverride)
+ entries := surfaceConfigsFor(cfg, surface)
+ if len(entries) == 0 {
+ entries = []appconfig.SurfaceConfig{{Provider: cfg.Provider}}
}
- fallbackModel := strings.TrimSpace(resolveDefaultModel(cfg, provider))
- modelOverride := strings.TrimSpace(surfaceModelFromConfig(cfg, surface))
maxTokens := s.maxTokens()
- opts := []llm.RequestOption{llm.WithMaxTokens(maxTokens)}
- if tempVal, ok := chooseSurfaceTemperature(surface, cfg, provider, modelOverride, fallbackModel); ok {
- opts = append(opts, llm.WithTemperature(tempVal))
- }
- if modelOverride != "" {
- opts = append(opts, llm.WithModel(modelOverride))
+ specs := make([]requestSpec, 0, len(entries))
+ for idx, raw := range entries {
+ entry := appconfig.SurfaceConfig{
+ Provider: strings.TrimSpace(raw.Provider),
+ Model: strings.TrimSpace(raw.Model),
+ Temperature: raw.Temperature,
+ }
+ provider := entry.Provider
+ if provider == "" {
+ provider = cfg.Provider
+ }
+ provider = canonicalProvider(provider)
+ fallbackModel := entry.Model
+ if fallbackModel == "" {
+ fallbackModel = strings.TrimSpace(resolveDefaultModel(cfg, provider))
+ }
+ opts := []llm.RequestOption{llm.WithMaxTokens(maxTokens)}
+ if entry.Model != "" {
+ opts = append(opts, llm.WithModel(entry.Model))
+ }
+ if temp, ok := chooseSurfaceTemperature(surface, cfg, entry, provider, fallbackModel); ok {
+ opts = append(opts, llm.WithTemperature(temp))
+ }
+ specs = append(specs, requestSpec{
+ provider: provider,
+ entry: entry,
+ fallbackModel: fallbackModel,
+ options: opts,
+ index: idx,
+ })
}
- return requestSpec{
- provider: provider,
- modelOverride: modelOverride,
- fallbackModel: fallbackModel,
- options: opts,
+ return specs
+}
+
+func (s *Server) primaryRequestSpec(surface surfaceKind) requestSpec {
+ specs := s.buildRequestSpecs(surface)
+ if len(specs) == 0 {
+ cfg := s.currentConfig()
+ provider := canonicalProvider(cfg.Provider)
+ fallback := strings.TrimSpace(resolveDefaultModel(cfg, provider))
+ return requestSpec{provider: provider, fallbackModel: fallback, options: []llm.RequestOption{llm.WithMaxTokens(s.maxTokens())}}
}
+ return specs[0]
+}
+
+// buildRequestSpec is retained for consumers expecting a single-entry helper.
+func (s *Server) buildRequestSpec(surface surfaceKind) requestSpec {
+ return s.primaryRequestSpec(surface)
}
func canonicalProvider(name string) string {
@@ -94,37 +132,13 @@ func surfaceConfigsFor(cfg appconfig.App, surface surfaceKind) []appconfig.Surfa
}
}
-func surfaceModelFromConfig(cfg appconfig.App, surface surfaceKind) string {
- configs := surfaceConfigsFor(cfg, surface)
- if len(configs) == 0 {
- return ""
- }
- return configs[0].Model
-}
-
-func surfaceProviderFromConfig(cfg appconfig.App, surface surfaceKind) string {
- configs := surfaceConfigsFor(cfg, surface)
- if len(configs) == 0 {
- return ""
- }
- return configs[0].Provider
-}
-
-func surfaceTemperatureFromConfig(cfg appconfig.App, surface surfaceKind) *float64 {
- configs := surfaceConfigsFor(cfg, surface)
- if len(configs) == 0 {
- return nil
- }
- return configs[0].Temperature
-}
-
-func chooseSurfaceTemperature(surface surfaceKind, cfg appconfig.App, provider string, overrideModel, fallbackModel string) (float64, bool) {
- if t := surfaceTemperatureFromConfig(cfg, surface); t != nil {
- return *t, true
+func chooseSurfaceTemperature(surface surfaceKind, cfg appconfig.App, entry appconfig.SurfaceConfig, provider string, fallbackModel string) (float64, bool) {
+ if entry.Temperature != nil {
+ return *entry.Temperature, true
}
if cfg.CodingTemperature != nil {
temp := *cfg.CodingTemperature
- effectiveModel := strings.TrimSpace(overrideModel)
+ effectiveModel := strings.TrimSpace(entry.Model)
if effectiveModel == "" {
effectiveModel = strings.TrimSpace(fallbackModel)
}
@@ -133,7 +147,7 @@ func chooseSurfaceTemperature(surface surfaceKind, cfg appconfig.App, provider s
}
return temp, true
}
- effectiveModel := strings.TrimSpace(overrideModel)
+ effectiveModel := strings.TrimSpace(entry.Model)
if effectiveModel == "" {
effectiveModel = strings.TrimSpace(fallbackModel)
}
@@ -283,19 +297,16 @@ func (s *Server) chatWithStats(ctx context.Context, surface surfaceKind, spec re
if client == nil {
return "", fmt.Errorf("llm client unavailable")
}
+ modelUsed := spec.effectiveModel(client.DefaultModel())
txt, err := client.Chat(ctx, msgs, spec.options...)
if err != nil {
- s.logLLMStats(spec.effectiveModel())
+ s.logLLMStats(modelUsed)
return "", err
}
s.incRecvCounters(len(txt))
// Update global stats cache
- model := spec.effectiveModel()
- if model == "" {
- model = client.DefaultModel()
- }
- _ = stats.Update(ctx, client.Name(), model, sent, len(txt))
- s.logLLMStats(model)
+ _ = stats.Update(ctx, client.Name(), modelUsed, sent, len(txt))
+ s.logLLMStats(modelUsed)
return txt, nil
}
diff --git a/internal/lsp/llm_request_opts_test.go b/internal/lsp/llm_request_opts_test.go
index 263db79..f4d31b9 100644
--- a/internal/lsp/llm_request_opts_test.go
+++ b/internal/lsp/llm_request_opts_test.go
@@ -4,6 +4,7 @@ import (
"context"
"testing"
+ "codeberg.org/snonux/hexai/internal/appconfig"
"codeberg.org/snonux/hexai/internal/llm"
)
@@ -15,6 +16,10 @@ func (f fakeClient) Chat(_ context.Context, _ []llm.Message, _ ...llm.RequestOpt
func (f fakeClient) Name() string { return f.name }
func (f fakeClient) DefaultModel() string { return f.model }
+func floatPtr(v float64) *float64 {
+ return &v
+}
+
func TestRequestSpec_Gpt5_ForcesTemp1(t *testing.T) {
s := newTestServer()
one := 0.2
@@ -30,7 +35,41 @@ func TestRequestSpec_Gpt5_ForcesTemp1(t *testing.T) {
if got.Temperature != 1.0 {
t.Fatalf("expected temp 1.0 for gpt-5, got %v", got.Temperature)
}
- if model := spec.effectiveModel(); model != "gpt-5.0" {
+ if model := spec.effectiveModel(s.llmClient.DefaultModel()); model != "gpt-5.0" {
t.Fatalf("expected fallback model gpt-5.0, got %q", model)
}
}
+
+func TestBuildRequestSpecs_MultiEntries(t *testing.T) {
+ s := newTestServer()
+ s.cfg.CompletionConfigs = []appconfig.SurfaceConfig{
+ {Provider: "openai", Model: "gpt-4o"},
+ {Provider: "copilot", Model: "cpt", Temperature: floatPtr(0.4)},
+ }
+ s.cfg.OpenAIModel = "gpt-3.5"
+ s.cfg.CopilotModel = "cpt-base"
+ s.cfg.MaxTokens = 256
+ specs := s.buildRequestSpecs(surfaceCompletion)
+ if len(specs) != 2 {
+ t.Fatalf("expected 2 specs, got %d", len(specs))
+ }
+ if specs[0].provider != "openai" || specs[0].index != 0 {
+ t.Fatalf("unexpected first spec: %+v", specs[0])
+ }
+ if specs[1].provider != "copilot" || specs[1].index != 1 {
+ t.Fatalf("unexpected second spec: %+v", specs[1])
+ }
+ var opts1, opts2 llm.Options
+ for _, opt := range specs[0].options {
+ opt(&opts1)
+ }
+ for _, opt := range specs[1].options {
+ opt(&opts2)
+ }
+ if opts1.Model != "gpt-4o" || opts1.MaxTokens != 256 {
+ t.Fatalf("unexpected opts1: %+v", opts1)
+ }
+ if opts2.Model != "cpt" || opts2.Temperature != 0.4 {
+ t.Fatalf("unexpected opts2: %+v", opts2)
+ }
+}
diff --git a/internal/lsp/provider_native_success_test.go b/internal/lsp/provider_native_success_test.go
index aab886c..e5ab81e 100644
--- a/internal/lsp/provider_native_success_test.go
+++ b/internal/lsp/provider_native_success_test.go
@@ -25,7 +25,8 @@ func TestProviderNativeCompletion_Success(t *testing.T) {
// current line with dot trigger; position after dot
current := "fmt."
p := CompletionParams{TextDocument: TextDocumentIdentifier{URI: "file:///x.go"}, Position: Position{Line: 0, Character: len(current)}}
- items, ok := s.tryProviderNativeCompletion(spec, s.llmClient, current, p, "", "", "func f(){}", "doc", false, "", false)
+ plan := completionPlan{current: current, params: p, funcCtx: "func f(){}", docStr: "doc", cacheKey: "k"}
+ items, ok := s.tryProviderNativeCompletion(context.Background(), plan, spec, s.llmClient, "0000")
if !ok || len(items) == 0 {
t.Fatalf("expected provider-native items")
}
@@ -51,7 +52,8 @@ func TestProviderNativeCompletion_IndentWithDoubleOpen(t *testing.T) {
spec := s.buildRequestSpec(surfaceCompletion)
current := " >>do>" // leading indent + double-open marker
p := CompletionParams{TextDocument: TextDocumentIdentifier{URI: "file:///x.go"}, Position: Position{Line: 0, Character: len(current)}}
- items, ok := s.tryProviderNativeCompletion(spec, s.llmClient, current, p, "", "", "func f(){}", "doc", false, "", false)
+ plan := completionPlan{current: current, params: p, funcCtx: "func f(){}", docStr: "doc", cacheKey: "k"}
+ items, ok := s.tryProviderNativeCompletion(context.Background(), plan, spec, s.llmClient, "0000")
if !ok || len(items) == 0 {
t.Fatalf("expected provider-native items")
}
@@ -88,7 +90,8 @@ func TestProviderNativeCompletion_UsesPromptTemplate(t *testing.T) {
current := "fmt."
// Cursor at line 1, char 1 -> before should be "AAA\nB"
p := CompletionParams{TextDocument: TextDocumentIdentifier{URI: uri}, Position: Position{Line: 1, Character: 1}}
- if _, ok := s.tryProviderNativeCompletion(spec, s.llmClient, current, p, "", "", "func f(){}", "doc", false, "", false); !ok {
+ plan := completionPlan{current: current, params: p, funcCtx: "func f(){}", docStr: "doc", cacheKey: "k"}
+ if _, ok := s.tryProviderNativeCompletion(context.Background(), plan, spec, s.llmClient, "0000"); !ok {
t.Fatalf("expected provider-native path")
}
if cap.lastPrompt == "" {
diff --git a/internal/lsp/server.go b/internal/lsp/server.go
index 28f3218..1fbb0cc 100644
--- a/internal/lsp/server.go
+++ b/internal/lsp/server.go
@@ -257,6 +257,28 @@ func (s *Server) clientFor(spec requestSpec) llm.Client {
if store != nil {
cfg = store.Snapshot()
}
+ cfg.Provider = provider
+ modelOverride := strings.TrimSpace(spec.entry.Model)
+ switch provider {
+ case "openai":
+ if modelOverride != "" {
+ cfg.OpenAIModel = modelOverride
+ } else if spec.fallbackModel != "" {
+ cfg.OpenAIModel = spec.fallbackModel
+ }
+ case "copilot":
+ if modelOverride != "" {
+ cfg.CopilotModel = modelOverride
+ } else if spec.fallbackModel != "" {
+ cfg.CopilotModel = spec.fallbackModel
+ }
+ case "ollama":
+ if modelOverride != "" {
+ cfg.OllamaModel = modelOverride
+ } else if spec.fallbackModel != "" {
+ cfg.OllamaModel = spec.fallbackModel
+ }
+ }
client, err := newClientForProvider(cfg, provider)
if err != nil {
logging.Logf("lsp ", "failed to build client for provider=%s: %v", provider, err)
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-14 23:18:48 +0000