Introduces experimental session list/load/resume

README.org

@@ -607,6 +607,7 @@ always go to Evil modes if you need to with ~C-z~).
 | agent-shell-qwen-command                      | Command and parameters for the Qwen Code client.                                |
 | agent-shell-qwen-environment                  | Environment variables for the Qwen Code client.                                 |
 | agent-shell-screenshot-command                | The program to use for capturing screenshots.                                   |
+| agent-shell-session-load-strategy             | How to choose existing sessions when session/list and session/load are available. |
 | agent-shell-section-functions                 | Abnormal hook run after overlays are applied (experimental).                    |
 | agent-shell-show-busy-indicator               | Non-nil to show the busy indicator animation in the header and mode line.       |
 | agent-shell-show-config-icons                 | Whether to show icons in agent config selection.                                |

agent-shell-active-message.el

@@ -0,0 +1,55 @@
+;;; agent-shell-active-message.el --- Active message utilities -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2024 Alvaro Ramirez
+
+;; Author: Alvaro Ramirez https://xenodium.com
+;; URL: https://github.com/xenodium/agent-shell
+
+;; This package is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This package is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; Provides a minibuffer progress message for agent-shell.
+
+;;; Code:
+
+(eval-when-compile
+  (require 'cl-lib))
+
+(cl-defun agent-shell-active-message-show (&key text)
+  "Show a minibuffer active message displaying TEXT.
+
+Returns an active message alist for use with
+`agent-shell-active-message-hide'."
+  (let* ((reporter (make-progress-reporter (or text "Loading...")))
+         (timer (run-at-time 0 0.1
+                             (lambda ()
+                               (progress-reporter-update reporter)))))
+    (list (cons :reporter reporter)
+          (cons :timer timer))))
+
+(cl-defun agent-shell-active-message-hide (&key active-message)
+  "Hide ACTIVE-MESSAGE previously shown with
+`agent-shell-active-message-show'."
+  (when active-message
+    (when-let ((timer (map-elt active-message :timer)))
+      (when (timerp timer)
+        (cancel-timer timer)))
+    (when-let ((reporter (map-elt active-message :reporter)))
+      (progress-reporter-done reporter)
+      (message nil))))
+
+(provide 'agent-shell-active-message)
+
+;;; agent-shell-active-message.el ends here

agent-shell-ui.el

@@ -396,6 +396,62 @@ NAVIGATION controls navigability:
     (put-text-property block-start (or body-end label-right-end label-left-end) 'read-only t)
     (put-text-property block-start (or body-end label-right-end label-left-end) 'front-sticky '(read-only))))
 
+(cl-defun agent-shell-ui-update-text (&key namespace-id block-id text append create-new no-undo)
+  "Update or insert a plain text entry identified by NAMESPACE-ID and BLOCK-ID.
+
+TEXT is the string to insert or append.
+When APPEND is non-nil, append TEXT to existing entry.
+When CREATE-NEW is non-nil, always create a new entry.
+When NO-UNDO is non-nil, disable undo recording."
+  (save-mark-and-excursion
+    (let* ((inhibit-read-only t)
+           (buffer-undo-list (if no-undo t buffer-undo-list))
+           (qualified-id (format "%s-%s" namespace-id block-id))
+           (props `(agent-shell-ui-state ((:qualified-id . ,qualified-id))
+                                         read-only t
+                                         front-sticky (read-only)))
+           (match (save-mark-and-excursion
+                    (goto-char (point-max))
+                    (text-property-search-backward
+                     'agent-shell-ui-state nil
+                     (lambda (_ state)
+                       (equal (map-elt state :qualified-id) qualified-id))
+                     t))))
+      (when text
+        (cond
+         ;; Append to existing entry.
+         ((and match (not create-new) append)
+          (goto-char (prop-match-end match))
+          (insert (apply #'propertize text props))
+          (list (cons :block (list (cons :start (prop-match-beginning match))
+                                   (cons :end (point))))
+                (cons :padding (list (cons :start (prop-match-beginning match))
+                                     (cons :end (point))))))
+         ;; Replace existing entry.
+         ((and match (not create-new))
+          (let ((padding-start (save-excursion
+                                 (goto-char (prop-match-beginning match))
+                                 (skip-chars-backward "\n")
+                                 (point))))
+            (delete-region (prop-match-beginning match) (prop-match-end match))
+            (goto-char (prop-match-beginning match))
+            (insert (apply #'propertize text props))
+            (list (cons :block (list (cons :start (prop-match-beginning match))
+                                     (cons :end (point))))
+                  (cons :padding (list (cons :start padding-start)
+                                       (cons :end (point)))))))
+         ;; New entry.
+         (t
+          (goto-char (point-max))
+          (let ((padding-start (point)))
+            (insert (agent-shell-ui--required-newlines 2))
+            (let ((block-start (point)))
+              (insert (apply #'propertize text props))
+              (list (cons :block (list (cons :start block-start)
+                                       (cons :end (point))))
+                    (cons :padding (list (cons :start padding-start)
+                                         (cons :end (point)))))))))))))
+
 (defun agent-shell-ui--required-newlines (desired)
   "Return string of newlines needed to reach DESIRED before POSITION."
   (let ((context (save-mark-and-excursion

agent-shell-viewport.el

@@ -162,6 +162,10 @@ Returns an alist with insertion details or nil otherwise:
   (interactive)
   (unless (derived-mode-p 'agent-shell-viewport-edit-mode)
     (user-error "Not in a shell viewport buffer"))
+  (when (and (not agent-shell-deferred-initialization)
+             (not (with-current-buffer (agent-shell-viewport--shell-buffer)
+                    (map-nested-elt agent-shell--state '(:session :id)))))
+    (user-error "Session not ready... please wait"))
   (setq agent-shell-viewport--compose-snapshot nil)
   (if agent-shell-prefer-viewport-interaction
       (agent-shell-viewport-compose-send-and-wait-for-response)
@@ -754,10 +758,14 @@ For example, offer to kill associated shell session."
       ;; triggered by shell buffers attempting to kill viewport buffer.
       (let ((agent-shell-viewport--clean-up nil))
         (when-let ((shell-buffers (seq-filter (lambda (shell-buffer)
-                                                (equal (agent-shell-viewport--buffer
-                                                        :shell-buffer shell-buffer
-                                                        :existing-only t)
-                                                       (current-buffer)))
+                                                (and (equal (agent-shell-viewport--buffer
+                                                             :shell-buffer shell-buffer
+                                                             :existing-only t)
+                                                            (current-buffer))
+                                                     ;; Skip shells already shutting down (client
+                                                     ;; is nil after agent-shell--shutdown).
+                                                     (buffer-local-value 'agent-shell--state shell-buffer)
+                                                     (map-elt (buffer-local-value 'agent-shell--state shell-buffer) :client)))
                                               (agent-shell-buffers)))
                    ((y-or-n-p "Kill shell session too?")))
           (mapc (lambda (shell-buffer)