From 5fbc9bbb5b9555e0806558c4425e0daf32b93263 Mon Sep 17 00:00:00 2001
From: Douwe Osinga <douwe@squareup.com>
Date: Fri, 7 Nov 2025 10:42:17 -0500
Subject: [PATCH 1/2] Fix the naming

---
 crates/goose-cli/src/session/mod.rs | 44 +++++++++++++++++++----------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/crates/goose-cli/src/session/mod.rs b/crates/goose-cli/src/session/mod.rs
index 469b06e11b9b..b0b4f92d052e 100644
--- a/crates/goose-cli/src/session/mod.rs
+++ b/crates/goose-cli/src/session/mod.rs
@@ -135,6 +135,32 @@ pub async fn classify_planner_response(
     }
 }
 
+fn generate_extension_name(extension_command: &str) -> String {
+    let cmd_name: String = extension_command
+        .split(|c| c == ' ' || c == '/')
+        .last()
+        .unwrap_or("")
+        .chars()
+        .filter(|c| c.is_alphanumeric())
+        .collect();
+
+    let prefix: String = cmd_name.chars().take(16).collect();
+
+    let random_suffix: String = rand::thread_rng()
+        .sample_iter(&Alphanumeric)
+        .take(8)
+        .map(char::from)
+        .collect();
+
+    let name = format!("{}_{}", prefix, random_suffix);
+
+    if name.chars().next().map_or(true, |c| !c.is_alphabetic()) {
+        format!("g{}", name)
+    } else {
+        name
+    }
+}
+
 impl CliSession {
     #[allow(clippy::too_many_arguments)]
     pub async fn new(
@@ -194,11 +220,7 @@ impl CliSession {
         }
 
         let cmd = parts.remove(0).to_string();
-        let name: String = rand::thread_rng()
-            .sample_iter(&Alphanumeric)
-            .take(8)
-            .map(char::from)
-            .collect();
+        let name = generate_extension_name(&extension_command);
 
         let config = ExtensionConfig::Stdio {
             name,
@@ -229,11 +251,7 @@ impl CliSession {
     /// # Arguments
     /// * `extension_url` - URL of the server
     pub async fn add_remote_extension(&mut self, extension_url: String) -> Result<()> {
-        let name: String = rand::thread_rng()
-            .sample_iter(&Alphanumeric)
-            .take(8)
-            .map(char::from)
-            .collect();
+        let name = generate_extension_name(&extension_url);
 
         let config = ExtensionConfig::Sse {
             name,
@@ -263,11 +281,7 @@ impl CliSession {
     /// # Arguments
     /// * `extension_url` - URL of the server
     pub async fn add_streamable_http_extension(&mut self, extension_url: String) -> Result<()> {
-        let name: String = rand::thread_rng()
-            .sample_iter(&Alphanumeric)
-            .take(8)
-            .map(char::from)
-            .collect();
+        let name = generate_extension_name(&extension_url);
 
         let config = ExtensionConfig::StreamableHttp {
             name,

From e94cb2ad83e57ce1ab4ab2e7c2965f38a505bffb Mon Sep 17 00:00:00 2001
From: Douwe Osinga <douwe@squareup.com>
Date: Fri, 7 Nov 2025 11:17:11 -0500
Subject: [PATCH 2/2] Lint

---
 crates/goose-cli/src/session/mod.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/goose-cli/src/session/mod.rs b/crates/goose-cli/src/session/mod.rs
index b0b4f92d052e..15b0d6849842 100644
--- a/crates/goose-cli/src/session/mod.rs
+++ b/crates/goose-cli/src/session/mod.rs
@@ -137,8 +137,8 @@ pub async fn classify_planner_response(
 
 fn generate_extension_name(extension_command: &str) -> String {
     let cmd_name: String = extension_command
-        .split(|c| c == ' ' || c == '/')
-        .last()
+        .split([' ', '/'])
+        .next_back()
         .unwrap_or("")
         .chars()
         .filter(|c| c.is_alphanumeric())
@@ -154,7 +154,7 @@ fn generate_extension_name(extension_command: &str) -> String {
 
     let name = format!("{}_{}", prefix, random_suffix);
 
-    if name.chars().next().map_or(true, |c| !c.is_alphabetic()) {
+    if name.chars().next().is_none_or(|c| !c.is_alphabetic()) {
         format!("g{}", name)
     } else {
         name