fix(mcp): allow package-style server names

Author: james

code-rs/cli/src/mcp_cmd.rs

@@ -259,6 +259,12 @@ mod tests {
             _ => panic!("expected streamable http transport"),
         }
     }
+
+    #[test]
+    fn package_style_server_name_is_valid() {
+        assert!(validate_server_name("npm:@modelcontextprotocol/server-sequential.thinking").is_ok());
+        assert!(validate_server_name("npm:@scope/package name").is_err());
+    }
 }
 
 fn run_remove(config_overrides: &CliConfigOverrides, remove_args: RemoveArgs) -> Result<()> {
@@ -591,11 +597,11 @@ fn validate_server_name(name: &str) -> Result<()> {
     let is_valid = !name.is_empty()
         && name
             .chars()
-            .all(|c| c.is_ascii_alphanumeric() || c == '-' || c == '_');
+            .all(|c| c.is_ascii_alphanumeric() || matches!(c, '-' | '_' | ':' | '@' | '/' | '.'));
 
     if is_valid {
         Ok(())
     } else {
-        bail!("invalid server name '{name}' (use letters, numbers, '-', '_')");
+        bail!("invalid server name '{name}' (use letters, numbers, '-', '_', ':', '@', '/', '.')");
     }
 }

code-rs/core/src/mcp_connection_manager.rs

@@ -283,7 +283,7 @@ impl McpConnectionManager {
             // Validate server name before spawning
             if !is_valid_mcp_server_name(&server_name) {
                 let message = format!(
-                    "invalid server name '{server_name}': must match pattern ^[a-zA-Z0-9_-]+$"
+                    "invalid server name '{server_name}': must match pattern ^[a-zA-Z0-9_:@/.-]+$"
                 );
                 errors.insert(
                     server_name,
@@ -598,7 +598,7 @@ fn is_valid_mcp_server_name(server_name: &str) -> bool {
     !server_name.is_empty()
         && server_name
             .chars()
-            .all(|c| c.is_ascii_alphanumeric() || c == '_' || c == '-')
+            .all(|c| c.is_ascii_alphanumeric() || matches!(c, '_' | '-' | ':' | '@' | '/' | '.'))
 }
 
 #[cfg(test)]
@@ -632,6 +632,14 @@ mod tests {
         }
     }
 
+    #[test]
+    fn package_style_server_name_is_valid() {
+        assert!(is_valid_mcp_server_name(
+            "npm:@modelcontextprotocol/server-sequential.thinking"
+        ));
+        assert!(!is_valid_mcp_server_name("npm:@scope/package name"));
+    }
+
     #[test]
     fn test_qualify_tools_short_non_duplicated_names() {
         let tools = vec![