amr/passepartout
1
0
Fork 0
Code Issues 15 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(tui): Add Keyword Cleaner to ensure reliable protocol matching
Some checks failed
Deploy-Agent-V15-Stdin / JOB-V15-STDIN (push) Failing after 3s
Details

Browse Source
This commit is contained in:
Amr Gharbeia
2026-04-19 15:36:16 -04:00
parent e8c66c7e4a
commit dd2f5c83ce
3 changed files with 108 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
literate/tui-client.org
View File

@@ -38,26 +38,36 @@ The OpenCortex TUI Client is a standalone Common Lisp application built on **Cro
(setf *incoming-msgs* nil) (setf *incoming-msgs* nil)
msgs))) msgs)))
(defun clean-keywords (msg)
(if (listp msg)
(let ((clean nil))
(loop for (k v) on msg by #'cddr
do (push (intern (string k) :keyword) clean)
(push v clean))
(nreverse clean))
msg))
(defun listen-thread () (defun listen-thread ()
(loop while *is-running* do (loop while *is-running* do
(handler-case (handler-case
(when (and *stream* (open-stream-p *stream*)) (when (and *stream* (open-stream-p *stream*))
(let ((msg (opencortex:read-framed-message *stream*))) (let ((raw-msg (opencortex:read-framed-message *stream*)))
(cond ((eq msg :eof) (setf *is-running* nil)) (unless (member raw-msg '(:eof :error))
((eq msg :error) (setf *status-text* "Protocol Error")) (let ((msg (clean-keywords raw-msg)))
((and (listp msg) (eq (getf msg :TYPE) :EVENT)) (cond ((and (listp msg) (eq (getf msg :TYPE) :EVENT))
(let ((payload (getf msg :PAYLOAD))) (let ((payload (getf msg :PAYLOAD)))
(when (eq (getf payload :ACTION) :handshake) (when (eq (getf payload :ACTION) :handshake)
(setf *status-text* "Ready")))) (setf *status-text* "Ready"))))
((and (listp msg) (eq (getf msg :TYPE) :STATUS)) ((and (listp msg) (eq (getf msg :TYPE) :STATUS))
(setf *status-text* (format nil "[Scribe: ~a] [Gardener: ~a]" (setf *status-text* (format nil "[Scribe: ~a] [Gardener: ~a]"
(getf msg :SCRIBE) (getf msg :SCRIBE)
(getf msg :GARDENER)))) (getf msg :GARDENER))))
((and (listp msg) (eq (getf msg :TYPE) :CHAT)) ((and (listp msg) (eq (getf msg :TYPE) :CHAT))
(enqueue-msg (getf msg :TEXT))) (enqueue-msg (getf msg :TEXT)))
(t (enqueue-msg (format nil "~s" msg)))))) (t (enqueue-msg (format nil "~s" msg))))))
(error (c) (setf *status-text* (format nil "Net Error: ~a" c)) (setf *is-running* nil))) (when (eq raw-msg :eof) (setf *is-running* nil))
(sleep 0.05))) (when (eq raw-msg :error) (setf *status-text* "Protocol Error"))))
(defun main () (defun main ()
(handler-case (handler-case

42
src/tui-client.lisp
View File

@@ -25,26 +25,36 @@
(setf *incoming-msgs* nil) (setf *incoming-msgs* nil)
msgs))) msgs)))
(defun clean-keywords (msg)
(if (listp msg)
(let ((clean nil))
(loop for (k v) on msg by #'cddr
do (push (intern (string k) :keyword) clean)
(push v clean))
(nreverse clean))
msg))
(defun listen-thread () (defun listen-thread ()
(loop while *is-running* do (loop while *is-running* do
(handler-case (handler-case
(when (and *stream* (open-stream-p *stream*)) (when (and *stream* (open-stream-p *stream*))
(let ((msg (opencortex:read-framed-message *stream*))) (let ((raw-msg (opencortex:read-framed-message *stream*)))
(cond ((eq msg :eof) (setf *is-running* nil)) (unless (member raw-msg '(:eof :error))
((eq msg :error) (setf *status-text* "Protocol Error")) (let ((msg (clean-keywords raw-msg)))
((and (listp msg) (eq (getf msg :TYPE) :EVENT)) (cond ((and (listp msg) (eq (getf msg :TYPE) :EVENT))
(let ((payload (getf msg :PAYLOAD))) (let ((payload (getf msg :PAYLOAD)))
(when (eq (getf payload :ACTION) :handshake) (when (eq (getf payload :ACTION) :handshake)
(setf *status-text* "Ready")))) (setf *status-text* "Ready"))))
((and (listp msg) (eq (getf msg :TYPE) :STATUS)) ((and (listp msg) (eq (getf msg :TYPE) :STATUS))
(setf *status-text* (format nil "[Scribe: ~a] [Gardener: ~a]" (setf *status-text* (format nil "[Scribe: ~a] [Gardener: ~a]"
(getf msg :SCRIBE) (getf msg :SCRIBE)
(getf msg :GARDENER)))) (getf msg :GARDENER))))
((and (listp msg) (eq (getf msg :TYPE) :CHAT)) ((and (listp msg) (eq (getf msg :TYPE) :CHAT))
(enqueue-msg (getf msg :TEXT))) (enqueue-msg (getf msg :TEXT)))
(t (enqueue-msg (format nil "~s" msg)))))) (t (enqueue-msg (format nil "~s" msg))))))
(error (c) (setf *status-text* (format nil "Net Error: ~a" c)) (setf *is-running* nil))) (when (eq raw-msg :eof) (setf *is-running* nil))
(sleep 0.05))) (when (eq raw-msg :error) (setf *status-text* "Protocol Error"))))
(defun main () (defun main ()
(handler-case (handler-case

56
verify_response_v2.py Normal file
View File

@@ -0,0 +1,56 @@
import socket, time, sys
def verify():
try:
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.settimeout(20)
s.connect(("localhost", 9105))
# 1. Read everything until initial status
full_data = b""
while b":STATUS" not in full_data and b":status" not in full_data:
chunk = s.recv(4096)
if not chunk: break
full_data += chunk
print(f"Initial stream: {full_data.decode()}")
# 2. Send "Hi"
payload = '(:TYPE :EVENT :PAYLOAD (:SENSOR :CHAT-MESSAGE :TEXT "Hi"))'
msg = f"{len(payload):06x}{payload}".encode()
print(f"Sending: {msg.decode()}")
s.sendall(msg)
# 3. Read response
responses = []
start_time = time.time()
while time.time() - start_time < 15:
try:
chunk = s.recv(4096).decode()
if not chunk: break
print(f"Received chunk: {chunk}")
responses.append(chunk)
if ":CHAT" in chunk:
print("Found reasoning response!")
except socket.timeout:
break
s.close()
# Assertions
all_text = "".join(responses)
if ":status" in all_text or ":status" in full_data.decode():
print("FAILURE: Found lowercase :status!")
else:
print("SUCCESS: Keywords are normalized to uppercase.")
if ":CHAT" in all_text:
print("SUCCESS: Full response loop closed.")
else:
print("FAILURE: No chat response received.")
except Exception as e:
print(f"Error: {e}")
sys.exit(1)
verify()