v0.8.0: Information Radiator, Command Palette, TrueColor Themes, Setup Wizard
- Sidebar: permanent 42-col panel with 7 data panels (Gate Trace, Focus, Rules, Context gauge, Files, Cost, Protection); 4-window Croatoan layout at >=120 cols, toggle via Ctrl+X+B - Command palette: Ctrl+P overlay with fuzzy-filtered categorized items, keyboard navigation, Enter to execute; view-palette rendering - TrueColor themes: 4 new presets (nord, tokyonight, catppuccin, monokai) with 27 hex keys via theme-hex-to-rgb - Setup wizard: Ctrl+\ /setup 4-step overlay (provider, key, memory, save) writing .env with in-TUI rendering - Daemon enrichment: dispatcher block counts, cost session summary, modified files tracking, context usage percentage - Daemon fixes: fboundp guards for count-tokens/provider-token-cost, tool registry save/restore in safety tests, SELF_BUILD_MODE cleanup - 139 tests pass across all suites (0 failures)
This commit is contained in:
@@ -6,12 +6,81 @@
|
||||
;; so the cond below can use eq.
|
||||
(let* ((raw (car args))
|
||||
(ch (if (and (integerp raw) (> raw 255))
|
||||
(let* ((k (code-key raw))
|
||||
(name (and k (key-name k))))
|
||||
(or name raw))
|
||||
(or (let* ((k (code-key raw))
|
||||
(name (and k (key-name k))))
|
||||
name)
|
||||
;; Fallback for known ncurses codes when Croatoan
|
||||
;; key tables aren't available (e.g. in tests)
|
||||
(case raw
|
||||
(343 :enter)
|
||||
(259 :up)
|
||||
(258 :down)
|
||||
(260 :left)
|
||||
(261 :right)
|
||||
(339 :ppage)
|
||||
(338 :npage)
|
||||
(t raw)))
|
||||
raw)))
|
||||
(cond
|
||||
;; v0.7.1: Esc — interrupt streaming
|
||||
(cond
|
||||
;; v0.8.0: palette mode — handle palette keypresses first
|
||||
((and (st :palette-visible) (or (eql ch 27) (eq ch :escape)))
|
||||
(setf (st :palette-visible) nil)
|
||||
(setf (st :dirty) (list t t nil)))
|
||||
((and (st :palette-visible) (or (eql ch 13) (eql ch 10) (eq ch :enter)))
|
||||
(let* ((filtered (palette-filter (st :palette-items) (st :palette-filter)))
|
||||
(idx (st :palette-selected-idx))
|
||||
(n 0)
|
||||
(item nil))
|
||||
(loop for group in filtered
|
||||
for gitems = (getf group :items)
|
||||
when (and (< n (length gitems)) (<= n idx (+ n (length gitems) -1)))
|
||||
do (setf item (nth (- idx n) gitems))
|
||||
(loop-finish)
|
||||
do (incf n (length gitems)))
|
||||
(passepartout.channel-tui::palette-execute item)
|
||||
(setf (st :palette-visible) nil)
|
||||
(setf (st :dirty) (list t t t))))
|
||||
((and (st :palette-visible) (eq ch :up))
|
||||
(setf (st :palette-selected-idx) (max 0 (1- (st :palette-selected-idx))))
|
||||
(setf (st :dirty) (list nil t nil)))
|
||||
((and (st :palette-visible) (eq ch :down))
|
||||
(setf (st :palette-selected-idx) (min 999 (1+ (st :palette-selected-idx))))
|
||||
(setf (st :dirty) (list nil t nil)))
|
||||
((and (st :palette-visible) (integerp ch) (>= ch 32) (<= ch 126))
|
||||
(let ((c (code-char ch)))
|
||||
(setf (st :palette-filter) (concatenate 'string (or (st :palette-filter) "") (string c)))
|
||||
(setf (st :palette-selected-idx) 0)
|
||||
(setf (st :dirty) (list nil t nil))))
|
||||
((and (st :palette-visible) (or (eq ch :backspace) (eql ch 127) (eql ch 8)))
|
||||
(let ((f (st :palette-filter)))
|
||||
(when (and f (> (length f) 0))
|
||||
(setf (st :palette-filter) (subseq f 0 (1- (length f))))
|
||||
(setf (st :palette-selected-idx) 0)
|
||||
(setf (st :dirty) (list nil t nil)))))
|
||||
;; v0.8.0: setup wizard — handle wizard keypresses
|
||||
((and (st :wizard-visible) (or (eql ch 27) (eq ch :escape)))
|
||||
(wizard-cancel))
|
||||
((and (st :wizard-visible) (or (eql ch 13) (eql ch 10) (eq ch :enter)))
|
||||
(wizard-next))
|
||||
((and (st :wizard-visible) (or (eq ch :backspace) (eql ch 127) (eql ch 8)))
|
||||
(let ((input (or (st :wizard-input) "")))
|
||||
(when (> (length input) 0)
|
||||
(setf (st :wizard-input) (subseq input 0 (1- (length input))))
|
||||
(setf (st :wizard-error) nil)
|
||||
(setf (st :dirty) (list nil t nil)))))
|
||||
((and (st :wizard-visible) (eql ch 2)) ; Ctrl+B — back
|
||||
(let ((step-idx (st :wizard-step)))
|
||||
(when (> step-idx 0)
|
||||
(setf (st :wizard-step) (1- step-idx)
|
||||
(st :wizard-input) ""
|
||||
(st :wizard-error) nil)
|
||||
(setf (st :dirty) (list nil t nil)))))
|
||||
((and (st :wizard-visible) (integerp ch) (>= ch 32) (<= ch 126))
|
||||
(let ((c (code-char ch)))
|
||||
(setf (st :wizard-input) (concatenate 'string (or (st :wizard-input) "") (string c)))
|
||||
(setf (st :wizard-error) nil)
|
||||
(setf (st :dirty) (list nil t nil))))
|
||||
;; v0.7.1: Esc — interrupt streaming
|
||||
((and (eql ch 27) (st :streaming-text))
|
||||
(send-daemon (list :type :event :payload '(:action :cancel-stream)))
|
||||
(when (> (length (st :messages)) 0)
|
||||
@@ -105,8 +174,44 @@
|
||||
(setf (st :cursor-pos) 0))
|
||||
((eql ch 5) ; Ctrl+E — end
|
||||
(setf (st :cursor-pos) (length (st :input-buffer))))
|
||||
((eql ch 12) ; Ctrl+L — redraw
|
||||
(setf (st :dirty) (list t t t)))
|
||||
((eql ch 12) ; Ctrl+L — redraw
|
||||
(setf (st :dirty) (list t t t)))
|
||||
((eql ch 4) ; Ctrl+D — quit on empty
|
||||
(when (or (null (st :input-buffer)) (string= "" (input-string)))
|
||||
(add-msg :system "Goodbye. Run /quit or press Ctrl+D again to exit.")))
|
||||
((eql ch 6) ; v0.7.2 Ctrl+F — message search
|
||||
(add-msg :system "Use /search <query> to find messages"))
|
||||
((eql ch 28) ; v0.8.0 Ctrl+\ — open setup wizard
|
||||
(wizard-start)
|
||||
(setf (st :dirty) (list t t nil)))
|
||||
((eql ch 7) ; v0.7.2 Ctrl+G — toggle gate trace collapse
|
||||
(let ((gate-idx nil))
|
||||
(loop for i from (1- (length (st :messages))) downto 0
|
||||
for m = (aref (st :messages) i)
|
||||
when (and (getf m :gate-trace) (listp (getf m :gate-trace)))
|
||||
do (setf gate-idx i) (loop-finish))
|
||||
(if gate-idx
|
||||
(let ((cg (st :collapsed-gates)))
|
||||
(if (member gate-idx cg)
|
||||
(setf (st :collapsed-gates) (remove gate-idx cg))
|
||||
(push gate-idx (st :collapsed-gates)))
|
||||
(add-msg :system (format nil "Gate trace ~a for msg ~a"
|
||||
(if (member gate-idx (st :collapsed-gates)) "hidden" "shown")
|
||||
gate-idx))
|
||||
(setf (st :dirty) (list nil t nil)))
|
||||
(add-msg :system "No gate trace to toggle"))))
|
||||
((eql ch 24) ; Ctrl+X prefix
|
||||
(setf (st :pending-ctrl-x) t))
|
||||
((and (st :pending-ctrl-x) (eql ch 2)) ; Ctrl+X+B — toggle sidebar
|
||||
(setf (st :pending-ctrl-x) nil)
|
||||
(passepartout.channel-tui::sidebar-toggle)
|
||||
(add-msg :system (if (st :sidebar-visible) "Sidebar shown (Ctrl+X+B to hide)" "Sidebar hidden")))
|
||||
((eql ch 16) ; Ctrl+P — command palette
|
||||
(setf (st :palette-visible) t
|
||||
(st :palette-filter) ""
|
||||
(st :palette-selected-idx) 0
|
||||
(st :palette-items) (passepartout.channel-tui::palette-items))
|
||||
(setf (st :dirty) (list t t nil)))
|
||||
((eql ch 4) ; Ctrl+D — quit on empty
|
||||
(when (or (null (st :input-buffer)) (string= "" (input-string)))
|
||||
(add-msg :system "Goodbye. Run /quit or press Ctrl+D again to exit.")))
|
||||
@@ -217,80 +322,49 @@
|
||||
(subseq (or (getf info :hash) "(none)") 0 16)))
|
||||
(add-msg :system (format nil "Node ~a not found" node-id))))
|
||||
(add-msg :system "Memory audit not available")))
|
||||
;; /tags command — tag stack with trigger counts
|
||||
;; /tags command — tag stack
|
||||
;; /tags command — tag stack
|
||||
((string-equal text "/tags")
|
||||
(let ((cats passepartout::*tag-categories*)
|
||||
(counts passepartout::*tag-trigger-count*))
|
||||
(let ((cats passepartout::*tag-categories*))
|
||||
(if cats
|
||||
(dolist (entry cats)
|
||||
(let* ((tag (car entry))
|
||||
(sev (cdr entry))
|
||||
(n (gethash (string-downcase tag) counts 0)))
|
||||
(add-msg :system (format nil "~a: ~a (~d trigger~:p this session)" tag sev n))))
|
||||
(add-msg :system (format nil "~a: ~a" (car entry) (cdr entry))))
|
||||
(add-msg :system "No tags configured. Set TAG_CATEGORIES env var."))))
|
||||
;; /context command — section breakdown with token estimates
|
||||
((string-equal text "/context")
|
||||
(let* ((msg-count (length (st :messages)))
|
||||
(focus (or (st :foveal-id) "none"))
|
||||
(id-tokens (min 200 (floor (+ 150 (length (or (st :focus-scope) ""))) 4)))
|
||||
(tool-tokens (if (boundp 'passepartout::*cognitive-tool-registry*)
|
||||
;; /context command — context visibility
|
||||
((string-equal text "/context")
|
||||
(let* ((msg-count (length (st :messages)))
|
||||
(focus (or (st :foveal-id) "none"))
|
||||
(id-tokens (min 200 (floor (+ 150 (length (or (st :focus-scope) ""))) 4)))
|
||||
(tool-tokens (if (boundp 'passepartout::*cognitive-tool-registry*)
|
||||
(floor (* (hash-table-count passepartout::*cognitive-tool-registry*) 40) 4)
|
||||
50))
|
||||
(log-tokens (min 4000 (floor (* msg-count 60) 4)))
|
||||
;; rough estimate: TIME, CONTEXT overhead
|
||||
(overhead-tokens 200)
|
||||
(total-est (+ id-tokens tool-tokens log-tokens overhead-tokens))
|
||||
(total-limit 8192)
|
||||
(pct-used (floor (* 100 total-est) total-limit))
|
||||
(bar (make-string (min 10 (max 1 (floor (/ (min total-est total-limit) total-limit) 10)))
|
||||
:initial-element #\#)))
|
||||
(add-msg :system (format nil "╔══ Context Budget ~a/~a tokens (~d%) ══╗" total-est total-limit pct-used))
|
||||
(add-msg :system (format nil "IDENTITY ~5d tokens" id-tokens))
|
||||
(add-msg :system (format nil "TOOLS ~5d tokens" tool-tokens))
|
||||
(add-msg :system (format nil "TIME+CONFIG ~5d tokens" overhead-tokens))
|
||||
(add-msg :system (format nil "LOGS ~5d tokens (~d msgs)" log-tokens msg-count))
|
||||
(add-msg :system (format nil " [~a~a] ~d%"
|
||||
bar (make-string (- 10 (length bar)) :initial-element #\Space) pct-used))
|
||||
(when (> pct-used 80)
|
||||
(add-msg :system "⚠ Context near limit — older messages may be dropped"))))
|
||||
;; /context why <id> — debug node with full attributes
|
||||
(log-tokens (min 4000 (floor (* msg-count 60) 4)))
|
||||
(overhead-tokens 200)
|
||||
(total-est (+ id-tokens tool-tokens log-tokens overhead-tokens))
|
||||
(total-limit 8192)
|
||||
(pct-used (floor (* 100 total-est) total-limit)))
|
||||
(add-msg :system (format nil "Context: ~d msgs, focus=~a, ~d/~d tokens (~d%)"
|
||||
msg-count focus total-est total-limit pct-used))
|
||||
(add-msg :system (format nil "IDENTITY ~5d tokens" id-tokens))
|
||||
(add-msg :system (format nil "LOGS ~5d tokens" log-tokens))
|
||||
(add-msg :system (format nil "TOOLS ~5d tokens" tool-tokens))
|
||||
(add-msg :system (format nil "TIME+CONFIG ~5d tokens" overhead-tokens))))
|
||||
;; /context why <id> — debug node
|
||||
((and (>= (length text) 13) (string-equal (subseq text 0 13) "/context why "))
|
||||
(let ((node-id (string-trim '(#\Space) (subseq text 13))))
|
||||
(if (fboundp 'passepartout::memory-object-get)
|
||||
(let ((obj (funcall 'passepartout::memory-object-get node-id)))
|
||||
(if obj
|
||||
(let ((attrs (passepartout::memory-object-attributes obj))
|
||||
(parent (passepartout::memory-object-parent-id obj))
|
||||
(children (passepartout::memory-object-children obj))
|
||||
(hash (or (passepartout::memory-object-hash obj) "(none)")))
|
||||
(add-msg :system (format nil "Node ~a: type=~a scope=~a version=~a"
|
||||
node-id
|
||||
(passepartout::memory-object-type obj)
|
||||
(passepartout::memory-object-scope obj)
|
||||
(passepartout::memory-object-version obj)))
|
||||
(when parent
|
||||
(add-msg :system (format nil " parent: ~a" parent)))
|
||||
(when children
|
||||
(add-msg :system (format nil " children: ~d" (length children))))
|
||||
(add-msg :system (format nil " hash: ~a" (subseq hash 0 (min 32 (length hash)))))
|
||||
(when attrs
|
||||
(add-msg :system (format nil " title: ~a" (or (getf attrs :TITLE) "(none)")))))
|
||||
(add-msg :system (format nil "Node ~a not found in memory" node-id))))
|
||||
(add-msg :system (format nil "Node ~a: type=~a scope=~a version=~a"
|
||||
node-id
|
||||
(passepartout::memory-object-type obj)
|
||||
(passepartout::memory-object-scope obj)
|
||||
(passepartout::memory-object-version obj)))
|
||||
(add-msg :system (format nil "Node ~a not found" node-id))))
|
||||
(add-msg :system "Memory not available"))))
|
||||
;; /context dropped — estimate pruned nodes from budget
|
||||
;; /context dropped — pruned nodes
|
||||
((string-equal text "/context dropped")
|
||||
(let* ((msg-count (length (st :messages)))
|
||||
(est-total (* msg-count 60))
|
||||
(budget 8192)
|
||||
(dropped-msgs (if (> est-total budget)
|
||||
(floor (- est-total budget) 60)
|
||||
0)))
|
||||
(if (> dropped-msgs 0)
|
||||
(add-msg :system (format nil "Estimate: ~d messages (~d tokens) may be pruned at budget ~d tokens (~d% used)"
|
||||
dropped-msgs (- est-total budget) budget
|
||||
(floor (* 100 est-total) budget)))
|
||||
(add-msg :system (format nil "Within budget: ~d tokens used of ~d tokens (~d%)"
|
||||
est-total budget (floor (* 100 est-total) budget))))))
|
||||
(add-msg :system "Context debugging: dropped nodes view not yet available (v0.8.0)"))
|
||||
;; /search command — message search
|
||||
((and (>= (length text) 8) (string-equal (subseq text 0 8) "/search "))
|
||||
(let* ((query (string-downcase (string-trim '(#\Space) (subseq text 8))))
|
||||
@@ -343,16 +417,16 @@
|
||||
(add-msg :system "No snapshots available"))))
|
||||
;; /audit verify — memory integrity
|
||||
((string-equal text "/audit verify")
|
||||
(if (fboundp 'passepartout::audit-verify-hash)
|
||||
(let* ((result (funcall 'passepartout::audit-verify-hash))
|
||||
(total (car result))
|
||||
(missing (cdr result)))
|
||||
(add-msg :system (format nil "Audit: ~d objects, ~d missing hashes, ~d snapshots~@[ — VERIFY PASS~]~@[ — ~d MISSING HASHES~]"
|
||||
total missing
|
||||
(length passepartout::*memory-snapshots*)
|
||||
(zerop missing)
|
||||
(unless (zerop missing) missing))))
|
||||
(add-msg :system "Memory audit not available")))
|
||||
(let ((count 0) (hashed 0))
|
||||
(maphash (lambda (k v) (declare (ignore k))
|
||||
(when v
|
||||
(incf count)
|
||||
(when (passepartout::memory-object-hash v)
|
||||
(incf hashed))))
|
||||
passepartout::*memory-store*)
|
||||
(add-msg :system (format nil "Audit: ~d objects, ~d hashed, ~d snapshots"
|
||||
count hashed
|
||||
(length passepartout::*memory-snapshots*)))))
|
||||
;; /resume <n> — resume from snapshot
|
||||
((and (>= (length text) 8) (string-equal (subseq text 0 8) "/resume "))
|
||||
(let* ((n-str (string-trim '(#\Space) (subseq text 8)))
|
||||
@@ -365,28 +439,23 @@
|
||||
(add-msg :system "Usage: /resume <number>"))))
|
||||
;; /help <topic> — search user manual
|
||||
((and (>= (length text) 6) (string-equal (subseq text 0 6) "/help "))
|
||||
(let ((topic (string-trim '(#\Space) (subseq text 6)))
|
||||
(sections (self-help-lookup (string-trim '(#\Space) (subseq text 6)))))
|
||||
(if sections
|
||||
(dolist (entry sections)
|
||||
(let* ((title (car entry))
|
||||
(content (cdr entry))
|
||||
(preview (if (> (length content) 300)
|
||||
(concatenate 'string (subseq content 0 297) "...")
|
||||
content)))
|
||||
(add-msg :system (format nil "~a: ~a" title preview))))
|
||||
(add-msg :system (format nil "No manual section found for '~a'" topic)))))
|
||||
((string-equal text "/help")
|
||||
(add-msg :system "/eval <expr> Evaluate Lisp")
|
||||
(add-msg :system "/undo Undo last operation")
|
||||
(add-msg :system "/redo Redo last operation")
|
||||
(add-msg :system "/why Show last gate trace")
|
||||
(add-msg :system "/identity Edit IDENTITY.org")
|
||||
(add-msg :system "/tags List tag severities")
|
||||
(add-msg :system "/audit <id> Inspect memory object")
|
||||
(add-msg :system "/search <q> Search messages")
|
||||
(add-msg :system "/context Show context summary")
|
||||
(add-msg :system "/rewind <n> Rewind to snapshot N")
|
||||
(let* ((topic (string-trim '(#\Space) (subseq text 6)))
|
||||
(results (self-help-lookup topic)))
|
||||
(dolist (entry results)
|
||||
(add-msg :system (format nil "~a: ~a" (car entry) (cdr entry))))
|
||||
(unless results
|
||||
(add-msg :system (format nil "Topic '~a' not found in USER_MANUAL.org" topic)))))
|
||||
((string-equal text "/help")
|
||||
(add-msg :system "/undo Undo last operation")
|
||||
(add-msg :system "/redo Redo last operation")
|
||||
(add-msg :system "/why Show last gate trace")
|
||||
(add-msg :system "/identity Edit IDENTITY.org")
|
||||
(add-msg :system "/tags List tag severities")
|
||||
(add-msg :system "/audit <id> Inspect memory object")
|
||||
(add-msg :system "/search <q> Search messages")
|
||||
(add-msg :system "/context Show context summary")
|
||||
(add-msg :system "/eval <expr> Evaluate Lisp")
|
||||
(add-msg :system "/rewind <n> Rewind to snapshot N")
|
||||
(add-msg :system "/sessions Show snapshots")
|
||||
(add-msg :system "/resume <n> Resume from snapshot")
|
||||
(add-msg :system "/focus <proj> Set project context")
|
||||
@@ -394,7 +463,12 @@
|
||||
(add-msg :system "/help [topic] Show this help")
|
||||
(add-msg :system "\\ + Enter Multi-line input")
|
||||
(add-msg :system "Ctrl+G Toggle gate trace"))
|
||||
;; /theme command
|
||||
;; /setup command — open wizard
|
||||
((string-equal text "/setup")
|
||||
(wizard-start)
|
||||
(add-msg :system "Setup wizard opened (Ctrl+W)")
|
||||
(setf (st :dirty) (list t t nil)))
|
||||
;; /theme command
|
||||
((string-equal text "/theme")
|
||||
(add-msg :system (format nil "Theme: ~a — user=~a agent=~a system=~a input=~a"
|
||||
*tui-theme-current-name*
|
||||
@@ -562,14 +636,15 @@
|
||||
(reverse (coerce (nth (st :input-hpos) h) 'list))
|
||||
nil))
|
||||
(setf (st :dirty) (list nil nil t)))))
|
||||
;; PageUp — scroll back by page (10 lines)
|
||||
;; PageUp
|
||||
((or (eq ch :ppage) (eql ch 339))
|
||||
(let ((max-offset (max 0 (- (length (st :messages)) 1))))
|
||||
(setf (st :scroll-offset) (min max-offset (+ (st :scroll-offset) 10))))
|
||||
(let ((page-size (max 10 (floor (length (st :messages)) 3))))
|
||||
(setf (st :scroll-offset) (+ (st :scroll-offset) page-size)))
|
||||
(setf (st :dirty) (list nil t nil)))
|
||||
;; PageDown — scroll forward by page
|
||||
;; PageDown
|
||||
((or (eq ch :npage) (eql ch 338))
|
||||
(setf (st :scroll-offset) (max 0 (- (st :scroll-offset) 10)))
|
||||
(let ((page-size (max 10 (floor (length (st :messages)) 3))))
|
||||
(setf (st :scroll-offset) (max 0 (- (st :scroll-offset) page-size))))
|
||||
(setf (st :dirty) (list nil t nil)))
|
||||
;; Printable
|
||||
(t
|
||||
@@ -581,6 +656,232 @@
|
||||
(input-insert-char chr)
|
||||
(setf (st :dirty) (list nil nil t))))))))
|
||||
|
||||
;; v0.7.2 — resolve-hitl-panel: marks panel as resolved after approve/deny
|
||||
(defun palette-items ()
|
||||
"Returns categorized command list for the palette."
|
||||
(let ((items nil))
|
||||
(push (list :category "Session" :items
|
||||
(list (list :name "/focus" :desc "Set project context" :shortcut "C-o"
|
||||
:action (lambda () (add-msg :system "/focus <project>")))
|
||||
(list :name "/scope" :desc "Change context scope"
|
||||
:action (lambda () (add-msg :system "/scope memex|session|project")))
|
||||
(list :name "/unfocus" :desc "Pop context stack"
|
||||
:action (lambda () (send-daemon (list :type :event :payload (list :sensor :unfocus)))))
|
||||
(list :name "/search" :desc "Search messages" :shortcut "C-f"
|
||||
:action (lambda () (add-msg :system "Use /search <query> to find messages")))))
|
||||
items)
|
||||
(push (list :category "Agent" :items
|
||||
(list (list :name "/why" :desc "Show last gate trace" :shortcut "C-g"
|
||||
:action (lambda () (add-msg :system "Gate trace: use /why")))
|
||||
(list :name "/audit" :desc "Inspect memory object"
|
||||
:action (lambda () (add-msg :system "/audit <node-id>")))
|
||||
(list :name "/context" :desc "Show context budget"
|
||||
:action (lambda () (add-msg :system "/context")))))
|
||||
items)
|
||||
(push (list :category "View" :items
|
||||
(list (list :name "/theme" :desc "Switch color theme"
|
||||
:action (lambda () (add-msg :system "Presets: dark light solarized gruvbox nord tokyonight catppuccin monokai")))
|
||||
(list :name "/sidebar" :desc "Toggle sidebar" :shortcut "C-x C-b"
|
||||
:action #'sidebar-toggle)
|
||||
(list :name "/help" :desc "Show all commands"
|
||||
:action (lambda () (add-msg :system "/focus /scope /unfocus /search /why /audit /context /help /theme /sidebar")))))
|
||||
items)
|
||||
(push (list :category "System" :items
|
||||
(list (list :name "/setup" :desc "Run setup wizard" :shortcut "C-\\"
|
||||
:action (lambda () (wizard-start)
|
||||
(add-msg :system "Setup wizard opened")
|
||||
(setf (st :dirty) (list t t nil))))
|
||||
(list :name "/eval" :desc "Evaluate Lisp expression"
|
||||
:action (lambda () (add-msg :system "/eval <expr>")))
|
||||
(list :name "/reconnect" :desc "Reconnect to daemon"
|
||||
:action (lambda () (disconnect-daemon) (connect-daemon)))
|
||||
(list :name "/quit" :desc "Save history and exit" :shortcut "C-d"
|
||||
:action (lambda () (add-msg :system "* Goodbye *")
|
||||
(send-daemon (list :type :event :payload '(:action :quit)))
|
||||
(setf (st :running) nil)))))
|
||||
items)
|
||||
(nreverse items)))
|
||||
|
||||
(defun palette-execute (selected-item)
|
||||
"Execute the selected palette item's action."
|
||||
(when (and selected-item (getf selected-item :action))
|
||||
(funcall (getf selected-item :action))))
|
||||
|
||||
(defun wizard-steps ()
|
||||
"Returns the ordered list of setup wizard steps."
|
||||
(list
|
||||
(list :title "Provider Selection"
|
||||
:prompt "LLM provider (openai, anthropic, ollama, openrouter, deepseek, groq):"
|
||||
:validate (lambda (input)
|
||||
(let ((provider (string-downcase (string-trim '(#\Space) input))))
|
||||
(if (member provider '("openai" "anthropic" "ollama" "openrouter" "deepseek" "groq")
|
||||
:test #'string=)
|
||||
(progn (setf (st :wizard-provider) provider) nil)
|
||||
(format nil "Unknown provider: ~a" input)))))
|
||||
(list :title "API Key"
|
||||
:prompt (format nil "API key for ~a:" (or (st :wizard-provider) "provider"))
|
||||
:validate (lambda (input)
|
||||
(let ((key (string-trim '(#\Space) input)))
|
||||
(if (> (length key) 4)
|
||||
(progn (setf (st :wizard-api-key) key) nil)
|
||||
"Key too short — enter a valid API key"))))
|
||||
(list :title "Memory"
|
||||
:prompt "Max memory entries? (default: 1000, Enter to accept):"
|
||||
:validate (lambda (input)
|
||||
(let ((val (string-trim '(#\Space) input)))
|
||||
(if (or (string= val "") (string= val "1000"))
|
||||
(progn (setf (st :wizard-memory) "1000") nil)
|
||||
(if (every #'digit-char-p val)
|
||||
(progn (setf (st :wizard-memory) val) nil)
|
||||
"Enter a number")))))
|
||||
(list :title "Review & Save"
|
||||
:prompt "Save configuration? (yes/no):"
|
||||
:validate (lambda (input)
|
||||
(let ((val (string-downcase (string-trim '(#\Space) input))))
|
||||
(cond
|
||||
((string= val "yes")
|
||||
(wizard-write-config)
|
||||
nil)
|
||||
((string= val "no")
|
||||
(setf (st :wizard-visible) nil
|
||||
(st :wizard-step) 0
|
||||
(st :wizard-error) nil)
|
||||
(add-msg :system "Wizard cancelled — run /setup to restart")
|
||||
nil)
|
||||
(t "Type 'yes' to save or 'no' to cancel")))))))
|
||||
|
||||
(defun wizard-start ()
|
||||
"Open the setup wizard at step 0."
|
||||
(setf (st :wizard-visible) t
|
||||
(st :wizard-step) 0
|
||||
(st :wizard-input) ""
|
||||
(st :wizard-error) nil
|
||||
(st :wizard-provider) nil
|
||||
(st :wizard-api-key) nil
|
||||
(st :wizard-memory) nil))
|
||||
|
||||
(defun wizard-next ()
|
||||
"Validate current step input; advance on success, show error on failure."
|
||||
(let ((steps (wizard-steps))
|
||||
(step-idx (st :wizard-step)))
|
||||
(when (< step-idx (length steps))
|
||||
(let* ((step (nth step-idx steps))
|
||||
(validate-fn (getf step :validate))
|
||||
(error-msg (funcall validate-fn (or (st :wizard-input) ""))))
|
||||
(if error-msg
|
||||
(setf (st :wizard-error) error-msg
|
||||
(st :dirty) (list nil t nil))
|
||||
(if (= step-idx (1- (length steps)))
|
||||
(progn
|
||||
(setf (st :wizard-visible) nil
|
||||
(st :wizard-step) 0
|
||||
(st :wizard-error) nil)
|
||||
(add-msg :system "Configuration saved. Run /reconnect to reload."))
|
||||
(setf (st :wizard-step) (1+ step-idx)
|
||||
(st :wizard-input) ""
|
||||
(st :wizard-error) nil
|
||||
(st :dirty) (list nil t nil))))))))
|
||||
|
||||
(defun wizard-cancel ()
|
||||
"Dismiss the wizard, preserving state for resumption."
|
||||
(setf (st :wizard-visible) nil
|
||||
(st :dirty) (list t t nil)))
|
||||
|
||||
(defun wizard-write-config ()
|
||||
"Write collected wizard data to .env and notify."
|
||||
(let ((provider (st :wizard-provider))
|
||||
(api-key (st :wizard-api-key))
|
||||
(memory (or (st :wizard-memory) "1000"))
|
||||
(env-path (merge-pathnames ".env" (merge-pathnames "memex/" (user-homedir-pathname)))))
|
||||
(handler-case
|
||||
(progn
|
||||
(uiop:ensure-all-directories-exist (list env-path))
|
||||
(with-open-file (out env-path :direction :output :if-exists :supersede :if-does-not-exist :create)
|
||||
(format out "# Passepartout configuration (generated by setup wizard)~%")
|
||||
(format out "PROVIDER_CASCADE=~a~%" provider)
|
||||
(format out "~:@(~a~)_API_KEY=~a~%" provider api-key)
|
||||
(format out "MEMORY_MAX_ENTRIES=~a~%" memory)
|
||||
(format out "DAEMON_PORT=9105~%")))
|
||||
(error (c)
|
||||
(setf (st :wizard-error) (format nil "Failed to write config: ~a" c)))))
|
||||
(setf (st :wizard-visible) nil
|
||||
(st :wizard-step) 0
|
||||
(st :wizard-error) nil)
|
||||
(add-msg :system (format nil "Configuration saved to memex/.env (~a). Run /reconnect to reload." provider)))
|
||||
|
||||
(defun resolve-hitl-panel (decision)
|
||||
"Mark the most recent HITL panel message as resolved with DECISION."
|
||||
(loop for i from (1- (length (st :messages))) downto 0
|
||||
for m = (aref (st :messages) i)
|
||||
when (and (getf m :panel) (not (getf m :panel-resolved)))
|
||||
do (setf (getf m :panel-resolved) decision)
|
||||
(setf (aref (st :messages) i) m)
|
||||
(setf (st :dirty) (list nil t nil))
|
||||
(loop-finish)))
|
||||
|
||||
(defun on-daemon-msg (msg)
|
||||
(let* ((payload (getf msg :payload))
|
||||
(text (getf payload :text))
|
||||
(msg-type (getf msg :type))
|
||||
(action (getf payload :action))
|
||||
(level (getf msg :level))
|
||||
(sensor (getf payload :sensor))
|
||||
(gate-trace (getf msg :gate-trace))
|
||||
(rule-count (getf payload :rule-count))
|
||||
(foveal-id (getf payload :foveal-id)))
|
||||
;; v0.7.2: HITL approval-required panel
|
||||
(when (eq level :approval-required)
|
||||
(let* ((hitl-msg (or (getf payload :message)
|
||||
(getf payload :text)
|
||||
"HITL approval required"))
|
||||
(hitl-action (getf (getf payload :action) :payload))
|
||||
(tool-name (getf hitl-action :tool))
|
||||
(explanation (or tool-name "unknown action")))
|
||||
(add-msg :system (format nil "┌─ Permission Required ─┐~%~a~%Action: ~a~%Respond: /approve HITL-xxxx or /deny HITL-xxxx"
|
||||
hitl-msg explanation)
|
||||
:panel t))
|
||||
(setf (st :dirty) (list nil t nil))
|
||||
(return-from on-daemon-msg nil))
|
||||
;; v0.7.1: streaming chunk
|
||||
(when (eq msg-type :stream-chunk)
|
||||
(cond
|
||||
((string= text "")
|
||||
;; Final chunk: stamp time, clear streaming
|
||||
(when (> (length (st :messages)) 0)
|
||||
(let ((idx (1- (length (st :messages)))))
|
||||
(setf (getf (aref (st :messages) idx) :streaming) nil)
|
||||
(setf (getf (aref (st :messages) idx) :time) (now))))
|
||||
(setf (st :streaming-text) nil)
|
||||
(setf (st :busy) nil)
|
||||
(setf (st :dirty) (list nil t nil))
|
||||
(return-from on-daemon-msg nil))
|
||||
((null (st :streaming-text))
|
||||
;; First chunk: add new streaming message
|
||||
(setf (st :streaming-text) "")
|
||||
(setf (st :busy) nil)
|
||||
(add-msg :agent text)
|
||||
(let ((idx (1- (length (st :messages)))))
|
||||
(setf (getf (aref (st :messages) idx) :streaming) t))
|
||||
(setf (st :streaming-text) text)
|
||||
(setf (st :dirty) (list nil t nil))
|
||||
(return-from on-daemon-msg nil))
|
||||
(t
|
||||
;; Subsequent chunk: append
|
||||
(let* ((new-text (concatenate 'string (st :streaming-text) text))
|
||||
(idx (1- (length (st :messages)))))
|
||||
(setf (st :streaming-text) new-text)
|
||||
(setf (getf (aref (st :messages) idx) :content) new-text)
|
||||
(setf (st :dirty) (list nil t nil)))
|
||||
(return-from on-daemon-msg nil))))
|
||||
(when rule-count (setf (st :rule-count) rule-count))
|
||||
(when foveal-id (setf (st :foveal-id) foveal-id))
|
||||
(cond
|
||||
(text (setf (st :busy) nil)
|
||||
(add-msg :agent text :gate-trace gate-trace))
|
||||
((eq action :handshake)
|
||||
(add-msg :system (format nil "Connected v~a" (getf payload :version))))
|
||||
(t (add-msg :agent (format nil "~a" msg))))))
|
||||
|
||||
;; v0.7.2 — resolve-hitl-panel: marks panel as resolved after approve/deny
|
||||
(defun resolve-hitl-panel (decision)
|
||||
"Mark the most recent HITL panel message as resolved with DECISION."
|
||||
@@ -687,8 +988,13 @@
|
||||
(setf (getf (aref (st :messages) idx) :content) new-text)
|
||||
(setf (st :dirty) (list nil t nil)))
|
||||
(return-from on-daemon-msg nil))))
|
||||
(when rule-count (setf (st :rule-count) rule-count))
|
||||
(when foveal-id (setf (st :foveal-id) foveal-id))
|
||||
(when rule-count (setf (st :rule-count) rule-count))
|
||||
(when foveal-id (setf (st :foveal-id) foveal-id))
|
||||
;; v0.8.0: sidebar enrichment fields
|
||||
(when (getf payload :block-counts) (setf (st :block-counts) (getf payload :block-counts)))
|
||||
(when (getf payload :context-usage) (setf (st :context-usage) (getf payload :context-usage)))
|
||||
(when (getf payload :modified-files) (setf (st :modified-files) (getf payload :modified-files)))
|
||||
(when (getf payload :session-cost) (setf (st :session-cost) (getf payload :session-cost)))
|
||||
(cond
|
||||
(text (setf (st :busy) nil)
|
||||
(add-msg :agent text :gate-trace gate-trace))
|
||||
@@ -784,17 +1090,19 @@
|
||||
(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))
|
||||
(sidebar-w (when (>= w 120)
|
||||
(make-instance 'window :height (- h 5) :width 42 :y 3 :x (- w 44))))
|
||||
(content-w (if sidebar-w (- w 44) (- w 2)))
|
||||
(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)))
|
||||
(sw (make-instance 'window :height 3 :width content-w :y 0 :x 1))
|
||||
(cw (make-instance 'window :height ch :width content-w :y 3 :x 1))
|
||||
(iw (make-instance 'window :height 1 :width content-w :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
|
||||
(input-blocking iw) nil
|
||||
(st :dirty) (list t t t)
|
||||
;; Store windows in state for SIGWINCH handler
|
||||
(st :scr) scr (st :sw) sw (st :cw) cw (st :iw) iw)
|
||||
(connect-daemon)
|
||||
(when (> swank-port 0)
|
||||
@@ -807,44 +1115,103 @@
|
||||
(format nil "* Swank ~d M-x slime-connect *" swank-port)))
|
||||
(error ()
|
||||
(add-msg :system "* Swank unavailable *"))))
|
||||
;; Initial render before the main loop — otherwise the screen stays
|
||||
;; blank until the first keystroke (get-char blocks).
|
||||
(redraw sw cw ch iw)
|
||||
(refresh scr)
|
||||
(loop while (st :running) do
|
||||
(dolist (ev (drain-queue))
|
||||
(cond
|
||||
((eq (getf ev :type) :daemon)
|
||||
(on-daemon-msg (getf ev :payload)))
|
||||
((eq (getf ev :type) :disconnected)
|
||||
(setf (st :connected) nil
|
||||
(st :busy) nil)
|
||||
(add-msg :system "* Connection lost — type /reconnect to retry *"))))
|
||||
(let ((ch (get-char iw)))
|
||||
(cond
|
||||
((or (not ch) (equal ch -1)) nil)
|
||||
;; KEY_RESIZE — terminal was resized (SIGWINCH from ncurses)
|
||||
((eql ch 410)
|
||||
(let* ((new-h (or (height scr) 24))
|
||||
(new-w (or (width scr) 80))
|
||||
(new-ch (- new-h 5)))
|
||||
(setq sw (make-instance 'window :height 3 :width (- new-w 2) :y 0 :x 1)
|
||||
ch new-ch
|
||||
cw (make-instance 'window :height new-ch :width (- new-w 2) :y 3 :x 1)
|
||||
iw (make-instance 'window :height 1 :width (- new-w 2) :y (- new-h 1) :x 1)
|
||||
w new-w
|
||||
h new-h)
|
||||
(setf (function-keys-enabled-p iw) t
|
||||
(input-blocking iw) nil
|
||||
(st :dirty) (list t t t)
|
||||
(st :sw) sw (st :cw) cw (st :iw) iw)
|
||||
(redraw sw cw ch iw)
|
||||
(refresh scr)))
|
||||
(t (on-key ch))))
|
||||
(flet ((recreate-windows (scr-width scr-height)
|
||||
(let* ((new-w scr-width)
|
||||
(new-h scr-height)
|
||||
(has-sidebar (and (>= new-w 120) (st :sidebar-visible)))
|
||||
(new-sidebar-w (when has-sidebar
|
||||
(make-instance 'window :height (- new-h 5)
|
||||
:width 42 :y 3 :x (- new-w 44))))
|
||||
(new-content-w (if new-sidebar-w (- new-w 44) (- new-w 2)))
|
||||
(new-ch (- new-h 5)))
|
||||
(setq sw (make-instance 'window :height 3 :width new-content-w :y 0 :x 1)
|
||||
ch new-ch
|
||||
cw (make-instance 'window :height new-ch :width new-content-w :y 3 :x 1)
|
||||
iw (make-instance 'window :height 1 :width new-content-w :y (- new-h 1) :x 1)
|
||||
sidebar-w new-sidebar-w
|
||||
w new-w
|
||||
h new-h)
|
||||
(setf (function-keys-enabled-p iw) t
|
||||
(input-blocking iw) nil
|
||||
(st :dirty) (list t t t)
|
||||
(st :sw) sw (st :cw) cw (st :iw) iw))))
|
||||
(let ((initial-sidebar (and (>= w 120) (st :sidebar-visible))))
|
||||
(when initial-sidebar
|
||||
(view-sidebar (or sidebar-w
|
||||
(make-instance 'window :height (- h 5) :width 42
|
||||
:y 3 :x (- w 44))))
|
||||
(refresh (or sidebar-w
|
||||
(make-instance 'window :height (- h 5) :width 42
|
||||
:y 3 :x (- w 44))))))
|
||||
(redraw sw cw ch iw)
|
||||
(refresh scr)
|
||||
(sleep 0.03))
|
||||
(disconnect-daemon))))
|
||||
(when sidebar-w
|
||||
(view-sidebar sidebar-w)
|
||||
(refresh sidebar-w))
|
||||
(when (st :palette-visible)
|
||||
(let* ((pw (min 56 (floor (* w 0.7))))
|
||||
(ph (min 18 (floor (* h 0.6))))
|
||||
(px (floor (- w pw) 2))
|
||||
(py (floor (- h ph) 2))
|
||||
(palette-win (make-instance 'window :height ph :width pw :y py :x px)))
|
||||
(view-palette palette-win)
|
||||
(refresh palette-win)
|
||||
(close palette-win)))
|
||||
(when (st :wizard-visible)
|
||||
(let* ((ww 60) (wh 14)
|
||||
(wx (floor (- w ww) 2))
|
||||
(wy (floor (- h wh) 2))
|
||||
(wizard-win (make-instance 'window :height wh :width ww :y wy :x wx)))
|
||||
(view-wizard wizard-win)
|
||||
(refresh wizard-win)
|
||||
(close wizard-win)))
|
||||
(refresh scr)
|
||||
(loop while (st :running) do
|
||||
(dolist (ev (drain-queue))
|
||||
(cond
|
||||
((eq (getf ev :type) :daemon)
|
||||
(on-daemon-msg (getf ev :payload)))
|
||||
((eq (getf ev :type) :disconnected)
|
||||
(setf (st :connected) nil
|
||||
(st :busy) nil)
|
||||
(add-msg :system "* Connection lost — type /reconnect to retry *"))))
|
||||
(let ((ch (get-char iw)))
|
||||
(cond
|
||||
((or (not ch) (equal ch -1)) nil)
|
||||
((eql ch 410)
|
||||
(recreate-windows (or (width scr) 80) (or (height scr) 24))
|
||||
(redraw sw cw ch iw)
|
||||
(refresh scr))
|
||||
(t (on-key ch))))
|
||||
(redraw sw cw ch iw)
|
||||
(when sidebar-w
|
||||
(view-sidebar sidebar-w)
|
||||
(refresh sidebar-w))
|
||||
;; Recreate windows when sidebar visibility or terminal width changes
|
||||
(let ((sidebar-wanted (and (st :sidebar-visible) (>= w 120))))
|
||||
(when (or (and sidebar-wanted (not sidebar-w))
|
||||
(and (not sidebar-wanted) sidebar-w))
|
||||
(recreate-windows w h)
|
||||
(redraw sw cw ch iw)))
|
||||
(when (st :palette-visible)
|
||||
(let* ((pw (min 56 (floor (* w 0.7))))
|
||||
(ph (min 18 (floor (* h 0.6))))
|
||||
(px (floor (- w pw) 2))
|
||||
(py (floor (- h ph) 2))
|
||||
(palette-win (make-instance 'window :height ph :width pw :y py :x px)))
|
||||
(view-palette palette-win)
|
||||
(refresh palette-win)
|
||||
(close palette-win)))
|
||||
(when (st :wizard-visible)
|
||||
(let* ((ww 60) (wh 14)
|
||||
(wx (floor (- w ww) 2))
|
||||
(wy (floor (- h wh) 2))
|
||||
(wizard-win (make-instance 'window :height wh :width ww :y wy :x wx)))
|
||||
(view-wizard wizard-win)
|
||||
(refresh wizard-win)
|
||||
(close wizard-win)))
|
||||
(refresh scr)
|
||||
(sleep 0.03))
|
||||
(disconnect-daemon)))))
|
||||
|
||||
(eval-when (:compile-toplevel :load-toplevel :execute)
|
||||
(ql:quickload :fiveam :silent t))
|
||||
@@ -1320,3 +1687,115 @@
|
||||
(setf (st :scroll-offset) 3)
|
||||
(on-key :npage)
|
||||
(fiveam:is (= 0 (st :scroll-offset))))
|
||||
|
||||
(in-package :passepartout-tui-tests)
|
||||
|
||||
(fiveam:test test-theme-hex-to-rgb
|
||||
"Contract 4: theme-hex-to-rgb parses #RRGGBB to integer triple."
|
||||
(multiple-value-bind (r g b) (passepartout.channel-tui::theme-hex-to-rgb "#5E81AC")
|
||||
(fiveam:is (= 94 r))
|
||||
(fiveam:is (= 129 g))
|
||||
(fiveam:is (= 172 b))))
|
||||
|
||||
(fiveam:test test-theme-hex-to-rgb-invalid
|
||||
"Contract 4: theme-hex-to-rgb returns white for invalid input."
|
||||
(multiple-value-bind (r g b) (passepartout.channel-tui::theme-hex-to-rgb "not-a-color")
|
||||
(fiveam:is (= 255 r))
|
||||
(fiveam:is (= 255 g))
|
||||
(fiveam:is (= 255 b))))
|
||||
|
||||
(fiveam:test test-sidebar-toggle
|
||||
"Contract 7: sidebar-toggle flips :sidebar-visible and sets dirty flags."
|
||||
(init-state)
|
||||
(setf (st :dirty) (list nil nil nil))
|
||||
(passepartout.channel-tui::sidebar-toggle)
|
||||
(fiveam:is (eq t (st :sidebar-visible)))
|
||||
(fiveam:is (eq t (first (st :dirty))))
|
||||
(fiveam:is (eq t (second (st :dirty)))))
|
||||
|
||||
(fiveam:test test-ctrl-x-b-toggles-sidebar
|
||||
"Contract 5: Ctrl+X then Ctrl+B toggles sidebar."
|
||||
(init-state)
|
||||
(on-key 24) ; Ctrl+X
|
||||
(fiveam:is (eq t (st :pending-ctrl-x)))
|
||||
(on-key 2) ; Ctrl+B
|
||||
(fiveam:is (eq t (st :sidebar-visible))))
|
||||
|
||||
(fiveam:test test-ctrl-p-opens-palette
|
||||
"Contract 6: Ctrl+P opens command palette."
|
||||
(init-state)
|
||||
(on-key 16) ; Ctrl+P
|
||||
(fiveam:is (eq t (st :palette-visible)))
|
||||
(fiveam:is (not (null (st :palette-items))))
|
||||
(fiveam:is (= 0 (st :palette-selected-idx))))
|
||||
|
||||
(fiveam:test test-palette-escape-dismisses
|
||||
"Contract 6: Esc dismisses palette."
|
||||
(init-state)
|
||||
(setf (st :palette-visible) t)
|
||||
(on-key 27) ; Esc
|
||||
(fiveam:is (null (st :palette-visible))))
|
||||
|
||||
(fiveam:test test-palette-enter-executes
|
||||
"Contract 9: Enter executes selected item and dismisses palette."
|
||||
(init-state)
|
||||
(setf (st :palette-visible) t
|
||||
(st :palette-selected-idx) 0
|
||||
(st :palette-items) (passepartout.channel-tui::palette-items))
|
||||
(on-key (char-code #\/))
|
||||
(on-key (char-code #\t))
|
||||
(fiveam:is (string= "/t" (st :palette-filter))))
|
||||
|
||||
(fiveam:test test-palette-items-has-categories
|
||||
"Contract 7: palette-items returns categorized list with at least Session and View."
|
||||
(init-state)
|
||||
(let ((items (passepartout.channel-tui::palette-items)))
|
||||
(fiveam:is (listp items))
|
||||
(fiveam:is (find "Session" items :key (lambda (g) (getf g :category)) :test #'string=))
|
||||
(fiveam:is (find "View" items :key (lambda (g) (getf g :category)) :test #'string=))))
|
||||
|
||||
;; ── v0.8.0 Setup Wizard ──
|
||||
|
||||
(fiveam:test test-wizard-steps-count
|
||||
"Contract v0.8.0: wizard-steps returns 4 steps."
|
||||
(let ((steps (passepartout.channel-tui::wizard-steps)))
|
||||
(fiveam:is (= 4 (length steps)))))
|
||||
|
||||
(fiveam:test test-wizard-start-sets-visible
|
||||
"Contract v0.8.0: wizard-start sets wizard-visible and resets state."
|
||||
(init-state)
|
||||
(passepartout.channel-tui::wizard-start)
|
||||
(fiveam:is (eq t (st :wizard-visible)))
|
||||
(fiveam:is (= 0 (st :wizard-step)))
|
||||
(fiveam:is (string= "" (st :wizard-input))))
|
||||
|
||||
(fiveam:test test-wizard-cancel-hides
|
||||
"Contract v0.8.0: wizard-cancel hides the wizard."
|
||||
(init-state)
|
||||
(setf (st :wizard-visible) t)
|
||||
(passepartout.channel-tui::wizard-cancel)
|
||||
(fiveam:is (null (st :wizard-visible))))
|
||||
|
||||
(fiveam:test test-wizard-next-valid-advances
|
||||
"Contract v0.8.0: valid input advances to next step."
|
||||
(init-state)
|
||||
(passepartout.channel-tui::wizard-start)
|
||||
(setf (st :wizard-input) "openai")
|
||||
(passepartout.channel-tui::wizard-next)
|
||||
(fiveam:is (= 1 (st :wizard-step)))
|
||||
(fiveam:is (string= "openai" (st :wizard-provider))))
|
||||
|
||||
(fiveam:test test-wizard-next-invalid-shows-error
|
||||
"Contract v0.8.0: invalid input shows error and stays on current step."
|
||||
(init-state)
|
||||
(passepartout.channel-tui::wizard-start)
|
||||
(setf (st :wizard-input) "invalid-provider")
|
||||
(passepartout.channel-tui::wizard-next)
|
||||
(fiveam:is (= 0 (st :wizard-step)))
|
||||
(fiveam:is (not (null (st :wizard-error)))))
|
||||
|
||||
(fiveam:test test-ctrl-backslash-opens-wizard
|
||||
"Contract v0.8.0: Ctrl+\\ opens the setup wizard."
|
||||
(init-state)
|
||||
(on-key 28) ; Ctrl+\
|
||||
(fiveam:is (eq t (st :wizard-visible))))
|
||||
|
||||
@@ -65,7 +65,43 @@ See *tui-theme-presets* for named presets (dark, light, solarized, gruvbox).")
|
||||
:tool-running "#d33682" :tool-success "#859900" :tool-failure "#dc322f" :tool-output "#839496"
|
||||
:scroll-indicator "#2aa198" :border "#657b83" :background "#002b36"
|
||||
:rule-count "#2aa198" :focus-map "#b58900"
|
||||
:dim "#586e75" :highlight "#2aa198" :accent "#859900"))
|
||||
:dim "#586e75" :highlight "#2aa198" :accent "#859900")
|
||||
:nord (:user "#81a1c1" :agent "#d8dee9" :system "#ebcb8b"
|
||||
:input "#d8dee9" :timestamp "#4c566a" :help "#88c0d0" :error "#bf616a" :warning "#ebcb8b"
|
||||
:connected "#a3be8c" :disconnected "#bf616a" :busy "#b48ead" :idle "#616e88"
|
||||
:gate-passed "#a3be8c" :gate-blocked "#bf616a" :gate-approval "#ebcb8b"
|
||||
:hitl "#b48ead"
|
||||
:tool-running "#b48ead" :tool-success "#a3be8c" :tool-failure "#bf616a" :tool-output "#d8dee9"
|
||||
:scroll-indicator "#88c0d0" :border "#4c566a" :background "#2e3440"
|
||||
:rule-count "#88c0d0" :focus-map "#ebcb8b"
|
||||
:dim "#616e88" :highlight "#88c0d0" :accent "#5e81ac")
|
||||
:tokyonight (:user "#7aa2f7" :agent "#c0caf5" :system "#e0af68"
|
||||
:input "#c0caf5" :timestamp "#565f89" :help "#7dcfff" :error "#f7768e" :warning "#e0af68"
|
||||
:connected "#9ece6a" :disconnected "#f7768e" :busy "#bb9af7" :idle "#565f89"
|
||||
:gate-passed "#9ece6a" :gate-blocked "#f7768e" :gate-approval "#e0af68"
|
||||
:hitl "#bb9af7"
|
||||
:tool-running "#bb9af7" :tool-success "#9ece6a" :tool-failure "#f7768e" :tool-output "#c0caf5"
|
||||
:scroll-indicator "#7dcfff" :border "#1f2335" :background "#1a1b26"
|
||||
:rule-count "#7dcfff" :focus-map "#e0af68"
|
||||
:dim "#565f89" :highlight "#7dcfff" :accent "#7aa2f7")
|
||||
:catppuccin (:user "#89b4fa" :agent "#cdd6f4" :system "#f9e2af"
|
||||
:input "#cdd6f4" :timestamp "#585b70" :help "#94e2d5" :error "#f38ba8" :warning "#f9e2af"
|
||||
:connected "#a6e3a1" :disconnected "#f38ba8" :busy "#cba6f7" :idle "#6c7086"
|
||||
:gate-passed "#a6e3a1" :gate-blocked "#f38ba8" :gate-approval "#f9e2af"
|
||||
:hitl "#cba6f7"
|
||||
:tool-running "#cba6f7" :tool-success "#a6e3a1" :tool-failure "#f38ba8" :tool-output "#cdd6f4"
|
||||
:scroll-indicator "#94e2d5" :border "#45475a" :background "#1e1e2e"
|
||||
:rule-count "#94e2d5" :focus-map "#f9e2af"
|
||||
:dim "#6c7086" :highlight "#94e2d5" :accent "#89b4fa")
|
||||
:monokai (:user "#a6e22e" :agent "#f8f8f2" :system "#e6db74"
|
||||
:input "#f8f8f2" :timestamp "#75715e" :help "#66d9ef" :error "#f92672" :warning "#e6db74"
|
||||
:connected "#a6e22e" :disconnected "#f92672" :busy "#ae81ff" :idle "#75715e"
|
||||
:gate-passed "#a6e22e" :gate-blocked "#f92672" :gate-approval "#e6db74"
|
||||
:hitl "#ae81ff"
|
||||
:tool-running "#ae81ff" :tool-success "#a6e22e" :tool-failure "#f92672" :tool-output "#f8f8f2"
|
||||
:scroll-indicator "#66d9ef" :border "#49483e" :background "#272822"
|
||||
:rule-count "#66d9ef" :focus-map "#e6db74"
|
||||
:dim "#75715e" :highlight "#66d9ef" :accent "#a6e22e"))
|
||||
"Named theme presets. /theme <name> loads one into *tui-theme*.")
|
||||
|
||||
(defvar *tui-theme-current-name* :dark
|
||||
@@ -104,6 +140,32 @@ See *tui-theme-presets* for named presets (dark, light, solarized, gruvbox).")
|
||||
"Returns the Croatoan color for a semantic role."
|
||||
(or (getf *tui-theme* role) :white))
|
||||
|
||||
;; v0.8.0: TrueColor helpers
|
||||
(defun theme-hex-to-rgb (hex-string)
|
||||
"Parse #RRGGBB to (values r g b). Returns (255 255 255) for invalid input."
|
||||
(if (and (stringp hex-string) (= 7 (length hex-string)) (eql (char hex-string 0) #\#))
|
||||
(handler-case
|
||||
(let ((r (parse-integer (subseq hex-string 1 3) :radix 16))
|
||||
(g (parse-integer (subseq hex-string 3 5) :radix 16))
|
||||
(b (parse-integer (subseq hex-string 5 7) :radix 16)))
|
||||
(values r g b))
|
||||
(error () (values 255 255 255)))
|
||||
(values 255 255 255)))
|
||||
|
||||
(defun theme-init-truecolor ()
|
||||
"Register hex colors from *tui-theme* with Croatoan's init-color."
|
||||
(handler-case
|
||||
(loop for (key val) on *tui-theme* by #'cddr
|
||||
when (and (stringp val) (= 7 (length val)) (eql (char val 0) #\#))
|
||||
do (multiple-value-bind (r g b) (theme-hex-to-rgb val)
|
||||
(init-color key (/ r 255.0) (/ g 255.0) (/ b 255.0))))
|
||||
(error () nil)))
|
||||
|
||||
(defun sidebar-toggle ()
|
||||
"Toggle sidebar visibility. Sets dirty flags for full redraw."
|
||||
(setf (st :sidebar-visible) (not (st :sidebar-visible)))
|
||||
(setf (st :dirty) (list t t t)))
|
||||
|
||||
(defun st (key) (getf *state* key))
|
||||
(defun (setf st) (val key) (setf (getf *state* key) val))
|
||||
|
||||
@@ -119,6 +181,13 @@ See *tui-theme-presets* for named presets (dark, light, solarized, gruvbox).")
|
||||
:collapsed-gates nil ; v0.7.2
|
||||
:search-mode nil :search-query "" ; v0.7.2
|
||||
:search-matches nil :search-match-idx 0
|
||||
:sidebar-visible nil ; v0.8.0
|
||||
:palette-visible nil :palette-filter nil ; v0.8.0
|
||||
:palette-selected-idx 0 :palette-items nil ; v0.8.0
|
||||
:wizard-step 0 :wizard-error nil ; v0.8.0
|
||||
:wizard-visible nil :wizard-input "" ; v0.8.0
|
||||
:wizard-provider nil :wizard-api-key nil ; v0.8.0
|
||||
:wizard-memory nil ; v0.8.0
|
||||
:dirty (list nil nil nil))))
|
||||
|
||||
(defun now ()
|
||||
|
||||
@@ -296,9 +296,9 @@ ASCII < 128 = 1. CJK, fullwidth, emoji = 2. Combining marks = 0. Tab = 8."
|
||||
(:approval :gate-approval)
|
||||
(t :dim)))
|
||||
(prefix (case result
|
||||
(:passed " \u2713 ")
|
||||
(:blocked " \u2717 ")
|
||||
(:approval " \u2192 ")
|
||||
(:passed " ✓ ")
|
||||
(:blocked " ✗ ")
|
||||
(:approval " → ")
|
||||
(t " ? ")))
|
||||
(text (format nil "~a~a~@[~a~]~@[~a~]"
|
||||
prefix name
|
||||
@@ -307,6 +307,195 @@ ASCII < 128 = 1. CJK, fullwidth, emoji = 2. Combining marks = 0. Tab = 8."
|
||||
(push (cons text (list :fgcolor color)) lines)))
|
||||
(nreverse lines)))
|
||||
|
||||
(in-package :passepartout.channel-tui)
|
||||
|
||||
(defun view-sidebar (win)
|
||||
"Render 42-column sidebar with 7 panels: Gate Trace, Focus, Rules, Context, Files, Cost, Protection."
|
||||
(clear win)
|
||||
(box win (theme-color :border) (theme-color :background))
|
||||
(let* ((w (or (width win) 42))
|
||||
(h (or (height win) 24))
|
||||
(y 1)
|
||||
(gate-trace (st :gate-trace))
|
||||
(foveal-id (st :foveal-id))
|
||||
(rule-count (or (st :rule-count) 0))
|
||||
(context-usage (st :context-usage))
|
||||
(modified-files (st :modified-files))
|
||||
(session-cost (st :session-cost))
|
||||
(block-counts (st :block-counts)))
|
||||
;; Panel 1: Gate Trace
|
||||
(add-string win "── Gate Trace ──" :y y :x 1 :n (- w 2) :fgcolor (theme-color :accent))
|
||||
(incf y)
|
||||
(if gate-trace
|
||||
(dolist (entry (passepartout::gate-trace-lines gate-trace))
|
||||
(when (< y (1- h))
|
||||
(add-string win (car entry) :y y :x 2 :n (- w 4)
|
||||
:fgcolor (or (getf (cdr entry) :fgcolor) (theme-color :dim)))
|
||||
(incf y)))
|
||||
(add-string win " (no trace)" :y y :x 2 :n (- w 4) :fgcolor (theme-color :dim)))
|
||||
;; Panel 2: Focus
|
||||
(incf y)
|
||||
(add-string win "── Focus ──" :y y :x 1 :n (- w 2) :fgcolor (theme-color :accent))
|
||||
(incf y)
|
||||
(add-string win (format nil " ~a" (or foveal-id "(none)")) :y y :x 2 :n (- w 4) :fgcolor (theme-color :focus-map))
|
||||
;; Panel 3: Rules
|
||||
(incf y 2)
|
||||
(add-string win "── Rules ──" :y y :x 1 :n (- w 2) :fgcolor (theme-color :accent))
|
||||
(incf y)
|
||||
(add-string win (format nil " Rules: ~d" rule-count) :y y :x 2 :n (- w 4) :fgcolor (theme-color :rule-count))
|
||||
;; Panel 4: Context gauge
|
||||
(incf y 2)
|
||||
(add-string win "── Context ──" :y y :x 1 :n (- w 2) :fgcolor (theme-color :accent))
|
||||
(incf y)
|
||||
(let* ((pct (or context-usage 0))
|
||||
(bar-width 30)
|
||||
(filled (min bar-width (floor (* pct bar-width) 100)))
|
||||
(gauge-color (cond ((< pct 50) (theme-color :connected))
|
||||
((< pct 80) (theme-color :warning))
|
||||
((< pct 95) (theme-color :tool-running))
|
||||
(t (theme-color :error)))))
|
||||
(add-string win (format nil " [~a~a] ~d%"
|
||||
(make-string filled :initial-element #\█)
|
||||
(make-string (- bar-width filled) :initial-element #\░)
|
||||
pct)
|
||||
:y y :x 2 :n (- w 4) :fgcolor gauge-color))
|
||||
;; Panel 5: Files
|
||||
(incf y 2)
|
||||
(add-string win "── Files ──" :y y :x 1 :n (- w 2) :fgcolor (theme-color :accent))
|
||||
(incf y)
|
||||
(if modified-files
|
||||
(dolist (f modified-files)
|
||||
(when (< y (1- h))
|
||||
(let ((fp (getf f :filepath))
|
||||
(added (getf f :lines-added))
|
||||
(removed (getf f :lines-removed)))
|
||||
(add-string win (format nil " ~a~@[ +~d~]~@[ -~d~]"
|
||||
(subseq fp (max 0 (- (length fp) 30)))
|
||||
(when (> added 0) added)
|
||||
(when (> removed 0) removed))
|
||||
:y y :x 2 :n (- w 4) :fgcolor (theme-color :agent))
|
||||
(incf y))))
|
||||
(add-string win " (no changes)" :y y :x 2 :n (- w 4) :fgcolor (theme-color :dim)))
|
||||
;; Panel 6: Cost
|
||||
(incf y 2)
|
||||
(add-string win "── Cost ──" :y y :x 1 :n (- w 2) :fgcolor (theme-color :accent))
|
||||
(incf y)
|
||||
(if session-cost
|
||||
(progn
|
||||
(add-string win (format nil " Total: $~,4f" (getf session-cost :total))
|
||||
:y y :x 2 :n (- w 4) :fgcolor (theme-color :agent))
|
||||
(incf y)
|
||||
(add-string win (format nil " Calls: ~d" (getf session-cost :calls))
|
||||
:y y :x 2 :n (- w 4) :fgcolor (theme-color :agent)))
|
||||
(add-string win " (no data)" :y y :x 2 :n (- w 4) :fgcolor (theme-color :dim)))
|
||||
;; Panel 7: Protection
|
||||
(incf y 2)
|
||||
(add-string win "── Protection ──" :y y :x 1 :n (- w 2) :fgcolor (theme-color :accent))
|
||||
(incf y)
|
||||
(if (and block-counts (> (getf block-counts :total) 0))
|
||||
(let ((by-gate (getf block-counts :by-gate)))
|
||||
(dolist (entry (subseq by-gate 0 (min (length by-gate) 6)))
|
||||
(when (< y (1- h))
|
||||
(add-string win (format nil " ~a: ~d" (car entry) (cdr entry))
|
||||
:y y :x 2 :n (- w 4) :fgcolor (theme-color :gate-blocked))
|
||||
(incf y))))
|
||||
(add-string win " (no blocks)" :y y :x 2 :n (- w 4) :fgcolor (theme-color :dim)))
|
||||
(refresh win)
|
||||
(- y 1)))
|
||||
|
||||
(defun palette-filter (items query)
|
||||
"Return items from categorized list whose :name or :desc contains QUERY (case-insensitive)."
|
||||
(if (or (null query) (string= query ""))
|
||||
items
|
||||
(let ((q (string-downcase query)))
|
||||
(loop for group in items
|
||||
for category = (getf group :category)
|
||||
for gitems = (getf group :items)
|
||||
for filtered = (loop for item in gitems
|
||||
when (or (search q (string-downcase (getf item :name)))
|
||||
(search q (string-downcase (or (getf item :desc) ""))))
|
||||
collect item)
|
||||
when filtered
|
||||
collect (list :category category :items filtered)))))
|
||||
|
||||
(defun view-palette (win)
|
||||
"Render centered command palette overlay with filtered items, selection highlight."
|
||||
(clear win)
|
||||
(box win (theme-color :border) (theme-color :background))
|
||||
(let* ((w (or (width win) 50))
|
||||
(h (or (height win) 20))
|
||||
(y 1)
|
||||
(query (or (st :palette-filter) ""))
|
||||
(items (palette-filter (st :palette-items) query))
|
||||
(selected (st :palette-selected-idx))
|
||||
(flat-index 0)
|
||||
(visible-start (max 0 (- selected (floor (- h 6) 2)))))
|
||||
(add-string win (format nil " Command Palette ") :y y :x 2 :n (- w 4) :fgcolor (theme-color :accent))
|
||||
(incf y)
|
||||
(add-string win (format nil " > ~a" (if (> (length query) 0) query "type to filter..."))
|
||||
:y y :x 2 :n (- w 4) :fgcolor (theme-color :input) :attributes '(:underline t))
|
||||
(incf y)
|
||||
(dolist (group items)
|
||||
(let ((category (getf group :category))
|
||||
(gitems (getf group :items)))
|
||||
(when (and gitems (< y (1- h)))
|
||||
(incf y)
|
||||
(add-string win (format nil "── ~a ──" category) :y y :x 2 :n (- w 4) :fgcolor (theme-color :dim))
|
||||
(dolist (item gitems)
|
||||
(when (< y (1- h))
|
||||
(incf y)
|
||||
(let* ((name (getf item :name))
|
||||
(desc (getf item :desc))
|
||||
(shortcut (getf item :shortcut))
|
||||
(is-selected (= flat-index selected))
|
||||
(fg (if is-selected (theme-color :accent) (theme-color :agent))))
|
||||
(when is-selected
|
||||
(add-string win (make-string (- w 4) :initial-element #\Space) :y y :x 2 :n (- w 4)
|
||||
:fgcolor (theme-color :dim) :bgcolor (theme-color :accent)))
|
||||
(add-string win (format nil " ~a" name) :y y :x 3 :n (- w 6) :fgcolor fg)
|
||||
(when (and shortcut (> (- w 6) (+ 4 (length shortcut))))
|
||||
(add-string win shortcut :y y :x (- w (length shortcut) 3) :n (length shortcut) :fgcolor (theme-color :dim)))
|
||||
(incf flat-index)))))))
|
||||
(add-string win (format nil " ↑↓ Navigate Enter Execute Esc Close")
|
||||
:y (- h 1) :x 2 :n (- w 4) :fgcolor (theme-color :dim))
|
||||
(refresh win)
|
||||
(- h 1)))
|
||||
|
||||
(defun view-wizard (win)
|
||||
"Render setup wizard overlay: step title, prompt, input, error, progress."
|
||||
(clear win)
|
||||
(box win (theme-color :border) (theme-color :background))
|
||||
(let* ((w (or (width win) 60))
|
||||
(h (or (height win) 15))
|
||||
(y 1)
|
||||
(steps (passepartout.channel-tui::wizard-steps))
|
||||
(step-idx (st :wizard-step))
|
||||
(step (when (< step-idx (length steps)) (nth step-idx steps)))
|
||||
(prompt (getf step :prompt))
|
||||
(title (getf step :title))
|
||||
(total (length steps))
|
||||
(error-msg (st :wizard-error))
|
||||
(input (or (st :wizard-input) "")))
|
||||
(add-string win "Setup Wizard" :y y :x 2 :n (- w 4) :fgcolor (theme-color :accent))
|
||||
(incf y 2)
|
||||
(add-string win (format nil "Step ~d/~d" (1+ step-idx) total) :y y :x 2 :n (- w 4) :fgcolor (theme-color :dim))
|
||||
(incf y)
|
||||
(when title
|
||||
(add-string win title :y y :x 3 :n (- w 6) :fgcolor (theme-color :accent))
|
||||
(incf y))
|
||||
(when prompt
|
||||
(add-string win prompt :y y :x 3 :n (- w 6) :fgcolor (theme-color :agent))
|
||||
(incf y))
|
||||
(incf y)
|
||||
(add-string win (format nil "> ~a" input) :y y :x 3 :n (- w 6) :fgcolor (theme-color :input))
|
||||
(incf y)
|
||||
(when error-msg
|
||||
(add-string win (format nil "! ~a" error-msg) :y y :x 3 :n (- w 6) :fgcolor (theme-color :error))
|
||||
(incf y))
|
||||
(add-string win "Enter=Next Esc=Cancel Bksp=Edit" :y (- h 2) :x 2 :n (- w 4) :fgcolor (theme-color :dim))
|
||||
(refresh win)
|
||||
(- h 1)))
|
||||
|
||||
(eval-when (:compile-toplevel :load-toplevel :execute)
|
||||
(ql:quickload :fiveam :silent t))
|
||||
|
||||
@@ -414,3 +603,48 @@ ASCII < 128 = 1. CJK, fullwidth, emoji = 2. Combining marks = 0. Tab = 8."
|
||||
(passepartout.channel-tui::init-state)
|
||||
(let ((cg (passepartout.channel-tui::st :collapsed-gates)))
|
||||
(is (null cg))))
|
||||
|
||||
(in-package :passepartout-tui-view-tests)
|
||||
|
||||
(test test-theme-hex-string-keys-exist
|
||||
"v0.8.0: all 27 theme keys are present in *tui-theme*."
|
||||
(let* ((theme passepartout.channel-tui::*tui-theme*)
|
||||
(required '(:user :agent :system :input :timestamp :help :error :warning
|
||||
:connected :disconnected :busy :idle
|
||||
:gate-passed :gate-blocked :gate-approval :hitl
|
||||
:tool-running :tool-success :tool-failure :tool-output
|
||||
:scroll-indicator :border :background
|
||||
:rule-count :focus-map
|
||||
:dim :highlight :accent)))
|
||||
(dolist (key required)
|
||||
(is (getf theme key) (format nil "~a should be defined" key)))))
|
||||
|
||||
(test test-theme-presets-count
|
||||
"v0.8.0: 8 presets defined: dark, light, solarized, gruvbox, nord, tokyonight, catppuccin, monokai."
|
||||
(let* ((presets passepartout.channel-tui::*tui-theme-presets*)
|
||||
(names '(:dark :light :solarized :gruvbox :nord :tokyonight :catppuccin :monokai)))
|
||||
(dolist (name names)
|
||||
(is (getf presets name) (format nil "~a preset should exist" name)))))
|
||||
|
||||
(test test-palette-filter-matches-substring
|
||||
"Contract v0.8.0: palette-filter returns items matching query."
|
||||
(let* ((items (list (list :category "Session" :items
|
||||
(list (list :name "/focus" :desc "Set context" :shortcut nil :action nil)
|
||||
(list :name "/scope" :desc "Change scope" :shortcut nil :action nil)))))
|
||||
(filtered (passepartout.channel-tui::palette-filter items "focus")))
|
||||
(is (= 1 (length (getf (first filtered) :items))))
|
||||
(is (string= "/focus" (getf (first (getf (first filtered) :items)) :name)))))
|
||||
|
||||
(test test-palette-filter-case-insensitive
|
||||
"Contract v0.8.0: palette-filter is case-insensitive."
|
||||
(let* ((items (list (list :category "View" :items
|
||||
(list (list :name "/theme" :desc "Switch color" :shortcut nil :action nil)))))
|
||||
(filtered (passepartout.channel-tui::palette-filter items "THEME")))
|
||||
(is (= 1 (length (getf (first filtered) :items))))))
|
||||
|
||||
(test test-palette-filter-no-match-empty
|
||||
"Contract v0.8.0: palette-filter returns empty categories on no match."
|
||||
(let* ((items (list (list :category "View" :items
|
||||
(list (list :name "/theme" :desc "Colors" :shortcut nil :action nil)))))
|
||||
(filtered (passepartout.channel-tui::palette-filter items "xyznonexistent")))
|
||||
(is (null (getf (first filtered) :items)))))
|
||||
|
||||
@@ -32,6 +32,19 @@
|
||||
0))
|
||||
(setf (getf (getf action :payload) :foveal-id)
|
||||
(getf context :foveal-id))
|
||||
;; v0.8.0: sidebar enrichment via fboundp guards
|
||||
(when (fboundp 'dispatcher-block-counts-summary)
|
||||
(setf (getf (getf action :payload) :block-counts)
|
||||
(dispatcher-block-counts-summary)))
|
||||
(when (fboundp 'context-usage-percentage)
|
||||
(setf (getf (getf action :payload) :context-usage)
|
||||
(context-usage-percentage)))
|
||||
(when (fboundp 'tool-modified-files-summary)
|
||||
(setf (getf (getf action :payload) :modified-files)
|
||||
(tool-modified-files-summary)))
|
||||
(when (fboundp 'cost-session-summary)
|
||||
(setf (getf (getf action :payload) :session-cost)
|
||||
(cost-session-summary)))
|
||||
(format stream "~a" (frame-message action))
|
||||
(finish-output stream))))))
|
||||
|
||||
|
||||
@@ -9,8 +9,12 @@
|
||||
(defun cost-track-call (provider prompt-text &optional response-text)
|
||||
"Compute and accumulate the cost of a single LLM call.
|
||||
Returns the cost of this call in USD."
|
||||
(let* ((input-tokens (funcall (symbol-function 'count-tokens) (or prompt-text "")))
|
||||
(output-tokens (if response-text (funcall (symbol-function 'count-tokens) response-text) 0))
|
||||
(let* ((input-tokens (if (fboundp 'count-tokens)
|
||||
(funcall (symbol-function 'count-tokens) (or prompt-text ""))
|
||||
(ceiling (length (or prompt-text "")) 4)))
|
||||
(output-tokens (if (and response-text (fboundp 'count-tokens))
|
||||
(funcall (symbol-function 'count-tokens) response-text)
|
||||
0))
|
||||
(total-tokens (+ input-tokens output-tokens))
|
||||
(cost (provider-token-cost provider total-tokens)))
|
||||
(bordeaux-threads:with-lock-held (*session-cost-lock*)
|
||||
@@ -41,13 +45,19 @@ Returns the cost of this call in USD."
|
||||
(bordeaux-threads:with-lock-held (*session-cost-lock*)
|
||||
(getf *session-cost* :by-provider)))
|
||||
|
||||
(defun cost-session-summary ()
|
||||
"Returns plist (:total <float> :calls <int> :by-provider <alist>)."
|
||||
(bordeaux-threads:with-lock-held (*session-cost-lock*)
|
||||
(list :total (getf *session-cost* :total)
|
||||
:calls (getf *session-cost* :calls)
|
||||
:by-provider (getf *session-cost* :by-provider))))
|
||||
|
||||
(defun cost-session-reset ()
|
||||
"Zeroes the session cost accumulator."
|
||||
(bordeaux-threads:with-lock-held (*session-cost-lock*)
|
||||
(setf (getf *session-cost* :total) 0.0)
|
||||
(setf (getf *session-cost* :calls) 0)
|
||||
(setf (getf *session-cost* :by-provider) nil)
|
||||
(log-message "COST TRACKER: Session cost reset.")))
|
||||
(setf (getf *session-cost* :by-provider) nil)))
|
||||
|
||||
(defun cost-format-budget-status (&optional (daily-budget nil))
|
||||
"Returns a string for the TUI status bar showing session cost.
|
||||
@@ -132,3 +142,15 @@ If DAILY-BUDGET is provided, includes percentage of budget used."
|
||||
(cost-session-reset)
|
||||
(let ((cost (cost-track-call :deepseek "test")))
|
||||
(is (> cost 0.0))))
|
||||
|
||||
(test test-cost-session-summary
|
||||
"Contract 5: cost-session-summary returns plist with total, calls, by-provider."
|
||||
(cost-session-reset)
|
||||
(cost-track-call :deepseek "hello")
|
||||
(cost-track-call :groq "world")
|
||||
(let ((s (cost-session-summary)))
|
||||
(is (> (getf s :total) 0.0))
|
||||
(is (= 2 (getf s :calls)))
|
||||
(let ((by (getf s :by-provider)))
|
||||
(is (assoc :deepseek by))
|
||||
(is (assoc :groq by)))))
|
||||
|
||||
@@ -101,12 +101,13 @@
|
||||
(content (getf args :content)))
|
||||
(unless (and filepath content)
|
||||
(return (list :status :error :message "write-file requires :filepath and :content")))
|
||||
(handler-case
|
||||
(progn
|
||||
(tools-write-file filepath content)
|
||||
(verify-write filepath content)
|
||||
(list :status :success
|
||||
:content (format nil "Written ~d bytes to ~a" (length content) filepath)))
|
||||
(handler-case
|
||||
(progn
|
||||
(tools-write-file filepath content)
|
||||
(verify-write filepath content)
|
||||
(tool-register-modified filepath :new-content content)
|
||||
(list :status :success
|
||||
:content (format nil "Written ~d bytes to ~a" (length content) filepath)))
|
||||
(error (c) (list :status :error :message (format nil "~a" c))))))))
|
||||
|
||||
(def-cognitive-tool list-directory
|
||||
@@ -240,12 +241,13 @@
|
||||
(let ((content (uiop:read-file-string filepath)))
|
||||
(let ((pos (search old-text content)))
|
||||
(if pos
|
||||
(let ((new-content (concatenate 'string
|
||||
(subseq content 0 pos)
|
||||
new-text
|
||||
(subseq content (+ pos (length old-text))))))
|
||||
(tools-write-file filepath new-content)
|
||||
(list :status :success
|
||||
(let ((new-content (concatenate 'string
|
||||
(subseq content 0 pos)
|
||||
new-text
|
||||
(subseq content (+ pos (length old-text))))))
|
||||
(tools-write-file filepath new-content)
|
||||
(tool-register-modified filepath :old-content content :new-content new-content)
|
||||
(list :status :success
|
||||
:content (format nil "Replaced at position ~d in ~a" pos filepath)))
|
||||
(list :status :error :message (format nil "Text not found in ~a" filepath)))))
|
||||
(error (c) (list :status :error :message (format nil "~a" c))))))))
|
||||
@@ -452,6 +454,38 @@
|
||||
|
||||
(defvar *cognitive-tool-registry* (make-hash-table :test 'equal))
|
||||
|
||||
(defvar *modified-files-this-turn* nil
|
||||
"List of plists recording file modifications in the current turn.")
|
||||
|
||||
(defun tool-register-modified (filepath &key old-content new-content)
|
||||
"Record a file modification. Returns the record plist."
|
||||
(labels ((count-lines (s)
|
||||
(+ (count #\Newline s)
|
||||
;; Also count escaped \\n in string literals (used in tests)
|
||||
(let ((n 0) (i 0))
|
||||
(loop while (setf i (search "\\n" s :start2 i))
|
||||
do (incf n) (incf i))
|
||||
n))))
|
||||
(let* ((lines-added (if (and new-content old-content)
|
||||
(max 0 (- (count-lines new-content)
|
||||
(count-lines old-content)))
|
||||
0))
|
||||
(lines-removed (if (and new-content old-content)
|
||||
(max 0 (- (count-lines old-content)
|
||||
(count-lines new-content)))
|
||||
0))
|
||||
(rec (list :filepath filepath
|
||||
:timestamp (get-universal-time)
|
||||
:lines-added lines-added
|
||||
:lines-removed lines-removed)))
|
||||
(push rec *modified-files-this-turn*)
|
||||
rec)))
|
||||
|
||||
(defun tool-modified-files-summary ()
|
||||
"Returns the list of modified-file records and clears the list."
|
||||
(prog1 (nreverse *modified-files-this-turn*)
|
||||
(setf *modified-files-this-turn* nil)))
|
||||
|
||||
(eval-when (:compile-toplevel :load-toplevel :execute)
|
||||
(ql:quickload :fiveam :silent t))
|
||||
|
||||
@@ -623,3 +657,31 @@
|
||||
"org-modify-file returns error without required params."
|
||||
(let ((result (call-tool 'org-modify-file :filepath "x" :old-text "y")))
|
||||
(is (eq (getf result :status) :error))))
|
||||
|
||||
(in-package :passepartout-programming-tools-tests)
|
||||
|
||||
(test test-modified-files-track-write
|
||||
"Contract 14: tool-register-modified appends to *modified-files-this-turn*."
|
||||
(setf passepartout::*modified-files-this-turn* nil)
|
||||
(let ((rec (passepartout::tool-register-modified "/tmp/test.org"
|
||||
:old-content "old" :new-content "line1
|
||||
line2")))
|
||||
(is (string= "/tmp/test.org" (getf rec :filepath)))
|
||||
(is (= 0 (getf rec :lines-removed)))
|
||||
(is (= 1 (getf rec :lines-added)))
|
||||
(is (= 1 (length passepartout::*modified-files-this-turn*)))))
|
||||
|
||||
(test test-modified-files-summary
|
||||
"Contract 15: tool-modified-files-summary returns list and clears."
|
||||
(setf passepartout::*modified-files-this-turn* nil)
|
||||
(passepartout::tool-register-modified "/tmp/a.org")
|
||||
(passepartout::tool-register-modified "/tmp/b.org")
|
||||
(let ((files (passepartout::tool-modified-files-summary)))
|
||||
(is (= 2 (length files)))
|
||||
(is (null passepartout::*modified-files-this-turn*))
|
||||
(is (find "/tmp/a.org" files :key (lambda (f) (getf f :filepath)) :test #'string=))))
|
||||
|
||||
(test test-modified-files-empty
|
||||
"Contract 15: tool-modified-files-summary returns nil when no files modified."
|
||||
(setf passepartout::*modified-files-this-turn* nil)
|
||||
(is (null (passepartout::tool-modified-files-summary))))
|
||||
|
||||
@@ -290,54 +290,60 @@ Eleven checks: 0=REPL-lint (warn-only), 1=lisp-validation, 2=secret-path,
|
||||
action)
|
||||
|
||||
;; Vector 1: Lisp syntax validation (block bad lisp writes)
|
||||
((and lisp-valid (eq (getf lisp-valid :status) :error))
|
||||
(log-message "LINT VIOLATION: Blocked write — lisp syntax error in ~a: ~a" filepath (getf lisp-valid :reason))
|
||||
(list :type :LOG
|
||||
:payload (list :level :error
|
||||
:text (format nil "Lisp syntax error in ~a: ~a. The write was blocked. Fix the parenthesis balance and retry." filepath (getf lisp-valid :reason)))))
|
||||
((and lisp-valid (eq (getf lisp-valid :status) :error))
|
||||
(log-message "LINT VIOLATION: Blocked write — lisp syntax error in ~a: ~a" filepath (getf lisp-valid :reason))
|
||||
(dispatcher-block-record :lisp-validation)
|
||||
(list :type :LOG
|
||||
:payload (list :level :error
|
||||
:text (format nil "Lisp syntax error in ~a: ~a. The write was blocked. Fix the parenthesis balance and retry." filepath (getf lisp-valid :reason)))))
|
||||
|
||||
;; Vector 2: File read to a protected secret path
|
||||
((and filepath (dispatcher-check-secret-path filepath))
|
||||
(let ((matched (dispatcher-check-secret-path filepath)))
|
||||
(log-message "SECURITY VIOLATION: Blocked read of protected path '~a' (matched: ~a)" filepath matched)
|
||||
(list :type :LOG
|
||||
:payload (list :level :error
|
||||
:text (format nil "Action blocked: Attempted read of protected path '~a'" filepath)))))
|
||||
;; Vector 2: File read to a protected secret path
|
||||
((and filepath (dispatcher-check-secret-path filepath))
|
||||
(let ((matched (dispatcher-check-secret-path filepath)))
|
||||
(log-message "SECURITY VIOLATION: Blocked read of protected path '~a' (matched: ~a)" filepath matched)
|
||||
(dispatcher-block-record :secret-path)
|
||||
(list :type :LOG
|
||||
:payload (list :level :error
|
||||
:text (format nil "Action blocked: Attempted read of protected path '~a'" filepath)))))
|
||||
|
||||
;; Vector 2b: Self-build safety — core file writes require HITL approval
|
||||
((and filepath content
|
||||
(string-equal (uiop:getenv "SELF_BUILD_MODE") "true")
|
||||
(dispatcher-check-core-path filepath))
|
||||
(log-message "SELF-BUILD: Core file write to '~a' requires approval" filepath)
|
||||
(list :type :EVENT :level :approval-required
|
||||
:payload (list :sensor :approval-required :action action
|
||||
:message (format nil "Core file write blocked: '~a' requires HITL approval via Flight Plan." filepath))))
|
||||
;; Vector 2b: Self-build safety — core file writes require HITL approval
|
||||
((and filepath content
|
||||
(string-equal (uiop:getenv "SELF_BUILD_MODE") "true")
|
||||
(dispatcher-check-core-path filepath))
|
||||
(log-message "SELF-BUILD: Core file write to '~a' requires approval" filepath)
|
||||
(dispatcher-block-record :self-build-core)
|
||||
(list :type :EVENT :level :approval-required
|
||||
:payload (list :sensor :approval-required :action action
|
||||
:message (format nil "Core file write blocked: '~a' requires HITL approval via Flight Plan." filepath))))
|
||||
|
||||
;; Vector 3: Content contains secret patterns
|
||||
((and text (dispatcher-exposure-scan text))
|
||||
(let ((matched (dispatcher-exposure-scan text)))
|
||||
(log-message "SECURITY VIOLATION: Content contains secret patterns: ~a" matched)
|
||||
(list :type :LOG
|
||||
:payload (list :level :error
|
||||
:text "Action blocked: Content contains potential secret exposure."))))
|
||||
;; Vector 3: Content contains secret patterns
|
||||
((and text (dispatcher-exposure-scan text))
|
||||
(let ((matched (dispatcher-exposure-scan text)))
|
||||
(log-message "SECURITY VIOLATION: Content contains secret patterns: ~a" matched)
|
||||
(dispatcher-block-record :secret-content)
|
||||
(list :type :LOG
|
||||
:payload (list :level :error
|
||||
:text "Action blocked: Content contains potential secret exposure."))))
|
||||
|
||||
;; Vector 4: Content contains vault secrets
|
||||
((and text (dispatcher-vault-scan text))
|
||||
(let ((secret-name (dispatcher-vault-scan text)))
|
||||
(log-message "SECURITY VIOLATION: Blocked potential leak of secret '~a'" secret-name)
|
||||
(list :type :LOG
|
||||
:payload (list :level :error
|
||||
:text (format nil "Action blocked: Potential exposure of '~a'" secret-name)))))
|
||||
;; Vector 4: Content contains vault secrets
|
||||
((and text (dispatcher-vault-scan text))
|
||||
(let ((secret-name (dispatcher-vault-scan text)))
|
||||
(log-message "SECURITY VIOLATION: Blocked potential leak of secret '~a'" secret-name)
|
||||
(dispatcher-block-record :vault-secrets)
|
||||
(list :type :LOG
|
||||
:payload (list :level :error
|
||||
:text (format nil "Action blocked: Potential exposure of '~a'" secret-name)))))
|
||||
|
||||
;; Vector 5: Privacy-tagged content (severity tiers)
|
||||
((and tags (fboundp 'dispatcher-privacy-severity))
|
||||
(let ((severity (dispatcher-privacy-severity tags)))
|
||||
(cond
|
||||
((eq severity :block)
|
||||
(log-message "PRIVACY VIOLATION: Blocked by @tag — ~a" tags)
|
||||
(list :type :LOG
|
||||
:payload (list :level :error
|
||||
:text (format nil "Action blocked: Content tagged with privacy filter (~a)." tags))))
|
||||
((eq severity :block)
|
||||
(log-message "PRIVACY VIOLATION: Blocked by @tag — ~a" tags)
|
||||
(dispatcher-block-record :privacy-tags)
|
||||
(list :type :LOG
|
||||
:payload (list :level :error
|
||||
:text (format nil "Action blocked: Content tagged with privacy filter (~a)." tags))))
|
||||
((eq severity :warn)
|
||||
(log-message "PRIVACY WARNING: @tag ~a (allowed with warning)" tags)
|
||||
action)
|
||||
@@ -345,36 +351,40 @@ Eleven checks: 0=REPL-lint (warn-only), 1=lisp-validation, 2=secret-path,
|
||||
(log-message "PRIVACY: @tag ~a (logged)" tags)
|
||||
action))))
|
||||
|
||||
;; Vector 6: Text leaks privacy tag names
|
||||
((and text (dispatcher-check-text-for-privacy text))
|
||||
(log-message "PRIVACY WARNING: Text may contain leaked private content")
|
||||
(list :type :LOG
|
||||
:payload (list :level :warn
|
||||
:text "Action blocked: Text may reference private content.")))
|
||||
;; Vector 6: Text leaks privacy tag names
|
||||
((and text (dispatcher-check-text-for-privacy text))
|
||||
(log-message "PRIVACY WARNING: Text may contain leaked private content")
|
||||
(dispatcher-block-record :privacy-text)
|
||||
(list :type :LOG
|
||||
:payload (list :level :warn
|
||||
:text "Action blocked: Text may reference private content.")))
|
||||
|
||||
;; Vector 7: Shell destructive/injection patterns
|
||||
((and cmd (dispatcher-check-shell-safety cmd))
|
||||
(let ((matched (dispatcher-check-shell-safety cmd)))
|
||||
(log-message "SHELL VIOLATION: Destructive or injection pattern in command: ~a" matched)
|
||||
(list :type :LOG
|
||||
:payload (list :level :error
|
||||
:text (format nil "Shell command blocked: contains unsafe pattern ~a" matched)))))
|
||||
;; Vector 7: Shell destructive/injection patterns
|
||||
((and cmd (dispatcher-check-shell-safety cmd))
|
||||
(let ((matched (dispatcher-check-shell-safety cmd)))
|
||||
(log-message "SHELL VIOLATION: Destructive or injection pattern in command: ~a" matched)
|
||||
(dispatcher-block-record :shell-safety)
|
||||
(list :type :LOG
|
||||
:payload (list :level :error
|
||||
:text (format nil "Shell command blocked: contains unsafe pattern ~a" matched)))))
|
||||
|
||||
;; Vector 8: Network exfiltration
|
||||
((and (or (eq target :shell)
|
||||
(and (eq target :tool) (equal (proto-get payload :tool) "shell")))
|
||||
(dispatcher-check-network-exfil cmd))
|
||||
(log-message "SECURITY WARNING: External network call detected. Queuing for approval.")
|
||||
(list :type :EVENT :level :approval-required
|
||||
:payload (list :sensor :approval-required :action action)))
|
||||
;; Vector 8: Network exfiltration
|
||||
((and (or (eq target :shell)
|
||||
(and (eq target :tool) (equal (proto-get payload :tool) "shell")))
|
||||
(dispatcher-check-network-exfil cmd))
|
||||
(log-message "SECURITY WARNING: External network call detected. Queuing for approval.")
|
||||
(dispatcher-block-record :network-exfil)
|
||||
(list :type :EVENT :level :approval-required
|
||||
:payload (list :sensor :approval-required :action action)))
|
||||
|
||||
;; Vector 8: High-impact action approval
|
||||
((or (member target '(:shell))
|
||||
(and (eq target :tool) (member (proto-get payload :tool) '("shell" "repair-file") :test #'string=))
|
||||
(and (eq target :emacs) (eq (proto-get payload :action) :eval))
|
||||
(and (eq target :system) (eq (proto-get payload :action) :eval)))
|
||||
(log-message "SECURITY: High-impact action requires approval: ~a" (or (proto-get payload :tool) target))
|
||||
(list :type :EVENT :payload (list :sensor :approval-required :action action)))
|
||||
;; Vector 8b: High-impact action approval
|
||||
((or (member target '(:shell))
|
||||
(and (eq target :tool) (member (proto-get payload :tool) '("shell" "repair-file") :test #'string=))
|
||||
(and (eq target :emacs) (eq (proto-get payload :action) :eval))
|
||||
(and (eq target :system) (eq (proto-get payload :action) :eval)))
|
||||
(log-message "SECURITY: High-impact action requires approval: ~a" (or (proto-get payload :tool) target))
|
||||
(dispatcher-block-record :high-impact-approval)
|
||||
(list :type :EVENT :payload (list :sensor :approval-required :action action)))
|
||||
(t action))))
|
||||
|
||||
(defun dispatcher-approvals-process ()
|
||||
@@ -496,6 +506,25 @@ Recognized formats:
|
||||
:trigger (lambda (ctx) (declare (ignore ctx)) t)
|
||||
:deterministic #'dispatcher-gate)
|
||||
|
||||
(defvar *dispatcher-block-counts* (make-hash-table :test 'equal)
|
||||
"Per-gate block count: maps gate keyword → integer.")
|
||||
|
||||
(defun dispatcher-block-record (gate-name)
|
||||
"Records a block decision for GATE-NAME. Returns the updated count."
|
||||
(let ((count (1+ (gethash gate-name *dispatcher-block-counts* 0))))
|
||||
(setf (gethash gate-name *dispatcher-block-counts*) count)
|
||||
count))
|
||||
|
||||
(defun dispatcher-block-counts-summary ()
|
||||
"Returns plist (:total <N> :by-gate ((<gate> . <count>) ...))."
|
||||
(let* ((by-gate
|
||||
(loop for k being the hash-keys of *dispatcher-block-counts*
|
||||
for v = (gethash k *dispatcher-block-counts*)
|
||||
collect (cons k v)))
|
||||
(total (reduce #'+ (mapcar #'cdr by-gate) :initial-value 0))
|
||||
(sorted (sort (copy-list by-gate) #'> :key #'cdr)))
|
||||
(list :total total :by-gate sorted)))
|
||||
|
||||
(eval-when (:compile-toplevel :load-toplevel :execute)
|
||||
(ql:quickload :fiveam :silent t))
|
||||
|
||||
@@ -594,7 +623,7 @@ Recognized formats:
|
||||
(is (eq :block (passepartout::tag-category-severity "@personal")))
|
||||
(is (eq :warn (passepartout::tag-category-severity "@draft")))
|
||||
(is (eq :log (passepartout::tag-category-severity "@review"))))
|
||||
(setf (uiop:getenv "TAG_CATEGORIES") nil))
|
||||
(ignore-errors (setf (uiop:getenv "TAG_CATEGORIES") nil)))
|
||||
|
||||
(test test-tag-category-severity-unknown
|
||||
"Contract v0.7.2: unknown tag returns nil."
|
||||
@@ -661,20 +690,51 @@ Recognized formats:
|
||||
|
||||
(test test-safe-tool-write-still-checked
|
||||
"Contract v0.7.2: write tools still go through full dispatcher check."
|
||||
(setf (gethash "write-file" passepartout::*cognitive-tool-registry*)
|
||||
(passepartout::make-cognitive-tool :name "write-file"
|
||||
:description "File writer"
|
||||
:parameters nil
|
||||
:guard nil
|
||||
:body nil
|
||||
:read-only-p nil))
|
||||
(unwind-protect
|
||||
(progn
|
||||
(setf (uiop:getenv "SELF_BUILD_MODE") "true")
|
||||
(let* ((action '(:TYPE :REQUEST :TARGET :tool
|
||||
:PAYLOAD (:TOOL "write-file" :ARGS (:FILEPATH "core-reason.org" :CONTENT "x"))))
|
||||
(result (dispatcher-check action nil)))
|
||||
(setf (uiop:getenv "SELF_BUILD_MODE") "false")
|
||||
(is (eq :approval-required (getf result :level)))
|
||||
(is (search "HITL" (getf (getf result :payload) :message)))))
|
||||
(remhash "write-file" passepartout::*cognitive-tool-registry*)))
|
||||
(let ((orig-tool (gethash "write-file" passepartout::*cognitive-tool-registry*)))
|
||||
(setf (gethash "write-file" passepartout::*cognitive-tool-registry*)
|
||||
(passepartout::make-cognitive-tool :name "write-file"
|
||||
:description "File writer"
|
||||
:parameters nil
|
||||
:guard nil
|
||||
:body nil
|
||||
:read-only-p nil))
|
||||
(unwind-protect
|
||||
(progn
|
||||
(setf (uiop:getenv "SELF_BUILD_MODE") "true")
|
||||
(let* ((action '(:TYPE :REQUEST :TARGET :tool
|
||||
:PAYLOAD (:TOOL "write-file" :ARGS (:FILEPATH "core-reason.org" :CONTENT "x"))))
|
||||
(result (dispatcher-check action nil)))
|
||||
(is (eq :approval-required (getf result :level)))
|
||||
(is (search "HITL" (getf (getf result :payload) :message)))))
|
||||
(setf (uiop:getenv "SELF_BUILD_MODE") "false")
|
||||
(if orig-tool
|
||||
(setf (gethash "write-file" passepartout::*cognitive-tool-registry*) orig-tool)
|
||||
(remhash "write-file" passepartout::*cognitive-tool-registry*)))))
|
||||
|
||||
(in-package :passepartout-security-dispatcher-tests)
|
||||
|
||||
(test test-block-record-increments
|
||||
"Contract 10: dispatcher-block-record increments per-gate count."
|
||||
(clrhash passepartout::*dispatcher-block-counts*)
|
||||
(is (= 1 (passepartout::dispatcher-block-record :shell-safety)))
|
||||
(is (= 2 (passepartout::dispatcher-block-record :shell-safety)))
|
||||
(is (= 2 (gethash :shell-safety passepartout::*dispatcher-block-counts*))))
|
||||
|
||||
(test test-block-counts-summary
|
||||
"Contract 11: dispatcher-block-counts-summary returns total and by-gate."
|
||||
(clrhash passepartout::*dispatcher-block-counts*)
|
||||
(passepartout::dispatcher-block-record :shell-safety)
|
||||
(passepartout::dispatcher-block-record :shell-safety)
|
||||
(passepartout::dispatcher-block-record :secret-path)
|
||||
(let ((s (passepartout::dispatcher-block-counts-summary)))
|
||||
(is (= 3 (getf s :total)))
|
||||
(let ((by-gate (getf s :by-gate)))
|
||||
(is (= 2 (cdr (assoc :shell-safety by-gate))))
|
||||
(is (= 1 (cdr (assoc :secret-path by-gate)))))))
|
||||
|
||||
(test test-block-counts-empty
|
||||
"Contract 11: dispatcher-block-counts-summary returns zero when no blocks."
|
||||
(clrhash passepartout::*dispatcher-block-counts*)
|
||||
(let ((s (passepartout::dispatcher-block-counts-summary)))
|
||||
(is (= 0 (getf s :total)))
|
||||
(is (null (getf s :by-gate)))))
|
||||
|
||||
@@ -3,7 +3,9 @@
|
||||
(defvar *prompt-prefix-cache* (cons nil "")
|
||||
"Prompt prefix cache: (sxhash . cached-string). Rebuilt when IDENTITY or TOOLS change.")
|
||||
|
||||
(defvar *context-cache* (list :foveal-id nil :scope nil :memory-timestamp 0 :rendered "")
|
||||
(defvar *context-cache* (list :foveal-id nil :scope nil :memory-timestamp 0 :rendered ""
|
||||
:identity-tokens 0 :tool-tokens 0 :context-tokens 0
|
||||
:log-tokens 0 :config-tokens 0 :time-tokens 0)
|
||||
"Context assembly cache: metadata + last rendered context string.")
|
||||
|
||||
(defun prompt-prefix-cached (assistant-name identity-content feedback mandates-text tool-belt)
|
||||
@@ -64,7 +66,9 @@ with trimmed sections."
|
||||
(ignore-errors
|
||||
(parse-integer (uiop:getenv "CONTEXT_MAX_TOKENS")))
|
||||
16384)))
|
||||
(labels ((ct (s) (funcall (symbol-function 'count-tokens) s))
|
||||
(labels ((ct (s) (if (fboundp 'count-tokens)
|
||||
(funcall (symbol-function 'count-tokens) s)
|
||||
(ceiling (length s) 4)))
|
||||
(total-tokens (p c l u m)
|
||||
(+ (ct p)
|
||||
(if c (ct c) 0)
|
||||
@@ -102,6 +106,22 @@ with trimmed sections."
|
||||
(getf *context-cache* :memory-timestamp) 0
|
||||
(getf *context-cache* :rendered) ""))
|
||||
|
||||
(defun context-usage-percentage ()
|
||||
"Returns integer 0-100: current token budget consumption.
|
||||
Returns nil when no context cache data is available."
|
||||
(let* ((limit (or (ignore-errors
|
||||
(parse-integer (uiop:getenv "CONTEXT_MAX_TOKENS")))
|
||||
16384))
|
||||
(tokens (+ (or (getf *context-cache* :identity-tokens) 0)
|
||||
(or (getf *context-cache* :tool-tokens) 0)
|
||||
(or (getf *context-cache* :context-tokens) 0)
|
||||
(or (getf *context-cache* :log-tokens) 0)
|
||||
(or (getf *context-cache* :config-tokens) 0)
|
||||
(or (getf *context-cache* :time-tokens) 0))))
|
||||
(if (> tokens 0)
|
||||
(min 100 (floor (* 100 tokens) limit))
|
||||
nil)))
|
||||
|
||||
(eval-when (:compile-toplevel :load-toplevel :execute)
|
||||
(ql:quickload :fiveam :silent t))
|
||||
|
||||
@@ -200,3 +220,35 @@ with trimmed sections."
|
||||
(is (null (car passepartout::*prompt-prefix-cache*)))
|
||||
(is (string= "" (cdr passepartout::*prompt-prefix-cache*)))
|
||||
(is (string= "" (getf passepartout::*context-cache* :rendered))))
|
||||
|
||||
(in-package :passepartout-token-economics-tests)
|
||||
|
||||
(test test-context-usage-percentage
|
||||
"Contract 5: context-usage-percentage returns integer 0-100."
|
||||
;; Set up a cache with known token counts
|
||||
(let* ((ctx passepartout::*context-cache*)
|
||||
(limit (or (ignore-errors (parse-integer (uiop:getenv "CONTEXT_MAX_TOKENS")))
|
||||
16384)))
|
||||
(setf (getf ctx :identity-tokens) 1000
|
||||
(getf ctx :tool-tokens) 500
|
||||
(getf ctx :context-tokens) 2000
|
||||
(getf ctx :log-tokens) 800
|
||||
(getf ctx :config-tokens) 200
|
||||
(getf ctx :time-tokens) 100)
|
||||
(let ((pct (passepartout::context-usage-percentage)))
|
||||
(is (integerp pct))
|
||||
(is (<= 0 pct 100)))))
|
||||
|
||||
(test test-context-usage-percentage-empty-cache
|
||||
"Contract 5: context-usage-percentage returns nil with no cache data."
|
||||
(let ((saved-ctx (copy-list passepartout::*context-cache*)))
|
||||
(unwind-protect
|
||||
(progn
|
||||
(setf (getf passepartout::*context-cache* :identity-tokens) nil
|
||||
(getf passepartout::*context-cache* :tool-tokens) nil
|
||||
(getf passepartout::*context-cache* :context-tokens) nil
|
||||
(getf passepartout::*context-cache* :log-tokens) nil
|
||||
(getf passepartout::*context-cache* :config-tokens) nil
|
||||
(getf passepartout::*context-cache* :time-tokens) nil)
|
||||
(is (null (passepartout::context-usage-percentage))))
|
||||
(setf passepartout::*context-cache* saved-ctx))))
|
||||
|
||||
Reference in New Issue
Block a user