Next camp refactor live (#5706)

crates/goose/src/agents/agent.rs

@@ -805,9 +805,7 @@ impl Agent {
         } else {
             SessionManager::add_message(&session_config.id, &user_message).await?;
         }
-
         let session = SessionManager::get_session(&session_config.id, true).await?;
-
         let conversation = session
             .conversation
             .clone()

crates/goose/src/agents/tool_execution.rs

@@ -71,12 +71,14 @@ impl Agent {
                             }
                         });
 
-                    let confirmation = Message::user().with_tool_confirmation_request(
-                        request.id.clone(),
-                        tool_call.name.to_string().clone(),
-                        tool_call.arguments.clone().unwrap_or_default(),
-                        security_message,
-                    );
+                    let confirmation = Message::assistant()
+                        .with_tool_confirmation_request(
+                            request.id.clone(),
+                            tool_call.name.to_string().clone(),
+                            tool_call.arguments.clone().unwrap_or_default(),
+                            security_message,
+                        )
+                        .user_only();
                     yield confirmation;
 
                     let mut rx = self.confirmation_rx.lock().await;