Improve stop prompt

Author: ericdallo

CHANGELOG.md

@@ -5,7 +5,11 @@
 - Fix remote server on Windows stealing TLS traffic from Tailscale/WireGuard when using the same port, by binding to specific interfaces instead of `0.0.0.0` when tunnel adapters are detected.
 - Fix plugin-defined hooks not firing for `chatStart` and `sessionStart` due to plugins resolving after hooks fired. #374
 - Fix workspace cache resume when worktrees are dynamically added mid-session by using the initial workspace set for the cache key. #372
-- Fix exception when stopping while a subagent chat run.
+- Lots of improvements to stop prompt behavior:
+  - Fix exception when stopping while a subagent chat run.
+  - Fix duplicate "Prompt stopped" message when stopping with a running subagent.
+  - Fix delayed newline appearing after stopping a prompt by suppressing belated status notifications.
+  - Reduce stream watchdog poll interval for faster stop responsiveness.
 
 ## 0.117.0
 

src/eca/features/chat.clj

@@ -465,6 +465,7 @@
         (logger/info logger-tag "Superseding active prompt" {:chat-id chat-id
                                                              :status (get-in @db* [:chats chat-id :status])}))
       (swap! db* assoc-in [:chats chat-id :status] :running)
+      (swap! db* update-in [:chats chat-id] dissoc :prompt-finished?)
       (swap! db* assoc-in [:chats chat-id :updated-at] (System/currentTimeMillis))
       (messenger/chat-status-changed messenger {:chat-id chat-id :status :running})
       (swap! db* assoc-in [:chats chat-id :prompt-id] prompt-id)
@@ -772,7 +773,10 @@
                 (when (and (= prompt-id (get-in @db* [:chats chat-id :prompt-id]))
                            (contains? #{:stopping :running} (get-in @db* [:chats chat-id :status])))
                   (swap! db* assoc-in [:chats chat-id :status] :idle)
-                  (messenger/chat-status-changed (:messenger chat-ctx) {:chat-id chat-id :status :idle})
+                  ;; Only notify client if finish-chat-prompt! hasn't already run,
+                  ;; otherwise the belated statusChanged causes duplicate finished handling.
+                  (when-not (get-in @db* [:chats chat-id :prompt-finished?])
+                    (messenger/chat-status-changed (:messenger chat-ctx) {:chat-id chat-id :status :idle}))
                   (db/update-workspaces-cache! @db* metrics))))))))))
 
 (defn ^:private send-mcp-prompt!
@@ -1021,25 +1025,28 @@
      :commands commands}))
 
 (defn prompt-stop
-  [{:keys [chat-id]} db* messenger metrics]
-  (when (identical? :running (get-in @db* [:chats chat-id :status]))
-    ;; Set :stopping immediately to prevent race with stream callbacks
-    ;; that check status via assert-chat-not-stopped! or cancelled?
-    (swap! db* assoc-in [:chats chat-id :status] :stopping)
-    (let [chat-ctx {:chat-id chat-id
-                    :db* db*
-                    :metrics metrics
-                    :messenger messenger
-                    :parent-chat-id (get-in @db* [:chats chat-id :parent-chat-id])}]
-      (lifecycle/send-content! chat-ctx :system {:type :text
-                                                  :text "\nPrompt stopped"})
+  ([params db* messenger metrics]
+   (prompt-stop params db* messenger metrics {}))
+  ([{:keys [chat-id]} db* messenger metrics {:keys [silent?]}]
+   (when (identical? :running (get-in @db* [:chats chat-id :status]))
+     ;; Set :stopping immediately to prevent race with stream callbacks
+     ;; that check status via assert-chat-not-stopped! or cancelled?
+     (swap! db* assoc-in [:chats chat-id :status] :stopping)
+     (let [chat-ctx {:chat-id chat-id
+                     :db* db*
+                     :metrics metrics
+                     :messenger messenger
+                     :parent-chat-id (get-in @db* [:chats chat-id :parent-chat-id])}]
+       (when-not silent?
+         (lifecycle/send-content! chat-ctx :system {:type :text
+                                                    :text "\nPrompt stopped"}))
 
-      ;; Handle each active tool call
-      (doseq [[tool-call-id _] (tc/get-active-tool-calls @db* chat-id)]
-        (tc/transition-tool-call! db* chat-ctx tool-call-id :stop-requested
-                                  {:reason {:code :user-prompt-stop
-                                            :text "Tool call rejected because of user prompt stop"}}))
-      (lifecycle/finish-chat-prompt! :stopping (dissoc chat-ctx :on-finished-side-effect)))))
+       ;; Handle each active tool call
+       (doseq [[tool-call-id _] (tc/get-active-tool-calls @db* chat-id)]
+         (tc/transition-tool-call! db* chat-ctx tool-call-id :stop-requested
+                                   {:reason {:code :user-prompt-stop
+                                             :text "Tool call rejected because of user prompt stop"}}))
+       (lifecycle/finish-chat-prompt! :stopping (dissoc chat-ctx :on-finished-side-effect))))))
 
 (defn delete-chat
   [{:keys [chat-id]} db* messenger config metrics]

src/eca/features/chat/lifecycle.clj

@@ -88,7 +88,8 @@
                      {:type :progress
                       :state :finished})
       (when-not (get-in @db* [:chats chat-id :created-at])
-        (swap! db* assoc-in [:chats chat-id :created-at] (System/currentTimeMillis))))
+        (swap! db* assoc-in [:chats chat-id :created-at] (System/currentTimeMillis)))
+      (swap! db* assoc-in [:chats chat-id :prompt-finished?] true))
     (when (and on-finished-side-effect
                (not (identical? :stopping (get-in @db* [:chats chat-id :status]))))
       (on-finished-side-effect))

src/eca/features/tools/agent.clj

@@ -75,11 +75,11 @@
                         :max-steps max-steps}}}))
 
 (defn ^:private stop-subagent-chat!
-  "Stop a running subagent chat."
+  "Stop a running subagent chat silently (parent already shows 'Prompt stopped')."
   [db* messenger metrics subagent-chat-id agent-name]
   (let [prompt-stop (requiring-resolve 'eca.features.chat/prompt-stop)]
     (try
-      (prompt-stop {:chat-id subagent-chat-id} db* messenger metrics)
+      (prompt-stop {:chat-id subagent-chat-id} db* messenger metrics {:silent? true})
       (catch Exception e
         (logger/warn logger-tag (format "Error stopping subagent '%s': %s" agent-name (.getMessage e)))))))
 

src/eca/llm_util.clj

@@ -88,7 +88,7 @@
   (logger/debug tag (format "[%s] %s %s" rid (or event "") data)))
 
 (def ^:private default-stream-idle-timeout-ms 120000)
-(def ^:private default-stream-check-interval-ms 2000)
+(def ^:private default-stream-check-interval-ms 500)
 
 (defn start-stream-watchdog!
   "Starts a daemon thread that monitors a streaming connection.