Fix message->decision parsing and add tests

Ensure commands are tokenized with support for quoted arguments and detect MCP prompts by parsing the first token with a single split. Adds message->decision-test to verify existing behavior and quoted-args handling.

🤖 Generated with [eca](https://eca.dev)

Co-Authored-By: eca <[email protected]>

Author: ericdallo

src/eca/features/chat.clj

@@ -76,27 +76,29 @@
                   :message-cost (shared/tokens->cost input-tokens input-cache-creation-tokens input-cache-read-tokens output-tokens full-model db)
                   :session-cost (shared/tokens->cost total-input-tokens total-input-cache-creation-tokens total-input-cache-read-tokens total-output-tokens full-model db)))))
 
-(defn ^:private message->decision [message]
-  (let [slash? (string/starts-with? message "/")
-        mcp-prompt? (string/includes? (first (string/split message #" ")) ":")]
-    (cond
-      (and slash? mcp-prompt?)
-      (let [command (subs message 1)
-            parts (string/split command #" ")
-            [server] (string/split command #":")]
-        {:type :mcp-prompt
-         :server server
-         :prompt (second (string/split (first parts) #":"))
-         :args (vec (rest parts))})
+(defn ^:private tokenize-args [^String s]
+  (if (string/blank? s)
+    []
+    (->> (re-seq #"\s*\"([^\"]*)\"|\s*([^\s]+)" s)
+         (map (fn [[_ quoted unquoted]] (or quoted unquoted)))
+         (vec))))
 
-      slash?
+(defn ^:private message->decision [message]
+  (let [slash? (string/starts-with? message "/")]
+    (if slash?
       (let [command (subs message 1)
-            parts (string/split command #" ")]
-        {:type :eca-command
-         :command (first parts)
-         :args (vec (rest parts))})
-
-      :else
+            tokens (let [toks (tokenize-args command)] (if (seq toks) toks [""]))
+            first-token (first tokens)
+            args (vec (rest tokens))]
+        (if (and first-token (string/includes? first-token ":"))
+          (let [[server prompt] (string/split first-token #":" 2)]
+            {:type :mcp-prompt
+             :server server
+             :prompt prompt
+             :args args})
+          {:type :eca-command
+           :command first-token
+           :args args}))
       {:type :prompt-message
        :message message})))
 
@@ -230,15 +232,15 @@
                                                                                                              :origin origin)})
                                                   (send-content! chat-ctx :assistant
                                                                  (assoc-some
-                                                                   {:type :toolCalled
-                                                                    :origin origin
-                                                                    :name name
-                                                                    :arguments arguments
-                                                                    :error (:error result)
-                                                                    :id id
-                                                                    :outputs (:contents result)}
-                                                                   :details details
-                                                                   :summary summary))))
+                                                                  {:type :toolCalled
+                                                                   :origin origin
+                                                                   :name name
+                                                                   :arguments arguments
+                                                                   :error (:error result)
+                                                                   :id id
+                                                                   :outputs (:contents result)}
+                                                                  :details details
+                                                                  :summary summary))))
                                               (do
                                                 (add-to-history! {:role "tool_call" :content tool-call})
                                                 (add-to-history! {:role "tool_call_output"

test/eca/features/chat_test.clj

@@ -267,3 +267,36 @@
         (is (match?
              @invoked?
              [[{:role :user :content "test"}] test-chat-ctx]))))))
+
+(deftest message->decision-test
+  (testing "plain prompt message"
+    (is (= {:type :prompt-message
+            :message "Hello world"}
+           (#'f.chat/message->decision "Hello world"))))
+  (testing "ECA command without args"
+    (is (= {:type :eca-command
+            :command "help"
+            :args []}
+           (#'f.chat/message->decision "/help"))))
+  (testing "ECA command with args"
+    (is (= {:type :eca-command
+            :command "search"
+            :args ["foo" "bar"]}
+           (#'f.chat/message->decision "/search foo bar"))))
+  (testing "ECA command with args with spaces in quotes"
+    (is (= {:type :eca-command
+            :command "search"
+            :args ["foo bar" "baz" "qux bla blow"]}
+           (#'f.chat/message->decision "/search \"foo bar\" baz \"qux bla blow\""))))
+  (testing "MCP prompt without args"
+    (is (= {:type :mcp-prompt
+            :server "server"
+            :prompt "prompt"
+            :args []}
+           (#'f.chat/message->decision "/server:prompt"))))
+  (testing "MCP prompt with args"
+    (is (= {:type :mcp-prompt
+            :server "server"
+            :prompt "prompt"
+            :args ["arg1" "arg2"]}
+           (#'f.chat/message->decision "/server:prompt arg1 arg2")))))