Enable compose navigation to jump to response also

Author: xenodium

chatgpt-shell-prompt-compose.el

@@ -533,39 +533,70 @@ Useful if sending a request failed, perhaps from failed connectivity."
           (set-window-configuration window-config))))))
 
 (defun chatgpt-shell-prompt-compose-next-item ()
-  "Jump to and select next item (block, link, interaction)."
+  "Jump to and select next item (request, response, block, link, interaction)."
   (interactive)
   (unless (derived-mode-p 'chatgpt-shell-prompt-compose-mode)
     (user-error "Not in a shell compose buffer"))
-  (let* ((next-block (save-excursion
+  (let* ((request (save-excursion
+                    (when (get-text-property (point) 'ignore)
+                      (text-property-search-forward 'request t)
+                      (point))))
+         (response (save-excursion
+                     (when (get-text-property (point) 'request)
+                       (text-property-search-forward 'request nil)
+                       (point))))
+         (next-block (save-excursion
                        (call-interactively #'chatgpt-shell-next-source-block)))
          (next-link (save-excursion
                       (call-interactively #'chatgpt-shell-next-link)))
          (positions (delq nil (list next-block
-                                    next-link)))
+                                    next-link
+                                    response
+                                    request)))
          (next-pos (when positions
                      (apply 'min positions))))
     (cond ((not next-pos)
            (chatgpt-shell-prompt-compose-next-interaction))
+          ((eq next-pos request)
+           (deactivate-mark)
+           (goto-char next-pos))
           ((eq next-pos next-block)
            (deactivate-mark)
            (goto-char next-block)
            (call-interactively #'chatgpt-shell-mark-block))
+          ((eq next-pos response)
+           (deactivate-mark)
+           (goto-char next-pos))
           ((eq next-pos next-link)
            (deactivate-mark)
            (goto-char next-link)))))
 
 (defun chatgpt-shell-prompt-compose-previous-item ()
-  "Jump to and select previous item (block, link, interaction)."
+  "Jump to and select previous item (request, response, block, link, interaction)."
   (interactive)
   (unless (derived-mode-p 'chatgpt-shell-prompt-compose-mode)
     (user-error "Not in a shell compose buffer"))
-  (let* ((previous-block (save-excursion
+  (let* ((location (point))
+         (response (save-excursion
+                     (when (and (not (get-text-property (point) 'ignore))
+                                (not (get-text-property (point) 'request)))
+                       (text-property-search-backward 'request nil)
+                       (text-property-search-forward 'request nil)
+                       (unless (eq location (point))
+                         (point)))))
+         (request (unless response
+                    (save-excursion
+                      (goto-char (point-min))
+                      (text-property-search-forward 'prompt t)
+                      (point))))
+         (previous-block (save-excursion
                            (call-interactively #'chatgpt-shell-previous-source-block)))
          (previous-link (save-excursion
                           (call-interactively #'chatgpt-shell-previous-link)))
          (positions (delq nil (list previous-block
-                                    previous-link)))
+                                    previous-link
+                                    response
+                                    request)))
          (previous-pos (when positions
                          (apply 'max positions))))
     (cond ((eq (point) (save-excursion
@@ -574,6 +605,9 @@ Useful if sending a request failed, perhaps from failed connectivity."
                          (point)))
            (deactivate-mark)
            (chatgpt-shell-prompt-compose-previous-interaction))
+          ((eq previous-pos request)
+           (deactivate-mark)
+           (goto-char request))
           ((not previous-pos)
            (deactivate-mark)
            (goto-char (point-min))
@@ -582,6 +616,9 @@ Useful if sending a request failed, perhaps from failed connectivity."
            (deactivate-mark)
            (goto-char previous-block)
            (call-interactively #'chatgpt-shell-mark-block))
+          ((eq previous-pos response)
+           (deactivate-mark)
+           (goto-char previous-pos))
           ((eq previous-pos previous-link)
            (deactivate-mark)
            (goto-char previous-link)))))