Keep onboarding exclusive and preview controls on one row

.github/workflows/build.yml

@@ -84,11 +84,14 @@ jobs:
             runner: macos-15-intel
           - arch: arm64
             arch_tag: darwin-arm64
-            runner: macos-14
+            runner: macos-15
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Select Xcode for Icon Composer
+        run: sudo xcode-select --switch /Applications/Xcode_26.3.app/Contents/Developer
+
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:

.github/workflows/macos-release-candidate.yml

@@ -96,6 +96,9 @@ jobs:
           persist-credentials: false
           ref: ${{ needs.authorize-source.outputs.source_sha }}
 
+      - name: Select Xcode for Icon Composer
+        run: sudo xcode-select --switch /Applications/Xcode_26.3.app/Contents/Developer
+
       - name: Setup Node.js
         uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
         with:

.github/workflows/release.yml

@@ -127,6 +127,9 @@ jobs:
         with:
           ref: ${{ needs.prepare-release.outputs.source_sha }}
 
+      - name: Select Xcode for Icon Composer
+        run: sudo xcode-select --switch /Applications/Xcode_26.3.app/Contents/Developer
+
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
@@ -234,7 +237,7 @@ jobs:
     name: Build macOS arm64
     needs: prepare-release
     if: needs.prepare-release.outputs.release_scope == 'all'
-    runs-on: macos-14
+    runs-on: macos-15
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       APPLE_ID: ${{ secrets.APPLE_ID }}
@@ -246,6 +249,9 @@ jobs:
         with:
           ref: ${{ needs.prepare-release.outputs.source_sha }}
 
+      - name: Select Xcode for Icon Composer
+        run: sudo xcode-select --switch /Applications/Xcode_26.3.app/Contents/Developer
+
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:

README.md

@@ -192,7 +192,7 @@ PKGBUILD, desktop entry, release sync, and optional **local-from-source** packag
 
 ### Prerequisites
 
-**macOS:** Xcode Command Line Tools (`xcode-select --install`).
+**macOS:** Install Xcode Command Line Tools (`xcode-select --install`) for development. To package the app, select a full Xcode 26 or later installation with `xcode-select` so Electron Builder can compile the icon with `actool`. Xcode 26 requires macOS 15.6 or later.
 
 **Linux (Ubuntu/Debian):**
 

electron-builder.json5

@@ -86,7 +86,7 @@
         "arch": ["x64", "arm64"]
       }
     ],
-    "icon": "icons/icons/mac/icon.icns",
+    "icon": "icons/icons/mac/Recordly.icon",
     "artifactName": "${productName}-${arch}.${ext}",
     "extendInfo": {
       // The main app restores its Dock icon through desktopPresence. Declaring

electron/authStorage.test.ts

@@ -3,7 +3,7 @@ import os from "node:os";
 import path from "node:path";
 import { createClient } from "@supabase/supabase-js";
 import { safeStorage } from "electron";
-import { afterEach, beforeEach, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, expect, it, onTestFinished, vi } from "vitest";
 
 const native = vi.hoisted(() => ({
 	directory: "",
@@ -42,6 +42,30 @@ afterEach(async () => {
 	await fs.rm(native.directory, { recursive: true, force: true });
 });
 
+it("does not check Keychain on macOS until there are credentials to store", async () => {
+	const platform = Object.getOwnPropertyDescriptor(process, "platform")!;
+	Object.defineProperty(process, "platform", { ...platform, value: "darwin" });
+	const checkEncryption = vi.spyOn(safeStorage, "isEncryptionAvailable");
+	onTestFinished(() => {
+		checkEncryption.mockRestore();
+		Object.defineProperty(process, "platform", platform);
+	});
+	const key = "sb-recordlytest-auth-token";
+	expect(await invoke("available")).toBe(true);
+	await invoke("migrate", {});
+	expect(await invoke("get", key)).toBeNull();
+	await invoke("remove", key);
+	expect(checkEncryption).not.toHaveBeenCalled();
+	checkEncryption.mockReturnValue(false);
+	expect(await invoke("set", key, "session")).toBe(false);
+	await expect(
+		fs.stat(path.join(native.directory, "private-auth", "session.enc")),
+	).rejects.toMatchObject({ code: "ENOENT" });
+	checkEncryption.mockReturnValue(true);
+	await invoke("set", key, "session");
+	expect(await invoke("get", key)).toBe("session");
+});
+
 it("freshly reads another process's generation before reading, writing or migrating", async () => {
 	const key = "sb-recordlytest-auth-token";
 	await invoke("set", key, "old-session");

electron/authStorage.ts

@@ -137,12 +137,13 @@ function storagePath(): string {
 }
 
 async function load(): Promise<{ entries: AuthEntries; persisted: boolean }> {
-	if (!encryptionAvailable()) throw new Error("Secure authentication storage is unavailable.");
 	try {
 		const filePath = storagePath();
 		const stat = await fs.stat(filePath);
 		if (stat.size > MAX_STORE_LENGTH * 8)
 			throw new Error("Authentication storage is too large.");
+		if (!encryptionAvailable())
+			throw new Error("Secure authentication storage is unavailable.");
 		const payload = JSON.parse(safeStorage.decryptString(await fs.readFile(filePath)));
 		if (payload.version !== 1) throw new Error("Unsupported authentication storage version.");
 		return { entries: validateEntries(payload.entries), persisted: true };
@@ -157,8 +158,13 @@ async function load(): Promise<{ entries: AuthEntries; persisted: boolean }> {
 	}
 }
 
+class AuthEncryptionUnavailableError extends Error {}
+
 async function save(next: AuthEntries): Promise<void> {
 	const validated = validateEntries(next);
+	if (!encryptionAvailable()) {
+		throw new AuthEncryptionUnavailableError("Secure authentication storage is unavailable.");
+	}
 	const encrypted = safeStorage.encryptString(JSON.stringify({ version: 1, entries: validated }));
 	const filePath = storagePath();
 	const directory = path.dirname(filePath);
@@ -203,13 +209,24 @@ export function readNativeAuthStorageValue(key: string): Promise<string | null>
 }
 
 export function registerAuthStorageHandlers(flowHooks?: AuthFlowStorageHooks): void {
-	ipcMain.handle("auth-storage:available", (event) => {
+	ipcMain.handle("auth-storage:available", async (event) => {
 		assertTrustedRenderer(event);
+		if (process.platform === "darwin") {
+			try {
+				await fs.stat(storagePath());
+			} catch (error) {
+				// Checking safeStorage can prompt for Keychain access. Defer it until
+				// we have credentials to read or save.
+				if ((error as NodeJS.ErrnoException).code === "ENOENT") return true;
+				throw error;
+			}
+		}
 		return encryptionAvailable();
 	});
 	ipcMain.handle("auth-storage:migrate", (event, snapshot: unknown) => {
 		assertTrustedRenderer(event);
 		const validated = validateEntries(snapshot);
+		if (Object.keys(validated).length === 0) return;
 		return serialize(() =>
 			transaction(async () => {
 				const current = await load();
@@ -246,8 +263,9 @@ export function registerAuthStorageHandlers(flowHooks?: AuthFlowStorageHooks): v
 				completedCallback = { key, fingerprint: validated[key] };
 			}
 			try {
-				return await transaction(async () => {
-					const next = { ...(await load()).entries, ...validated };
+				const result = await transaction(async () => {
+					const current = await load();
+					const next = { ...current.entries, ...validated };
 					if (completedCallback)
 						for (const candidate of Object.keys(next)) {
 							if (
@@ -266,8 +284,22 @@ export function registerAuthStorageHandlers(flowHooks?: AuthFlowStorageHooks): v
 					);
 					for (const expired of retries.slice(0, -MAX_CONSENT_RETRIES))
 						delete next[expired];
-					await save(next);
+					try {
+						await save(next);
+					} catch (error) {
+						// Let the renderer use temporary sign-in only if there is no store to unlock.
+						if (
+							process.platform === "darwin" &&
+							!current.persisted &&
+							error instanceof AuthEncryptionUnavailableError
+						) {
+							return false as const;
+						}
+						throw error;
+					}
 				});
+				if (result === false) await rollback?.().catch(() => undefined);
+				return result;
 			} catch (error) {
 				await rollback?.().catch(() => undefined);
 				throw error;
@@ -279,9 +311,11 @@ export function registerAuthStorageHandlers(flowHooks?: AuthFlowStorageHooks): v
 		assertKey(key);
 		return serialize(async () => {
 			await transaction(async () => {
-				const next = { ...(await load()).entries };
-				delete next[key];
-				await save(next);
+				const { entries } = await load();
+				if (key in entries) {
+					delete entries[key];
+					await save(entries);
+				}
 				if (completedCallback?.key === key) completedCallback = undefined;
 			});
 			// The verifier is already removed durably. Optional route cleanup must

electron/electron-env.d.ts

@@ -242,7 +242,7 @@ interface Window {
 		authStorageAvailable: () => Promise<boolean>;
 		authStorageMigrate: (items: Record<string, string>) => Promise<void>;
 		authStorageGetItem: (key: string) => Promise<string | null>;
-		authStorageSetItem: (key: string, value: string) => Promise<void>;
+		authStorageSetItem: (key: string, value: string) => Promise<void | false>;
 		authStorageRemoveItem: (key: string) => Promise<void>;
 		hudOverlaySetIgnoreMouse: (ignore: boolean) => void;
 		hudOverlaySetSourceSelectionActive: (active: boolean) => void;

electron/main.ts

@@ -727,13 +727,12 @@ function getTrayIcon(filename: string) {
 }
 
 function syncDockIcon() {
-	if (process.platform !== "darwin" || !app.dock) {
+	// The packaged app uses the native icon from its macOS bundle.
+	if (process.platform !== "darwin" || app.isPackaged || !app.dock) {
 		return;
 	}
 
-	const dockIcon = getAppImage(
-		IS_DEV ? "app-icons/recordly-solid-blue-512.png" : getPlatformAppIconFilename(512),
-	);
+	const dockIcon = getAppImage("app-icons/recordly-solid-blue-512.png");
 	if (!dockIcon.isEmpty()) {
 		app.dock.setIcon(dockIcon);
 	}

electron/onboardingWindow.test.ts

@@ -2,7 +2,13 @@ import { EventEmitter } from "node:events";
 import { beforeEach, expect, it, onTestFinished, vi } from "vitest";
 
 const electron = vi.hoisted(() => ({
-	app: { isPackaged: false, isReady: () => true, focus: vi.fn() },
+	app: {
+		isPackaged: false,
+		isReady: () => true,
+		focus: vi.fn(),
+		on: vi.fn(),
+		removeListener: vi.fn(),
+	},
 	ipcMain: { on: vi.fn(), handle: vi.fn() },
 	screen: {
 		getPrimaryDisplay: () => {
@@ -18,6 +24,8 @@ class FakeWindow extends EventEmitter {
 		return windows;
 	}
 	destroyed = false;
+	visible = false;
+	preventClose = false;
 	url = "";
 	webContents = Object.assign(new EventEmitter(), {
 		isDestroyed: () => this.destroyed,
@@ -28,14 +36,21 @@ class FakeWindow extends EventEmitter {
 	});
 	setBounds = vi.fn();
 	getBounds = () => ({ x: 1600, y: 10, width: 500, height: 500 });
-	show = vi.fn();
+	show = vi.fn(() => {
+		this.visible = true;
+		this.emit("show");
+	});
+	hide = vi.fn(() => {
+		this.visible = false;
+	});
 	focus = vi.fn();
 	moveTop = vi.fn();
 	setMenu = vi.fn();
 	isMinimized = () => false;
-	isVisible = () => this.show.mock.calls.length > 0;
+	isVisible = () => this.visible;
 	isDestroyed = () => this.destroyed;
 	close = vi.fn(() => {
+		if (this.preventClose) return;
 		this.destroyed = true;
 		this.emit("closed");
 	});
@@ -64,11 +79,49 @@ vi.mock("./rendererServer", () => ({ getPackagedRendererBaseUrl: () => "http://l
 
 beforeEach(() => {
 	vi.resetModules();
+	vi.clearAllMocks();
 	windows.length = 0;
 	electron.app.isPackaged = false;
 	vi.stubEnv("VITE_DEV_SERVER_URL", "http://localhost:5173");
 });
 
+it("preserves existing work without closing its window and suppresses attempts to show it", async () => {
+	const { showOnboardingWindow, closeOnboardingWindow } = await import("./windows");
+	const editor = new FakeWindow();
+	editor.preventClose = true;
+	editor.show();
+	showOnboardingWindow();
+	expect(editor.close).not.toHaveBeenCalled();
+	expect(editor.isDestroyed()).toBe(false);
+	expect(editor.isVisible()).toBe(false);
+	editor.show();
+	expect(editor.isVisible()).toBe(false);
+	closeOnboardingWindow();
+	expect(editor.isVisible()).toBe(true);
+	editor.show();
+	expect(editor.isVisible()).toBe(true);
+});
+
+it("suppresses late-created windows until onboarding closes", async () => {
+	const { showOnboardingWindow, closeOnboardingWindow } = await import("./windows");
+	showOnboardingWindow();
+	const lateWindow = new FakeWindow();
+	const [, onCreated] = electron.app.on.mock.calls.find(
+		([event]) => event === "browser-window-created",
+	)!;
+	onCreated({}, lateWindow);
+	lateWindow.show();
+	expect(lateWindow.isVisible()).toBe(false);
+	lateWindow.visible = true;
+	lateWindow.emit("restore");
+	expect(lateWindow.isVisible()).toBe(false);
+	closeOnboardingWindow();
+	expect(electron.app.removeListener).toHaveBeenCalledWith("browser-window-created", onCreated);
+	expect(lateWindow.isVisible()).toBe(true);
+	lateWindow.show();
+	expect(lateWindow.isVisible()).toBe(true);
+});
+
 it("replays only the reveal, keeps existing windows open, and lets it play again", async () => {
 	const { getOnboardingWindow, replayOnboardingIntro } = await import("./windows");
 	const editor = new FakeWindow();
@@ -100,13 +153,16 @@ it("replays only the reveal, keeps existing windows open, and lets it play again
 	expect(windows.at(-1)?.isDestroyed()).toBe(true);
 });
 
-it("closes every other app window and loads the dev preview", async () => {
+it("hides every other app window and loads the dev preview", async () => {
 	const { focusOnboardingWindow, showOnboardingWindow } = await import("./windows");
 	const editor = new FakeWindow();
 	const hud = new FakeWindow();
 	const selector = new FakeWindow();
 	const onboarding = showOnboardingWindow({ preview: true }) as unknown as FakeWindow;
-	for (const other of [editor, hud, selector]) expect(other.close).toHaveBeenCalledOnce();
+	for (const other of [editor, hud, selector]) {
+		expect(other.hide).toHaveBeenCalled();
+		expect(other.close).not.toHaveBeenCalled();
+	}
 	expect(onboarding.isDestroyed()).toBe(false);
 	expect(onboarding.loadURL).toHaveBeenCalledWith(
 		"http://localhost:5173?windowType=onboarding&onboardingPreview=1",
@@ -120,12 +176,12 @@ it("closes every other app window and loads the dev preview", async () => {
 	}
 });
 
-it("restarts an existing onboarding preview and closes newly opened windows", async () => {
+it("restarts an existing onboarding preview and hides newly opened windows", async () => {
 	const { showOnboardingWindow } = await import("./windows");
 	const onboarding = showOnboardingWindow() as unknown as FakeWindow;
 	const other = new FakeWindow();
 	expect(showOnboardingWindow({ preview: true })).toBe(onboarding);
-	expect(other.close).toHaveBeenCalledOnce();
+	expect(other.hide).toHaveBeenCalled();
 	expect(onboarding.loadURL).toHaveBeenLastCalledWith(
 		"http://localhost:5173?windowType=onboarding&onboardingPreview=1",
 	);
@@ -161,7 +217,7 @@ it.each([
 	expect(onboarding.loadURL).toHaveBeenCalledTimes(1);
 	expect(onboarding.show).toHaveBeenCalled();
 	expect(onboarding.focus).toHaveBeenCalled();
-	expect(other.close).toHaveBeenCalledOnce();
+	expect(other.hide).toHaveBeenCalled();
 });
 
 it.each([