Standardize Session Name Attribute

crates/goose-cli/src/cli.rs

@@ -75,7 +75,7 @@ async fn get_session_id(identifier: Identifier) -> Result<String> {
 
         sessions
             .into_iter()
-            .find(|s| s.id == name || s.description.contains(&name))
+            .find(|s| s.name == name)
             .map(|s| s.id)
             .ok_or_else(|| anyhow::anyhow!("No session found with name '{}'", name))
     } else if let Some(path) = identifier.path {

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

@@ -222,7 +222,7 @@ pub async fn handle_schedule_sessions(id: String, limit: Option<usize>) -> Resul
                         "  - Session ID: {}, Working Dir: {}, Description: \"{}\", Schedule ID: {:?}",
                         session_name, // Display the session_name as Session ID
                         metadata.working_dir.display(),
-                        metadata.description,
+                        metadata.name,
                         metadata.schedule_id.as_deref().unwrap_or("N/A")
                     );
                 }

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

@@ -13,7 +13,7 @@ const TRUNCATED_DESC_LENGTH: usize = 60;
 pub async fn remove_sessions(sessions: Vec<Session>) -> Result<()> {
     println!("The following sessions will be removed:");
     for session in &sessions {
-        println!("- {} {}", session.id, session.description);
+        println!("- {} {}", session.id, session.name);
     }
 
     let should_delete = confirm("Are you sure you want to delete these sessions?")
@@ -45,10 +45,10 @@ fn prompt_interactive_session_removal(sessions: &[Session]) -> Result<Vec<Sessio
     let display_map: std::collections::HashMap<String, Session> = sessions
         .iter()
         .map(|s| {
-            let desc = if s.description.is_empty() {
-                "(no description)"
+            let desc = if s.name.is_empty() {
+                "(no name)"
             } else {
-                &s.description
+                &s.name
             };
             let truncated_desc = safe_truncate(desc, TRUNCATED_DESC_LENGTH);
             let display_text = format!("{} - {} ({})", s.updated_at, truncated_desc, s.id);
@@ -154,10 +154,7 @@ pub async fn handle_session_list(
 
             println!("Available sessions:");
             for session in sessions {
-                let output = format!(
-                    "{} - {} - {}",
-                    session.id, session.description, session.updated_at
-                );
+                let output = format!("{} - {} - {}", session.id, session.name, session.updated_at);
                 println!("{}", output);
             }
         }
@@ -188,7 +185,7 @@ pub async fn handle_session_export(
             let conversation = session
                 .conversation
                 .ok_or_else(|| anyhow::anyhow!("Session has no messages"))?;
-            export_session_to_markdown(conversation.messages().to_vec(), &session.description)
+            export_session_to_markdown(conversation.messages().to_vec(), &session.name)
         }
         _ => return Err(anyhow::anyhow!("Unsupported format: {}", format)),
     };
@@ -293,10 +290,10 @@ pub async fn prompt_interactive_session_selection() -> Result<String> {
     let display_map: std::collections::HashMap<String, Session> = sessions
         .iter()
         .map(|s| {
-            let desc = if s.description.is_empty() {
-                "(no description)"
+            let desc = if s.name.is_empty() {
+                "(no name)"
             } else {
-                &s.description
+                &s.name
             };
             let truncated_desc = safe_truncate(desc, TRUNCATED_DESC_LENGTH);
 

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

@@ -225,7 +225,7 @@ pub async fn handle_web(
 async fn serve_index() -> Result<Redirect, (http::StatusCode, String)> {
     let session = SessionManager::create_session(
         std::env::current_dir().unwrap_or_else(|_| std::path::PathBuf::from(".")),
-        "Web session".to_string(),
+        Some("Web session".to_string()),
     )
     .await
     .map_err(|err| (http::StatusCode::INTERNAL_SERVER_ERROR, err.to_string()))?;
@@ -290,7 +290,7 @@ async fn list_sessions() -> Json<serde_json::Value> {
                 session_info.push(serde_json::json!({
                     "name": session.id,
                     "path": session.id,
-                    "description": session.description,
+                    "description": session.name,
                     "message_count": session.message_count,
                     "working_dir": session.working_dir
                 }));

crates/goose-cli/src/session/builder.rs

@@ -311,12 +311,9 @@ pub async fn build_session(session_config: SessionBuilderConfig) -> CliSession {
     } else if let Some(session_id) = session_config.session_id {
         Some(session_id)
     } else {
-        let session = SessionManager::create_session(
-            std::env::current_dir().unwrap(),
-            "CLI Session".to_string(),
-        )
-        .await
-        .unwrap();
+        let session = SessionManager::create_session(std::env::current_dir().unwrap(), None)
+            .await
+            .unwrap();
         Some(session.id)
     };
 

crates/goose-server/src/routes/agent.rs

@@ -139,9 +139,9 @@ async fn start_agent(
     }
 
     let counter = state.session_counter.fetch_add(1, Ordering::SeqCst) + 1;
-    let description = format!("New session {}", counter);
+    let name = format!("New session {}", counter);
 
-    let mut session = SessionManager::create_session(PathBuf::from(&working_dir), description)
+    let mut session = SessionManager::create_session(PathBuf::from(&working_dir), Some(name))
         .await
         .map_err(|err| {
             error!("Failed to create session: {}", err);

crates/goose-server/src/routes/schedule.rs

@@ -69,7 +69,7 @@ fn default_limit() -> u32 {
 #[serde(rename_all = "camelCase")]
 pub struct SessionDisplayInfo {
     id: String,          // Derived from session_name (filename)
-    name: String,        // From metadata.description
+    name: String,        // From metadata.name
     created_at: String,  // Derived from session_name, in ISO 8601 format
     working_dir: String, // from metadata.working_dir (as String)
     schedule_id: Option<String>,
@@ -325,7 +325,7 @@ async fn sessions_handler(
             for (session_name, session) in session_tuples {
                 display_infos.push(SessionDisplayInfo {
                     id: session_name.clone(),
-                    name: session.description,
+                    name: session.name,
                     created_at: parse_session_name_to_iso(&session_name),
                     working_dir: session.working_dir.to_string_lossy().into_owned(),
                     schedule_id: session.schedule_id,

crates/goose-server/src/routes/session.rs

@@ -135,7 +135,7 @@ async fn update_session_description(
     }
 
     SessionManager::update_session(&session_id)
-        .description(request.description)
+        .name(request.description)
         .apply()
         .await
         .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;

crates/goose/src/agents/agent.rs

@@ -1035,9 +1035,7 @@ impl Agent {
             let provider = self.provider().await?;
             let session_id = session_config.id.clone();
             tokio::spawn(async move {
-                if let Err(e) =
-                    SessionManager::maybe_update_description(&session_id, provider).await
-                {
+                if let Err(e) = SessionManager::maybe_update_name(&session_id, provider).await {
                     warn!("Failed to generate session description: {}", e);
                 }
             });

crates/goose/src/agents/subagent_handler.rs

@@ -103,7 +103,7 @@ fn get_agent_messages(
         let working_dir = task_config.parent_working_dir;
         let session = SessionManager::create_session(
             working_dir.clone(),
-            format!("Subagent task for: {}", parent_session_id),
+            Some(format!("Subagent task for: {}", parent_session_id)),
         )
         .await
         .map_err(|e| anyhow!("Failed to create a session for sub agent: {}", e))?;

crates/goose/src/scheduler.rs

@@ -1174,11 +1174,11 @@ async fn run_scheduled_job_internal(
     // Create session upfront for both cases
     let session = match SessionManager::create_session(
         current_dir.clone(),
-        if recipe.prompt.is_some() {
+        Some(if recipe.prompt.is_some() {
             format!("Scheduled job: {}", job.id)
         } else {
             "Empty job - no prompt".to_string()
-        },
+        }),
     )
     .await
     {