From 893c8b1fddcc296d2268cbdd6598283d2d621032 Mon Sep 17 00:00:00 2001 From: Luke Roberts <1096744+lukeroberts@users.noreply.github.com> Date: Sun, 23 Aug 2026 21:35:37 -0500 Subject: [PATCH] fix(desktop): preserve remote session routing --- .../hooks/use-prompt-actions/index.test.tsx | 38 +++++++++++++++ .../session/hooks/use-prompt-actions/index.ts | 28 ++++++++++- .../hooks/use-session-actions.test.tsx | 42 ++++++++++++++++- .../hooks/use-session-actions/index.ts | 47 +++++++++++-------- 4 files changed, 133 insertions(+), 22 deletions(-) diff --git a/apps/desktop/src/app/session/hooks/use-prompt-actions/index.test.tsx b/apps/desktop/src/app/session/hooks/use-prompt-actions/index.test.tsx index 3445a38615..0470583c4e 100644 --- a/apps/desktop/src/app/session/hooks/use-prompt-actions/index.test.tsx +++ b/apps/desktop/src/app/session/hooks/use-prompt-actions/index.test.tsx @@ -9,6 +9,7 @@ import { textPart } from '@/lib/chat-messages' import { createClientSessionState } from '@/lib/chat-runtime' import { $composerAttachments, $composerDraft, type ComposerAttachment, setComposerDraft } from '@/store/composer' import { $queuedPromptsBySession, getQueuedPrompts } from '@/store/composer-queue' +import { requestGatewayForAgent } from '@/store/gateway' import { $goalsBySession, setSessionGoal } from '@/store/goals' import { $hudMode } from '@/store/hud' import { $notifications, clearNotifications } from '@/store/notifications' @@ -49,6 +50,11 @@ vi.mock('@/hermes', () => ({ transcribeAudio: vi.fn() })) +vi.mock('@/store/gateway', async importOriginal => ({ + ...(await importOriginal>()), + requestGatewayForAgent: vi.fn() +})) + // The active id the desktop holds is the *runtime* session id from // session.create — deliberately distinct from the stored DB id here, because // that mismatch is the bug: the REST renameSession endpoint resolves against @@ -1767,9 +1773,41 @@ describe('usePromptActions desktop slash pickers', () => { describe('usePromptActions submit / queue drain semantics', () => { afterEach(() => { cleanup() + $connection.set(null) + vi.mocked(requestGatewayForAgent).mockReset() vi.restoreAllMocks() }) + it('pins prompt.submit to the active registry connection when the remote session row is untagged', async () => { + $connection.set({ connectionId: 'hermes01', mode: 'remote' } as never) + setSessions([sessionInfo({ id: 'stored-remote', profile: 'default' })]) + + const ambientRequest = vi.fn(async () => ({}) as never) + vi.mocked(requestGatewayForAgent).mockResolvedValue({} as never) + + let handle: HarnessHandle | null = null + await actRender( + (handle = h)} + refreshSessions={async () => undefined} + requestGateway={ambientRequest} + runtimeIdByStoredSessionIdRef={{ current: new Map([['stored-remote', 'runtime-remote']]) }} + storedSessionId="stored-remote" + /> + ) + + expect(await handle!.submitText('continue remotely')).toBe(true) + expect(requestGatewayForAgent).toHaveBeenCalledWith( + 'hermes01', + 'default', + 'prompt.submit', + { session_id: 'runtime-remote', text: 'continue remotely' }, + 1_800_000 + ) + expect(ambientRequest).not.toHaveBeenCalled() + }) + it('clears a leftover interrupted flag on a fresh submit (so the new turn streams)', async () => { const seeds: Record[] = [] const requestGateway = vi.fn(async () => ({}) as never) diff --git a/apps/desktop/src/app/session/hooks/use-prompt-actions/index.ts b/apps/desktop/src/app/session/hooks/use-prompt-actions/index.ts index f76795fa2b..540dfbf42f 100644 --- a/apps/desktop/src/app/session/hooks/use-prompt-actions/index.ts +++ b/apps/desktop/src/app/session/hooks/use-prompt-actions/index.ts @@ -22,6 +22,7 @@ import { updateComposerAttachment } from '@/store/composer' import { resetSessionBackground } from '@/store/composer-status' +import { requestGatewayForAgent } from '@/store/gateway' import { clearNotifications, notify, notifyError } from '@/store/notifications' import { clearPreviewArtifacts } from '@/store/preview-status' import { clearAllPrompts } from '@/store/prompts' @@ -31,6 +32,7 @@ import { $currentCwd, $messages, $terminalBackend, + getSessionOwnerHint, setActiveSessionId, setAwaitingResponse, setBusy, @@ -484,6 +486,30 @@ export function usePromptActions({ } }, [activeSessionId, composerAttachments, eagerlyUploadAttachment]) + // Session resume can be routed through a registry connection while the + // render-time requestGateway still points at the local default socket. Keep + // every follow-up session RPC on the same composite owner; otherwise resume + // succeeds on HERMES01 and prompt.submit immediately fails locally with + // "session not found". + const requestForPromptSession = useCallback( + (method, params = {}, timeoutMs) => { + const storedSessionId = selectedStoredSessionIdRef.current + const owner = storedSessionId ? getSessionOwnerHint(storedSessionId) : undefined + const ambientConnection = $connection.get() + + const connectionId = + owner?.connectionId || + (ambientConnection?.mode === 'remote' ? ambientConnection.connectionId?.trim() || '' : '') + + if (connectionId) { + return requestGatewayForAgent(connectionId, owner?.profile || 'default', method, params, timeoutMs) + } + + return timeoutMs === undefined ? requestGateway(method, params) : requestGateway(method, params, timeoutMs) + }, + [requestGateway, selectedStoredSessionIdRef] + ) + const submitPromptText = useSubmitPrompt({ activeSessionIdRef, busyRef, @@ -492,7 +518,7 @@ export function usePromptActions({ getRoutedStoredSessionId, getRuntimeIdForStoredSession, getRouteToken, - requestGateway, + requestGateway: requestForPromptSession, runtimeIdByStoredSessionIdRef, resumeStoredSession, selectedStoredSessionIdRef, diff --git a/apps/desktop/src/app/session/hooks/use-session-actions.test.tsx b/apps/desktop/src/app/session/hooks/use-session-actions.test.tsx index 0ca358f86f..32b6b910dc 100644 --- a/apps/desktop/src/app/session/hooks/use-session-actions.test.tsx +++ b/apps/desktop/src/app/session/hooks/use-session-actions.test.tsx @@ -18,7 +18,7 @@ import { import { createClientSessionState } from '@/lib/chat-runtime' import { $clarifyRequests, clearClarifyRequest, setClarifyRequest } from '@/store/clarify' import { clearSessionDraft, stashSessionDraft, takeSessionDraft } from '@/store/composer' -import { requestGatewayForAgent } from '@/store/gateway' +import { requestGatewayForAgent, requestGatewayForProfile } from '@/store/gateway' import { $activeGatewayProfile, $newChatProfile, $newChatRoute, ensureGatewayProfile } from '@/store/profile' import { $projectScope, $projectTree, ALL_PROJECTS } from '@/store/projects' import { @@ -38,6 +38,7 @@ import { setActiveSessionStoredIdRotation, setAwaitingResponse, setBusy, + setConnection, setCurrentCwd, setCurrentFastMode, setCurrentModel, @@ -80,7 +81,8 @@ vi.mock('@/store/profile', async importOriginal => ({ vi.mock('@/store/gateway', async importOriginal => ({ ...(await importOriginal>()), - requestGatewayForAgent: vi.fn() + requestGatewayForAgent: vi.fn(), + requestGatewayForProfile: vi.fn() })) vi.mock('@/components/pane-shell/tree/store', async importOriginal => ({ @@ -1992,9 +1994,45 @@ describe('resumeSession warm-cache mapping integrity', () => { .mockResolvedValue({ messages: [] } as never) vi.mocked(requestGatewayForAgent).mockReset() clearClarifyRequest() + vi.mocked(requestGatewayForProfile).mockReset() + setConnection(null) vi.restoreAllMocks() }) + it('pins an untagged row to the active registry connection instead of the same-named local profile', async () => { + setConnection({ connectionId: 'hermes01', mode: 'remote' } as never) + setSessions([storedSession({ id: 'remote-stored', profile: 'default' })]) + vi.mocked(getLatestSessionMessages).mockResolvedValue({ messages: [], session_id: 'remote-stored' } as never) + vi.mocked(requestGatewayForAgent).mockResolvedValue({ + info: {}, + messages: [], + resumed: 'remote-stored', + session_id: 'remote-runtime' + } as never) + vi.mocked(requestGatewayForProfile).mockResolvedValue({ + info: {}, + messages: [], + resumed: 'remote-stored', + session_id: 'wrong-local-runtime' + } as never) + + const ambientRequest = vi.fn(async () => ({}) as never) + let resume: ((storedSessionId: string, replaceRoute?: boolean) => Promise) | null = null + + render( (resume = ready)} requestGateway={ambientRequest} />) + await waitFor(() => expect(resume).not.toBeNull()) + await resume!('remote-stored', true) + + expect(requestGatewayForAgent).toHaveBeenCalledWith( + 'hermes01', + 'default', + 'session.resume', + expect.objectContaining({ session_id: 'remote-stored' }) + ) + expect(requestGatewayForProfile).not.toHaveBeenCalled() + expect(ambientRequest).not.toHaveBeenCalled() + }) + it('pins metadata, transcript, resume, activate, and usage to the captured connection', async () => { const ownerRoute: SessionProfileRoute = { connectionId: 'source-a', diff --git a/apps/desktop/src/app/session/hooks/use-session-actions/index.ts b/apps/desktop/src/app/session/hooks/use-session-actions/index.ts index 431be7cc11..5f5dd0d85b 100644 --- a/apps/desktop/src/app/session/hooks/use-session-actions/index.ts +++ b/apps/desktop/src/app/session/hooks/use-session-actions/index.ts @@ -48,6 +48,7 @@ import { import { setApprovalRequest } from '@/store/prompts' import { $activeSessionStoredIdRotation, + $connection, $currentCwd, $currentFastMode, $currentModel, @@ -788,6 +789,17 @@ export function useSessionActions({ // resolveStoredSession finds the row by id (cheap), so an uncached pasted // id loads as fast as a sidebar click instead of hanging on a list scan. const ownerRoute = capturedOwner || getSessionOwnerHint(storedSessionId) + // A connection switch clears/reloads the session rows before this path + // runs, so an untagged row belongs to the connection that supplied the + // current list. Capture that source before the async metadata lookup. If + // we reduce it to the profile string `default`, requestForSessionProfile + // resolves the local default socket and sends an SSH session id to the + // wrong machine ("resume failed: session not found"). + const ambientConnection = $connection.get() + + const ambientConnectionId = + ambientConnection?.mode === 'remote' ? ambientConnection.connectionId?.trim() || '' : '' + const storedForProfile = await resolveStoredSession(storedSessionId, ownerRoute) const sessionProfile = storedForProfile?.profile @@ -795,14 +807,17 @@ export function useSessionActions({ return } + const resolvedConnectionId = ownerRoute?.connectionId || storedForProfile?.connection_id || ambientConnectionId + // A row spliced from a CONNECTED registry gateway (#88880) carries its - // owning connection — activate THAT gateway, not a same-named local - // profile. Rows without the tag keep the legacy profile path. - const sessionOwner: SessionOwnerScope = - ownerRoute || - (storedForProfile?.connection_id + // owning connection. A row fetched directly after activating a registry + // gateway can be untagged, so retain the captured ambient connection too. + // Either way, route by the composite (connection, profile), never by a + // same-named profile alone. + const sessionOwner: SessionOwnerScope = ownerRoute || + (resolvedConnectionId ? { - connectionId: storedForProfile.connection_id, + connectionId: resolvedConnectionId, profile: sessionProfile || 'default' } : sessionProfile) @@ -810,19 +825,13 @@ export function useSessionActions({ // All-profiles / plugin navigation must not steal chrome API-home: // dial the owning backend without moving $activeGatewayProfile. if ($showAllProfiles.get()) { - if (ownerRoute?.connectionId || storedForProfile?.connection_id) { - await openGatewayForAgent( - ownerRoute?.connectionId || storedForProfile?.connection_id || null, - ownerRoute?.profile || sessionProfile || 'default' - ) + if (resolvedConnectionId) { + await openGatewayForAgent(resolvedConnectionId, ownerRoute?.profile || sessionProfile || 'default') } else if (sessionProfile) { await openGatewayForProfile(normalizeProfileKey(sessionProfile)) } - } else if (ownerRoute?.connectionId || storedForProfile?.connection_id) { - await ensureGatewayAgent( - ownerRoute?.connectionId || storedForProfile?.connection_id || null, - ownerRoute?.profile || sessionProfile || 'default' - ) + } else if (resolvedConnectionId) { + await ensureGatewayAgent(resolvedConnectionId, ownerRoute?.profile || sessionProfile || 'default') } else { await ensureGatewayProfile(sessionProfile) } @@ -842,10 +851,10 @@ export function useSessionActions({ const requestForSession = (method: string, params: Record = {}): Promise => requestForSessionProfile(sessionOwner, requestGateway, method, params) - const sessionRestScope = ownerRoute + const sessionRestScope = resolvedConnectionId ? { - connectionId: ownerRoute.connectionId, - profile: ownerRoute.targetProfile || ownerRoute.profile + connectionId: resolvedConnectionId, + profile: ownerRoute?.targetProfile || ownerRoute?.profile || sessionProfile || 'default' } : storedForProfile?.connection_id ? {