Fix crash when hook returns additionalContext and user called /compact

Author: ericdallo

CHANGELOG.md

@@ -8,6 +8,7 @@
 - Improve error handling when MCP promtps fail on server side.
 - Use rewrite-json to edit jsons without losing formatting.
 - Allow shell output redirections to `/tmp/` in plan/explorer agents instead of denying them.
+- Fix crash when hook returns additionalContext and message has string content (e.g. `/compact` command).
 
 ## 0.115.1
 

src/eca/features/chat.clj

@@ -408,7 +408,9 @@
                                                         (and (seq additional-contexts) context-idx)
                                                         (reduce (fn [msgs {:keys [hook-name content]}]
                                                                   (update-in msgs [context-idx :content]
-                                                                             #(conj (vec %)
+                                                                             #(conj (if (string? %)
+                                                                                      [{:type :text :text %}]
+                                                                                      (vec %))
                                                                                     {:type :text
                                                                                      :text (lifecycle/wrap-additional-context hook-name content)})))
                                                                 rewritten

src/eca/llm_providers/anthropic.clj

@@ -158,19 +158,20 @@
                                    (if (string? c)
                                      (string/trim c)
                                      (vec
-                                      (keep #(case (name (:type %))
+                                      (keep #(when-let [t (:type %)]
+                                               (case (name t)
 
-                                               "text"
-                                               (update % :text string/trim)
+                                                 "text"
+                                                 (update % :text string/trim)
 
-                                               "image"
-                                               (when supports-image?
-                                                 {:type "image"
-                                                  :source {:data (:base64 %)
-                                                           :media_type (:media-type %)
-                                                           :type "base64"}})
+                                                 "image"
+                                                 (when supports-image?
+                                                   {:type "image"
+                                                    :source {:data (:base64 %)
+                                                             :media_type (:media-type %)
+                                                             :type "base64"}})
 
-                                               %)
+                                                 %))
                                             c))))))))
         past-messages))
 

test/eca/llm_providers/anthropic_test.clj

@@ -190,6 +190,28 @@
                                                    :raw-content [{:type "web_search_result" :title "Test" :url "https://test.com"}]}}]
             true))))))
 
+(deftest normalize-messages-nil-type-resilience-test
+  (testing "content blocks with nil :type are filtered out"
+    (is (match?
+         [{:role "user"
+           :content [{:type :text :text "hello"}]}]
+         (#'llm-providers.anthropic/normalize-messages
+          [{:role "user"
+            :content [{:type :text :text "hello"}
+                      {:text "orphan without type"}
+                      nil]}]
+          true))))
+  (testing "message with keyword :type content works (additionalContext injection)"
+    (is (match?
+         [{:role "user"
+           :content [{:type :text :text "compact the chat"}
+                     {:type :text :text "<additionalContext from=\"test\">\ntoday is monday\n</additionalContext>"}]}]
+         (#'llm-providers.anthropic/normalize-messages
+          [{:role "user"
+            :content [{:type :text :text "compact the chat"}
+                      {:type :text :text "<additionalContext from=\"test\">\ntoday is monday\n</additionalContext>"}]}]
+          true)))))
+
 (deftest server-web-search-full-pipeline-test
   (testing "thinking + server web search + thinking + text normalizes to single assistant message"
     (let [input [{:role "user" :content "search for something"}