Desktop app ui cleanup

Author: Sg312

apps/desktop/README.md

@@ -23,7 +23,7 @@ src/main/           # main process (bundled to dist/main.cjs)
   updater.ts        # electron-updater wiring, channels, downgrade/block guards
   menu.ts           # role-based macOS menus
 src/preload/        # contextBridge IPC bridge (bundled to dist/preload.cjs)
-static/             # bundled local pages (offline.html, settings.html)
+static/             # bundled local pages (offline.html)
 e2e/                # Playwright _electron smoke suite
 ```
 

apps/desktop/src/main/index.ts

@@ -23,10 +23,9 @@ import {
   handleConnectIntercept,
   tearDownSession,
 } from '@/main/session-lifecycle'
-import { closeSettingsWindow, openSettingsWindow } from '@/main/settings-window'
-import { createLauncherShortcutManager, LAUNCHER_SHORTCUT_PRESETS } from '@/main/shortcuts'
+import { createLauncherShortcutManager } from '@/main/shortcuts'
 import { attachTelemetryPolicy } from '@/main/telemetry-policy'
-import { installTray, type TrayHandle } from '@/main/tray'
+import { installTray, settingsRoute, type TrayHandle } from '@/main/tray'
 import { checkForUpdatesInteractive, initUpdater } from '@/main/updater'
 import { createMainWindow, setupPermissionHandlers } from '@/main/window'
 import { attachWindowOpenPolicy, isPopupContents } from '@/main/windows'
@@ -185,8 +184,9 @@ function main(): void {
     void win.loadURL(`${origin}${route}`).catch(() => {})
   }
 
+  /** Opens the Sim app's settings page in the main window. */
   function openSettings(): void {
-    openSettingsWindow({ preloadPath, isPackaged: app.isPackaged, getMainWindow })
+    void openMainWindowAt(settingsRoute(config.get('lastRoute')))
   }
 
   /**
@@ -229,32 +229,6 @@ function main(): void {
 
   const launcherShortcut = createLauncherShortcutManager(toggleLauncher)
 
-  async function applyOrigin(raw: string) {
-    const previousOrigin = appOrigin()
-    const result = config.setOrigin(raw)
-    if (!result.ok) {
-      return result
-    }
-    closeSettingsWindow()
-    if (result.origin === previousOrigin) {
-      return result
-    }
-    logger.info('Server origin changed; recreating window')
-    events.record('origin_changed')
-    await localFilesystem.forgetAll()
-    handoff.clear()
-    // The launcher window is bound to the old origin's partition; the next
-    // summon recreates it against the new origin.
-    launcher.destroy()
-    const win = getMainWindow()
-    if (win) {
-      mainWindow = null
-      win.destroy()
-    }
-    await createAndLoadMainWindow()
-    return result
-  }
-
   async function signOutFromMenu(): Promise<void> {
     await localFilesystem.forgetAll()
     const ses = session.fromPartition(partitionForOrigin(appOrigin()))
@@ -316,9 +290,6 @@ function main(): void {
       appOrigin,
       allowHttpLocalhost,
       retryLoad: () => loadHealth?.retry(),
-      openSettings,
-      closeSettings: closeSettingsWindow,
-      applyOrigin,
       localFilesystem,
       beginOAuthConnect: (providerId, scope) => connectFlow.beginConnectHandoff(providerId, scope),
       launcher: {
@@ -336,22 +307,6 @@ function main(): void {
         hide: () => launcher.hide(),
         resize: (height) => launcher.resize(height),
       },
-      launcherShortcut: {
-        get: () => ({
-          shortcut: launcherShortcut.current(),
-          presets: [...LAUNCHER_SHORTCUT_PRESETS],
-          status: launcherShortcut.status(),
-        }),
-        set: (raw) => {
-          const status = launcherShortcut.apply(raw)
-          config.set('launcherShortcut', launcherShortcut.current())
-          return {
-            shortcut: launcherShortcut.current(),
-            presets: [...LAUNCHER_SHORTCUT_PRESETS],
-            status,
-          }
-        },
-      },
     })
     await createAndLoadMainWindow()
     installApplicationMenu({
@@ -372,7 +327,6 @@ function main(): void {
         appOrigin,
         lastRoute: () => config.get('lastRoute'),
         openMainWindow: (route) => void openMainWindowAt(route),
-        openSettings,
       })
     }
     initUpdater({ getWindow: getMainWindow, events })

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

@@ -22,7 +22,7 @@ function collectHandlers() {
   return { invoke, on }
 }
 
-const fileEvent = { senderFrame: { url: 'file:///app/static/settings.html' } }
+const fileEvent = { senderFrame: { url: 'file:///app/static/offline.html' } }
 const appEvent = { senderFrame: { url: `${APP}/workspace/ws1` } }
 const evilEvent = { senderFrame: { url: 'https://evil.example/page' } }
 
@@ -38,9 +38,6 @@ describe('registerIpcHandlers', () => {
       allowHttpLocalhost: () => false,
       retryLoad: vi.fn(),
       beginOAuthConnect: vi.fn(async () => true),
-      openSettings: vi.fn(),
-      closeSettings: vi.fn(),
-      applyOrigin: vi.fn(async () => ({ ok: true as const, origin: 'https://sim.ai' })),
       localFilesystem: new LocalFilesystemService({
         chooseDirectory: vi.fn(async () => null),
       }),
@@ -50,18 +47,6 @@ describe('registerIpcHandlers', () => {
         hide: vi.fn(),
         resize: vi.fn(),
       },
-      launcherShortcut: {
-        get: vi.fn(() => ({
-          shortcut: 'Alt+Space',
-          presets: ['Alt+Space'],
-          status: 'registered' as const,
-        })),
-        set: vi.fn(() => ({
-          shortcut: 'Control+Space',
-          presets: ['Alt+Space'],
-          status: 'registered' as const,
-        })),
-      },
     }
     registerIpcHandlers(deps)
   })
@@ -86,9 +71,9 @@ describe('registerIpcHandlers', () => {
 
     // Chip-initiated connects carry workspace/credential scope; malformed
     // scopes (wrong types, unsafe ids) are rejected before the handoff.
-    expect(
-      await handler?.(appEvent, 'slack', { workspaceId: 'ws1', credentialId: 'cred_1' })
-    ).toBe(true)
+    expect(await handler?.(appEvent, 'slack', { workspaceId: 'ws1', credentialId: 'cred_1' })).toBe(
+      true
+    )
     expect(deps.beginOAuthConnect).toHaveBeenCalledWith('slack', {
       workspaceId: 'ws1',
       credentialId: 'cred_1',
@@ -107,36 +92,19 @@ describe('registerIpcHandlers', () => {
     ).toEqual({ ok: true, data: { mounts: [] } })
   })
 
-  it('restricts shell-control channels to bundled local pages', async () => {
-    const { invoke, on } = collectHandlers()
+  it('restricts shell-control channels to bundled local pages', () => {
+    const { on } = collectHandlers()
 
     on.get('offline:retry')?.(appEvent)
     expect(deps.retryLoad).not.toHaveBeenCalled()
     on.get('offline:retry')?.(fileEvent)
     expect(deps.retryLoad).toHaveBeenCalledTimes(1)
-
-    on.get('settings:open')?.(evilEvent)
-    expect(deps.openSettings).not.toHaveBeenCalled()
-    on.get('settings:open')?.(fileEvent)
-    expect(deps.openSettings).toHaveBeenCalledTimes(1)
-
-    expect(await invoke.get('settings:get')?.(appEvent)).toBeNull()
-    expect(await invoke.get('settings:get')?.(fileEvent)).toEqual({
-      origin: 'https://sim.ai',
-      isDefault: true,
-    })
-
-    expect(await invoke.get('settings:save')?.(appEvent, 'https://other.example')).toEqual({
-      ok: false,
-      error: 'Not allowed',
-    })
-    await invoke.get('settings:save')?.(fileEvent, 'https://other.example')
-    expect(deps.applyOrigin).toHaveBeenCalledWith('https://other.example')
   })
 
   it('handles a missing senderFrame safely', async () => {
     const { invoke } = collectHandlers()
-    expect(await invoke.get('settings:get')?.({ senderFrame: null })).toBeNull()
+    expect(await invoke.get('desktop:oauth-connect')?.({ senderFrame: null }, 'slack')).toBe(false)
+    expect(deps.beginOAuthConnect).not.toHaveBeenCalled()
   })
 
   it('restricts browser-agent tool execution to the app origin and known tools', async () => {
@@ -208,19 +176,4 @@ describe('registerIpcHandlers', () => {
     on.get('launcher:resize')?.(appEvent, 400)
     expect(deps.launcher.resize).toHaveBeenCalledWith(400)
   })
-
-  it('restricts launcher shortcut settings to bundled local pages', async () => {
-    const { invoke } = collectHandlers()
-    expect(await invoke.get('settings:launcher-shortcut-get')?.(appEvent)).toBeNull()
-    expect(await invoke.get('settings:launcher-shortcut-get')?.(fileEvent)).toMatchObject({
-      shortcut: 'Alt+Space',
-      status: 'registered',
-    })
-    expect(await invoke.get('settings:launcher-shortcut-set')?.(appEvent, 'Control+Space')).toBe(
-      null
-    )
-    expect(await invoke.get('settings:launcher-shortcut-set')?.(fileEvent, 42)).toBeNull()
-    await invoke.get('settings:launcher-shortcut-set')?.(fileEvent, 'Control+Space')
-    expect(deps.launcherShortcut.set).toHaveBeenCalledWith('Control+Space')
-  })
 })

apps/desktop/src/main/ipc.ts

@@ -1,11 +1,8 @@
 import { isBrowserToolName } from '@sim/browser-protocol'
-import type { LauncherShortcutSettings } from '@sim/desktop-bridge'
 import type { IpcMainEvent, IpcMainInvokeEvent } from 'electron'
 import { ipcMain } from 'electron'
 import { executeTool, handlePanelAction } from '@/main/browser-agent/driver'
 import { setPanelBounds } from '@/main/browser-agent/session'
-import type { OriginValidation } from '@/main/config'
-import { DEFAULT_ORIGIN } from '@/main/config'
 import type { LocalFilesystemService } from '@/main/local-filesystem'
 import { openExternalSafe } from '@/main/navigation'
 
@@ -99,9 +96,6 @@ export interface IpcDeps {
   appOrigin: () => string
   allowHttpLocalhost: () => boolean
   retryLoad: () => void
-  openSettings: () => void
-  closeSettings: () => void
-  applyOrigin: (raw: string) => Promise<OriginValidation>
   localFilesystem: LocalFilesystemService
   beginOAuthConnect: (providerId: string, scope: OAuthConnectScope) => Promise<boolean>
   launcher: {
@@ -110,16 +104,12 @@ export interface IpcDeps {
     hide: () => void
     resize: (height: number) => void
   }
-  launcherShortcut: {
-    get: () => LauncherShortcutSettings
-    set: (shortcut: string) => LauncherShortcutSettings
-  }
 }
 
 /**
  * Who may call a channel:
  * - `app-origin`: only the remote app origin (main window / launcher pages).
- * - `local-page`: only bundled `file:` pages (settings, offline) — shell control.
+ * - `local-page`: only bundled `file:` pages (offline) — shell control.
  * - `any`: sender-independent channels that validate their input instead.
  */
 type ChannelGate = 'app-origin' | 'local-page' | 'any'
@@ -226,36 +216,6 @@ export function registerIpcHandlers(deps: IpcDeps): void {
       },
     },
     'offline:retry': { kind: 'send', gate: 'local-page', handler: () => deps.retryLoad() },
-    'settings:open': { kind: 'send', gate: 'local-page', handler: () => deps.openSettings() },
-    'settings:close': { kind: 'send', gate: 'local-page', handler: () => deps.closeSettings() },
-    'settings:get': {
-      kind: 'invoke',
-      gate: 'local-page',
-      denied: null,
-      handler: () => {
-        const origin = deps.appOrigin()
-        return { origin, isDefault: origin === DEFAULT_ORIGIN }
-      },
-    },
-    'settings:save': {
-      kind: 'invoke',
-      gate: 'local-page',
-      denied: { ok: false, error: 'Not allowed' },
-      handler: (raw) =>
-        typeof raw === 'string' ? deps.applyOrigin(raw) : { ok: false, error: 'Not allowed' },
-    },
-    'settings:launcher-shortcut-get': {
-      kind: 'invoke',
-      gate: 'local-page',
-      denied: null,
-      handler: () => deps.launcherShortcut.get(),
-    },
-    'settings:launcher-shortcut-set': {
-      kind: 'invoke',
-      gate: 'local-page',
-      denied: null,
-      handler: (raw) => (typeof raw === 'string' ? deps.launcherShortcut.set(raw) : null),
-    },
     'launcher:open-chat': {
       kind: 'send',
       gate: 'app-origin',