Merge branch 'staging-v4' of github.com:simstudioai/sim into staging-v4

Author: icecrasher321

apps/desktop/src/main/index.ts

@@ -484,6 +484,8 @@ function main(): void {
       newChat: () => void openMainWindowAt(newChatRoute(config.get('lastRoute'))),
       closeFocusedBrowserTab: (win) => closeFocusedBrowserTab(win),
       reopenClosedBrowserTab: (win) => reopenClosedBrowserTab(win),
+      closeFocusedTerminal: () => terminal.closeFocusedTerminal(),
+      reopenClosedTerminal: () => terminal.reopenClosedTerminal(),
       toggleSidebar: () => getMainWindow()?.webContents.send('desktop:command', 'toggle-sidebar'),
       signOut: signOutFromMenu,
       checkForUpdates: () =>

apps/desktop/src/main/ipc.ts

@@ -583,6 +583,20 @@ export function registerIpcHandlers(deps: IpcDeps): void {
         return deps.terminal.executeTool(toolCallId, call.operation, args)
       },
     },
+    'terminal:handoff-done': {
+      kind: 'send',
+      gate: 'app-origin',
+      requires: 'terminal',
+      handler: (terminalId) => {
+        if (typeof terminalId === 'string') deps.terminal.finishHandoff(terminalId)
+      },
+    },
+    'terminal:focused': {
+      kind: 'send',
+      gate: 'app-origin',
+      requires: 'terminal',
+      handler: (focused) => deps.terminal.setPanelFocused(focused === true),
+    },
     'terminal:scrollback': {
       kind: 'invoke',
       gate: 'app-origin',

apps/desktop/src/main/menu.test.ts

@@ -20,6 +20,8 @@ function makeDeps(): MenuDeps {
     openSettings: vi.fn(),
     newWindow: vi.fn(),
     newChat: vi.fn(),
+    closeFocusedTerminal: vi.fn(() => false),
+    reopenClosedTerminal: vi.fn(() => false),
     closeFocusedBrowserTab: vi.fn(() => false),
     reopenClosedBrowserTab: vi.fn(() => false),
     toggleSidebar: vi.fn(),

apps/desktop/src/main/menu.ts

@@ -16,6 +16,13 @@ export interface MenuDeps {
   newChat: () => void
   closeFocusedBrowserTab: (win: BrowserWindow | null) => boolean
   reopenClosedBrowserTab: (win: BrowserWindow | null) => boolean
+  /**
+   * Terminal counterparts. Menu accelerators are global, so Cmd-W and
+   * Cmd-Shift-T reach here whatever the user is looking at; each panel gets
+   * asked whether the keystroke was meant for it before the window acts.
+   */
+  closeFocusedTerminal: () => boolean
+  reopenClosedTerminal: () => boolean
   toggleSidebar: () => void
   signOut: () => void
   checkForUpdates: () => void
@@ -101,6 +108,7 @@ export function buildMenuTemplate(deps: MenuDeps): MenuItemConstructorOptions[]
           label: 'Reopen Closed Tab',
           accelerator: 'CmdOrCtrl+Shift+T',
           click: (_item, focusedWindow) => {
+            if (deps.reopenClosedTerminal()) return
             const win =
               focusedWindow instanceof BrowserWindow ? focusedWindow : deps.getMainWindow()
             deps.reopenClosedBrowserTab(win)
@@ -110,6 +118,7 @@ export function buildMenuTemplate(deps: MenuDeps): MenuItemConstructorOptions[]
           label: 'Close Window',
           accelerator: 'CmdOrCtrl+W',
           click: (_item, focusedWindow) => {
+            if (deps.closeFocusedTerminal()) return
             const win =
               focusedWindow instanceof BrowserWindow ? focusedWindow : deps.getMainWindow()
             if (deps.closeFocusedBrowserTab(win)) return