Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

Merge branch 'feat/mcp-server-oauth-host' into feat/mcp-server-oauth-desktop

Diego Zacarias53b8a3344647
diff --cc desktop-app/src/main.ts
index ad8ef5cc7,1a58669d0..328826aff
--- a/desktop-app/src/main.ts
+++ b/desktop-app/src/main.ts
@@@ -1,12 -1,12 +1,14 @@@
import { BrowserWindow, app, ipcMain, nativeTheme, powerMonitor } from 'electron'
import path from 'node:path'
import { AppService } from './appService.js'
+import { routeClerumOauthCompleted } from './clerumDeepLink.js'
import { config } from './config.js'
+ import { createEvenfireDeepLinkRouter } from './evenfireDeepLinkRouter.js'
import { assertTrustedSender, registerIpcHandlers } from './ipc.js'
import { createMainWindowCoordinator, createRetryableInitializer } from './mainWindowCoordinator.js'
import { wireMainWindowRendererReadiness } from './mainWindowReadiness.js'
+import { McpOauthCompletionQueue } from './mcpOauthCompletionQueue.js'
+ import { initPluginSdkRuntime } from './pluginSdkRuntime.js'
import { collectInitialProtocolUrls } from './protocolLaunchArgs.js'
import { SandboxUiDeepLinkQueue } from './sandboxUiDeepLinkQueue.js'
import {
@@@ -31,18 -31,7 +33,16 @@@ process.stderr?.on?.('error', () => {}
let mainWindow: BrowserWindow | null = null
const appService = new AppService()
- const pendingEvenfireUrls: string[] = []
- const MAX_PENDING_EVENFIRE_URLS = 20
const sandboxUiDeepLinkQueue = new SandboxUiDeepLinkQueue()
+// U5: deliver mcp-oauth completions to the renderer, or queue them when the
+// renderer is not yet ready (cold start), draining after `app:rendererReady`.
+const mcpOauthCompletionQueue = new McpOauthCompletionQueue(completion => {
+ if (mainWindow && !mainWindow.isDestroyed() && mainWindowRendererReady) {
+ mainWindow.webContents.send('rpc:mcpOauthCompleted', completion)
+ return true
+ }
+ return false
+})
let mainWindowLifecycleReady = false
let mainWindowRendererReady = false
let appWindowVisibilityWired = false
@@@ -155,12 -138,7 +149,12 @@@ ipcMain.handle('app:rendererReady', eve
assertTrustedSender(event)
if (!mainWindow || event.sender !== mainWindow.webContents) return
mainWindowRendererReady = true
- drainPendingEvenfireUrls()
+ evenfireDeepLinkRouter.drainPending()
+ // U5: flush mcp-oauth completions that arrived before the renderer installed
+ // its listener (cold start). The onMcpOauthCompleted listener is registered by
+ // useAppController's effect, which runs before App's rendererReady effect, so
+ // it is guaranteed installed by the time this handshake fires.
+ mcpOauthCompletionQueue.drain()
})
ipcMain.handle('sandboxUi:listPendingDeepLinks', event => {