Fix absolute paths being interpreted as commands.

Fixes #199

Author: ericdallo

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Fix absolute paths being interpreted as commands. #199
+
 ## 0.78.4
 
 - Fix regression exceptions on specific corner cases with log obfuscation.

src/eca/features/chat.clj

@@ -505,22 +505,26 @@
          (map (fn [[_ quoted unquoted]] (or quoted unquoted)))
          (vec))))
 
-(defn ^:private message->decision [message]
-  (let [slash? (string/starts-with? message "/")]
-    (if slash?
-      (let [command (subs message 1)
-            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}))
+(defn ^:private message->decision [message db config]
+  (let [all-command-names (->> (f.commands/all-commands db config)
+                               (map :name)
+                               set)
+        slash? (string/starts-with? message "/")
+        possible-command (when slash? (subs message 1))
+        [command-name & args] (when possible-command
+                                (let [toks (tokenize-args possible-command)] (if (seq toks) toks [""])))
+        args (vec args)
+        command? (contains? all-command-names command-name)]
+    (if command?
+      (if (and command-name (string/includes? command-name ":"))
+        (let [[server prompt] (string/split command-name #":" 2)]
+          {:type :mcp-prompt
+           :server server
+           :prompt prompt
+           :args args})
+        {:type :eca-command
+         :command command-name
+         :args args})
       {:type :prompt-message
        :message message})))
 
@@ -991,7 +995,7 @@
                   :metrics metrics
                   :config config
                   :messenger messenger}
-        decision (message->decision message)
+        decision (message->decision message db config)
         hook-outputs* (atom [])
         _ (f.hooks/trigger-if-matches! :preRequest
                                        {:chat-id chat-id

test/eca/features/chat_test.clj

@@ -500,31 +500,37 @@
   (testing "plain prompt message"
     (is (= {:type :prompt-message
             :message "Hello world"}
-           (#'f.chat/message->decision "Hello world"))))
+           (#'f.chat/message->decision "Hello world" {} {}))))
+  (testing "message starting with a absolute path"
+    (is (= {:type :prompt-message
+            :message "/path/to/file check this out"}
+           (#'f.chat/message->decision "/path/to/file check this out" {} {}))))
   (testing "ECA command without args"
     (is (= {:type :eca-command
-            :command "help"
+            :command "doctor"
             :args []}
-           (#'f.chat/message->decision "/help"))))
+           (#'f.chat/message->decision "/doctor" {} {}))))
   (testing "ECA command with args"
     (is (= {:type :eca-command
-            :command "search"
+            :command "login"
             :args ["foo" "bar"]}
-           (#'f.chat/message->decision "/search foo bar"))))
+           (#'f.chat/message->decision "/login foo bar" {} {}))))
   (testing "ECA command with args with spaces in quotes"
     (is (= {:type :eca-command
-            :command "search"
+            :command "login"
             :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")))))
+           (#'f.chat/message->decision "/login \"foo bar\" baz \"qux bla blow\"" {} {}))))
+  (with-redefs [f.mcp/all-prompts (constantly [{:name "prompt"
+                                                :server "server"}])]
+    (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" {} {}))))))