Skip to content

Display qualifier key binding help in text style header #474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bcc32 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Display qualifier key binding help in text style header #474

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 52 additions & 38 deletions agent-shell.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3217,44 +3217,58 @@ When provided, included in help-echo tooltips."
(unless state
(error "STATE is required"))
(let* ((header-model (agent-shell--make-header-model state :qualifier qualifier :bindings bindings))
(text-header (format " %s%s%s @ %s%s%s%s"
(propertize (map-elt header-model :buffer-name)
'font-lock-face 'font-lock-variable-name-face)
(if (map-elt header-model :model-name)
(concat " ➤ " (propertize (map-elt header-model :model-name)
'font-lock-face 'font-lock-negation-char-face
'help-echo (concat "Click to open LLM model menu "
(when model-binding
(propertize model-binding 'face 'help-key-binding)))
'mouse-face 'mode-line-highlight
'local-map (let ((map (make-sparse-keymap)))
(define-key map [header-line mouse-1]
(agent-shell--mode-line-model-menu))
map)))
"")
(if (map-elt header-model :mode-name)
(concat " ➤ " (propertize (map-elt header-model :mode-name)
'font-lock-face 'font-lock-type-face
'help-echo (concat "Click to open session mode menu "
(when mode-binding
(propertize mode-binding 'face 'help-key-binding)))
'mouse-face 'mode-line-highlight
'local-map (let ((map (make-sparse-keymap)))
(define-key map [header-line mouse-1]
(agent-shell--mode-line-mode-menu))
map)))
"")
(propertize (map-elt header-model :project-name) 'font-lock-face 'font-lock-string-face)
(if (map-elt header-model :session-id)
(concat " ➤ " (map-elt header-model :session-id))
"")
(if (map-elt header-model :context-indicator)
(concat (if (> (length (map-elt header-model :context-indicator)) 1) " ➤ " " ")
(map-elt header-model :context-indicator))
"")
(if (map-elt header-model :busy-indicator-frame)
(map-elt header-model :busy-indicator-frame)
""))))
(text-header (concat
(format " %s%s%s @ %s%s%s%s"
(propertize (map-elt header-model :buffer-name)
'font-lock-face 'font-lock-variable-name-face)
(if (map-elt header-model :model-name)
(concat " ➤ " (propertize (map-elt header-model :model-name)
'font-lock-face 'font-lock-negation-char-face
'help-echo (concat "Click to open LLM model menu "
(when model-binding
(propertize model-binding 'face 'help-key-binding)))
'mouse-face 'mode-line-highlight
'local-map (let ((map (make-sparse-keymap)))
(define-key map [header-line mouse-1]
(agent-shell--mode-line-model-menu))
map)))
"")
(if (map-elt header-model :mode-name)
(concat " ➤ " (propertize (map-elt header-model :mode-name)
'font-lock-face 'font-lock-type-face
'help-echo (concat "Click to open session mode menu "
(when mode-binding
(propertize mode-binding 'face 'help-key-binding)))
'mouse-face 'mode-line-highlight
'local-map (let ((map (make-sparse-keymap)))
(define-key map [header-line mouse-1]
(agent-shell--mode-line-mode-menu))
map)))
"")
(propertize (map-elt header-model :project-name) 'font-lock-face 'font-lock-string-face)
(if (map-elt header-model :session-id)
(concat " ➤ " (map-elt header-model :session-id))
"")
(if (map-elt header-model :context-indicator)
(concat (if (> (length (map-elt header-model :context-indicator)) 1) " ➤ " " ")
(map-elt header-model :context-indicator))
"")
(if (map-elt header-model :busy-indicator-frame)
(map-elt header-model :busy-indicator-frame)
""))
(when (or bindings qualifier)
(concat
" "
(when qualifier
(concat qualifier " "))
(mapconcat
(lambda (binding)
(format "%s %s"
(propertize (map-elt binding :key)
'font-lock-face 'help-key-binding)
(map-elt binding :description)))
bindings
" "))))))
(pcase agent-shell-header-style
((or 'none (pred null)) nil)
('text text-header)
Expand Down