Skip to content

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

TypeScript

Merge remote-tracking branch 'origin/dev' into feat/mcp-connectors-desktop-refactor

Diego Zacariasa63ed3484b8a
diff --cc desktop-app/ui/src/App.tsx
index a87222af4,36dfc9107..1d1b63eb2
--- a/desktop-app/ui/src/App.tsx
+++ b/desktop-app/ui/src/App.tsx
@@@ -1837,30 -2132,64 +2103,61 @@@ export function App()
/>
)}
{vm.navItem === DESKTOP_ROUTES.connectors && <McpServersPage />}
- {vm.navItem === DESKTOP_ROUTES.contextDetails && (
- <ContextDetailsPage />
- )}
{vm.navItem === DESKTOP_ROUTES.plugins && <WorkflowsPage />}
{vm.navItem === DESKTOP_ROUTES.apps && (
- <SandboxUiPage
- boundsRefreshKey={sandboxUiBoundsRefreshKey}
- actionRequest={sandboxActionRequest}
- conversationOrigin={sandboxUiConversationOrigin}
- currentTeamId={vm.currentTeamId}
- headerShellOverlayOpen={
- headerShellOverlayOpen || commandPaletteOpen
- }
- sidebarShellOverlayOpen={sidebarSettingsMenuOpen}
- toastShellOverlayOpen={vm.toasts.length > 0}
- shortcutApp={activeSandboxUiApp}
- shortcutOpenRequestId={sandboxUiShortcutOpenRequestId}
- localSearchRequestId={sandboxLocalSearchRequestId}
- onBackToConversation={handleSandboxUiBackToConversation}
- onEmbeddedAppOpening={handleSandboxUiOpening}
- onEmbeddedAppMounted={handleSandboxUiMounted}
- onEmbeddedAppBack={handleSandboxUiClosed}
- onEmbeddedAppRemoved={handleSandboxUiRemoved}
- onEmbedBoundsApplied={handleSandboxUiBoundsApplied}
- onNotify={vm.pushToast}
- onShortcutOpenResult={handleSandboxUiShortcutOpenResult}
- />
+ <>
+ <SandboxUiPage
+ boundsRefreshKey={sandboxUiBoundsRefreshKey}
+ actionRequest={sandboxActionRequest}
+ conversationOrigin={sandboxUiConversationOrigin}
+ currentTeamId={vm.currentTeamId}
+ headerShellOverlayOpen={
+ headerShellOverlayOpen || commandPaletteOpen
+ }
+ sidebarShellOverlayOpen={sidebarSettingsMenuOpen}
+ toastShellOverlayOpen={vm.toasts.length > 0}
+ deepLinkShellOverlayOpen={sandboxUiDeepLinkDialog !== null}
+ shortcutApp={activeSandboxUiApp}
+ shortcutOpenRequestId={sandboxUiShortcutOpenRequestId}
+ localSearchRequestId={sandboxLocalSearchRequestId}
+ chatDrawerOpen={chatDrawerVisible}
+ onToggleChatDrawer={toggleChatDrawer}
+ onBackToConversation={handleSandboxUiBackToConversation}
+ onEmbeddedAppOpening={handleSandboxUiOpening}
+ onEmbeddedAppMounted={handleSandboxUiMounted}
+ onEmbeddedAppBack={handleSandboxUiClosed}
+ onEmbeddedAppRemoved={handleSandboxUiRemoved}
+ onEmbedBoundsApplied={handleSandboxUiBoundsApplied}
+ onEmbedSlotTopChange={setChatDrawerEmbedTop}
+ onNotify={vm.pushToast}
+ onShortcutOpenResult={handleSandboxUiShortcutOpenResult}
+ />
+ {chatDrawerVisible && (
+ <ChatDrawer
+ header={
+ <ChatSwitcher
+ tabs={chatViewTabs.tabs}
+ activeTabId={chatViewTabs.activeTabId}
+ onSelect={handleSelectChatViewTab}
+ onNewChat={handleNewChatViewTab}
+ focusRequestId={chatSwitcherFocusRequestId}
+ />
+ }
+ onNewChat={handleNewChatViewTab}
+ onClose={closeChatDrawer}
+ containerRef={chatDrawerRef}
+ ready={chatDrawerReady}
+ onResizeHandleMouseDown={
+ chatDrawerResize.onResizeHandleMouseDown
+ }
+ onResizeHandleKeyDown={chatDrawerResize.onResizeHandleKeyDown}
+ width={chatDrawerResize.width}
+ resizing={chatDrawerResize.isResizing}
+ >
+ <ChatPage scrollContainerRef={chatDrawerRef} />
+ </ChatDrawer>
+ )}
+ </>
)}
{vm.navItem === DESKTOP_ROUTES.settings && (
<SettingsPage
diff --cc desktop-app/ui/src/hooks/useAppController.ts
index 356b88218,42b89f96b..f8c31d9f9
--- a/desktop-app/ui/src/hooks/useAppController.ts
+++ b/desktop-app/ui/src/hooks/useAppController.ts
@@@ -914,9 -981,19 +937,19 @@@ export function useAppController()
if (!targetChatId) {
chat.clearActiveChat()
}
- nav.setSelectedAgentRoute('details')
+ nav.setSelectedAgentRoute(AGENT_WORKSPACE_ROUTES.connectors)
nav.setSelectedAgent(agentName)
- nav.setNavItem(DESKTOP_ROUTES.chat)
+ if (!options.keepNavItem) nav.setNavItem(DESKTOP_ROUTES.chat)
+ // Drawer same-agent selection: `setSelectedAgent` above is a no-op (same
+ // value) and `navItem` is not flipped, so the agent-selection effect will
+ // not replay to consume the pending selection — load the chat imperatively.
+ // The pending selection is still set above so that when the caller DID
+ // change the route in the same batch (launch-from-chat: chat→apps), the
+ // effect replays into its `specific` branch instead of the reset branch;
+ // both switches target the same chat and `switchToChat` coalesces them.
+ if (options.keepNavItem && targetChatId && nav.selectedAgent === agentName) {
+ void chat.switchToChat(agentName, targetChatId)
+ }
},
[
chat.clearActiveChat,