2 files changed, 72 insertions, 0 deletions
diff --git a/internal/lsp/completion_provider_fallback_test.go b/internal/lsp/completion_provider_fallback_test.go
new file mode 100644
index 0000000..04ca7a4
--- /dev/null
+++ b/internal/lsp/completion_provider_fallback_test.go
@@ -0,0 +1,41 @@
+package lsp
+
+import (
+    "context"
+    "encoding/json"
+    "io"
+    "testing"
+
+    "codeberg.org/snonux/hexai/internal/llm"
+)
+
+// fakeCompleterErr implements both Client and CodeCompleter; CodeCompletion errors,
+// forcing tryProviderNativeCompletion to take the error path and fall back to chat.
+type fakeCompleterErr struct{}
+func (fakeCompleterErr) Chat(context.Context, []llm.Message, ...llm.RequestOption) (string, error) { return "X", nil }
+func (fakeCompleterErr) Name() string { return "prov" }
+func (fakeCompleterErr) DefaultModel() string { return "m" }
+func (fakeCompleterErr) CodeCompletion(context.Context, string, string, int, string, float64) ([]string, error) { return nil, io.EOF }
+
+func TestCompletion_FallbackOnProviderError(t *testing.T) {
+    s := newTestServer()
+    s.llmClient = fakeCompleterErr{}
+    // Provide simple document
+    uri := "file:///x.go"
+    s.setDocument(uri, "package p\nfunc f(){\nfmt.\n}\n")
+    // Position after 'fmt.' to satisfy prefix heuristics
+    p := CompletionParams{TextDocument: TextDocumentIdentifier{URI: uri}, Position: Position{Line:2, Character:4}}
+    // Build context for trigger character '.'
+    ctx := struct{ TriggerKind int `json:"triggerKind"`; TriggerCharacter string `json:"triggerCharacter"` }{TriggerKind: 2, TriggerCharacter: "."}
+    bctx, _ := json.Marshal(ctx)
+    p.Context = json.RawMessage(bctx)
+
+    // Call handleCompletion and ensure it returns at least one item from chat fallback
+    var buf nopWriter
+    s.out = &buf
+    s.handleCompletion(Request{JSONRPC: "2.0", ID: json.RawMessage("6"), Method: "textDocument/completion", Params: mustJSON(p)})
+    // No panic implies path executed; detailed decode not needed here
+}
+
+type nopWriter struct{}
+func (nopWriter) Write(p []byte) (int, error) { return len(p), nil }
diff --git a/internal/lsp/handlers_end_to_end_test.go b/internal/lsp/handlers_end_to_end_test.go
index 5466f1c..9767fa6 100644
--- a/internal/lsp/handlers_end_to_end_test.go
+++ b/internal/lsp/handlers_end_to_end_test.go
@@ -109,6 +109,37 @@ func TestHandleCodeActionResolve_Document(t *testing.T) {
     if resolved.Edit == nil { t.Fatalf("expected resolved edit") }
 }
 
+func TestHandleCodeAction_NoLLMOrEmptySelection_ReturnsEmpty(t *testing.T) {
+    var out bytes.Buffer
+    s := &Server{logger: log.New(io.Discard, "", 0), docs: make(map[string]*document), out: &out}
+    uri := "file:///x.go"
+    s.setDocument(uri, "package p\n\n")
+    // Empty selection
+    p := CodeActionParams{TextDocument: TextDocumentIdentifier{URI: uri}, Range: Range{Start: Position{Line:1}, End: Position{Line:1}}}
+    b, _ := json.Marshal(p)
+    req := Request{JSONRPC: "2.0", ID: json.RawMessage("4"), Method: "textDocument/codeAction", Params: b}
+    out.Reset()
+    s.handleCodeAction(req)
+    resp := captureResponse(t, &out)
+    var actions []CodeAction
+    rb, _ := json.Marshal(resp.Result)
+    _ = json.Unmarshal(rb, &actions)
+    if len(actions) != 0 { t.Fatalf("expected no actions for empty selection, got %d", len(actions)) }
+
+    // No llm client: should also return empty even if selection non-empty
+    p2 := CodeActionParams{TextDocument: TextDocumentIdentifier{URI: uri}, Range: Range{Start: Position{Line:0}, End: Position{Line:0, Character:7}}}
+    out.Reset()
+    req2 := Request{JSONRPC: "2.0", ID: json.RawMessage("5"), Method: "textDocument/codeAction", Params: mustJSON(p2)}
+    s.handleCodeAction(req2)
+    resp2 := captureResponse(t, &out)
+    var actions2 []CodeAction
+    rb2, _ := json.Marshal(resp2.Result)
+    _ = json.Unmarshal(rb2, &actions2)
+    if len(actions2) != 0 { t.Fatalf("expected no actions when llm is nil") }
+}
+
+func mustJSON(v any) json.RawMessage { b, _ := json.Marshal(v); return b }
+
 func TestDetectAndHandleChat_InsertsReply(t *testing.T) {
     var out bytes.Buffer
     s := &Server{logger: log.New(io.Discard, "", 0), docs: make(map[string]*document), out: &out}