Improve system prompt to add project env context.

Author: ericdallo

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Improve system prompt to add project env context.
+
 ## 0.79.0
 
 - Fix absolute paths being interpreted as commands. #199

resources/prompts/additional_system_info.md

@@ -0,0 +1,8 @@
+# Project Environment Context
+
+Workspaces: {workspaceRoots}
+
+**Path Resolution & Context:**
+*Workspaces:* Directories containing code or data relevant to this session.
+*Rule:* Use Workspaces as the base to resolve relative paths into absolute paths when required by tools.
+

resources/prompts/agent_behavior.md

@@ -1,7 +1,6 @@
 You are ECA (Editor Code Assistant), an AI coding assistant that operates on an editor.
 
 You are pair programming with a USER to solve their coding task. Each time the USER sends a message, we may automatically attach some context information about their current state, such as passed contexts, rules defined by USER, project structure, and more. This information may or may not be relevant to the coding task, it is up for you to decide.
-The user workspace root(s) are: {workspaceRoots}
 
 You are an agent - please keep going until the user's query is completely resolved, before ending your turn and yielding back to the user. Only terminate your turn when you are sure that the problem is solved. Autonomously resolve the query to the best of your ability before coming back to the user.
 

src/eca/features/prompt.clj

@@ -39,27 +39,25 @@
    s
    vars))
 
-(defn ^:private eca-chat-prompt [behavior config db]
+(defn ^:private eca-chat-prompt [behavior config]
   (let [behavior-config (get-in config [:behavior behavior])
         ;; Use systemPromptFile from behavior config, or fall back to built-in
         prompt-file (or (:systemPromptFile behavior-config)
                         ;; For built-in behaviors without explicit config
                         (when (#{"agent" "plan"} behavior)
                           (str "prompts/" behavior "_behavior.md")))]
-    (replace-vars
-      (cond
-        ;; Custom behavior with absolute path
-        (and prompt-file (string/starts-with? prompt-file "/"))
-        (slurp prompt-file)
+    (cond
+      ;; Custom behavior with absolute path
+      (and prompt-file (string/starts-with? prompt-file "/"))
+      (slurp prompt-file)
 
-        ;; Built-in or resource path
-        prompt-file
-        (load-builtin-prompt (some-> prompt-file (string/replace-first #"prompts/" "")))
+      ;; Built-in or resource path
+      prompt-file
+      (load-builtin-prompt (some-> prompt-file (string/replace-first #"prompts/" "")))
 
-        ;; Fallback for unknown behavior
-        :else
-        (load-builtin-prompt "agent_behavior.md"))
-      {:workspaceRoots (shared/workspaces-as-str db)})))
+      ;; Fallback for unknown behavior
+      :else
+      (load-builtin-prompt "agent_behavior.md"))))
 
 (defn contexts-str [refined-contexts repo-map*]
   (multi-str
@@ -91,7 +89,7 @@
 
 (defn build-chat-instructions [refined-contexts rules repo-map* behavior config db]
   (multi-str
-   (eca-chat-prompt behavior config db)
+   (eca-chat-prompt behavior config)
    (when (seq rules)
      ["<rules description=\"Rules defined by user\">\n"
       (reduce
@@ -102,7 +100,11 @@
       "</rules>"])
    ""
    (when (seq refined-contexts)
-     [(contexts-str refined-contexts repo-map*)])))
+     [(contexts-str refined-contexts repo-map*)])
+   ""
+   (replace-vars
+    (load-builtin-prompt "additional_system_info.md")
+    {:workspaceRoots (shared/workspaces-as-str db)})))
 
 (defn build-rewrite-instructions [text path full-text range config]
   (let [prompt-file (-> config :rewrite :systemPromptFile)