claude-code-session-manager 0.17.2 → 0.17.3

package/src/main/index.cjs

@@ -276,6 +276,7 @@ async function rebootApp() {
     logReboot('falling back to app.relaunch()');
     app.relaunch();
   }
+  runShutdownCleanup();   // app.exit bypasses will-quit
   app.exit(0);
 }
 
@@ -338,6 +339,7 @@ function createWindow() {
     // instead of blindly trying http://localhost:5173, which would (a) load
     // remote content and (b) almost always fail in a packaged install.
     console.error('[main] dist/index.html missing and SM_DEV is not set — refusing to load remote content. Reinstall or set SM_DEV=1 for dev.');
+    runShutdownCleanup();   // app.exit bypasses will-quit
     app.exit(1);
     return;
   }
@@ -732,7 +734,13 @@ app.whenReady().then(async () => {
   // uncleanly (the silent OOM-kill we've been chasing), then starts the memory
   // heartbeat + render/child-process-gone hooks for this run. See
   // crashDiagnostics.cjs for the full rationale.
-  crashDiagnostics.init({ logs, getPowerBlockerId: () => powerBlockerId });
+  crashDiagnostics.init({
+    logs,
+    getPowerBlockerId: () => powerBlockerId,
+    // If a suspend ever fires while we're alive, the OS lock lapsed — re-assert
+    // our block-mode systemd-inhibit so the next idle window stays covered.
+    onSuspendWhileAlive: () => { stopSystemdInhibit(); startSystemdInhibit(); },
+  });
 
   // Boot-time detection 1: surface `claude` binary resolution so a missing
   // install becomes visible to the renderer instead of failing silently on
@@ -941,7 +949,15 @@ app.whenReady().then(async () => {
     });
 });
 
-app.on('will-quit', () => {
+// Centralized teardown. `will-quit` fires on a normal quit, but `app.exit()`
+// (in-app reboot, dist-missing abort) bypasses will-quit entirely — so those
+// sites must call this directly, otherwise markCleanShutdown never runs and the
+// next boot misreports a clean reboot as an UNCLEAN OOM crash, and the
+// powerSaveBlocker/inhibitor leak until process death.
+let teardownDone = false;
+function runShutdownCleanup() {
+  if (teardownDone) return;          // idempotent — will-quit may still fire after an app.exit path
+  teardownDone = true;
   // Mark a clean exit so the next boot can distinguish a graceful quit from an
   // OOM-kill / native crash (which leaves the sentinel `open`).
   crashDiagnostics.markCleanShutdown();
@@ -953,7 +969,9 @@ app.on('will-quit', () => {
     powerBlockerId = -1;
   }
   stopSystemdInhibit();
-});
+}
+
+app.on('will-quit', runShutdownCleanup);
 
 app.on('window-all-closed', () => {
   if (rebooting) return; // new window is about to be created