Desktop boot: show a window immediately and self-heal stale launchd state

Two boot-time fixes in the desktop main process: Show a lightweight "Starting Executor" window at app.whenReady, before any service or sidecar work, then load the real web UI into the same window once the connection resolves (no second-window flash). A pending second-instance now focuses that startup window instead of no-opping while connection is null. Classify the supervised service by both registered and running instead of ignoring the running signal: - registered and running: attach; only kick if the attach still misses it. - registered but not running (the stale plist/unit/task case): restart, and if the OS manager cannot start it, reinstall the service (install is already idempotent) before waiting. If install also fails, fall back to managed spawn immediately. The 15s attach wait is only paid after a kick or install actually succeeds, so a stale registration no longer costs a dead wait.

Rhys Sullivan committed 4 months ago

Commit 5023a2a1 parent 7f618052 files · +199 −45Browse files

Unified · Split

2 files

apps/desktop/src/main/crash-screen.ts +98 −0
apps/desktop/src/main/index.ts +101 −45

apps/desktop/src/main/crash-screen.ts+98−0

@@ -11,6 +11,104 @@ export interface CrashScreenOptions { · 10 unmodified lines
11	readonly reported: boolean;	11	readonly reported: boolean;
12	}	12	}
13		13
		14	export const startupWindowHtml = (): string => `<!doctype html>
		15	<html>
		16	<head>
		17	<meta charset="utf-8" />
		18	<title>Executor</title>
		19	<style>
		20	:root {
		21	color-scheme: light dark;
		22	--background: #0a0a0a;
		23	--foreground: #fafafa;
		24	--muted: #a1a1aa;
		25	--line: #27272a;
		26	--pulse: #fafafa;
		27	}
		28	@media (prefers-color-scheme: light) {
		29	:root {
		30	--background: #f7f7f4;
		31	--foreground: #18181b;
		32	--muted: #60646c;
		33	--line: #d8d8d0;
		34	--pulse: #18181b;
		35	}
		36	}
		37	body {
		38	margin: 0;
		39	min-height: 100vh;
		40	display: grid;
		41	place-items: center;
		42	background: var(--background);
		43	color: var(--foreground);
		44	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
		45	}
		46	main {
		47	width: min(22rem, calc(100vw - 4rem));
		48	display: grid;
		49	gap: 1rem;
		50	justify-items: center;
		51	text-align: center;
		52	}
		53	.mark {
		54	width: 2.25rem;
		55	height: 2.25rem;
		56	border: 1px solid var(--line);
		57	border-radius: 8px;
		58	display: grid;
		59	place-items: center;
		60	font-size: 0.82rem;
		61	font-weight: 650;
		62	letter-spacing: 0;
		63	}
		64	h1 {
		65	margin: 0;
		66	font-size: 1.05rem;
		67	font-weight: 600;
		68	letter-spacing: 0;
		69	}
		70	p {
		71	margin: -0.35rem 0 0;
		72	color: var(--muted);
		73	font-size: 0.82rem;
		74	line-height: 1.5;
		75	}
		76	.activity {
		77	width: 8rem;
		78	height: 2px;
		79	overflow: hidden;
		80	border-radius: 999px;
		81	background: var(--line);
		82	}
		83	.activity::after {
		84	content: "";
		85	display: block;
		86	width: 45%;
		87	height: 100%;
		88	border-radius: inherit;
		89	background: var(--pulse);
		90	animation: slide 1.15s ease-in-out infinite;
		91	}
		92	@keyframes slide {
		93	0% { transform: translateX(-110%); opacity: 0.35; }
		94	50% { opacity: 0.9; }
		95	100% { transform: translateX(245%); opacity: 0.35; }
		96	}
		97	@media (prefers-reduced-motion: reduce) {
		98	.activity::after { animation: none; transform: none; width: 100%; opacity: 0.55; }
		99	}
		100	</style>
		101	</head>
		102	<body>
		103	<main>
		104	<div class="mark">Ex</div>
		105	<h1>Starting Executor…</h1>
		106	<p>Preparing your local workspace.</p>
		107	<div class="activity" aria-hidden="true"></div>
		108	</main>
		109	</body>
		110	</html>`;
		111
14	export const sidecarCrashHtml = ({ reported }: CrashScreenOptions): string => `<!doctype html>	112	export const sidecarCrashHtml = ({ reported }: CrashScreenOptions): string => `<!doctype html>
15	<html>	113	<html>
16	<head>	114	<head>

apps/desktop/src/main/index.ts+101−45

   initErrorReporting,
   reportAProblem,
 } from "./diagnostics";
-import { sidecarCrashHtml } from "./crash-screen";
+import { sidecarCrashHtml, startupWindowHtml } from "./crash-screen";
 import { replaceSupervisedDaemonForDesktop } from "./supervised-connection";
 import {
   bundledExecutorPath,
   return url.toString();
 };
+const htmlDataUrl = (html: string): string =>
+  `data:text/html;charset=utf-8,${encodeURIComponent(html)}`;
 // The supervised daemon (and the desktop sidecar) own this data dir — the same
 // path the CLI's `executor web`/daemon uses, so desktop and CLI share state.
 const DESKTOP_DATA_DIR = join(homedir(), ".executor");
   return response === 0;
 };
+const acceptSupervisedConnection = async (
+  attached: SidecarConnection,
+): Promise<SidecarConnection | null> => {
+  if (!shouldReplaceDaemonForDesktop(attached)) return attached;
+  const settings = getServerSettings();
+  return replaceSupervisedDaemonForDesktop(attached, {
+    install: () =>
+      installSupervisedService({
+        port: settings.port,
+        dataDir: DESKTOP_DATA_DIR,
+      }),
+    waitForAttach: () => waitForSupervisedAttach(30_000, { port: settings.port }),
+    attach: attachToSupervisedDaemon,
+    onInstallFailure: (error) => {
+      log.warn("Failed to replace older supervised daemon; re-checking before falling back", error);
+    },
+  });
+};
+const installSupervisedAndWait = async (reason: string): Promise<SidecarConnection | null> => {
+  const settings = getServerSettings();
+  // oxlint-disable-next-line executor/no-try-catch-or-throw -- boundary: install failure falls back to managed-spawn so the app still launches
+  try {
+    await installSupervisedService({
+      port: settings.port,
+      dataDir: DESKTOP_DATA_DIR,
+    });
+  } catch (error) {
+    log.warn(`Failed to install supervised service after ${reason}; using managed sidecar`, error);
+    return null;
+  }
+  return waitForSupervisedAttach(15_000, { port: settings.port });
+};
 /**
  * Resolve a connection to the OS-supervised daemon, installing it on first run
  * (with consent). Returns null when supervision is unavailable or the user
   // 1. Already running → attach.
   const attached = await attachToSupervisedDaemon();
   if (attached) {
-    if (!shouldReplaceDaemonForDesktop(attached)) return attached;
+    return acceptSupervisedConnection(attached);
-    const settings = getServerSettings();
-    return replaceSupervisedDaemonForDesktop(attached, {
-      install: () =>
-        installSupervisedService({
-          port: settings.port,
-          dataDir: DESKTOP_DATA_DIR,
-        }),
-      waitForAttach: () => waitForSupervisedAttach(30_000, { port: settings.port }),
-      attach: attachToSupervisedDaemon,
-      onInstallFailure: (error) => {
-        log.warn(
-          "Failed to replace older supervised daemon; re-checking before falling back",
-          error,
-        );
-      },
-    });
   }
   // Headless/e2e: the first-run background-service prompt and the systemd/
   const status = await supervisedServiceStatus();
   if (!status.supported) return null;
-  // 2. Registered but not currently serving → kick it and wait.
+  // 2. Registered and running, but the first attach missed it. Kick once and
+  // wait only when the kick command succeeds.
   if (status.registered) {
-    // oxlint-disable-next-line executor/no-try-catch-or-throw -- boundary: a restart failure just falls through to managed-spawn
+    if (status.running) {
+      const attachedAfterStatus = await attachToSupervisedDaemon();
+      if (attachedAfterStatus) return acceptSupervisedConnection(attachedAfterStatus);
+      // oxlint-disable-next-line executor/no-try-catch-or-throw -- boundary: a restart failure just falls through to managed-spawn
+      try {
+        await restartSupervisedService();
+      } catch (error) {
+        log.warn(
+          "Failed to restart running supervised service after attach failed; using managed sidecar",
+          error,
+        );
+        return null;
+      }
+      return waitForSupervisedAttach(15_000);
+    }
+    // 3. Registered but not running usually means a stale plist/unit/task. Try
+    // restart first, then reinstall the service if the OS manager cannot start it.
+    // oxlint-disable-next-line executor/no-try-catch-or-throw -- boundary: restart failure triggers supervised service self-heal
     try {
       await restartSupervisedService();
     } catch (error) {
-      log.warn("Failed to kickstart supervised service", error);
+      log.warn("Failed to restart registered supervised service; reinstalling", error);
+      return installSupervisedAndWait("registered service restart failure");
     }
     return waitForSupervisedAttach(15_000);
   }
-  // 3. First run → ask, then install + start. The unit carries no secret; the
+  // 4. First run → ask, then install + start. The unit carries no secret; the
   // supervised daemon mints/loads its bearer from auth.json under DESKTOP_DATA_DIR.
   if (!(await confirmEnableBackgroundService())) return null;
-  const settings = getServerSettings();
+  return installSupervisedAndWait("first-run prompt");
-  // oxlint-disable-next-line executor/no-try-catch-or-throw -- boundary: install failure falls back to managed-spawn so the app still launches
-  try {
-    await installSupervisedService({
-      port: settings.port,
-      dataDir: DESKTOP_DATA_DIR,
-    });
-  } catch (error) {
-    log.error("Failed to install supervised service; using managed sidecar", error);
-    return null;
-  }
-  return waitForSupervisedAttach(15_000);
 };
 // Crash monitor for the supervised daemon: the OS service manager restarts it
         if (supervisedMonitorMisses < SUPERVISED_MONITOR_MISSES_BEFORE_DOWN) return;
         if (!supervisedDaemonDown && window) {
           supervisedDaemonDown = true;
-          const html = sidecarCrashHtml({ reported: errorReportingEnabled });
+          showCrashScreen(window);
-          void window.loadURL(`data:text/html;charset=utf-8,${encodeURIComponent(html)}`);
         }
         return;
       }
   log.info(`[dock-icon] set to ${iconPath} (${image.getSize().width}×${image.getSize().height})`);
 };
-const createWindow = async (conn: SidecarConnection) => {
+const createMainBrowserWindow = (options: { readonly show: boolean }): BrowserWindow => {
   const windowState = windowStateKeeper({
     defaultWidth: 1280,
     defaultHeight: 800,
   });
-  installBearerAuthHeader(conn.baseUrl, conn.authToken);
   const linuxIcon = resolveLinuxIcon();
   const window = new BrowserWindow({
     // header, which is offset to clear them (.desktop-macos-titlebar).
     minWidth: 768,
     minHeight: 480,
-    show: false,
+    show: options.show,
     backgroundColor: "#0a0a0a",
     autoHideMenuBar: true,
     ...(process.platform === "darwin"
     return { action: "deny" };
   });
+  return window;
+};
+const showStartupWindow = async (): Promise<void> => {
+  const window = liveMainWindow() ?? createMainBrowserWindow({ show: true });
+  if (window.isMinimized()) window.restore();
+  if (!window.isVisible()) window.show();
+  window.focus();
+  // oxlint-disable-next-line executor/no-try-catch-or-throw -- boundary: local startup HTML should not block service startup
+  try {
+    await window.loadURL(htmlDataUrl(startupWindowHtml()));
+  } catch (error) {
+    log.warn("Failed to load startup window", error);
+  }
+};
+const showCrashScreen = (window: BrowserWindow | null = liveMainWindow()): void => {
+  if (!window) return;
+  const html = sidecarCrashHtml({ reported: errorReportingEnabled });
+  void window.loadURL(htmlDataUrl(html));
+};
+const createWindow = async (conn: SidecarConnection) => {
+  installBearerAuthHeader(conn.baseUrl, conn.authToken);
+  const existingWindow = liveMainWindow();
+  const window = existingWindow ?? createMainBrowserWindow({ show: false });
   // A supervised daemon can pass the health probe and still disappear before
   // navigation begins. Treat that as a failed connection instead of leaving the
   // user with a visible BrowserWindow that only shows the black background.
   // oxlint-disable-next-line executor/no-try-catch-or-throw -- boundary: Electron navigation rejects when the sidecar vanishes during startup
   try {
     await window.loadURL(webUrlForConnection(conn));
+    if (!window.isDestroyed() && !window.isVisible()) window.show();
   } catch (error) {
     log.error("Failed to load Executor web UI", error);
-    destroyWindow(window);
+    if (!existingWindow) destroyWindow(window);
     // oxlint-disable-next-line executor/no-try-catch-or-throw -- boundary: caller decides whether to fall back or surface startup failure
     throw error;
   }
 // here, the boot-time update check never runs (it sits after a successful
 // sidecar start), so a broken app could never self-update its way out.
 const handleFatalSidecarFailure = async (error: unknown) => {
+  showCrashScreen();
   if (app.isPackaged) {
     // Install whatever finishes downloading by the time the user quits the
     // failure dialog; if it downloads while the dialog is open, the regular
 const boot = async () => {
   installDockIcon();
   installApplicationMenu();
+  await showStartupWindow();
   setupAutoUpdater();
   applyFakeUpdateFromEnv();
   registerIpcHandlers();
   // every request with no explanation. Swap in the crash screen — its
   // buttons drive the regular preload bridge (restart / export diagnostics).
   onUnexpectedSidecarExit(() => {
-    const window = liveMainWindow();
+    showCrashScreen();
-    if (!window) return;
-    const html = sidecarCrashHtml({ reported: errorReportingEnabled });
-    void window.loadURL(`data:text/html;charset=utf-8,${encodeURIComponent(html)}`);
     // A crashing sidecar may be a broken release — quietly stage any
     // available update so the install prompt appears on its own (same
     // self-heal as the fatal startup path).

Desktop boot: show a window immediately and self-heal stale launchd state

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code