Support rollback only messages, tool call changes or both in chat/rollback.

Author: ericdallo

CHANGELOG.md

@@ -5,6 +5,8 @@
 
 - Fix custom tools to support argument numbers.
 - Improve read_file summary to mention offset being read.
+- Enhanced hooks documentation with new types (sessionStart, sessionEnd, chatStart, chatEnd), JSON input/output schemas, execution options (timeout)
+- Support rollback only messages, tool call changes or both in `chat/rollback`.
 
 ## 0.84.2
 

docs/protocol.md

@@ -1254,7 +1254,14 @@ interface ChatRollbackParams {
      * The message content id.
      */
     contentId: string;
+    
+    /**
+     * The types of rollbacks to include, allowing to rollback one or more types.
+     */
+    include: ChatRollbackInclude[];
 }
+
+type ChatRollbackInclude = 'messages' | 'tools';
 ```
 
 _Response:_

src/eca/features/chat.clj

@@ -1439,11 +1439,14 @@
 (defn rollback-chat
   "Remove messages from chat in db until content-id matches.
    Then notify to clear chat and then the kept messages."
-  [{:keys [chat-id content-id]} db* messenger]
-  (let [all-messages (get-in @db* [:chats chat-id :messages])
+  [{:keys [chat-id content-id include]} db* messenger]
+  (let [include (set include)
+        all-messages (get-in @db* [:chats chat-id :messages])
         tool-calls (get-in @db* [:chats chat-id :tool-calls])
-        new-messages (vec (take-while #(not= (:content-id %) content-id) all-messages))
-        removed-messages (vec (drop-while #(not= (:content-id %) content-id) all-messages))
+        new-messages (when (contains? include "messages")
+                       (vec (take-while #(not= (:content-id %) content-id) all-messages)))
+        removed-messages (when (contains? include "tools")
+                           (vec (drop-while #(not= (:content-id %) content-id) all-messages)))
         rollback-changes (->> removed-messages
                               (filter #(= "tool_call_output" (:role %)))
                               (keep #(get-in tool-calls [(:id (:content %)) :rollback-changes]))
@@ -1454,13 +1457,14 @@
       (if content
         (spit path content)
         (io/delete-file path true)))
-    (swap! db* assoc-in [:chats chat-id :messages] new-messages)
-    (messenger/chat-cleared
-     messenger
-     {:chat-id chat-id
-      :messages true})
-    (send-chat-contents!
-     new-messages
-     {:chat-id chat-id
-      :messenger messenger})
+    (when new-messages
+      (swap! db* assoc-in [:chats chat-id :messages] new-messages)
+      (messenger/chat-cleared
+       messenger
+       {:chat-id chat-id
+        :messages true})
+      (send-chat-contents!
+       new-messages
+       {:chat-id chat-id
+        :messenger messenger}))
     {}))

test/eca/features/chat_test.clj

@@ -584,7 +584,10 @@
 
         ;; Rollback to second message (keep first 2 messages, remove last 2)
         (h/reset-messenger!)
-        (is (= {} (f.chat/rollback-chat {:chat-id chat-id :content-id second-content-id} (h/db*) (h/messenger))))
+        (is (= {} (f.chat/rollback-chat
+                    {:chat-id chat-id
+                     :include ["messages" "tools"]
+                     :content-id second-content-id} (h/db*) (h/messenger))))
 
         ;; Verify messages after content-id are removed (keeps messages before content-id)
         (is (match?