lkn
/
ollie-el
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

complete: shell out to u/complete instead of managing copilot session directly

This commit is contained in:
Levi Neely 2026-05-03 22:02:45 +02:00
parent b22030827a
commit de3d08ce14
1 changed files with 47 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

174
ellie.el
View File

@ -562,52 +562,6 @@ Attaches to the last session if it still exists; otherwise creates a new one."
(defvar ellie--complete-timer nil (defvar ellie--complete-timer nil
"Timer for polling completion result.") "Timer for polling completion result.")
(defun ellie--complete-session-id ()
"Return the deterministic copilot session ID for `default-directory'."
(let* ((cwd (expand-file-name default-directory))
;; Emulate POSIX cksum: use the same CRC but just take the numeric hash.
;; We shell out once to stay consistent with the acme script.
(hash (string-trim
(shell-command-to-string
(format "printf '%%s' %s | cksum | awk '{print $1}'"
(shell-quote-argument cwd))))))
(concat hash "-copilot")))
(defun ellie--complete-ensure-session ()
"Find or create the copilot session for `default-directory'.
Returns the session directory path."
(when (string-empty-p ellie-complete-backend)
(user-error "Set `ellie-complete-backend' or $OLLIE_COMPLETE_BACKEND"))
(when (string-empty-p ellie-complete-model)
(user-error "Set `ellie-complete-model' or $OLLIE_COMPLETE_MODEL"))
(let* ((id (ellie--complete-session-id))
(sdir (expand-file-name id (ellie--sessions-dir))))
(if (file-directory-p sdir)
;; Check for failed state; kill and recreate if needed.
(let ((state (ellie--complete-state sdir)))
(when (or (string-prefix-p "failed" state)
(string-prefix-p "error" state))
(ignore-errors (ellie--fwrite (expand-file-name "ctl" sdir) "kill\n"))
(sleep-for 0.1)
(ellie--complete-create-session id))
sdir)
(ellie--complete-create-session id)
sdir)))
(defun ellie--complete-create-session (id)
"Create a copilot session with ID."
(let ((spec (format "name=%s\ncwd=%s\nagent=copilot\nbackend=%s\nmodel=%s\n"
id (expand-file-name default-directory)
ellie-complete-backend ellie-complete-model)))
(ellie--fwrite (ellie--sessions-new-path) spec)
(let ((sdir (expand-file-name id (ellie--sessions-dir)))
(deadline (+ (float-time) 5.0)))
(while (and (not (file-directory-p sdir))
(< (float-time) deadline))
(sleep-for 0.05))
(unless (file-directory-p sdir)
(user-error "Timeout waiting for copilot session %s" id)))))
(defun ellie--complete-strip (text) (defun ellie--complete-strip (text)
"Strip markdown fences and info lines from TEXT." "Strip markdown fences and info lines from TEXT."
(let ((lines (split-string text "\n"))) (let ((lines (split-string text "\n")))
@ -617,25 +571,6 @@ Returns the session directory path."
lines)) lines))
(string-join lines "\n"))) (string-join lines "\n")))
(defun ellie--complete-state (sdir)
"Read the session state from cfg in SDIR."
(let ((cfg (ellie--fread (expand-file-name "cfg" sdir))))
(if (and cfg (string-match "^state=\\(.*\\)$" cfg))
(string-trim (match-string 1 cfg))
"unknown")))
(defun ellie--read-from-byte-offset (path offset)
"Read PATH and return content starting at byte OFFSET as a string."
(if (or (<= offset 0) (not (file-exists-p path)))
(or (ellie--fread path) "")
(with-temp-buffer
(set-buffer-multibyte nil)
(insert-file-contents-literally path)
(let ((raw (buffer-substring-no-properties
(min (1+ offset) (point-max))
(point-max))))
(decode-coding-string raw 'utf-8)))))
;; Ghost text state. ;; Ghost text state.
(defvar ellie--ghost-overlay nil "Overlay showing the ghost completion.") (defvar ellie--ghost-overlay nil "Overlay showing the ghost completion.")
(defvar ellie--ghost-text nil "The pending ghost text string.") (defvar ellie--ghost-text nil "The pending ghost text string.")
@ -675,15 +610,12 @@ If REGION is a cons (BEG . END), the ghost replaces that region on accept."
ellie--ghost-overlay ov) ellie--ghost-overlay ov)
(overlay-put ov 'display (propertize text 'face 'ellie-ghost)) (overlay-put ov 'display (propertize text 'face 'ellie-ghost))
(overlay-put ov 'ellie-ghost t)) (overlay-put ov 'ellie-ghost t))
;; No region: show ghost on next line. ;; No region: show ghost inline at point.
(save-excursion (setq ellie--ghost-pos pos)
(goto-char pos) (setq ellie--ghost-overlay (make-overlay pos pos buf))
(end-of-line) (overlay-put ellie--ghost-overlay 'after-string
(setq ellie--ghost-pos (point)) (propertize text 'face 'ellie-ghost))
(setq ellie--ghost-overlay (make-overlay (point) (point) buf)) (overlay-put ellie--ghost-overlay 'ellie-ghost t))
(overlay-put ellie--ghost-overlay 'after-string
(propertize (concat "\n" text) 'face 'ellie-ghost))
(overlay-put ellie--ghost-overlay 'ellie-ghost t)))
(ellie-ghost-mode 1) (ellie-ghost-mode 1)
(add-hook 'pre-command-hook #'ellie--ghost-pre-command nil t)))) (add-hook 'pre-command-hook #'ellie--ghost-pre-command nil t))))
@ -710,10 +642,8 @@ If REGION is a cons (BEG . END), the ghost replaces that region on accept."
(delete-region (car region) (cdr region)) (delete-region (car region) (cdr region))
(goto-char (car region)) (goto-char (car region))
(insert text)) (insert text))
(save-excursion (goto-char pos)
(goto-char pos) (insert text)))))
(insert "\n" text))
(goto-char (+ pos 1 (length text)))))))
(defun ellie--ghost-accept-cmd () (defun ellie--ghost-accept-cmd ()
"Interactive command to accept ghost text." "Interactive command to accept ghost text."
@ -727,14 +657,17 @@ If REGION is a cons (BEG . END), the ghost replaces that region on accept."
;;;###autoload ;;;###autoload
(defun ellie-complete () (defun ellie-complete ()
"Request AI code completion and show it as ghost text on the next line. "Request AI code completion and show it as ghost text.
\\`TAB' accepts the suggestion; any other key dismisses it. \\`TAB' accepts the suggestion; any other key dismisses it.
Calling again while a suggestion is showing requests a new one." Calling again while a suggestion is showing requests a new one."
(interactive) (interactive)
(when (string-empty-p ellie-complete-backend)
(user-error "Set `ellie-complete-backend' or $OLLIE_COMPLETE_BACKEND"))
(when (string-empty-p ellie-complete-model)
(user-error "Set `ellie-complete-model' or $OLLIE_COMPLETE_MODEL"))
(let* ((prev-region ellie--ghost-region)) (let* ((prev-region ellie--ghost-region))
(ellie--ghost-dismiss) (ellie--ghost-dismiss)
(let* ((sdir (ellie--complete-ensure-session)) (let* ((filename (or (buffer-file-name) (buffer-name)))
(filename (or (buffer-file-name) (buffer-name)))
(has-region (or (use-region-p) prev-region)) (has-region (or (use-region-p) prev-region))
(reg-beg (cond ((use-region-p) (region-beginning)) (reg-beg (cond ((use-region-p) (region-beginning))
(prev-region (car prev-region)))) (prev-region (car prev-region))))
@ -744,56 +677,43 @@ Calling again while a suggestion is showing requests a new one."
(prefix (buffer-substring-no-properties (prefix (buffer-substring-no-properties
(max (point-min) (- ctx-point ellie-complete-prefix-max)) (max (point-min) (- ctx-point ellie-complete-prefix-max))
ctx-point)) ctx-point))
(selected (if has-region
(buffer-substring-no-properties reg-beg reg-end)
""))
(suffix (buffer-substring-no-properties (suffix (buffer-substring-no-properties
(if has-region reg-end (point)) (if has-region reg-end (point))
(min (point-max) (+ (if has-region reg-end (point)) (min (point-max) (+ (if has-region reg-end (point))
ellie-complete-suffix-max)))) ellie-complete-suffix-max))))
(prompt (if has-region (cur-point (point))
(format "Replace the selected code in %s. Output ONLY the replacement text — no markdown fences, no explanation.\n\n<prefix>\n%s\n</prefix>\n<selected>\n%s\n</selected>\n<suffix>\n%s\n</suffix>" (region-cons (and has-region (cons reg-beg reg-end)))
(file-name-nondirectory filename) prefix selected suffix) (buf (current-buffer))
(format "Complete the code at the cursor in %s. Output ONLY the raw text to insert at the cursor position. Do NOT wrap the output in markdown code fences or backticks. No explanation, no preamble.\n\n<prefix>\n%s\n</prefix>\n<suffix>\n%s\n</suffix>" (ucomplete (expand-file-name "u/complete" ellie-mount-directory)))
(file-name-nondirectory filename) prefix suffix))) (when has-region (deactivate-mark))
(cur-point (point)) (message "ellie: completing...")
(region-cons (and has-region (cons reg-beg reg-end))) (let* ((process-environment
(buf (current-buffer))) (append (list (concat "OLLIE=" ellie-mount-directory))
(when has-region (deactivate-mark)) process-environment))
(message "ellie: completing...") (cmd (format "%s -file %s -suffix %s -model %s -backend %s"
(ellie--fwrite (expand-file-name "prompt" sdir) prompt) (shell-quote-argument ucomplete)
(when ellie--complete-timer (cancel-timer ellie--complete-timer)) (shell-quote-argument (file-name-nondirectory filename))
(let ((deadline (+ (float-time) 30.0))) (shell-quote-argument suffix)
(setq ellie--complete-timer (shell-quote-argument ellie-complete-model)
(run-with-timer 0.3 0.3 (shell-quote-argument ellie-complete-backend)))
(lambda () (proc-buf (generate-new-buffer " *ellie-complete*")))
(condition-case err (when ellie--complete-timer (cancel-timer ellie--complete-timer))
(let ((state (ellie--complete-state sdir))) (set-process-sentinel
(cond (start-process-shell-command "ellie-complete" proc-buf
((string= state "idle") (format "printf '%%s' %s | %s"
(cancel-timer ellie--complete-timer) (shell-quote-argument prefix) cmd))
(setq ellie--complete-timer nil) (lambda (proc _event)
(let* ((offset (string-to-number (when (eq (process-status proc) 'exit)
(or (ellie--fread (let ((result (string-trim-right
(expand-file-name "offset" sdir)) (ellie--complete-strip
"0"))) (with-current-buffer (process-buffer proc)
(chat-path (expand-file-name "chat" sdir)) (buffer-string))))))
(result (string-trim-right (kill-buffer (process-buffer proc))
(ellie--complete-strip (if (or (not (zerop (process-exit-status proc)))
(ellie--read-from-byte-offset chat-path offset))))) (string-empty-p (string-trim result)))
(ellie--fwrite (expand-file-name "ctl" sdir) "clear\n") (message "ellie: empty completion")
(if (string-empty-p (string-trim result)) (ellie--ghost-show result cur-point buf region-cons)
(message "ellie: empty completion") (message "ellie: TAB/RET accept · M-/ retry · any key dismiss"))))))))))
(ellie--ghost-show result cur-point buf region-cons)
(message "ellie: TAB/RET accept · M-/ retry · any key dismiss"))))
((> (float-time) deadline)
(cancel-timer ellie--complete-timer)
(setq ellie--complete-timer nil)
(message "ellie: completion timed out"))))
(error
(cancel-timer ellie--complete-timer)
(setq ellie--complete-timer nil)
(message "ellie: completion error: %s" err))))))))))
;;;###autoload ;;;###autoload
(define-key global-map (kbd "M-/") #'ellie-complete) (define-key global-map (kbd "M-/") #'ellie-complete)