Fix variable replacing in some tool prompts.

Author: ericdallo

CHANGELOG.md

@@ -3,6 +3,8 @@
 ## Unreleased
 
 - Updated instructions for `/login` command and invalid input handling.
+- Fix server name on `chat/contentReceived` when preparing tool call.
+- Fix variable replacing in some tool prompts.
 
 ## 0.75.4
 

resources/prompts/compact.md

@@ -13,7 +13,7 @@ However, if the session is primarily a general conversation and not technical, f
   - Summarize the chat in a way that allows any LLM to continue the conversation based on the summary.
 
 Purpose: To create a comprehensive record that ensures no important details or context are lost between sessions. This process prioritizes thoroughness over brevity to retain all critical information..
-$addionalUserInput
+{additionalUserInput}
 
 ## Response
 

resources/prompts/init.md

@@ -4,4 +4,4 @@ Analyze this codebase and create an AGENTS.md file containing:
 
 The file you create will be given to agentic coding agents (such as yourself) that operate in this repository. Make it about 20 lines long.
 
-If there's already an AGENTS.md, improve it if it's located in $workspaceRoots.
+If there's already an AGENTS.md, improve it if it's located in {workspaceFolders}.

resources/prompts/tools/eca_directory_tree.md

@@ -1,3 +1,3 @@
 Returns a recursive tree view of files and directories starting from the specified path.
 The path parameter must be an absolute path, not a relative path.
-**Only works within the directories: $workspaceRoots.**
+**Only works within the directories: {workspaceRoots}.**

resources/prompts/tools/eca_move_file.md

@@ -1,4 +1,4 @@
 Move or rename files and directories.
 Can move files between directories and rename them in a single operation.
 If the destination exists, the operation will fail. Works across different directories and can be used for simple renaming within the same directory.
-Both source and destination must be within the directories: $workspaceRoots.
+Both source and destination must be within the directories: {workspaceRoots}.

resources/prompts/tools/eca_read_file.md

@@ -1,3 +1,3 @@
 Read the contents of a file from the file system. Use this tool when you need to examine the contents of a single file.
 Optionally use the 'line_offset' and/or 'limit' parameters to read specific contents of the file when you know the range.
-Prefer call once this tool over multiple calls passing small offsets. **Only works within the directories: $workspaceRoots.**
+Prefer call once this tool over multiple calls passing small offsets. **Only works within the directories: {workspaceRoots}.**

resources/prompts/tools/eca_write_file.md

@@ -2,4 +2,4 @@ Create a new file or completely overwrite an existing file with new content.
 This tool will automatically create any necessary parent directories if they don't exist.
 Use this tool when you want to create a new file from scratch or completely replace the entire content of an existing file.
 For partial edits or content replacement within existing files, use eca_edit_file instead.
-**Only works within the directories: $workspaceRoots.**
+**Only works within the directories: {workspaceRoots}.**

src/eca/features/chat.clj

@@ -628,7 +628,7 @@
                                 (assert-chat-not-stopped! chat-ctx)
                                 (transition-tool-call! db* chat-ctx id :tool-prepare
                                                        {:name name
-                                                        :server (tool-name->server name all-tools)
+                                                        :server (:name (tool-name->server name all-tools))
                                                         :origin (tool-name->origin name all-tools)
                                                         :arguments-text arguments-text
                                                         :summary (f.tools/tool-call-summary all-tools name nil config)}))

src/eca/features/completion.clj

@@ -6,6 +6,8 @@
    [eca.llm-api :as llm-api]
    [eca.logger :as logger]))
 
+(set! *warn-on-reflection* true)
+
 (def ^:private logger-tag "[COMPLETION]")
 
 (def ^:private completion-tag "<ECA_TAG>")

src/eca/features/prompt.clj

@@ -113,9 +113,9 @@
 (defn compact-prompt [additional-input config]
   (replace-vars
    (compact-prompt-template (:compactPromptFile config))
-   {:addionalUserInput (if additional-input
-                         (format "You MUST respect this user input in the summarization: %s." additional-input)
-                         "")}))
+   {:additionalUserInput (if additional-input
+                           (format "You MUST respect this user input in the summarization: %s." additional-input)
+                           "")}))
 
 (defn inline-completion-prompt [config]
   (let [prompt-file (get-in config [:completion :systemPromptFile])]