Merge branch 'completion'

Author: ericdallo

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Add `:config-file` cli option to pass in config.
+- Add support for completion. #12
 
 ## 0.72.2
 

docs/configuration.md

@@ -495,6 +495,10 @@ To configure, add your OTLP collector config via `:otlp` map following [otlp aut
                 maxEntriesPerDir?: number;
             };
         };
+        completion?: {
+            model?: string;
+            systemPromptFile?: string;
+        };
         otlp?: {[key: string]: string};
     }
     ```
@@ -562,6 +566,10 @@ To configure, add your OTLP collector config via `:otlp` map following [otlp aut
           "maxTotalEntries": 800,
           "maxEntriesPerDir": 50
         }
+      },
+      "completion": {
+        "model": "openai/gpt-4o",
+        "systemPromptFile": "prompts/inline_completion.md"
       }
     }
     ```

docs/protocol.md

@@ -87,6 +87,30 @@ The protocol defines a set of lifecycle messages that manage the connection and
         Note right of S: Server stops its process
     ```
 
+### Basic structures
+
+```typescript
+export type ErrorType = 'error' | 'warning' | 'info';
+
+interface Error {
+    type: ErrorType;
+    message: string;
+}
+
+interface Range {
+   start: {
+       line: number;
+       character: number;
+   };
+   
+   end: {
+       line: number;
+       character: number;
+   };
+}
+```
+
+
 ### Initialize (↩️)
 
 The first request sent from client to server. This message:
@@ -1274,17 +1298,7 @@ interface EditorDiagnostic {
     /**
      * The diagnostic range (1-based).
      */
-    range: {
-        start: {
-            line: number;
-            character: number;
-        };
-        
-        end: {
-            line: number;
-            character: number;
-        };
-    };
+    range: Range;
 
     /**
      * The diagnostic code. Ex: 'wrong-args'
@@ -1300,7 +1314,65 @@ interface EditorDiagnostic {
 
 ### Completion (↩️)
 
-Soon
+A request sent from client to server, asking for a text to be presented to user as a inline completion for the current text code.
+
+_Request:_ 
+
+* method: `completion/inline`
+* params: `CompletionInlineParams` defined as follows:
+
+```typescript
+interface CompletionInlineParams {
+    /**
+     * The current document text.
+     */
+    docText: string;
+
+    /**
+     * The document version.
+     * Clients should increment this on their side each time document is changed.
+     * Server will return this on its completion so clients can 
+     * discard if document was changed/version was increased.
+     */
+    docVersion: number;
+
+    /**
+     * The cursor position.
+     */
+    position: {
+       line: number;
+       character: number;
+    };
+}
+```
+
+_Response:_ `CompletionInlineResponse | Error`
+
+```typescript
+interface CompletionInlineResponse {
+    /**
+     * The items available as completion.
+     */
+    items: CompletionInlineItem[];
+}
+
+interface CompletionInlineItem {
+    /**
+     * The item text
+     */
+    text: string;
+
+    /**
+     * The item doc-version
+     */
+    docVersion: number;
+    
+    /**
+     * The range of this new text in the document
+     */
+    range: Range;
+}
+```
 
 ### Edit (↩️)
 
@@ -1494,17 +1566,5 @@ _Request:_
 * params: `ShowMessageParams` defined as follows:
 
 ```typescript
-interface ShowMessageParams {
-    /**
-     * The message type. See {@link MessageType}.
-    */
-    type: MessageType;
-
-    /**
-     * The actual message.
-     */
-    message: string;
-}
-
-export type MessageType = 'error' | 'warning' | 'info';
+type ShowMessageParams = Error;
 ```

integration-test/llm_mock/anthropic.clj

@@ -206,19 +206,10 @@
         (hk/close ch)))))
 
 (defn ^:private chat-title-text-0 [ch]
-  (sse-send! ch "content_block_delta"
-             {:type "content_block_delta"
-              :index 0
-              :delta {:type "text_delta" :text "Some Cool"}})
-  (sse-send! ch "content_block_delta"
-             {:type "content_block_delta"
-              :index 0
-              :delta {:type "text_delta" :text " Title"}})
-  (sse-send! ch "message_delta"
-             {:type "message_delta"
-              :delta {:stop_reason "end_turn"}
-              :usage {:input_tokens 5
-                      :output_tokens 10}})
+  (hk/send! ch
+            (json/generate-string
+             {:content [{:text "Some Cool Title"}]})
+            true)
   (hk/close ch))
 
 (defn handle-anthropic-messages [req]

integration-test/llm_mock/ollama.clj

@@ -63,10 +63,10 @@
         (hk/close ch)))))
 
 (defn ^:private chat-title-text-0 [ch]
-  (sse-send! ch {:message {:thinking "Some Cool"}})
-  (sse-send! ch {:message {:thinking " Title"}})
-  (sse-send! ch {:done_reason "stop"})
-  (hk/close ch))
+  (hk/send! ch
+            (json/generate-string
+             {:message {:content "Some Cool Title"}})
+            true))
 
 (defn handle-ollama-chat [req]
   (let [body-str (slurp (:body req))

integration-test/llm_mock/openai.clj

@@ -180,17 +180,10 @@
         (hk/close ch)))))
 
 (defn ^:private chat-title-text-0 [ch]
-  (sse-send! ch "response.output_text.delta"
-             {:type "response.output_text.delta" :delta "Some Cool"})
-  (sse-send! ch "response.output_text.delta"
-             {:type "response.output_text.delta" :delta " Title"})
-  (sse-send! ch "response.completed"
-             {:type "response.completed"
-              :response {:output []
-                         :usage {:input_tokens 5
-                                 :output_tokens 10}
-                         :status "completed"}})
-  (hk/close ch))
+  (hk/send! ch
+            (json/generate-string
+             {:output [{:content [{:text "Some Cool Title"}]}]})
+            true))
 
 (defn handle-openai-responses [req]
   (let [body (some-> (slurp (:body req))

integration-test/llm_mock/openai_chat.clj

@@ -90,11 +90,10 @@
   (hk/close ch))
 
 (defn ^:private chat-title-text-0 [ch]
-  (send-sse! ch {:choices [{:delta {:content "Some Cool"}}]})
-  (send-sse! ch {:choices [{:delta {:content " Title"}}]})
-  (send-sse! ch {:usage {:prompt_tokens 5 :completion_tokens 10}})
-  (send-sse! ch {:choices [{:delta {} :finish_reason "stop"}]})
-  (hk/close ch))
+  (hk/send! ch
+            (json/generate-string
+             {:choices [{:message {:content "Some Cool Title"}}]})
+            true))
 
 (defn handle-openai-chat [req]
   ;; Capture and normalize the request body for assertions in tests

resources/prompts/inline_completion.md

@@ -0,0 +1,15 @@
+You are ECA Code Completer, an editor-native code completion engine.
+
+## Objective
+
+Given user code with <ECA_TAG>, generate the correct and useful text that the developer would likely write replacing that tag. Output only the text that directly replaces the ECA tag.
+
+## Core rules
+
+- Keep completions concise and safe: prefer 1–5 lines that compile, end at a natural boundary, and do not over-start or over-close scopes.
+- Match file style exactly: respect indentation, naming conventions, import/usings syntax, quotes, semicolons, docstring format, and line wrapping.
+- Favor in-scope symbols over inventing new ones; use existing helpers, types, and constants whenever possible.
+- If unsure, prefer a short, syntactically valid snippet to a longer guess.
+- Infer language from context and fully adhere to its language and framework conventions.
+- Never output placeholders or boilerplate such as TODO, FIXME, or lorem ipsum.
+- Pay attention on spaces after adding newlines to match the resulting code indentation.

src/eca/config.clj

@@ -118,7 +118,10 @@
    :compactPromptFile "prompts/compact.md"
    :index {:ignoreFiles [{:type :gitignore}]
            :repoMap {:maxTotalEntries 800
-                     :maxEntriesPerDir 50}}})
+                     :maxEntriesPerDir 50}}
+   :completion {:model "openai/gpt-4o"
+                :systemPromptFile "prompts/inline_completion.md"}})
+   
 
 (def ^:private fallback-behavior "agent")
 

src/eca/features/chat.clj

@@ -561,27 +561,28 @@
 
     (when-not (get-in db [:chats chat-id :title])
       (future
-        (when-let [title @(llm-api/simple-prompt
-                           {:provider provider
-                            :model model
-                            :model-capabilities model-capabilities
-                            :instructions (f.prompt/title-prompt)
-                            :user-messages user-messages
-                            :config config
-                            :tools []
-                            :provider-auth provider-auth})]
-          (let [title (subs title 0 (min (count title) 30))]
-            (swap! db* assoc-in [:chats chat-id :title] title)
-            (send-content! chat-ctx :system (assoc-some
-                                             {:type :metadata}
-                                             :title title))
-            ;; user prompt responded faster than title was generated
-            (when (= :idle (get-in @db* [:chats chat-id :status]))
-              (db/update-workspaces-cache! @db* metrics))))))
+        (when-let [{:keys [result]} (llm-api/sync-prompt!
+                                     {:provider provider
+                                      :model model
+                                      :model-capabilities model-capabilities
+                                      :instructions (f.prompt/title-prompt)
+                                      :user-messages user-messages
+                                      :config config
+                                      :tools []
+                                      :provider-auth provider-auth})]
+          (when result
+            (let [title (subs result 0 (min (count result) 30))]
+              (swap! db* assoc-in [:chats chat-id :title] title)
+              (send-content! chat-ctx :system (assoc-some
+                                               {:type :metadata}
+                                               :title title))
+              ;; user prompt responded faster than title was generated
+              (when (= :idle (get-in @db* [:chats chat-id :status]))
+                (db/update-workspaces-cache! @db* metrics)))))))
     (send-content! chat-ctx :system {:type :progress
                                      :state :running
                                      :text "Waiting model"})
-    (llm-api/complete!
+    (llm-api/async-prompt!
      {:model model
       :provider provider
       :model-capabilities model-capabilities