fix(widget): when closing widget, remove process if prompt is hidden

script-kit · Nov 6, 2024 · 3208019 · 3208019
1 parent a742b71
commit 3208019
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/main/messages.ts b/src/main/messages.ts
@@ -557,6 +557,9 @@ export const createMessageMap = (processInfo: ProcessAndPrompt) => {
           w.destroy();
 
           remove(widgetState.widgets, ({ id }) => id === widgetId);
+          if (!prompt?.isVisible()) {
+            processes.removeByPid(w.pid);
+          }
         };
 
         widget?.webContents.on('before-input-event', (event, input) => {
@@ -620,7 +623,9 @@ export const createMessageMap = (processInfo: ProcessAndPrompt) => {
       }
 
       log.info(`${widgetId}: Widget closed`);
-      prompt?.focusPrompt();
+      if (prompt?.isVisible()) {
+        prompt?.focusPrompt();
+      }
 
       widget.removeAllListeners();
       widget.destroy();
@@ -633,6 +638,10 @@ export const createMessageMap = (processInfo: ProcessAndPrompt) => {
           widgetId,
         });
       }
+
+      if (!prompt?.isVisible()) {
+        processes.removeByPid(widget.pid);
+      }
     }),
 
     WIDGET_CAPTURE_PAGE: onChildChannelOverride(async ({ child }, { channel, value }) => {

diff --git a/src/shared/widget.ts b/src/shared/widget.ts
@@ -19,14 +19,16 @@ const initWidgets = {
 
 export const widgetState: typeof initWidgets = proxy(initWidgets);
 
-export const findWidget = (id: string, reason = '') => {
+export const findWidget = (id: string, reason = ''): BrowserWindow & { pid: number } | null => {
   const options = widgetState.widgets.find((opts) => opts.id === id);
   if (!options) {
     log.warn(`${reason}: widget not found: ${id}`);
     return null;
   }
 
-  return BrowserWindow.fromId(options.wid);
+  const window = BrowserWindow.fromId(options.wid);
+  (window as any).pid = options.pid; //hack
+  return window as BrowserWindow & { pid: number };
 };
 
 const subWidgets = subscribeKey(widgetState, 'widgets', (widgets) => {