anywhere window stuff fixes

build/build_number.txt

@@ -1 +1 @@
-371
+383

src/automations/anywhere.ts

@@ -9,7 +9,7 @@ export default class PromptAnywhere {
   constructor() {
   }
 
-  static initPrompt = async (): Promise<void> => {
+  static open = async (): Promise<void> => {
 
     // get foremost app
     let foremostApp = '';
@@ -24,6 +24,15 @@ export default class PromptAnywhere {
       foremostApp: foremostApp
     });
   }
+
+  static close = async (): Promise<void> => {
+
+    // close
+    await window.closePromptAnywhere();
+    await window.restoreWindows();
+    //await window.releaseFocus();
+
+  }
 
   static insert = async (app: App, response: string): Promise<void> => {
 
@@ -47,26 +56,22 @@ export default class PromptAnywhere {
 
       // done
       await window.restoreWindows();
-      await window.releaseFocus();
+      //await window.releaseFocus();
       return;
 
     } catch (error) {
       console.error('Error while testing', error);
     }
 
-    // done waiting
-    await window.closeWaitingPanel();
-    await window.restoreWindows();
-    await window.releaseFocus();
+    // done
+    await this.close()
 
   }
 
   static continueAsChat = async (app: App, chatId: string): Promise<void> => {
 
-    // done with this
-    await window.closePromptAnywhere();
-    await window.restoreWindows();
-    await window.releaseFocus();
+    // done
+    await this.close();
 
     // now open main
     await window.openMainWindow({ queryParams: { chatId: chatId } });

src/main.ts

@@ -82,7 +82,7 @@ if (!process.mas) {
 // this is going to be called later
 const registerShortcuts = () => {
   shortcuts.registerShortcuts(app, {
-    prompt: PromptAnywhere.initPrompt,
+    prompt: PromptAnywhere.open,
     chat: window.openMainWindow,
     command: Commander.initCommand,
     readaloud: ReadAloud.read,
@@ -123,7 +123,7 @@ app.whenReady().then(() => {
   menu.installMenu(app, {
     quit: app.quit,
     checkForUpdates: autoUpdater.check,
-    newPrompt: PromptAnywhere.initPrompt,
+    newPrompt: PromptAnywhere.open,
     newChat: window.openMainWindow,
     newScratchpad: window.openScratchPad,
     settings: window.openSettingsWindow,
@@ -430,7 +430,7 @@ ipcMain.on('code-python-run', async (event, payload) => {
 })
 
 ipcMain.on('anywhere-prompt', async () => {
-  await PromptAnywhere.initPrompt();
+  await PromptAnywhere.open();
 });
 
 ipcMain.on('anywhere-insert', async (event, payload) => {
@@ -441,8 +441,8 @@ ipcMain.on('anywhere-continue-as-chat', async (_, chatId) => {
   await PromptAnywhere.continueAsChat(app, chatId);
 })
 
-ipcMain.on('anywhere-cancel', async () => {
-  await window.closePromptAnywhere();
+ipcMain.on('anywhere-close', async () => {
+  await PromptAnywhere.close();
 })
 
 ipcMain.on('anywhere-resize', async (_, payload) => {

src/main/tray.ts

@@ -81,7 +81,7 @@ export default class {
     // add common stuff
     return [
       ...menuItems,
-      { label: 'New Prompt', accelerator: shortcuts.shortcutAccelerator(configShortcuts?.prompt), click: PromptAnywhere.initPrompt },
+      { label: 'New Prompt', accelerator: shortcuts.shortcutAccelerator(configShortcuts?.prompt), click: PromptAnywhere.open },
       { label: 'New Chat', accelerator: shortcuts.shortcutAccelerator(configShortcuts?.chat), click: window.openMainWindow },
       { label: 'New Scratchpad', accelerator: shortcuts.shortcutAccelerator(configShortcuts?.scratchpad), click: window.openScratchPad },
       { label: 'Run AI Command', accelerator: shortcuts.shortcutAccelerator(configShortcuts?.command), click: Commander.initCommand },

src/preload.ts

@@ -78,7 +78,7 @@ contextBridge.exposeInMainWorld(
       prompt: () => { return ipcRenderer.send('anywhere-prompt') },
       insert: (text: string): void => { return ipcRenderer.send('anywhere-insert', text) },
       continue: (chatid: string): void => { return ipcRenderer.send('anywhere-continue-as-chat', chatid) },
-      cancel: (): void => { return ipcRenderer.send('anywhere-cancel') },
+      close: (): void => { return ipcRenderer.send('anywhere-close') },
       resize: (deltaX : number, deltaY: number): void => { return ipcRenderer.send('anywhere-resize', { deltaX, deltaY }) },
     },
     experts: {

src/screens/PromptAnywhere.vue

@@ -311,7 +311,7 @@ const onClose = () => {
   document.removeEventListener('keydown', onKeyDown)
 
   // done
-  window.api.anywhere.cancel()
+  window.api.anywhere.close()
 }
 
 const onStopGeneration = () => {

src/screens/Wait.vue

@@ -15,7 +15,7 @@ const hover = ref(false)
 
 const onCancel = () => {
   window.api.commands.cancel()
-  window.api.anywhere.cancel()
+  window.api.anywhere.close()
 }
 
 </script>

src/types/index.d.ts

@@ -221,7 +221,7 @@ declare global {
         prompt?(): void
         insert?(prompt: string): void
         continue?(chatId: string): void
-        cancel?(): void
+        close?(): void
         resize?(deltaX: number, deltaY: number): void
       }
       experts?: {

tests/screens/prompt.test.ts

@@ -66,7 +66,7 @@ beforeAll(() => {
       prompt: vi.fn(),
       insert: vi.fn(),
       continue: vi.fn(),
-      cancel: vi.fn(),
+      close: vi.fn(),
     },
     markdown: {
       render: renderMarkdown
@@ -100,10 +100,10 @@ test('Closes when click on container', async () => {
   const wrapper = mount(PromptAnywhere)
   wrapper.find('.prompt').trigger('mousedown')
   wrapper.find('.container').trigger('mouseup')
-  expect(window.api.anywhere.cancel).not.toHaveBeenCalled()
+  expect(window.api.anywhere.close).not.toHaveBeenCalled()
   wrapper.find('.container').trigger('mousedown')
   wrapper.find('.container').trigger('mouseup')
-  expect(window.api.anywhere.cancel).toHaveBeenCalled()
+  expect(window.api.anywhere.close).toHaveBeenCalled()
 })
 
 test('Renders response', async () => {
@@ -144,7 +144,7 @@ test('Closes when click on icon', async () => {
   wrapper.vm.response = new Message('assistant', 'This is a response')
   await wrapper.vm.$nextTick()
   wrapper.find('.close').trigger('click')
-  expect(window.api.anywhere?.cancel).toHaveBeenCalledWith()
+  expect(window.api.anywhere.close).toHaveBeenCalledWith()
 })
 
 test('Manages conversation', async () => {
@@ -245,5 +245,5 @@ test('Supports keyboard shortcuts', async () => {
   // quit
   vi.clearAllMocks()
   document.dispatchEvent(new KeyboardEvent('keyup', { key: 'Escape' }));
-  expect(window.api.anywhere?.cancel).toHaveBeenCalled()
+  expect(window.api.anywhere.close).toHaveBeenCalled()
 })

tests/screens/wait.test.ts

@@ -10,7 +10,7 @@ window.api = {
     cancel: vi.fn()
   },
   anywhere: {
-    cancel: vi.fn()
+    close: vi.fn()
   }
 }
 
@@ -38,5 +38,5 @@ test('Cancels command', () => {
   const wrapper = mount(Wait)
   wrapper.find('.cancel').trigger('click')
   expect(window.api.commands.cancel).toHaveBeenCalled()
-  expect(window.api.anywhere.cancel).toHaveBeenCalled()
+  expect(window.api.anywhere.close).toHaveBeenCalled()
 })

tests/unit/anywhere.test.ts

@@ -54,7 +54,7 @@ beforeEach(() => {
 
 test('Prepare prompt', async () => {
 
-  await PromptAnywhere.initPrompt()
+  await PromptAnywhere.open()
 
   expect(window.hideWindows).toHaveBeenCalledOnce()
   expect(window.openPromptAnywhere).toHaveBeenCalledOnce()
@@ -67,6 +67,7 @@ test('Execute Prompt', async () => {
 
   expect(window.closePromptAnywhere).toHaveBeenCalledOnce()
   expect(window.restoreWindows).toHaveBeenCalledOnce()
+  expect(window.releaseFocus).toHaveBeenCalledOnce()
 
   expect(Automator.prototype.pasteText).toHaveBeenCalledWith('Explain this')
 
@@ -78,7 +79,6 @@ test('Continue as Chat Prompt', async () => {
 
   expect(window.closePromptAnywhere).toHaveBeenCalledOnce()
   expect(window.restoreWindows).toHaveBeenCalledOnce()
-  expect(window.releaseFocus).toHaveBeenCalledOnce()
 
   expect(window.openMainWindow).toHaveBeenCalledWith({
     queryParams: { chatId: '123' }