/cmd/bd/{doctor,init}.go: skip initDiagnostics with embedded dolt

Author: coffeegoddd

cmd/bd/doctor.go

@@ -861,13 +861,11 @@ func runInitDiagnostics(path string) doctorResult {
 		result.OverallOK = false
 	}
 
-	// Check 3: Schema compatibility (server-mode only; embedded validates during initSchema)
-	if !isEmbeddedDolt {
-		schemaCheck := convertWithCategory(doctor.CheckSchemaCompatibility(path), doctor.CategoryCore)
-		result.Checks = append(result.Checks, schemaCheck)
-		if schemaCheck.Status == statusError {
-			result.OverallOK = false
-		}
+	// Check 3: Schema compatibility
+	schemaCheck := convertWithCategory(doctor.CheckSchemaCompatibility(path), doctor.CategoryCore)
+	result.Checks = append(result.Checks, schemaCheck)
+	if schemaCheck.Status == statusError {
+		result.OverallOK = false
 	}
 
 	// Check 4: Permissions
@@ -877,22 +875,18 @@ func runInitDiagnostics(path string) doctorResult {
 		result.OverallOK = false
 	}
 
-	// Checks 5-6: Dolt server connection and schema (server-mode only;
-	// embedded mode has no sql-server to connect to).
-	if !isEmbeddedDolt {
-		// Check 5: Dolt connection — validates init actually created a working DB
-		doltConnCheck := convertDoctorCheck(doctor.CheckDoltConnection(path))
-		result.Checks = append(result.Checks, doltConnCheck)
-		if doltConnCheck.Status == statusError {
-			result.OverallOK = false
-		}
+	// Check 5: Dolt connection — validates init actually created a working DB
+	doltConnCheck := convertDoctorCheck(doctor.CheckDoltConnection(path))
+	result.Checks = append(result.Checks, doltConnCheck)
+	if doltConnCheck.Status == statusError {
+		result.OverallOK = false
+	}
 
-		// Check 6: Dolt schema — validates tables were created
-		doltSchemaCheck := convertDoctorCheck(doctor.CheckDoltSchema(path))
-		result.Checks = append(result.Checks, doltSchemaCheck)
-		if doltSchemaCheck.Status == statusError {
-			result.OverallOK = false
-		}
+	// Check 6: Dolt schema — validates tables were created
+	doltSchemaCheck := convertDoctorCheck(doctor.CheckDoltSchema(path))
+	result.Checks = append(result.Checks, doltSchemaCheck)
+	if doltSchemaCheck.Status == statusError {
+		result.OverallOK = false
 	}
 
 	return result

cmd/bd/init.go

@@ -900,27 +900,27 @@ environment variable.`,
 		}
 
 		// Run limited diagnostics to verify init succeeded.
-		// Uses runInitDiagnostics (not runDiagnostics) to only check things
-		// that should be true immediately after init — skips git-dependent,
-		// federation, and other post-setup checks that aren't applicable yet.
-		doctorResult := runInitDiagnostics(cwd)
-		// Check if there are any warnings or errors (not just critical failures)
-		hasIssues := false
-		for _, check := range doctorResult.Checks {
-			if check.Status != statusOK {
-				hasIssues = true
-				break
-			}
-		}
-		if hasIssues {
-			fmt.Printf("%s Setup incomplete. Some issues were detected:\n", ui.RenderWarn("⚠"))
-			// Show just the warnings/errors, not all checks
+		// Skipped in embedded mode: diagnostics use dolt.NewFromConfigWithOptions
+		// which auto-starts a dolt sql-server. Embedded init already validates
+		// the database via initSchema.
+		if !isEmbeddedDolt {
+			doctorResult := runInitDiagnostics(cwd)
+			hasIssues := false
 			for _, check := range doctorResult.Checks {
 				if check.Status != statusOK {
-					fmt.Printf("  • %s: %s\n", check.Name, check.Message)
+					hasIssues = true
+					break
+				}
+			}
+			if hasIssues {
+				fmt.Printf("%s Setup incomplete. Some issues were detected:\n", ui.RenderWarn("⚠"))
+				for _, check := range doctorResult.Checks {
+					if check.Status != statusOK {
+						fmt.Printf("  • %s: %s\n", check.Name, check.Message)
+					}
 				}
+				fmt.Printf("\nRun %s to see details and fix these issues.\n\n", ui.RenderAccent("bd doctor --fix"))
 			}
-			fmt.Printf("\nRun %s to see details and fix these issues.\n\n", ui.RenderAccent("bd doctor --fix"))
 		}
 	},
 }