Improve setup project creation error recovery

Author: mkh09353

.changeset/improve-tos-guidance-project-create.md

@@ -0,0 +1,8 @@
+---
+"@googleworkspace/cli": patch
+---
+
+Improve `gws auth setup` project creation failures in step 3:
+- Detect Google Cloud Terms of Service precondition failures and show actionable guidance (`gcloud auth list`, account verification, Console ToS URL).
+- Detect invalid project ID format / already-in-use errors and show clearer guidance.
+- In interactive setup, keep the wizard open and re-prompt for a new project ID instead of exiting immediately on create failures.

src/setup.rs

@@ -613,6 +613,90 @@ fn get_access_token() -> Result<String, GwsError> {
     Ok(String::from_utf8_lossy(&output.stdout).trim().to_string())
 }
 
+fn is_tos_precondition_error(gcloud_output: &str) -> bool {
+    let lower = gcloud_output.to_ascii_lowercase();
+    lower.contains("callers must accept terms of service")
+        || (lower.contains("terms of service") && lower.contains("type: tos"))
+        || (lower.contains("failed_precondition") && lower.contains("type: tos"))
+}
+
+fn is_invalid_project_id_error(gcloud_output: &str) -> bool {
+    let lower = gcloud_output.to_ascii_lowercase();
+    lower.contains("argument project_id: bad value")
+        || lower.contains("project ids are immutable")
+        || lower.contains("project ids must be between 6 and 30 characters")
+}
+
+fn is_project_id_in_use_error(gcloud_output: &str) -> bool {
+    let lower = gcloud_output.to_ascii_lowercase();
+    lower.contains("already in use")
+        || lower.contains("already exists")
+        || lower.contains("already being used")
+}
+
+fn primary_gcloud_error_line(gcloud_output: &str) -> Option<String> {
+    gcloud_output
+        .lines()
+        .map(str::trim)
+        .find(|line| line.starts_with("ERROR:"))
+        .map(ToString::to_string)
+}
+
+fn format_project_create_failure(project_id: &str, account: &str, gcloud_output: &str) -> String {
+    if is_tos_precondition_error(gcloud_output) {
+        let mut msg = format!(
+            concat!(
+                "Failed to create project '{project_id}' because the active gcloud account has not accepted Google Cloud Terms of Service.\n\n",
+                "Fix:\n",
+                "1. Verify the active account: `gcloud auth list` and `gcloud config get-value account`\n",
+                "2. Sign in to https://console.cloud.google.com/ with that same account and accept Terms of Service.\n",
+                "3. Retry `gws auth setup` (or `gcloud projects create {project_id}`).\n\n",
+                "If this is a Google Workspace-managed account, an org admin may need to enable Google Cloud for the domain first."
+            ),
+            project_id = project_id
+        );
+        if !account.trim().is_empty() {
+            msg.push_str(&format!("\n\nActive account in this setup run: {account}"));
+        }
+        return msg;
+    }
+
+    if is_invalid_project_id_error(gcloud_output) {
+        return format!(
+            concat!(
+                "Failed to create project '{project_id}' because the project ID format is invalid.\n\n",
+                "Project IDs must:\n",
+                "- be 6 to 30 characters\n",
+                "- start with a lowercase letter\n",
+                "- use only lowercase letters, digits, or hyphens\n\n",
+                "Enter a new project ID and retry."
+            ),
+            project_id = project_id
+        );
+    }
+
+    if is_project_id_in_use_error(gcloud_output) {
+        return format!(
+            "Failed to create project '{project_id}' because the ID is already in use. Enter a different unique project ID and retry."
+        );
+    }
+
+    if let Some(primary) = primary_gcloud_error_line(gcloud_output) {
+        return format!(
+            "Failed to create project '{project_id}'.\n\n{primary}\n\nEnter a different project ID and retry."
+        );
+    }
+
+    let details = gcloud_output.trim();
+    if details.is_empty() {
+        return format!(
+            "Failed to create project '{project_id}'. Enter a different project ID and retry."
+        );
+    }
+
+    format!("Failed to create project '{project_id}'.\n\ngcloud error:\n{details}")
+}
+
 // ── API enabling ────────────────────────────────────────────────
 
 /// Enable selected Workspace APIs for a project.
@@ -1023,43 +1107,83 @@ fn stage_project(ctx: &mut SetupContext) -> Result<SetupStage, GwsError> {
                 let chosen = items.iter().find(|i| i.selected);
                 match chosen {
                     Some(item) if item.label.starts_with('➕') => {
-                        let project_name = match ctx
-                            .wizard
-                            .as_mut()
-                            .unwrap()
-                            .show_input("Create new GCP project", "Enter a unique project ID", None)
-                            .map_err(|e| GwsError::Validation(format!("TUI error: {e}")))?
-                        {
-                            crate::setup_tui::InputResult::Confirmed(v) if !v.is_empty() => v,
-                            _ => {
-                                return Err(GwsError::Validation(
-                                    "Project creation cancelled by user".to_string(),
-                                ))
+                        let mut last_attempt: Option<String> = None;
+                        loop {
+                            let project_name = match ctx
+                                .wizard
+                                .as_mut()
+                                .unwrap()
+                                .show_input(
+                                    "Create new GCP project",
+                                    "Enter a unique project ID",
+                                    last_attempt.as_deref(),
+                                )
+                                .map_err(|e| GwsError::Validation(format!("TUI error: {e}")))?
+                            {
+                                crate::setup_tui::InputResult::Confirmed(v) => {
+                                    let trimmed = v.trim().to_string();
+                                    if trimmed.is_empty() {
+                                        if let Some(ref mut w) = ctx.wizard {
+                                            w.show_message("Project ID cannot be empty. Enter a valid ID, press ↑ to go back, or Esc to cancel.")
+                                                .ok();
+                                        }
+                                        continue;
+                                    }
+                                    trimmed
+                                }
+                                crate::setup_tui::InputResult::GoBack => {
+                                    return Ok(SetupStage::Project);
+                                }
+                                crate::setup_tui::InputResult::Cancelled => {
+                                    ctx.finish_wizard();
+                                    return Err(GwsError::Validation(
+                                        "Setup cancelled".to_string(),
+                                    ));
+                                }
+                            };
+
+                            ctx.wizard
+                                .as_mut()
+                                .unwrap()
+                                .show_message(&format!("Creating project '{}'...", project_name))
+                                .ok();
+
+                            let output = gcloud_cmd()
+                                .args(["projects", "create", &project_name])
+                                .output()
+                                .map_err(|e| {
+                                    GwsError::Validation(format!("Failed to create project: {e}"))
+                                })?;
+                            if output.status.success() {
+                                set_gcloud_project(&project_name)?;
+                                ctx.wiz(2, StepStatus::Done(project_name.clone()));
+                                ctx.project_id = project_name;
+                                break Ok(SetupStage::EnableApis);
                             }
-                        };
 
-                        ctx.wizard
-                            .as_mut()
-                            .unwrap()
-                            .show_message(&format!("Creating project '{}'...", project_name))
-                            .ok();
-
-                        let status = gcloud_cmd()
-                            .args(["projects", "create", &project_name])
-                            .status()
-                            .map_err(|e| {
-                                GwsError::Validation(format!("Failed to create project: {e}"))
-                            })?;
-                        if !status.success() {
-                            return Err(GwsError::Validation(format!(
-                                "Failed to create project '{}'. Check the ID is valid and unique.",
-                                project_name
-                            )));
+                            let stderr = String::from_utf8_lossy(&output.stderr);
+                            let stdout = String::from_utf8_lossy(&output.stdout);
+                            let mut combined = stderr.trim().to_string();
+                            if !stdout.trim().is_empty() {
+                                if !combined.is_empty() {
+                                    combined.push('\n');
+                                }
+                                combined.push_str(stdout.trim());
+                            }
+
+                            let message = format_project_create_failure(
+                                &project_name,
+                                &ctx.account,
+                                &combined,
+                            );
+                            if let Some(ref mut w) = ctx.wizard {
+                                w.show_message(&format!(
+                                    "{message}\n\nTry another project ID, press ↑ to return to project selection, or Esc to cancel."
+                                ))
+                                .ok();
+                            }
+                            last_attempt = Some(project_name);
                         }
-                        set_gcloud_project(&project_name)?;
-                        ctx.wiz(2, StepStatus::Done(project_name.clone()));
-                        ctx.project_id = project_name;
-                        Ok(SetupStage::EnableApis)
                     }
                     Some(item) => {
                         set_gcloud_project(&item.label)?;
@@ -1627,6 +1751,47 @@ mod tests {
         assert_eq!(opts.project.as_deref(), Some("p"));
     }
 
+    #[test]
+    fn test_format_project_create_failure_tos_guidance() {
+        let msg = format_project_create_failure(
+            "example-project-123456",
+            "user@example.com",
+            "Operation failed: 9: Callers must accept Terms of Service\n type: TOS",
+        );
+
+        assert!(msg.contains("has not accepted Google Cloud Terms of Service"));
+        assert!(msg.contains("gcloud auth list"));
+        assert!(msg.contains("gcloud config get-value account"));
+        assert!(msg.contains("https://console.cloud.google.com/"));
+        assert!(msg.contains("user@example.com"));
+    }
+
+    #[test]
+    fn test_format_project_create_failure_invalid_id_guidance() {
+        let msg = format_project_create_failure(
+            "example-project-123456",
+            "",
+            "ERROR: (gcloud.projects.create) argument PROJECT_ID: Bad value [bad]: Project IDs must be between 6 and 30 characters.",
+        );
+
+        assert!(msg.contains("project ID format is invalid"));
+        assert!(msg.contains("be 6 to 30 characters"));
+        assert!(msg.contains("start with a lowercase letter"));
+        assert!(msg.contains("lowercase letters, digits, or hyphens"));
+    }
+
+    #[test]
+    fn test_format_project_create_failure_in_use_guidance() {
+        let msg = format_project_create_failure(
+            "example-project-123456",
+            "",
+            "Project ID already in use",
+        );
+
+        assert!(msg.contains("ID is already in use"));
+        assert!(msg.contains("different unique project ID"));
+    }
+
     // ── Account selection → gcloud action ───────────────────────
 
     #[test]