fix(init): handle Ctrl+C gracefully across the init wizard

Catch WizardCancelledError in preamble and update the suspend loop
to exit with code 0 (not 1) on user cancellation. Replace
abortIfCancelled in git checks with isCancel to return false instead
of throwing. Report cancellations to Sentry for telemetry.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: betegon

src/lib/init/git.ts

@@ -6,8 +6,7 @@
  */
 
 import { execFileSync } from "node:child_process";
-import { confirm, log } from "@clack/prompts";
-import { abortIfCancelled } from "./clack-utils.js";
+import { confirm, isCancel, log } from "@clack/prompts";
 
 export function isInsideGitWorkTree(opts: { cwd: string }): boolean {
   try {
@@ -61,7 +60,9 @@ export async function checkGitStatus(opts: {
       message:
         "You are not inside a git repository. Unable to revert changes if something goes wrong. Continue?",
     });
-    abortIfCancelled(proceed);
+    if (isCancel(proceed)) {
+      return false;
+    }
     return !!proceed;
   }
 
@@ -78,7 +79,9 @@ export async function checkGitStatus(opts: {
     const proceed = await confirm({
       message: "Continue with uncommitted changes?",
     });
-    abortIfCancelled(proceed);
+    if (isCancel(proceed)) {
+      return false;
+    }
     return !!proceed;
   }
 

src/lib/init/wizard-runner.ts

@@ -9,6 +9,7 @@
 import { randomBytes } from "node:crypto";
 import { cancel, confirm, intro, log, spinner } from "@clack/prompts";
 import { MastraClient } from "@mastra/client-js";
+import { captureException } from "@sentry/bun";
 import { formatBanner } from "../banner.js";
 import { CLI_VERSION } from "../constants.js";
 import { getAuthToken } from "../db/auth.js";
@@ -208,7 +209,17 @@ async function preamble(
   process.stderr.write(`\n${formatBanner()}\n\n`);
   intro("sentry init");
 
-  const confirmed = await confirmExperimental(yes);
+  let confirmed: boolean;
+  try {
+    confirmed = await confirmExperimental(yes);
+  } catch (err) {
+    if (err instanceof WizardCancelledError) {
+      captureException(err);
+      process.exitCode = 0;
+      return false;
+    }
+    throw err;
+  }
   if (!confirmed) {
     cancel("Setup cancelled.");
     process.exitCode = 0;
@@ -335,7 +346,8 @@ export async function runWizard(options: WizardOptions): Promise<void> {
     }
   } catch (err) {
     if (err instanceof WizardCancelledError) {
-      process.exitCode = 1;
+      captureException(err);
+      process.exitCode = 0;
       return;
     }
     if (spinState.running) {

test/lib/init/git.test.ts

@@ -26,19 +26,24 @@ const noop = () => {
 
 let execFileSyncSpy: ReturnType<typeof spyOn>;
 let confirmSpy: ReturnType<typeof spyOn>;
+let isCancelSpy: ReturnType<typeof spyOn>;
 let logWarnSpy: ReturnType<typeof spyOn>;
 
 // ── Setup / Teardown ────────────────────────────────────────────────────────
 
 beforeEach(() => {
   execFileSyncSpy = spyOn(cp, "execFileSync");
   confirmSpy = spyOn(clack, "confirm").mockResolvedValue(true);
+  isCancelSpy = spyOn(clack, "isCancel").mockImplementation(
+    (v: unknown) => v === Symbol.for("cancel")
+  );
   logWarnSpy = spyOn(clack.log, "warn").mockImplementation(noop);
 });
 
 afterEach(() => {
   execFileSyncSpy.mockRestore();
   confirmSpy.mockRestore();
+  isCancelSpy.mockRestore();
   logWarnSpy.mockRestore();
 });
 
@@ -133,6 +138,17 @@ describe("checkGitStatus", () => {
     expect(result).toBe(false);
   });
 
+  test("returns false without throwing when user cancels not-in-git-repo prompt", async () => {
+    execFileSyncSpy.mockImplementation(() => {
+      throw new Error("not a git repo");
+    });
+    confirmSpy.mockResolvedValue(Symbol.for("cancel"));
+
+    const result = await checkGitStatus({ cwd: "/tmp", yes: false });
+
+    expect(result).toBe(false);
+  });
+
   test("warns and auto-continues when not in git repo with --yes", async () => {
     execFileSyncSpy.mockImplementation(() => {
       throw new Error("not a git repo");
@@ -179,6 +195,17 @@ describe("checkGitStatus", () => {
     expect(result).toBe(false);
   });
 
+  test("returns false without throwing when user cancels dirty-tree prompt", async () => {
+    execFileSyncSpy
+      .mockReturnValueOnce(Buffer.from("true\n"))
+      .mockReturnValueOnce(Buffer.from(" M dirty.ts\n"));
+    confirmSpy.mockResolvedValue(Symbol.for("cancel"));
+
+    const result = await checkGitStatus({ cwd: "/tmp", yes: false });
+
+    expect(result).toBe(false);
+  });
+
   test("warns with file list and auto-continues for dirty tree with --yes", async () => {
     execFileSyncSpy
       .mockReturnValueOnce(Buffer.from("true\n"))

test/lib/init/wizard-runner.test.ts

@@ -55,6 +55,7 @@ function makeOptions(overrides?: Partial<WizardOptions>): WizardOptions {
 // ── Spy declarations ────────────────────────────────────────────────────────
 
 // clack
+let isCancelSpy: ReturnType<typeof spyOn>;
 let introSpy: ReturnType<typeof spyOn>;
 let confirmSpy: ReturnType<typeof spyOn>;
 let logInfoSpy: ReturnType<typeof spyOn>;
@@ -129,6 +130,9 @@ beforeEach(() => {
   process.exitCode = 0;
 
   // clack spies
+  isCancelSpy = spyOn(clack, "isCancel").mockImplementation(
+    (v: unknown) => v === Symbol.for("cancel")
+  );
   introSpy = spyOn(clack, "intro").mockImplementation(noop);
   confirmSpy = spyOn(clack, "confirm").mockResolvedValue(true);
   logInfoSpy = spyOn(clack.log, "info").mockImplementation(noop);
@@ -171,6 +175,7 @@ beforeEach(() => {
 });
 
 afterEach(() => {
+  isCancelSpy.mockRestore();
   introSpy.mockRestore();
   confirmSpy.mockRestore();
   logInfoSpy.mockRestore();
@@ -264,6 +269,29 @@ describe("runWizard", () => {
       expect(formatResultSpy).toHaveBeenCalled();
     });
 
+    test("exits cleanly when user presses Ctrl+C on experimental warning", async () => {
+      const origIsTTY = process.stdin.isTTY;
+      Object.defineProperty(process.stdin, "isTTY", {
+        value: true,
+        configurable: true,
+      });
+
+      confirmSpy.mockResolvedValue(Symbol.for("cancel"));
+
+      await runWizard(makeOptions({ yes: false }));
+
+      Object.defineProperty(process.stdin, "isTTY", {
+        value: origIsTTY,
+        configurable: true,
+      });
+
+      expect(cancelSpy).toHaveBeenCalledWith(
+        expect.stringContaining("Setup cancelled")
+      );
+      expect(process.exitCode).toBe(0);
+      expect(formatResultSpy).not.toHaveBeenCalled();
+    });
+
     test("exits cleanly when user declines experimental warning", async () => {
       const origIsTTY = process.stdin.isTTY;
       Object.defineProperty(process.stdin, "isTTY", {