fix(config): enforce allow_edit_existing_files restriction in tool selection (#388) (#389)

Wire up the existing but unused `infer_task_edit_requirement()` heuristic
to the tool selection pipeline. When a prompt indicates editing intent
(fix, implement, refactor, etc.), tools with `allow_edit_existing_files =
false` are now filtered out during tier-based selection.

Three changes:
- `resolve_tool_and_model()` accepts `needs_edit` and forwards it to
  `resolve_tier_tool_rotated()` (was hardcoded `false`)
- New `resolve_tier_tool_filtered()` replaces the unfiltered fallback,
  `resolve_tier_tool()` now delegates to it with `needs_edit=false`
- `run_cmd_execute` calls `infer_task_edit_requirement()` and passes
  the result through the strategy resolution chain

Closes #388

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Author: RyderFreeman4Logos

Cargo.lock

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "0.1.108"
+version = "0.1.109"
 edition = "2024"
 rust-version = "1.85"
 license = "Apache-2.0"

Cargo.toml

@@ -43,6 +43,7 @@ pub(crate) async fn handle_claude_sub_agent(
             &project_root,
             false, // claude-sub-agent does not support --force
             false, // claude-sub-agent does not support --force-override-user-config
+            false, // sub-agent dispatch always uses explicit tool
         )?;
 
     // 8. Build executor and validate tool

crates/cli-sub-agent/src/claude_sub_agent_cmd.rs

@@ -488,6 +488,7 @@ async fn handle_run_tool(args: Value) -> Result<Value> {
             &project_root,
             false, // MCP server does not support --force
             false, // MCP server does not support --force-override-user-config
+            false, // MCP tool dispatch always uses explicit tool
         )?;
 
     // Build executor

crates/cli-sub-agent/src/mcp_server.rs

@@ -172,6 +172,7 @@ pub(crate) async fn handle_run(
     };
     let run_timeout_seconds = resolve_run_timeout_seconds(timeout, skill.as_deref());
     let run_started_at = Instant::now();
+    let needs_edit = crate::run_helpers::infer_task_edit_requirement(&prompt_text).unwrap_or(false);
     let strategy_result = resolve_tool_by_strategy(
         &strategy,
         model_spec.as_deref(),
@@ -181,6 +182,7 @@ pub(crate) async fn handle_run(
         &project_root,
         force,
         force_override_user_config,
+        needs_edit,
     )?;
     let heterogeneous_runtime_fallback_candidates = strategy_result.runtime_fallback_candidates;
     let resolved_model_spec = strategy_result.model_spec;

crates/cli-sub-agent/src/run_cmd_execute.rs

@@ -133,6 +133,7 @@ pub(crate) fn resolve_tool_by_strategy(
     project_root: &Path,
     force: bool,
     force_override_user_config: bool,
+    needs_edit: bool,
 ) -> Result<StrategyResolution> {
     match strategy {
         ToolSelectionStrategy::Explicit(t) => {
@@ -144,6 +145,7 @@ pub(crate) fn resolve_tool_by_strategy(
                 project_root,
                 force,
                 force_override_user_config,
+                needs_edit,
             )?;
             Ok(StrategyResolution {
                 tool,
@@ -161,6 +163,7 @@ pub(crate) fn resolve_tool_by_strategy(
                 project_root,
                 force,
                 force_override_user_config,
+                needs_edit,
             )?;
             Ok(StrategyResolution {
                 tool,
@@ -177,6 +180,7 @@ pub(crate) fn resolve_tool_by_strategy(
             project_root,
             force,
             force_override_user_config,
+            needs_edit,
         ),
         ToolSelectionStrategy::HeterogeneousStrict => {
             let res = resolve_heterogeneous_strict(
@@ -187,6 +191,7 @@ pub(crate) fn resolve_tool_by_strategy(
                 project_root,
                 force,
                 force_override_user_config,
+                needs_edit,
             )?;
             Ok(StrategyResolution {
                 tool: res.0,
@@ -216,6 +221,7 @@ fn collect_enabled_tools(
     }
 }
 
+#[allow(clippy::too_many_arguments)]
 fn resolve_heterogeneous_preferred(
     model_spec: Option<&str>,
     model: Option<&str>,
@@ -224,6 +230,7 @@ fn resolve_heterogeneous_preferred(
     project_root: &Path,
     force: bool,
     force_override_user_config: bool,
+    needs_edit: bool,
 ) -> Result<StrategyResolution> {
     let detected_parent_tool = detect_parent_tool();
     let parent_tool_name = resolve_tool(detected_parent_tool, global_config);
@@ -245,6 +252,7 @@ fn resolve_heterogeneous_preferred(
                     project_root,
                     force,
                     force_override_user_config,
+                    needs_edit,
                 )?;
                 Ok(StrategyResolution {
                     tool: t,
@@ -267,6 +275,7 @@ fn resolve_heterogeneous_preferred(
                     project_root,
                     force,
                     force_override_user_config,
+                    needs_edit,
                 )?;
                 Ok(StrategyResolution {
                     tool: t,
@@ -288,6 +297,7 @@ fn resolve_heterogeneous_preferred(
             project_root,
             force,
             force_override_user_config,
+            needs_edit,
         )?;
         Ok(StrategyResolution {
             tool: t,
@@ -298,6 +308,7 @@ fn resolve_heterogeneous_preferred(
     }
 }
 
+#[allow(clippy::too_many_arguments)]
 fn resolve_heterogeneous_strict(
     model_spec: Option<&str>,
     model: Option<&str>,
@@ -306,6 +317,7 @@ fn resolve_heterogeneous_strict(
     project_root: &Path,
     force: bool,
     force_override_user_config: bool,
+    needs_edit: bool,
 ) -> Result<(ToolName, Option<String>, Option<String>)> {
     let detected_parent_tool = detect_parent_tool();
     let parent_tool_name = resolve_tool(detected_parent_tool, global_config);
@@ -323,6 +335,7 @@ fn resolve_heterogeneous_strict(
                 project_root,
                 force,
                 force_override_user_config,
+                needs_edit,
             ),
             None => {
                 anyhow::bail!(
@@ -346,6 +359,7 @@ fn resolve_heterogeneous_strict(
             project_root,
             force,
             force_override_user_config,
+            needs_edit,
         )
     }
 }

crates/cli-sub-agent/src/run_cmd_tool_selection.rs

@@ -17,6 +17,8 @@ use csa_session::TokenUsage;
 /// - model: optional model string (from CLI, with alias resolution applied)
 ///
 /// When tool is None, uses tier-based round-robin selection.
+/// `needs_edit`: when true, filters out tools with `allow_edit_existing_files = false`.
+#[allow(clippy::too_many_arguments)]
 pub(crate) fn resolve_tool_and_model(
     tool: Option<ToolName>,
     model_spec: Option<&str>,
@@ -25,6 +27,7 @@ pub(crate) fn resolve_tool_and_model(
     project_root: &Path,
     force: bool,
     force_override_user_config: bool,
+    needs_edit: bool,
 ) -> Result<(ToolName, Option<String>, Option<String>)> {
     // Case 1: model_spec provided → parse it to get tool
     if let Some(spec) = model_spec {
@@ -84,13 +87,15 @@ pub(crate) fn resolve_tool_and_model(
     if let Some(cfg) = config {
         // Try round-robin rotation first (needs project root to persist state)
         if let Ok(Some((tool_name_str, tier_model_spec))) =
-            csa_scheduler::resolve_tier_tool_rotated(cfg, "default", project_root, false)
+            csa_scheduler::resolve_tier_tool_rotated(cfg, "default", project_root, needs_edit)
         {
             let tool_name = parse_tool_name(&tool_name_str)?;
             return Ok((tool_name, Some(tier_model_spec), None));
         }
-        // Fallback: original non-rotating selection
-        if let Some((tool_name_str, tier_model_spec)) = cfg.resolve_tier_tool("default") {
+        // Fallback: original non-rotating selection (also respects edit restrictions)
+        if let Some((tool_name_str, tier_model_spec)) =
+            cfg.resolve_tier_tool_filtered("default", needs_edit)
+        {
             let tool_name = parse_tool_name(&tool_name_str)?;
             return Ok((tool_name, Some(tier_model_spec), None));
         }

crates/cli-sub-agent/src/run_helpers.rs

@@ -549,6 +549,7 @@ fn resolve_tool_and_model_disabled_tool_explicit_errors() {
         std::path::Path::new("/tmp"),
         true,  // force tier bypass
         false, // no override
+        false, // needs_edit
     );
     assert!(result.is_err());
     let msg = result.unwrap_err().to_string();
@@ -594,8 +595,9 @@ fn resolve_tool_and_model_disabled_tool_with_override_succeeds() {
         None,
         Some(&config),
         std::path::Path::new("/tmp"),
-        true, // force tier bypass
-        true, // override enabled
+        true,  // force tier bypass
+        true,  // override enabled
+        false, // needs_edit
     );
     assert!(result.is_ok());
     let (tool, _, _) = result.unwrap();
@@ -643,6 +645,7 @@ fn resolve_tool_and_model_disabled_tool_model_spec_errors() {
         std::path::Path::new("/tmp"),
         true,
         false,
+        false, // needs_edit
     );
     assert!(result.is_err());
     let msg = result.unwrap_err().to_string();