Feat/dynamic subagents

.github/workflows/ci.yml

@@ -15,25 +15,19 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Cache Cargo Dependencies
-        uses: actions/cache@v4
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@master
         with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            ./target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
+          toolchain: "1.89.0"
+          components: rustfmt, clippy
 
-      - name: Check
-        run: cargo check --verbose --all-targets
+      - uses: Swatinem/rust-cache@v2
 
       - name: Format Check
         run: cargo fmt -- --check
 
       - name: Lint
-        run: cargo clippy
+        run: cargo clippy --all-targets -- -D warnings
 
       - name: Build
         run: cargo build --verbose

cli/src/commands/acp/server.rs

@@ -975,6 +975,7 @@ impl StakpakAcpAgent {
                     &tool_call,
                     tool_cancel_rx,
                     self.current_session_id.get(),
+                    Some(self.model.read().await.id.clone()),
                 )
                 .await
                 .map_err(|e| {

cli/src/commands/agent/run/helpers.rs

@@ -4,7 +4,6 @@ use stakpak_api::models::ListRuleBook;
 use stakpak_shared::models::integrations::openai::{
     ChatMessage, FunctionDefinition, MessageContent, Role, Tool, ToolCallResult,
 };
-use stakpak_shared::models::subagent::SubagentConfigs;
 use uuid::Uuid;
 
 /// Build a CLI resume command string, preferring session ID over checkpoint ID.
@@ -157,28 +156,6 @@ pub fn add_rulebooks(user_input: &str, rulebooks: &[ListRuleBook]) -> (String, O
     (formatted_input, Some(rulebooks_text))
 }
 
-pub fn add_subagents(
-    messages: &[ChatMessage],
-    user_input: &str,
-    subagent_configs: &Option<SubagentConfigs>,
-) -> (String, Option<String>) {
-    if let Some(subagent_configs) = subagent_configs {
-        let subagents_text = subagent_configs.format_for_context();
-
-        if messages.is_empty() {
-            let formatted_input = format!(
-                "{}\n<subagents>\n{}\n</subagents>",
-                user_input, subagents_text
-            );
-            (formatted_input, Some(subagents_text))
-        } else {
-            (user_input.to_string(), None)
-        }
-    } else {
-        (user_input.to_string(), None)
-    }
-}
-
 pub fn tool_call_history_string(tool_calls: &[ToolCallResult]) -> Option<String> {
     if tool_calls.is_empty() {
         return None;

cli/src/commands/agent/run/mcp_init.rs

@@ -34,6 +34,10 @@ pub struct McpInitConfig {
     pub enabled_tools: EnabledToolsConfig,
     /// Whether to enable mTLS for secure communication
     pub enable_mtls: bool,
+    /// Whether to enable subagent tools
+    pub enable_subagents: bool,
+    /// Optional list of allowed tool names (filters tools if specified)
+    pub allowed_tools: Option<Vec<String>>,
 }
 
 impl Default for McpInitConfig {
@@ -43,6 +47,8 @@ impl Default for McpInitConfig {
             privacy_mode: false,
             enabled_tools: EnabledToolsConfig { slack: false },
             enable_mtls: true,
+            enable_subagents: true,
+            allowed_tools: None,
         }
     }
 }
@@ -126,6 +132,7 @@ async fn start_mcp_server(
     let redact_secrets = mcp_config.redact_secrets;
     let privacy_mode = mcp_config.privacy_mode;
     let enabled_tools = mcp_config.enabled_tools.clone();
+    let enable_subagents = mcp_config.enable_subagents;
 
     tokio::spawn(async move {
         let server_config = MCPServerConfig {
@@ -135,7 +142,7 @@ async fn start_mcp_server(
             privacy_mode,
             enabled_tools,
             tool_mode: ToolMode::Combined,
-            subagent_configs: None,
+            enable_subagents,
             certificate_chain: cert_chain,
         };
 
@@ -323,7 +330,12 @@ pub async fn initialize_mcp_server_and_tools(
         .await
         .map_err(|e| format!("Failed to get tools: {}", e))?;
 
-    let tools = convert_tools_with_filter(&mcp_tools, app_config.allowed_tools.as_ref());
+    // Use allowed_tools from mcp_config if provided, otherwise fall back to app_config
+    let allowed_tools_ref = mcp_config
+        .allowed_tools
+        .as_ref()
+        .or(app_config.allowed_tools.as_ref());
+    let tools = convert_tools_with_filter(&mcp_tools, allowed_tools_ref);
 
     Ok(McpInitResult {
         client: mcp_client,

cli/src/commands/agent/run/mod.rs

@@ -3,6 +3,7 @@ pub mod helpers;
 pub mod mcp_init;
 pub mod mode_async;
 pub mod mode_interactive;
+pub mod pause;
 pub mod profile_switch;
 pub mod renderer;
 pub mod stream;
@@ -11,4 +12,5 @@ pub mod tui;
 
 pub use mode_async::{RunAsyncConfig, run_async};
 pub use mode_interactive::{RunInteractiveConfig, run_interactive};
+pub use pause::{AsyncOutcome, ResumeInput};
 pub use renderer::OutputFormat;