Amr Gharbeia
1f8b821287
Some checks failed
Deploy (Gitea) / deploy (push) Failing after 2s
Croatoan returns key structs (make-key :name :backspace) for special keys. The on-key handler was comparing these structs to keywords like :backspace with eq, which always failed. Keys like Enter (returned as 13) worked, but Backspace/Tab/arrows didn't. Actually, the user couldn't delete typed characters. Fix: normalize at the top of on-key — if the input is a key struct, extract the :name keyword. This allows the existing keyword-based cond dispatches to work for all keys. Updated all tests to use (make-key :name :enter/backspace/tab) instead of raw integer codes, matching what Croatoan actually sends. TUI: 43/43 pass.
417 lines
17 KiB
Common Lisp
417 lines
17 KiB
Common Lisp
(in-package :passepartout.gateway-tui)
|
|
|
|
(defun on-key (&rest args)
|
|
;; Normalize: Croatoan returns key structs for special keys.
|
|
;; Extract the :name keyword so the rest of the handler can use eq.
|
|
(let* ((raw (car args))
|
|
(ch (if (typep raw 'croatoan:key)
|
|
(croatoan:key-name raw)
|
|
raw)))
|
|
(cond
|
|
;; Enter
|
|
((or (eq ch :enter) (eql ch 13) (eql ch 10)
|
|
(eql ch #\Newline) (eql ch #\Return))
|
|
;; Multi-line: if buffer ends with \, strip it and insert newline
|
|
(if (and (st :input-buffer) (eql (first (st :input-buffer)) #\\))
|
|
(progn (pop (st :input-buffer))
|
|
(push #\Newline (st :input-buffer))
|
|
(setf (st :dirty) (list nil nil t)))
|
|
(let ((text (string-trim '(#\Space #\Tab) (input-string))))
|
|
(when (> (length text) 0)
|
|
(push text (st :input-history))
|
|
(setf (st :input-hpos) 0)
|
|
(setf (st :scroll-offset) 0)
|
|
(cond
|
|
;; /help command
|
|
((string-equal text "/help")
|
|
(add-msg :system
|
|
"/eval <expr> Evaluate Lisp expression")
|
|
(add-msg :system
|
|
"/focus <proj> Set project context")
|
|
(add-msg :system
|
|
"/scope <s> Change scope (memex/session/project)")
|
|
(add-msg :system
|
|
"/unfocus Pop context stack")
|
|
(add-msg :system
|
|
"/theme Show current color theme")
|
|
(add-msg :system
|
|
"/help Show this help")
|
|
(add-msg :system
|
|
"\\ + Enter Multi-line input"))
|
|
;; /theme command
|
|
((string-equal text "/theme")
|
|
(add-msg :system
|
|
(format nil "Theme: user=~a agent=~a system=~a input=~a"
|
|
(getf *tui-theme* :user)
|
|
(getf *tui-theme* :agent)
|
|
(getf *tui-theme* :system)
|
|
(getf *tui-theme* :input))))
|
|
;; /eval command
|
|
((and (>= (length text) 6)
|
|
(string-equal (subseq text 0 6) "/eval "))
|
|
(handler-case
|
|
(let* ((*read-eval* t)
|
|
(*package* (find-package :passepartout.gateway-tui))
|
|
(r (eval (read-from-string (subseq text 6)))))
|
|
(add-msg :system (format nil "=> ~s" r)))
|
|
(error (c) (add-msg :system (format nil "=> ✗ ~a" c)))))
|
|
;; /focus <project> — set project context
|
|
((and (>= (length text) 7)
|
|
(string-equal (subseq text 0 7) "/focus "))
|
|
(let ((project (string-trim '(#\Space) (subseq text 7))))
|
|
(if (and (fboundp 'focus-project) (> (length project) 0))
|
|
(progn (funcall 'focus-project project nil)
|
|
(add-msg :system (format nil "Focused on project: ~a" project)))
|
|
(add-msg :system "Usage: /focus <project-name>"))))
|
|
;; /scope <scope> — change context scope
|
|
((and (>= (length text) 7)
|
|
(string-equal (subseq text 0 7) "/scope "))
|
|
(let ((scope-str (string-trim '(#\Space) (subseq text 7))))
|
|
(cond
|
|
((and (fboundp 'focus-session) (string-equal scope-str "session"))
|
|
(funcall 'focus-session)
|
|
(add-msg :system "Scope: session"))
|
|
((and (fboundp 'focus-project) (string-equal scope-str "project"))
|
|
(funcall 'focus-project nil nil)
|
|
(add-msg :system "Scope: project"))
|
|
((and (fboundp 'focus-memex) (string-equal scope-str "memex"))
|
|
(funcall 'focus-memex)
|
|
(add-msg :system "Scope: memex"))
|
|
(t (add-msg :system "Usage: /scope memex|session|project")))))
|
|
;; /unfocus — pop context
|
|
((and (>= (length text) 8)
|
|
(string-equal (subseq text 0 8) "/unfocus"))
|
|
(if (fboundp 'unfocus)
|
|
(progn (funcall 'unfocus)
|
|
(add-msg :system "Popped context"))
|
|
(add-msg :system "Context manager not loaded")))
|
|
;; Normal message
|
|
(t
|
|
(add-msg :user text)
|
|
(setf (st :busy) t)
|
|
(send-daemon (list :type :event
|
|
:payload (list :sensor :user-input :text text)))))
|
|
(setf (st :input-buffer) nil)
|
|
(setf (st :dirty) (list t t t))))))
|
|
;; Tab — command completion
|
|
((or (eql ch 9) (eq ch :tab))
|
|
(let ((text (input-string)))
|
|
(when (and (> (length text) 1) (eql (char text 0) #\/))
|
|
(let* ((cmds '("/eval" "/focus" "/scope" "/unfocus" "/help" "/theme"))
|
|
(match (find text cmds :test
|
|
(lambda (in cmd)
|
|
(and (>= (length cmd) (length in))
|
|
(string-equal cmd in :end1 (length in)))))))
|
|
(when match
|
|
(setf (st :input-buffer) (reverse (coerce match 'list)))
|
|
(when (member match '("/eval" "/focus" "/scope") :test #'string=)
|
|
(push #\Space (st :input-buffer)))
|
|
(setf (st :dirty) (list nil nil t)))))))
|
|
;; Backspace
|
|
((or (eq ch :backspace) (eql ch 127) (eql ch 8)
|
|
(eql ch #\Backspace))
|
|
(when (st :input-buffer) (pop (st :input-buffer)))
|
|
(setf (st :dirty) (list nil nil t)))
|
|
;; Up arrow
|
|
((or (eq ch :up) (eql ch 259))
|
|
(let* ((h (st :input-history)) (p (st :input-hpos)))
|
|
(when (and h (< p (1- (length h))))
|
|
(incf (st :input-hpos))
|
|
(setf (st :input-buffer)
|
|
(reverse (coerce (nth (st :input-hpos) h) 'list)))
|
|
(setf (st :dirty) (list nil nil t)))))
|
|
;; Down arrow
|
|
((or (eq ch :down) (eql ch 258))
|
|
(when (> (st :input-hpos) 0)
|
|
(decf (st :input-hpos))
|
|
(let ((h (st :input-history)))
|
|
(setf (st :input-buffer)
|
|
(if (and h (< (st :input-hpos) (length h)))
|
|
(reverse (coerce (nth (st :input-hpos) h) 'list))
|
|
nil))
|
|
(setf (st :dirty) (list nil nil t)))))
|
|
;; PageUp
|
|
((or (eq ch :ppage) (eql ch 339))
|
|
(incf (st :scroll-offset) 5)
|
|
(setf (st :dirty) (list nil t nil)))
|
|
;; PageDown
|
|
((or (eq ch :npage) (eql ch 338))
|
|
(setf (st :scroll-offset) (max 0 (- (st :scroll-offset) 5)))
|
|
(setf (st :dirty) (list nil t nil)))
|
|
;; Printable
|
|
(t
|
|
(let ((chr (typecase ch
|
|
(character ch)
|
|
(integer (code-char ch))
|
|
(t nil))))
|
|
(when (and chr (graphic-char-p chr))
|
|
(push chr (st :input-buffer))
|
|
(setf (st :dirty) (list nil nil t))))))))
|
|
|
|
(defun on-daemon-msg (msg)
|
|
(let* ((payload (getf msg :payload))
|
|
(text (getf payload :text))
|
|
(action (getf payload :action)))
|
|
(cond
|
|
(text (setf (st :busy) nil)
|
|
(add-msg :agent text))
|
|
((eq action :handshake)
|
|
(add-msg :system (format nil "Connected v~a" (getf payload :version))))
|
|
(t (add-msg :agent (format nil "~a" msg))))))
|
|
|
|
(defun send-daemon (msg)
|
|
(let ((s (st :stream)))
|
|
(when (and s (open-stream-p s))
|
|
(handler-case
|
|
(progn
|
|
(format s "~a" (frame-message msg))
|
|
(finish-output s))
|
|
(error (c) (log-message "TUI-SEND: ~a" c))))))
|
|
|
|
(defun recv-daemon (s)
|
|
(handler-case
|
|
(let* ((hdr (make-string 6)) (n 0))
|
|
(loop while (< n 6)
|
|
do (let ((ch (read-char s nil)))
|
|
(unless ch (return-from recv-daemon nil))
|
|
(setf (char hdr n) ch) (incf n)))
|
|
(let* ((len (parse-integer hdr :radix 16 :junk-allowed t))
|
|
(buf (make-string (or len 0))))
|
|
(when (and len (> len 0))
|
|
(loop for i from 0 below len
|
|
do (let ((ch (read-char s nil)))
|
|
(unless ch (return-from recv-daemon nil))
|
|
(setf (char buf i) ch)))
|
|
(let ((*read-eval* nil))
|
|
(read-from-string buf)))))
|
|
(error (c) (log-message "TUI-RECV: ~a" c) nil)))
|
|
|
|
(defun reader-loop (s)
|
|
(loop while (and (st :running) (open-stream-p s))
|
|
do (let ((msg (recv-daemon s)))
|
|
(when msg (queue-event (list :type :daemon :payload msg))))))
|
|
|
|
(defun connect-daemon (&optional (host "127.0.0.1") (port 9105))
|
|
(handler-case
|
|
(let ((s (usocket:socket-connect host port :element-type 'character)))
|
|
(setf (st :stream) (usocket:socket-stream s) (st :connected) t)
|
|
(bt:make-thread (lambda () (reader-loop (st :stream))) :name "tui-reader")
|
|
(add-msg :system "* Connected *")
|
|
t)
|
|
(error (c)
|
|
(add-msg :system (format nil "* Connection failed: ~a *" c))
|
|
nil)))
|
|
|
|
(defun disconnect-daemon ()
|
|
(when (st :stream)
|
|
(ignore-errors (close (st :stream)))
|
|
(setf (st :stream) nil (st :connected) nil)
|
|
(add-msg :system "* Disconnected *")))
|
|
|
|
(defun tui-main ()
|
|
(init-state)
|
|
(with-screen (scr :input-blocking nil :input-echoing nil :cursor-visible nil)
|
|
(let* ((h (or (height scr) 24))
|
|
(w (or (width scr) 80))
|
|
(sw (make-instance 'window :height 3 :width (- w 2) :y 0 :x 1))
|
|
(ch (- h 5))
|
|
(cw (make-instance 'window :height ch :width (- w 2) :y 3 :x 1))
|
|
(iw (make-instance 'window :height 1 :width (- w 2) :y (- h 1) :x 1))
|
|
(swank-port (or (ignore-errors
|
|
(parse-integer (uiop:getenv "TUI_SWANK_PORT")))
|
|
4006)))
|
|
(setf (function-keys-enabled-p iw) t
|
|
(st :dirty) (list t t t))
|
|
(connect-daemon)
|
|
(when (> swank-port 0)
|
|
(handler-case
|
|
(progn
|
|
(ql:quickload :swank :silent t)
|
|
(funcall (find-symbol "CREATE-SERVER" "SWANK")
|
|
:port swank-port :dont-close t)
|
|
(add-msg :system
|
|
(format nil "* Swank ~d M-x slime-connect *" swank-port)))
|
|
(error ()
|
|
(add-msg :system "* Swank unavailable *"))))
|
|
(loop while (st :running) do
|
|
(dolist (ev (drain-queue))
|
|
(when (eq (getf ev :type) :daemon)
|
|
(on-daemon-msg (getf ev :payload))))
|
|
(let ((ch (get-char iw)))
|
|
(when (and ch (not (equal ch -1)))
|
|
(on-key ch)))
|
|
(redraw sw cw ch iw)
|
|
(refresh scr)
|
|
(sleep 0.03))
|
|
(disconnect-daemon))))
|
|
|
|
(eval-when (:compile-toplevel :load-toplevel :execute)
|
|
(ql:quickload :fiveam :silent t))
|
|
|
|
(defpackage :passepartout-tui-tests
|
|
(:use :cl :passepartout :passepartout.gateway-tui)
|
|
(:export #:tui-suite))
|
|
|
|
(in-package :passepartout-tui-tests)
|
|
|
|
(fiveam:def-suite tui-suite :description "Verification of the TUI model and event handling")
|
|
(fiveam:in-suite tui-suite)
|
|
|
|
(fiveam:test test-init-state
|
|
"Contract model.1: init-state returns fresh state plist with required keys."
|
|
(init-state)
|
|
(fiveam:is (eq t (st :running)))
|
|
(fiveam:is (eq :chat (st :mode)))
|
|
(fiveam:is (eq nil (st :connected)))
|
|
(fiveam:is (eq nil (st :stream)))
|
|
(fiveam:is (eq nil (st :messages)))
|
|
(fiveam:is (eq 0 (st :scroll-offset)))
|
|
(fiveam:is (eq nil (st :busy))))
|
|
|
|
(fiveam:test test-add-msg
|
|
"Contract model.2: add-msg appends a message with role, content, and time."
|
|
(init-state)
|
|
(add-msg :user "hello")
|
|
(let* ((msgs (st :messages))
|
|
(msg (first msgs)))
|
|
(fiveam:is (eq :user (getf msg :role)))
|
|
(fiveam:is (string= "hello" (getf msg :content)))
|
|
(fiveam:is (stringp (getf msg :time)))
|
|
(fiveam:is (= 5 (length (getf msg :time))))))
|
|
|
|
(fiveam:test test-add-msg-dirty-flag
|
|
"Contract model.2: add-msg sets dirty flags for status and chat."
|
|
(init-state)
|
|
(setf (st :dirty) (list nil nil nil))
|
|
(add-msg :system "boot")
|
|
(let ((dirty (st :dirty)))
|
|
(fiveam:is (eq t (first dirty)))
|
|
(fiveam:is (eq t (second dirty)))
|
|
(fiveam:is (eq nil (third dirty)))))
|
|
|
|
(fiveam:test test-queue-event-roundtrip
|
|
"Contract model.3: queue-event + drain-queue preserves events in order."
|
|
(init-state)
|
|
(queue-event '(:type :key :payload (:ch 13)))
|
|
(queue-event '(:type :daemon :payload (:text "hi")))
|
|
(let ((evs (drain-queue)))
|
|
(fiveam:is (= 2 (length evs)))
|
|
(fiveam:is (equal '(:type :key :payload (:ch 13)) (first evs)))
|
|
(fiveam:is (equal '(:type :daemon :payload (:text "hi")) (second evs)))
|
|
(fiveam:is (null (drain-queue)))))
|
|
|
|
(fiveam:test test-on-key-enter-sends-user-message
|
|
"Contract 1: on-key with Enter extracts input, adds user message, clears buffer."
|
|
(init-state)
|
|
;; Simulate typing "test"
|
|
(dolist (ch '(#\t #\e #\s #\t))
|
|
(on-key (char-code ch)))
|
|
(fiveam:is (string= "test" (input-string)))
|
|
;; Simulate Enter key — Croatoan returns a key struct for :enter
|
|
(on-key (croatoan:make-key :name :enter))
|
|
;; Input buffer should be cleared
|
|
(fiveam:is (string= "" (input-string)))
|
|
;; A user message should be in the message list
|
|
(let ((msgs (st :messages)))
|
|
(fiveam:is (>= (length msgs) 1))
|
|
(let ((last (first msgs)))
|
|
(fiveam:is (eq :user (getf last :role)))
|
|
(fiveam:is (string= "test" (getf last :content))))))
|
|
|
|
(fiveam:test test-on-key-eval-command
|
|
"Contract 1: on-key handles /eval command and displays result."
|
|
(init-state)
|
|
;; Type "/eval (+ 1 2)"
|
|
(dolist (ch (coerce "/eval (+ 1 2)" 'list))
|
|
(on-key (char-code ch)))
|
|
(on-key (croatoan:make-key :name :enter))
|
|
(let ((msgs (st :messages)))
|
|
(fiveam:is (>= (length msgs) 1))
|
|
(let ((last-msg (first msgs)))
|
|
(fiveam:is (eq :system (getf last-msg :role)))
|
|
(fiveam:is (search "=> 3" (getf last-msg :content))))))
|
|
|
|
(fiveam:test test-on-key-focus-command
|
|
"Contract 1: /focus command parses project name."
|
|
(init-state)
|
|
(dolist (ch (coerce "/focus myapp" 'list))
|
|
(on-key (char-code ch)))
|
|
(on-key (croatoan:make-key :name :enter))
|
|
(let ((msg (first (st :messages))))
|
|
(fiveam:is (eq :system (getf msg :role)))))
|
|
|
|
(fiveam:test test-on-key-scope-command
|
|
"Contract 1: /scope command with valid argument."
|
|
(init-state)
|
|
(dolist (ch (coerce "/scope memex" 'list))
|
|
(on-key (char-code ch)))
|
|
(on-key (croatoan:make-key :name :enter))
|
|
(let ((msg (first (st :messages))))
|
|
(fiveam:is (eq :system (getf msg :role)))))
|
|
|
|
(fiveam:test test-on-key-unfocus-command
|
|
"Contract 1: /unfocus command dispatches correctly."
|
|
(init-state)
|
|
(dolist (ch (coerce "/unfocus" 'list))
|
|
(on-key (char-code ch)))
|
|
(on-key (croatoan:make-key :name :enter))
|
|
(let ((msg (first (st :messages))))
|
|
(fiveam:is (eq :system (getf msg :role)))))
|
|
|
|
(fiveam:test test-on-key-tab-completion
|
|
"Contract 1: Tab completes / commands when input starts with /."
|
|
(init-state)
|
|
(dolist (ch (coerce "/ev" 'list))
|
|
(on-key (char-code ch)))
|
|
(on-key (croatoan:make-key :name :tab))
|
|
(fiveam:is (string= "/eval " (input-string))))
|
|
|
|
(fiveam:test test-on-key-tab-no-slash
|
|
"Contract 1: Tab does nothing when input doesn't start with /."
|
|
(init-state)
|
|
(dolist (ch (coerce "hello" 'list))
|
|
(on-key (char-code ch)))
|
|
(on-key (croatoan:make-key :name :tab))
|
|
(fiveam:is (string= "hello" (input-string))))
|
|
|
|
(fiveam:test test-on-key-multiline
|
|
"Contract 1: \\ + Enter inserts newline instead of sending."
|
|
(init-state)
|
|
(dolist (ch (coerce "line1" 'list))
|
|
(on-key (char-code ch)))
|
|
(on-key (char-code #\\))
|
|
(on-key (croatoan:make-key :name :enter))
|
|
(fiveam:is (search "line1" (input-string)))
|
|
(fiveam:is (search (string #\Newline) (input-string))))
|
|
|
|
(fiveam:test test-on-key-help
|
|
"Contract 1: /help displays command list."
|
|
(init-state)
|
|
(dolist (ch (coerce "/help" 'list))
|
|
(on-key (char-code ch)))
|
|
(on-key (croatoan:make-key :name :enter))
|
|
(let ((msgs (st :messages)))
|
|
(fiveam:is (>= (length msgs) 3))
|
|
(fiveam:is (some (lambda (m) (search "/eval" (getf m :content))) msgs))))
|
|
|
|
(fiveam:test test-activity-indicator
|
|
"Contract model: :busy flag is set on send and cleared on agent response."
|
|
(init-state)
|
|
(fiveam:is (eq nil (st :busy)))
|
|
;; Simulate sending a normal message (sets busy)
|
|
(dolist (ch (coerce "hello" 'list))
|
|
(on-key (char-code ch)))
|
|
(on-key (croatoan:make-key :name :enter))
|
|
(fiveam:is (eq t (st :busy)))
|
|
;; Simulate receiving an agent response (clears busy)
|
|
(on-daemon-msg '(:type :event :payload (:text "hi back")))
|
|
(fiveam:is (eq nil (st :busy))))
|
|
|
|
(fiveam:test test-theme
|
|
"Contract view: *tui-theme* provides color mappings."
|
|
(fiveam:is (eq :green (getf *tui-theme* :user)))
|
|
(fiveam:is (eq :white (getf *tui-theme* :agent)))
|
|
(fiveam:is (eq :yellow (getf *tui-theme* :system)))
|
|
(fiveam:is (eq :cyan (getf *tui-theme* :input)))
|
|
(fiveam:is (eq :white (theme-color :unknown-role))))
|