feat: simplify CLI sessions

crates/goose-cli/src/commands/mod.rs

@@ -1,5 +1,4 @@
 pub mod agent_version;
 pub mod configure;
 pub mod mcp;
-pub mod session;
 pub mod version;

crates/goose-cli/src/lib.rs

@@ -0,0 +1,9 @@
+pub mod commands;
+pub mod log_usage;
+pub mod logging;
+pub mod session;
+#[cfg(test)]
+pub mod test_helpers;
+
+// Re-export commonly used types
+pub use session::Session;

crates/goose-cli/src/log_usage.rs

@@ -58,7 +58,7 @@ mod tests {
 
     #[test]
     fn test_session_logging() {
-        run_with_tmp_dir(|| {
+        run_with_tmp_dir(|_| {
             let home_dir = dirs::home_dir().unwrap();
             let log_file = home_dir
                 .join(".config")

crates/goose-cli/src/main.rs

@@ -1,26 +1,16 @@
 use anyhow::Result;
 use clap::{CommandFactory, Parser, Subcommand};
 
-mod cli_prompt;
-mod commands;
-mod log_usage;
-mod logging;
-mod prompt;
-mod session;
-
-use commands::agent_version::AgentCommand;
-use commands::configure::handle_configure;
-use commands::mcp::run_server;
-use commands::session::build_session;
-use commands::version::print_version;
 use console::style;
 use goose::config::Config;
-use logging::setup_logging;
+use goose_cli::commands::agent_version::AgentCommand;
+use goose_cli::commands::configure::handle_configure;
+use goose_cli::commands::mcp::run_server;
+use goose_cli::commands::version::print_version;
+use goose_cli::logging::setup_logging;
+use goose_cli::session::build_session;
 use std::io::{self, Read};
 
-#[cfg(test)]
-mod test_helpers;
-
 #[derive(Parser)]
 #[command(author, about, long_about = None)]
 struct Cli {