From 52e4308564c2e7fa80bc7fa922df24f0e6db3bd9 Mon Sep 17 00:00:00 2001
From: Will Pfleger <wpfleger@block.xyz>
Date: Wed, 1 Oct 2025 22:18:46 -0400
Subject: [PATCH] Using --resume with --name should still accept session IDs
 (#4937)

thank you!
---
 crates/goose-cli/src/cli.rs            | 2 +-
 crates/goose-cli/src/session/mod.rs    | 5 +++++
 crates/goose-cli/src/session/output.rs | 8 ++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/crates/goose-cli/src/cli.rs b/crates/goose-cli/src/cli.rs
index ad5cc9835e..5c644bf6eb 100644
--- a/crates/goose-cli/src/cli.rs
+++ b/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.description == name)
+            .find(|s| s.id == name || s.description.contains(&name))
             .map(|s| s.id)
             .ok_or_else(|| anyhow::anyhow!("No session found with name '{}'", name))
     } else if let Some(path) = identifier.path {
diff --git a/crates/goose-cli/src/session/mod.rs b/crates/goose-cli/src/session/mod.rs
index 61bb06d7ac..aadcdd5f0f 100644
--- a/crates/goose-cli/src/session/mod.rs
+++ b/crates/goose-cli/src/session/mod.rs
@@ -758,6 +758,11 @@ impl CliSession {
                 }
             }
         }
+
+        if let Some(id) = &self.session_id {
+            println!("Closing session. Session ID: {}", console::style(id).cyan());
+        }
+
         Ok(())
     }
 
diff --git a/crates/goose-cli/src/session/output.rs b/crates/goose-cli/src/session/output.rs
index 9027426ca1..639d7da961 100644
--- a/crates/goose-cli/src/session/output.rs
+++ b/crates/goose-cli/src/session/output.rs
@@ -743,6 +743,14 @@ pub fn display_session_info(
         );
     }
 
+    if let Some(id) = session_id {
+        println!(
+            "    {} {}",
+            style("session id:").dim(),
+            style(id).cyan().dim()
+        );
+    }
+
     println!(
         "    {} {}",
         style("working directory:").dim(),