Merge pull request #302 from aidxun/aidxun/fix-quit-helmor-onboarding

fix: enable quit flow during onboarding

Author: natllian

.changeset/quiet-badgers-quit.md

@@ -0,0 +1,5 @@
+---
+"helmor": patch
+---
+
+Fix Quit Helmor from the macOS app menu during onboarding so the app exits normally before the main workspace shell is loaded.

src/App.shortcuts.test.tsx

@@ -1,3 +1,4 @@
+import { invoke } from "@tauri-apps/api/core";
 import {
 	cleanup,
 	fireEvent,
@@ -955,6 +956,35 @@ describe("App global navigation shortcuts", () => {
 		});
 	});
 
+	it("quits from onboarding when Rust emits quit-requested", async () => {
+		const invokeMock = vi.mocked(invoke);
+		const baseInvokeImpl = invokeMock.getMockImplementation();
+		invokeMock.mockImplementation(
+			async (command: string, ...args: unknown[]) => {
+				if (command === "get_app_settings") {
+					return {
+						"app.onboarding_completed": "false",
+					};
+				}
+				return baseInvokeImpl?.(command, args[0] as undefined);
+			},
+		);
+
+		try {
+			apiMocks.requestQuit.mockReset();
+			render(<App />);
+			await screen.findByLabelText("Helmor onboarding");
+
+			emitTauriEvent("helmor://quit-requested");
+
+			await waitFor(() => {
+				expect(apiMocks.requestQuit).toHaveBeenCalledWith(false);
+			});
+		} finally {
+			invokeMock.mockImplementation(baseInvokeImpl ?? (async () => undefined));
+		}
+	});
+
 	it("closes the current session when macOS emits the close-current-session event", async () => {
 		await renderAppReady();
 

src/App.tsx

@@ -137,6 +137,7 @@ import { StreamingFooterOverlapScenario } from "./test/e2e-scenarios/streaming-f
 
 const SETTINGS_RELOAD_EVENT = "helmor:reload-settings";
 const OPEN_SETTINGS_EVENT = "helmor:open-settings";
+const EMPTY_SENDING_SESSION_IDS = new Set<string>();
 
 function App() {
 	const e2eScenario =
@@ -306,7 +307,10 @@ function MainApp() {
 				}}
 			>
 				{appSettings === null ? null : !appSettings.onboardingCompleted ? (
-					<AppOnboarding onComplete={completeOnboarding} />
+					<>
+						<AppOnboarding onComplete={completeOnboarding} />
+						<QuitConfirmDialog sendingSessionIds={EMPTY_SENDING_SESSION_IDS} />
+					</>
 				) : (
 					<AppShell
 						onOpenSettings={(workspaceId, workspaceRepoId) => {