From 7264fe3890abe2eb9cbf3ff7e5448f11cf5b3c5a Mon Sep 17 00:00:00 2001
From: Amp <amp@ampcode.com>
Date: Fri, 21 Aug 2026 09:09:35 +0000
Subject: [PATCH] fix(cli): make setup conflict error actionable

---
 src/cli/program/register.setup.test.ts | 2 +-
 src/cli/program/register.setup.ts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cli/program/register.setup.test.ts b/src/cli/program/register.setup.test.ts
index 709f2c72095f..50fc2990677c 100644
--- a/src/cli/program/register.setup.test.ts
+++ b/src/cli/program/register.setup.test.ts
@@ -157,7 +157,7 @@ describe("registerSetupCommand", () => {
     await runCli(["setup", ...args]);
 
     expect(runtime.error).toHaveBeenCalledWith(
-      `${flag} cannot be combined with onboarding options.`,
+      `${flag} cannot be combined with onboarding options. Rerun with either --message/--yes or onboarding options, not both.`,
     );
     expect(runtime.exit).toHaveBeenCalledWith(1);
     expect(readConfigFileSnapshotMock).not.toHaveBeenCalled();
diff --git a/src/cli/program/register.setup.ts b/src/cli/program/register.setup.ts
index bc612e3860f4..f02fa7b90539 100644
--- a/src/cli/program/register.setup.ts
+++ b/src/cli/program/register.setup.ts
@@ -261,7 +261,7 @@ export function registerSetupCommand(program: Command): void {
           .map((option) => option.long ?? option.short ?? option.flags)
           .toSorted();
         defaultRuntime.error(
-          `${systemAgentFlags.join(", ")} cannot be combined with onboarding options.`,
+          `${systemAgentFlags.join(", ")} cannot be combined with onboarding options. Rerun with either --message/--yes or onboarding options, not both.`,
         );
         defaultRuntime.exit(1);
         return;