fix: replace intrusive update modal with toast and fix double-restart bug (#841)

Author: k11kirky

apps/twig/src/main/services/app-lifecycle/service.ts

@@ -34,6 +34,51 @@ export class AppLifecycleService {
     process.exit(1);
   }
 
+  async cleanupForUpdate(): Promise<void> {
+    log.info("Cleanup for update started");
+
+    // Shut down watchers
+    log.info("Shutting down native watchers");
+    try {
+      const watcherRegistry = container.get<WatcherRegistryService>(
+        MAIN_TOKENS.WatcherRegistryService,
+      );
+      await watcherRegistry.shutdownAll();
+    } catch (error) {
+      log.warn("Failed to shutdown watcher registry", error);
+    }
+
+    // Kill all tracked processes
+    try {
+      const processTracking = container.get<ProcessTrackingService>(
+        MAIN_TOKENS.ProcessTrackingService,
+      );
+      const snapshot = await processTracking.getSnapshot(true);
+      log.info("Process snapshot before update", {
+        tracked: {
+          shell: snapshot.tracked.shell.length,
+          agent: snapshot.tracked.agent.length,
+          child: snapshot.tracked.child.length,
+        },
+      });
+
+      if (
+        snapshot.tracked.shell.length +
+          snapshot.tracked.agent.length +
+          snapshot.tracked.child.length >
+        0
+      ) {
+        log.info("Killing all tracked processes before update");
+        processTracking.killAll();
+      }
+    } catch (error) {
+      log.warn("Failed to kill processes before update", error);
+    }
+
+    // Skip container unbind, PostHog shutdown - app is restarting anyway
+    log.info("Cleanup for update complete");
+  }
+
   async shutdown(): Promise<void> {
     if (this._isShuttingDown) {
       log.warn("Shutdown already in progress, forcing exit");

apps/twig/src/main/services/updates/service.test.ts

@@ -17,6 +17,7 @@ const { mockApp, mockAutoUpdater, mockLifecycleService } = vi.hoisted(() => ({
   },
   mockLifecycleService: {
     shutdown: vi.fn(() => Promise.resolve()),
+    cleanupForUpdate: vi.fn(() => Promise.resolve()),
     setQuittingForUpdate: vi.fn(),
   },
 }));
@@ -341,9 +342,27 @@ describe("UpdatesService", () => {
 
       const result = await service.installUpdate();
       expect(result).toEqual({ installed: true });
-      expect(mockLifecycleService.shutdown).toHaveBeenCalled();
+
+      // Verify setQuittingForUpdate is called first
       expect(mockLifecycleService.setQuittingForUpdate).toHaveBeenCalled();
+
+      // Verify cleanupForUpdate is called (not full shutdown)
+      expect(mockLifecycleService.cleanupForUpdate).toHaveBeenCalled();
+      expect(mockLifecycleService.shutdown).not.toHaveBeenCalled();
+
+      // Verify quitAndInstall is called after cleanup
       expect(mockAutoUpdater.quitAndInstall).toHaveBeenCalled();
+
+      // Verify order: setQuittingForUpdate -> cleanupForUpdate -> quitAndInstall
+      const setQuittingOrder =
+        mockLifecycleService.setQuittingForUpdate.mock.invocationCallOrder[0];
+      const cleanupOrder =
+        mockLifecycleService.cleanupForUpdate.mock.invocationCallOrder[0];
+      const quitAndInstallOrder =
+        mockAutoUpdater.quitAndInstall.mock.invocationCallOrder[0];
+
+      expect(setQuittingOrder).toBeLessThan(cleanupOrder);
+      expect(cleanupOrder).toBeLessThan(quitAndInstallOrder);
     });
 
     it("returns false if quitAndInstall throws", async () => {

apps/twig/src/main/services/updates/service.ts

@@ -115,9 +115,13 @@ export class UpdatesService extends TypedEventEmitter<UpdatesEvents> {
     });
 
     try {
-      await this.lifecycleService.shutdown();
+      // Set the flag FIRST so before-quit handler won't prevent quit
       this.lifecycleService.setQuittingForUpdate();
 
+      // Do lightweight cleanup: kill processes, shut down watchers
+      // Skip container teardown so before-quit handler can still access services
+      await this.lifecycleService.cleanupForUpdate();
+
       autoUpdater.quitAndInstall();
       return { installed: true };
     } catch (error) {