diff --git a/lib/crates/fabro-agent/src/cli.rs b/lib/crates/fabro-agent/src/cli.rs
index 7723c3b47..1654b0630 100644
--- a/lib/crates/fabro-agent/src/cli.rs
+++ b/lib/crates/fabro-agent/src/cli.rs
@@ -472,6 +472,7 @@ pub async fn run_with_args_and_client(
     let profile: Arc<dyn AgentProfile> = Arc::from(profile);
 
     let mut session = Session::new(client, profile, env, config);
+    session.set_subagent_manager(manager_for_callback.clone());
 
     // Wire subagent event callback to parent session's emitter
     manager_for_callback
diff --git a/lib/crates/fabro-workflows/src/backend/api.rs b/lib/crates/fabro-workflows/src/backend/api.rs
index 87d0c71c7..1a004bfe5 100644
--- a/lib/crates/fabro-workflows/src/backend/api.rs
+++ b/lib/crates/fabro-workflows/src/backend/api.rs
@@ -242,6 +242,7 @@ impl AgentApiBackend {
         let profile: Arc<dyn AgentProfile> = Arc::from(profile);
 
         let mut session = Session::new(client, profile, Arc::clone(sandbox), config);
+        session.set_subagent_manager(manager_for_callback.clone());
         if !env.is_empty() {
             session.set_tool_env(env.clone());
         }