Merge pull request #110 from editor-code-assistant/feature/custom-behavior

Feature/custom behavior

Author: ericdallo

CHANGELOG.md

@@ -4,6 +4,12 @@
 
 - Added missing parameters to `toolCallRejected` where possible.  PR #109
 - Improve plan prompt present plan step.
+- Add custom behavior configuration support. #79
+  - Behaviors can now define `defaultModel`, `disabledTools`, `systemPromptFile`, and `toolCall` approval rules.
+  - Built-in `agent` and `plan` behaviors are pre-configured.
+  - Replace `systemPromptTemplateFile` with `systemPromptFile` for complete prompt files instead of templates.
+- Remove `nativeTools` configuration in favor of `toolCall` approval and `disabledTools`.
+  - Native tools are now always enabled by default, controlled via `disabledTools` and `toolCall` approval.
 
 ## 0.49.0
 

docs/configuration.md

@@ -341,13 +341,19 @@ There are 3 possible ways to configure rules following this order of priority:
         defaultModel?: string;
         rules?: [{path: string;}];
         commands?: [{path: string;}];
-        systemPromptTemplateFile?: string;
-        nativeTools?: {
-            filesystem: {enabled: boolean};
-            shell: {enabled: boolean,
-                    excludeCommands: string[]};
-            editor: {enabled: boolean,};
-        };
+        behavior?: {[key: string]: {
+            systemPromptFile?: string;
+            defaultModel?: string;
+            disabledTools?: string[];
+            toolCall?: {
+                approval?: {
+                    byDefault?: 'ask' | 'allow' | 'deny';
+                    allow?: {[key: string]: {argsMatchers?: {[key: string]: string[]}}};
+                    ask?: {[key: string]: {argsMatchers?: {[key: string]: string[]}}};
+                    deny?: {[key: string]: {argsMatchers?: {[key: string]: string[]}}};
+                };
+            };
+        }};
         customTools?: {[key: string]: {
             description: string;
             command: string;
@@ -404,10 +410,6 @@ There are 3 possible ways to configure rules following this order of priority:
       "defaultModel": null, // let ECA decides the default model.
       "rules" : [],
       "commands" : [],
-      "nativeTools": {"filesystem": {"enabled": true},
-                      "shell": {"enabled": true,
-                                "excludeCommands": []},
-                       "editor": {"enabled": true}},
       "disabledTools": [],
       "toolCall": {
         "approval": {

docs/features.md

@@ -26,7 +26,7 @@ It supports both MCP server tools + ECA native tools.
 
 #### Native tools
 
-ECA support built-in tools to avoid user extra installation and configuration, these tools are always included on models requests that support tools and can be [disabled/configured via config](./configuration.md) `nativeTools`.
+ECA support built-in tools to avoid user extra installation and configuration, these tools are always included on models requests that support tools and can be [disabled via config](./configuration.md) `disabledTools`.
 
 ##### Filesystem
 
@@ -44,7 +44,7 @@ Provides access to filesystem under workspace root, listing, reading and writing
 
 Provides access to run shell commands, useful to run build tools, tests, and other common commands, supports exclude/include commands. 
 
-- `eca_shell_command`: run shell command. Supports configs to exclude commands via `:nativeTools :shell :excludeCommands`.
+- `eca_shell_command`: run shell command. Command exclusion can be configured using toolCall approval configuration with regex patterns.
 
 ##### Editor
 

resources/prompts/agent_behavior.md

@@ -1,6 +1,24 @@
+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.
+
 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.
 
 <edit_file_instructions>
 NEVER show the code edits or new files to the user - only call the proper tool. The system will apply and display the edits.
 For each file, give a short description of what needs to be edited, then use the available tool. You can use the tool multiple times in a response, and you can keep writing text after using a tool. Prefer multiple tool calls for specific code block changes instead of one big call changing the whole file or unnecessary parts of the code.
 </edit_file_instructions>
+
+<communication>
+The chat is markdown mode.
+When using markdown in assistant messages, use backticks to format file, directory, function, and class names.
+Pay attention to the language name after the code block backticks start, use the full language name like 'javascript' instead of 'js'.
+</communication>
+
+<tool_calling>
+You have tools at your disposal to solve the coding task. Follow these rules regarding tool calls:
+1. ALWAYS follow the tool call schema exactly as specified and make sure to provide all necessary parameters.
+2. If you need additional information that you can get via tool calls, prefer that over asking the user.
+3. If you are not sure about file content or codebase structure pertaining to the user's request, use your tools to read files and gather the relevant information: do NOT guess or make up an answer.
+4. You have the capability to call multiple tools in a single response, batch your tool calls together for optimal performance.
+</tool_calling>

resources/prompts/plan_behavior.md

@@ -1,3 +1,5 @@
+You are ECA (Editor Code Assistant), an AI coding assistant.
+
 ## Plan Mode
 
 You are in planning mode. Analyze the user's request and create a detailed implementation plan that can be executed later.
@@ -49,3 +51,17 @@ NEVER print codeblocks for file changes unless explicitly requested - use the ap
 
 ### Remember
 Plans can involve many activities beyond code changes. Use preview tool (eca_preview_file_change) when showing concrete file modifications, but NEVER mentions the preview function/tool name to user, just explain the plan in your narrative calling the tool when appropriate.
+
+<communication>
+The chat is markdown mode.
+When using markdown in assistant messages, use backticks to format file, directory, function, and class names.
+Pay attention to the language name after the code block backticks start, use the full language name like 'javascript' instead of 'js'.
+</communication>
+
+<tool_calling>
+You have tools at your disposal to solve the coding task. Follow these rules regarding tool calls:
+1. ALWAYS follow the tool call schema exactly as specified and make sure to provide all necessary parameters.
+2. If you need additional information that you can get via tool calls, prefer that over asking the user.
+3. If you are not sure about file content or codebase structure pertaining to the user's request, use your tools to read files and gather the relevant information: do NOT guess or make up an answer.
+4. You have the capability to call multiple tools in a single response, batch your tool calls together for optimal performance.
+</tool_calling>

src/eca/config.clj

@@ -58,13 +58,22 @@
                                           "claude-sonnet-4" {}}}
                "ollama" {:url "http://localhost:11434"
                          :urlEnv "OLLAMA_API_URL"}}
+   :behavior {"agent" {:systemPromptFile "prompts/agent_behavior.md"
+                       :disabledTools ["eca_preview_file_change"]}
+              "plan" {:systemPromptFile "prompts/plan_behavior.md"
+                      :disabledTools ["eca_edit_file" "eca_write_file" "eca_move_file"]
+                      :toolCall {:approval {:deny {"eca_shell_command"
+                                                   {:argsMatchers {"command" [".*>.*",
+                                                                              ".*\\|\\s*(tee|dd|xargs).*",
+                                                                              ".*\\b(sed|awk|perl)\\s+.*-i.*",
+                                                                              ".*\\b(rm|mv|cp|touch|mkdir)\\b.*",
+                                                                              ".*git\\s+(add|commit|push).*",
+                                                                              ".*npm\\s+install.*",
+                                                                              ".*-c\\s+[\"'].*open.*[\"']w[\"'].*",
+                                                                              ".*bash.*-c.*>.*"]}}}}}}}
    :defaultModel nil
    :rules []
    :commands []
-   :nativeTools {:filesystem {:enabled true}
-                 :shell {:enabled true
-                         :excludeCommands []}
-                 :editor {:enabled true}}
    :disabledTools []
    :toolCall {:approval {:byDefault "ask"
                          :allow {"eca_preview_file_change" {}
@@ -83,6 +92,18 @@
            :repoMap {:maxTotalEntries 800
                      :maxEntriesPerDir 50}}})
 
+(def ^:private fallback-behavior "agent")
+
+(defn validate-behavior-name
+  "Validates if a behavior exists in config. Returns the behavior if valid,
+   or the fallback behavior if not."
+  [behavior config]
+  (if (contains? (:behavior config) behavior)
+    behavior
+    (do (logger/warn logger-tag (format "Unknown behavior '%s' specified, falling back to '%s'"
+                                        behavior fallback-behavior))
+        fallback-behavior)))
+
 (defn get-env [env] (System/getenv env))
 (defn get-property [property] (System/getProperty property))
 
@@ -197,7 +218,8 @@
   {:kebab-case
    [[:providers]]
    :stringfy
-   [[:providers]
+   [[:behavior]
+    [:providers]
     [:providers :ANY :models]
     [:toolCall :approval :allow]
     [:toolCall :approval :allow :ANY :argsMatchers]
@@ -207,7 +229,14 @@
     [:toolCall :approval :deny :ANY :argsMatchers]
     [:customTools]
     [:customTools :ANY :schema :properties]
-    [:mcpServers]]})
+    [:mcpServers]
+    ;; Behavior-specific toolCall
+    [:behavior :ANY :toolCall :approval :allow]
+    [:behavior :ANY :toolCall :approval :allow :ANY :argsMatchers]
+    [:behavior :ANY :toolCall :approval :ask]
+    [:behavior :ANY :toolCall :approval :ask :ANY :argsMatchers]
+    [:behavior :ANY :toolCall :approval :deny]
+    [:behavior :ANY :toolCall :approval :deny :ANY :argsMatchers]]})
 
 (defn all [db]
   (let [initialization-config @initialization-config*

src/eca/db.clj

@@ -24,7 +24,6 @@
    :providers-config-hash nil
    :last-config-notified {}
    :stopping false
-   :chat-behaviors ["agent" "plan"]
    :models {}
    :mcp-clients {}
 

src/eca/features/chat.clj

@@ -3,6 +3,7 @@
    [cheshire.core :as json]
    [clojure.set :as set]
    [clojure.string :as string]
+   [eca.config :as config]
    [eca.db :as db]
    [eca.features.commands :as f.commands]
    [eca.features.context :as f.context]
@@ -478,7 +479,7 @@
                                               details (f.tools/tool-call-details-before-invocation name arguments)
                                               summary (f.tools/tool-call-summary all-tools name arguments)
                                               origin (tool-name->origin name all-tools)
-                                              approval (f.tools/approval all-tools name arguments db config)
+                                              approval (f.tools/approval all-tools name arguments db config behavior)
                                               ask? (= :ask approval)]
                                           ;; assert: In :preparing or :stopped
                                           ;; Inform client the tool is about to run and store approval promise
@@ -656,20 +657,27 @@
                       (swap! db* assoc-in [:chats new-id] {:id new-id})
                       new-id))
         db @db*
-        full-model (or model (default-model db config))
+        raw-behavior (or behavior
+                         (-> config :chat :defaultBehavior) ;; legacy
+                         (-> config :defaultBehavior))
+        selected-behavior (config/validate-behavior-name raw-behavior config)
+        behavior-config (get-in config [:behavior selected-behavior])
+        ;; Simple model selection without behavior switching logic
+        full-model (or model
+                       (:defaultModel behavior-config)
+                       (default-model db config))
         rules (f.rules/all config (:workspace-folders db))
         refined-contexts (f.context/raw-contexts->refined contexts db config)
         repo-map* (delay (f.index/repo-map db config {:as-string? true}))
         instructions (f.prompt/build-instructions refined-contexts
                                                   rules
                                                   repo-map*
-                                                  (or behavior
-                                                      (-> config :chat :defaultBehavior) ;; legacy
-                                                      (-> config :defaultBehavior))
+                                                  selected-behavior
                                                   config)
         chat-ctx {:chat-id chat-id
                   :contexts contexts
-                  :behavior behavior
+                  :behavior selected-behavior
+                  :behavior-config behavior-config
                   :instructions instructions
                   :full-model full-model
                   :db* db*

src/eca/features/prompt.clj

@@ -12,14 +12,11 @@
 
 (def ^:private logger-tag "[PROMPT]")
 
-(defn ^:private base-prompt-template* [] (slurp (io/resource "prompts/eca_base.md")))
-(def ^:private base-prompt-template (memoize base-prompt-template*))
+;; Built-in behavior prompts are now complete files, not templates
+(defn ^:private load-builtin-prompt* [filename]
+  (slurp (io/resource (str "prompts/" filename))))
 
-(defn ^:private plan-behavior* [] (slurp (io/resource "prompts/plan_behavior.md")))
-(def ^:private plan-behavior (memoize plan-behavior*))
-
-(defn ^:private agent-behavior* [] (slurp (io/resource "prompts/agent_behavior.md")))
-(def ^:private agent-behavior (memoize agent-behavior*))
+(def ^:private load-builtin-prompt (memoize load-builtin-prompt*))
 
 (defn ^:private init-prompt-template* [] (slurp (io/resource "prompts/init.md")))
 (def ^:private init-prompt-template (memoize init-prompt-template*))
@@ -32,13 +29,24 @@
    vars))
 
 (defn ^:private eca-prompt [behavior config]
-  (let [prompt (or (some-> (:systemPromptTemplateFile config) slurp)
-                   (base-prompt-template))]
-    (replace-vars
-     prompt
-     {:behavior (case behavior
-                  "plan" (plan-behavior)
-                  "agent" (agent-behavior))})))
+  (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")))]
+    (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/" "")))
+
+      ;; Fallback for unknown behavior
+      :else
+      (load-builtin-prompt "agent_behavior.md"))))
 
 (defn build-instructions [refined-contexts rules repo-map* behavior config]
   (multi-str