diff --git a/src/commands/onboard.test.ts b/src/commands/onboard.test.ts
index 3d2b853c8b7e..e0048fdf9e2a 100644
--- a/src/commands/onboard.test.ts
+++ b/src/commands/onboard.test.ts
@@ -959,6 +959,7 @@ describe("setupWizardCommand", () => {
   });
 
   it.each([
+    ["--agent-name", { agentName: "robby" }],
     ["--tui", { tui: true }],
     ["--skip-ui", { skipUi: true }],
   ])("keeps %s on guided onboarding", async (_label, opts) => {
diff --git a/src/commands/onboard.ts b/src/commands/onboard.ts
index fd3d46473a5b..60a661253644 100644
--- a/src/commands/onboard.ts
+++ b/src/commands/onboard.ts
@@ -423,7 +423,7 @@ const GUIDED_SAFE_ONBOARD_KEYS = new Set([
   "reset",
   "resetScope",
   "nonInteractive",
-  "classic",
+  "agentName",
   "tui",
   "skipUi",
 ]);