From 1777d5af1d24585bdb65aa54be6ea952bc762e6e Mon Sep 17 00:00:00 2001 From: Neil Date: Tue, 10 Nov 2026 19:23:18 -0800 Subject: [PATCH 01/37] feat(cloud): Remote desktop as a first-class tab in Orca Cloud workspaces - + menu: Open Remote Desktop / Go to Remote Desktop (one desktop tab per workspace) - desktop tab: own toolbar (Monitor, Beta, live status, Reconnect) instead of the address bar, Monitor icon and 'Remote desktop' label in the tab strip - asleep / waking / archived / couldn't-wake cover with Wake or Unarchive - reconnects by itself after a wake, a closed forward or an app restart (main now reports each desktop page's connection: none, connecting, connected, paused + reason) --- .../remote-desktop-guest.test.ts | 93 +++++- .../hosted-sandbox/remote-desktop-guest.ts | 125 +++++--- .../remote-desktop-pause-copy.ts | 34 +++ src/preload/api/browser/browser-api.ts | 5 +- ...er-bridge-page-interaction-and-sessions.ts | 11 +- .../assemble-chrome/browser-page-pane.tsx | 69 +++-- .../CloudDesktopTabChrome.tsx | 286 ++++++++++++++++++ .../CloudDesktopTabSurface.tsx | 48 +++ .../CloudRemoteDesktopToast.tsx | 6 +- .../cmd-j/remote-desktop-quick-action.ts | 2 +- .../src/components/tab-bar/BrowserTab.tsx | 18 +- .../tab-bar/TabBarCreateEntryRow.tsx | 3 + .../tab-bar/tab-bar-static-create-menu.tsx | 21 +- .../tab-bar/tab-create-menu-options.test.ts | 39 +++ .../tab-bar/tab-create-menu-options.ts | 20 ++ .../use-tab-bar-create-menu-controller.ts | 9 +- src/renderer/src/i18n/locales/en.json | 16 +- .../open-cloud-remote-desktop.tsx | 9 +- .../remote-desktop-page-state.ts | 56 ++++ .../remote-desktop-tab.ts | 67 ++++ .../use-cloud-desktop-connection.test.ts | 86 ++++++ .../use-cloud-desktop-connection.ts | 196 ++++++++++++ .../cloud-remote-desktop.test.ts | 31 ++ .../hosted-sandbox/cloud-remote-desktop.ts | 61 +++- 24 files changed, 1211 insertions(+), 100 deletions(-) create mode 100644 src/main/hosted-sandbox/remote-desktop-pause-copy.ts create mode 100644 src/renderer/src/components/cloud-remote-desktop/CloudDesktopTabChrome.tsx create mode 100644 src/renderer/src/components/cloud-remote-desktop/CloudDesktopTabSurface.tsx create mode 100644 src/renderer/src/components/tab-bar/tab-create-menu-options.test.ts create mode 100644 src/renderer/src/lib/cloud-remote-desktop/remote-desktop-page-state.ts create mode 100644 src/renderer/src/lib/cloud-remote-desktop/remote-desktop-tab.ts create mode 100644 src/renderer/src/lib/cloud-remote-desktop/use-cloud-desktop-connection.test.ts create mode 100644 src/renderer/src/lib/cloud-remote-desktop/use-cloud-desktop-connection.ts create mode 100644 src/shared/hosted-sandbox/cloud-remote-desktop.test.ts diff --git a/src/main/hosted-sandbox/remote-desktop-guest.test.ts b/src/main/hosted-sandbox/remote-desktop-guest.test.ts index c336278d881..e7ca3436614 100644 --- a/src/main/hosted-sandbox/remote-desktop-guest.test.ts +++ b/src/main/hosted-sandbox/remote-desktop-guest.test.ts @@ -31,6 +31,8 @@ class FakeGuest extends EventEmitter { private waiters: ((answer: string) => void)[] = [] connectAnswer = 'connecting' pasteAnswer = true + /** What window.orcaDesktop.state() answers (main watches a handed-over ticket connect). */ + pageState: unknown = true getURL(): string { return this.url @@ -55,6 +57,9 @@ class FakeGuest extends EventEmitter { if (code.includes('orcaDesktop.paste(')) { return this.pasteAnswer } + if (code.includes('orcaDesktop.state()')) { + return this.pageState + } return true } /** The page asks for a ticket ('ticket') or reports a failed attempt ('retry'). */ @@ -236,7 +241,7 @@ describe('remote desktop page driver', () => { guest.emit('focus') expect(events.at(-1)).toEqual({ kind: 'state', - state: { browserPageId: 'page-1', desktop: true, captured: true } + state: { browserPageId: 'page-1', desktop: true, captured: true, connection: 'connecting' } }) guest.key({ type: 'keyDown', key: 'Control', control: true }) guest.key({ type: 'keyDown', key: 'Meta', control: true, meta: true }) @@ -270,7 +275,91 @@ describe('remote desktop page driver', () => { expect(isRemoteDesktopGuest(asWebContents(guest))).toBe(false) expect(events.at(-1)).toEqual({ kind: 'state', - state: { browserPageId: 'page-1', desktop: false, captured: false } + state: { browserPageId: 'page-1', desktop: false, captured: false, connection: 'none' } }) }) + + it('reports connected once the page says its session is up', async () => { + const { guest, events } = setup() + guest.pageState = 'connected' + await flush() + guest.ask('ticket') + await flush() + expect(events.at(-1)).toEqual({ + kind: 'state', + state: { browserPageId: 'page-1', desktop: true, captured: false, connection: 'connected' } + }) + }) + + it('reports a pause with its reason, so the tab can show the asleep state', async () => { + const { guest, events, failMint } = setup() + await flush() + guest.ask('ticket') + await flush() + failMint('asleep') + guest.ask('ticket') + await flush() + expect(events.at(-1)).toEqual({ + kind: 'state', + state: { + browserPageId: 'page-1', + desktop: true, + captured: false, + connection: 'paused', + reason: 'asleep' + } + }) + }) + + it('reports no session for a desktop page this computer has no forward for (restored tab)', async () => { + resetRemoteDesktopSessionsForTest() + const guest = new FakeGuest() + const events: unknown[] = [] + const stop = setupRemoteDesktopGuest({ + browserPageId: 'page-3', + guest: asWebContents(guest), + notify: (event) => events.push(event), + sleep: async () => {} + }) + await flush() + expect(guest.calls).toEqual([]) + expect(events).toEqual([ + { + kind: 'state', + state: { browserPageId: 'page-3', desktop: false, captured: false, connection: 'none' } + } + ]) + stop() + }) + + it('drops to no session when the forward closed under a page that needs a new ticket', async () => { + resetRemoteDesktopSessionsForTest() + let live = true + registerRemoteDesktopSession( + { + environmentId: 'env-1', + localPort: 6081, + path: 'vnc.html', + mint: async () => ({ ok: true, ticket: ticket(9), expiresAt: FAR_FUTURE }), + isLive: () => live + }, + { ticket: ticket(1), expiresAt: FAR_FUTURE } + ) + const guest = new FakeGuest() + const events: { kind: string; state?: { connection: string } }[] = [] + setupRemoteDesktopGuest({ + browserPageId: 'page-4', + guest: asWebContents(guest), + notify: (event) => events.push(event), + sleep: async () => {} + }) + await flush() + guest.ask('ticket') + await flush() + live = false // the sandbox slept: its forward closed + guest.ask('ticket') + await flush() + expect(events.at(-1)?.state?.connection).toBe('none') + expect(isRemoteDesktopGuest(asWebContents(guest))).toBe(false) + }) }) diff --git a/src/main/hosted-sandbox/remote-desktop-guest.ts b/src/main/hosted-sandbox/remote-desktop-guest.ts index 2e07357d636..2f9b400e345 100644 --- a/src/main/hosted-sandbox/remote-desktop-guest.ts +++ b/src/main/hosted-sandbox/remote-desktop-guest.ts @@ -9,12 +9,18 @@ // - pastes this computer's clipboard into the sandbox only on a paste key in the desktop. import { clipboard } from 'electron' import { translateMain } from '../i18n/main-i18n' +import { remoteDesktopPauseMessage as pauseMessage } from './remote-desktop-pause-copy' import { isAgentInjectingInput } from '../browser/cdp/input/agent-input-injection' +import { + isCloudRemoteDesktopUrl, + type RemoteDesktopConnection, + type RemoteDesktopPageState, + type RemoteDesktopPauseReason +} from '../../shared/hosted-sandbox/cloud-remote-desktop' import { onRemoteDesktopSessionRefreshed, remoteDesktopSessionForUrl, takeRemoteDesktopTicket, - type RemoteDesktopMintFailure, type RemoteDesktopSession } from './remote-desktop-sessions' import { @@ -31,14 +37,11 @@ const MIN_MINT_INTERVAL_MS = 1_000 const MAX_MINTS_PER_MINUTE = 10 const MAX_PASTE_CHARS = 1 << 20 const PAGE_READY_TIMEOUT_MS = 10_000 +/** How long, and how often, main watches a handed-over ticket become a connected session. */ +const CONNECT_WATCH_MS = 20_000 +const CONNECT_POLL_MS = 150 -export type RemoteDesktopGuestState = { - browserPageId: string - /** The page is a remote desktop with Orca's page glue. */ - desktop: boolean - /** It has keyboard focus: Orca's shortcuts are off until the release chord. */ - captured: boolean -} +export type RemoteDesktopGuestState = RemoteDesktopPageState export type RemoteDesktopGuestDeps = { browserPageId: string @@ -64,37 +67,6 @@ const WAIT_FOR_REQUEST = `(async () => { return window.orcaDesktop ? window.orcaDesktop.nextTicketRequest() : 'missing' })()` -function pauseMessage(reason: RemoteDesktopMintFailure | 'failed'): string { - switch (reason) { - case 'asleep': - return translateMain( - 'components.cloudRemoteDesktop.pageAsleep', - 'This sandbox is asleep. Wake it in Orca, then reconnect.' - ) - case 'archived': - return translateMain( - 'components.cloudRemoteDesktop.pageArchived', - 'This workspace is archived. Unarchive it in Orca, then reconnect.' - ) - case 'starting': - return translateMain( - 'components.cloudRemoteDesktop.pageStarting', - 'The sandbox is starting or waking. Reconnect in a moment.' - ) - case 'signed_out': - return translateMain( - 'components.cloudRemoteDesktop.pageSignedOut', - 'You’re signed out of Orca Cloud. Sign in, then reconnect.' - ) - case 'failed': - case 'unavailable': - return translateMain( - 'components.cloudRemoteDesktop.pageDisconnected', - 'The remote desktop disconnected. Your files are safe.' - ) - } -} - export function setupRemoteDesktopGuest(deps: RemoteDesktopGuestDeps): () => void { const { guest, browserPageId, notify } = deps const platform = deps.platform ?? process.platform @@ -106,6 +78,10 @@ export function setupRemoteDesktopGuest(deps: RemoteDesktopGuestDeps): () => voi let stopRefreshListener = (): void => {} let disposed = false let published = '' + let connection: RemoteDesktopConnection = 'none' + let pauseReason: RemoteDesktopPauseReason | undefined + /** The page's URL is shaped like a desktop (with or without a session on this computer). */ + let shaped = false /** Settles every in-flight page call when the page goes away (a torn-down page may never answer). */ let cancelInFlight = (): void => {} let cancelled = new Promise((resolve) => { @@ -120,19 +96,48 @@ export function setupRemoteDesktopGuest(deps: RemoteDesktopGuestDeps): () => voi const alive = (gen: number): boolean => !disposed && gen === generation && !guest.isDestroyed() const publish = (): void => { - const state = { + const state: RemoteDesktopGuestState = { browserPageId, desktop: session !== null, - captured: session !== null && !guest.isDestroyed() && guest.isFocused() + captured: session !== null && !guest.isDestroyed() && guest.isFocused(), + connection: session || shaped ? connection : 'none', + ...(connection === 'paused' && pauseReason ? { reason: pauseReason } : {}) } // Only changes, and nothing at all for ordinary pages' focus churn. - const key = `${state.desktop}:${state.captured}` - if (key === published || (!state.desktop && published === '')) { + const key = `${state.desktop}:${state.captured}:${shaped}:${state.connection}:${state.reason ?? ''}` + if (key === published || (!state.desktop && !shaped && published === '')) { return } published = key notify({ kind: 'state', state }) } + const setConnection = ( + gen: number, + next: RemoteDesktopConnection, + reason?: RemoteDesktopPauseReason + ): void => { + if (!alive(gen)) { + return + } + connection = next + pauseReason = next === 'paused' ? reason : undefined + publish() + } + /** The page says when its session is up; main only knows it handed over a ticket. */ + const watchConnected = async (gen: number): Promise => { + const until = Date.now() + CONNECT_WATCH_MS + while (alive(gen) && connection === 'connecting' && Date.now() < until) { + const pageState = await run(gen, 'window.orcaDesktop && window.orcaDesktop.state()') + if (pageState === 'connected') { + setConnection(gen, 'connected') + return + } + if (pageState !== 'connecting' && pageState !== 'idle') { + return + } + await sleep(CONNECT_POLL_MS) + } + } const run = async (gen: number, code: string): Promise => { if (!alive(gen)) { return undefined @@ -154,6 +159,7 @@ export function setupRemoteDesktopGuest(deps: RemoteDesktopGuestDeps): () => voi if (!alive(gen) || (ask !== 'ticket' && ask !== 'retry')) { return } + setConnection(gen, 'connecting') // 'retry': the last ticket never got a session (refused, or the forward was down). failures = ask === 'retry' || refused ? failures + 1 : 0 refused = false @@ -167,6 +173,13 @@ export function setupRemoteDesktopGuest(deps: RemoteDesktopGuestDeps): () => voi await sleep(Math.max(RETRY_DELAYS_MS[failures] ?? 4_000, MIN_MINT_INTERVAL_MS - sinceLast)) // The forward may have closed meanwhile; a page now on that port gets nothing. if (!alive(gen) || remoteDesktopSessionForUrl(guest.getURL()) !== current) { + // Its forward closed (the sandbox slept, or this computer dropped it): the renderer + // reopens the desktop once the sandbox is awake. + if (alive(gen)) { + session = null + guestsWithDesktop.delete(guest) + setConnection(gen, 'none') + } return } mintTimes = mintTimes.filter((at) => Date.now() - at < 60_000) @@ -186,10 +199,14 @@ export function setupRemoteDesktopGuest(deps: RemoteDesktopGuestDeps): () => voi const started = await run(gen, `window.orcaDesktop.connect(${JSON.stringify(minted.ticket)})`) // Anything but a started attempt still counts against the budget, so this never spins. refused = started !== 'connecting' + if (!refused) { + void watchConnected(gen) + } } } - async function pause(gen: number, reason: RemoteDesktopMintFailure | 'failed'): Promise { + async function pause(gen: number, reason: RemoteDesktopPauseReason): Promise { + setConnection(gen, 'paused', reason) const label = translateMain('components.cloudRemoteDesktop.reconnect', 'Reconnect') await run( gen, @@ -203,12 +220,20 @@ export function setupRemoteDesktopGuest(deps: RemoteDesktopGuestDeps): () => voi const gen = generation stopRefreshListener() stopRefreshListener = () => {} - session = remoteDesktopSessionForUrl(guest.getURL()) + const url = guest.getURL() + session = remoteDesktopSessionForUrl(url) + shaped = isCloudRemoteDesktopUrl(url) + connection = session ? 'connecting' : 'none' + pauseReason = undefined if (session) { guestsWithDesktop.add(guest) // Reopening from the menu resumes a page that stopped retrying (asleep, then woken). stopRefreshListener = onRemoteDesktopSessionRefreshed(session.localPort, () => { - void run(gen, 'window.orcaDesktop && window.orcaDesktop.resume()') + void run(gen, 'window.orcaDesktop && window.orcaDesktop.resume()').then((resumed) => { + if (resumed === true) { + setConnection(gen, 'connecting') + } + }) }) void driveTickets(gen, session) } else { @@ -225,6 +250,9 @@ export function setupRemoteDesktopGuest(deps: RemoteDesktopGuestDeps): () => voi generation += 1 cancelPageCalls() session = null + shaped = false + connection = 'none' + pauseReason = undefined guestsWithDesktop.delete(guest) stopRefreshListener() publish() @@ -296,8 +324,11 @@ export function setupRemoteDesktopGuest(deps: RemoteDesktopGuestDeps): () => voi } catch { // The guest may already be destroyed. } - if (session) { + if (session || shaped) { session = null + shaped = false + connection = 'none' + pauseReason = undefined publish() } } diff --git a/src/main/hosted-sandbox/remote-desktop-pause-copy.ts b/src/main/hosted-sandbox/remote-desktop-pause-copy.ts new file mode 100644 index 00000000000..bd50b2619d0 --- /dev/null +++ b/src/main/hosted-sandbox/remote-desktop-pause-copy.ts @@ -0,0 +1,34 @@ +// What a remote desktop page says when main stops handing it tickets (remote-desktop-guest.ts). +import { translateMain } from '../i18n/main-i18n' +import type { RemoteDesktopPauseReason } from '../../shared/hosted-sandbox/cloud-remote-desktop' + +export function remoteDesktopPauseMessage(reason: RemoteDesktopPauseReason): string { + switch (reason) { + case 'asleep': + return translateMain( + 'components.cloudRemoteDesktop.pageAsleep', + 'This sandbox is asleep. Wake it in Orca, then reconnect.' + ) + case 'archived': + return translateMain( + 'components.cloudRemoteDesktop.pageArchived', + 'This workspace is archived. Unarchive it in Orca, then reconnect.' + ) + case 'starting': + return translateMain( + 'components.cloudRemoteDesktop.pageStarting', + 'The sandbox is starting or waking. Reconnect in a moment.' + ) + case 'signed_out': + return translateMain( + 'components.cloudRemoteDesktop.pageSignedOut', + 'You’re signed out of Orca Cloud. Sign in, then reconnect.' + ) + case 'failed': + case 'unavailable': + return translateMain( + 'components.cloudRemoteDesktop.pageDisconnected', + 'The remote desktop disconnected. Your files are safe.' + ) + } +} diff --git a/src/preload/api/browser/browser-api.ts b/src/preload/api/browser/browser-api.ts index 887ea272d3a..ed85892e5fc 100644 --- a/src/preload/api/browser/browser-api.ts +++ b/src/preload/api/browser/browser-api.ts @@ -1,3 +1,4 @@ +import type { RemoteDesktopPageState } from '../../../shared/hosted-sandbox/cloud-remote-desktop' import type { BrowserSessionCookieApi } from './browser-session-cookie-api' import type { BrowserDevToolsDockBounds } from '../../../shared/browser/devtools/browser-devtools-dock' import type { BrowserSetAnnotationViewportBridgeArgs } from '../../../shared/browser/annotations/browser-annotation-viewport-bridge' @@ -213,9 +214,7 @@ export type BrowserApi = { /** Escape pressed in a focused page; the page also receives it unless a grab pick is running. */ onGuestEscape: (callback: (args: { browserPageId: string }) => void) => () => void /** A browser page became (or stopped being) a remote desktop, or gained or lost the keyboard. */ - onRemoteDesktopState: ( - callback: (args: { browserPageId: string; desktop: boolean; captured: boolean }) => void - ) => () => void + onRemoteDesktopState: (callback: (args: RemoteDesktopPageState) => void) => () => void /** The release chord was pressed in a remote desktop: give the keyboard back to Orca. */ onRemoteDesktopRelease: (callback: (args: { browserPageId: string }) => void) => () => void sessionListProfiles: () => Promise diff --git a/src/preload/api/browser/browser-bridge-page-interaction-and-sessions.ts b/src/preload/api/browser/browser-bridge-page-interaction-and-sessions.ts index c6ce70adebb..e546b24839a 100644 --- a/src/preload/api/browser/browser-bridge-page-interaction-and-sessions.ts +++ b/src/preload/api/browser/browser-bridge-page-interaction-and-sessions.ts @@ -1,3 +1,4 @@ +import type { RemoteDesktopPageState } from '../../../shared/hosted-sandbox/cloud-remote-desktop' import type { GoogleCookieClearLocalTarget } from '../../../shared/browser/cookies/browser-google-cookie-clear' import { ipcRenderer } from 'electron' import { @@ -168,13 +169,9 @@ export const browserPageInteractionAndSessionsApi = { ipcRenderer.on('browser:guestEscape', listener) return () => ipcRenderer.removeListener('browser:guestEscape', listener) }, - onRemoteDesktopState: ( - callback: (args: { browserPageId: string; desktop: boolean; captured: boolean }) => void - ): (() => void) => { - const listener = ( - _event: Electron.IpcRendererEvent, - data: { browserPageId: string; desktop: boolean; captured: boolean } - ) => callback(data) + onRemoteDesktopState: (callback: (args: RemoteDesktopPageState) => void): (() => void) => { + const listener = (_event: Electron.IpcRendererEvent, data: RemoteDesktopPageState) => + callback(data) ipcRenderer.on('browser:remoteDesktopState', listener) return () => ipcRenderer.removeListener('browser:remoteDesktopState', listener) }, diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-pane.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-pane.tsx index 015330ae64e..70a948cff4e 100644 --- a/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-pane.tsx +++ b/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-pane.tsx @@ -22,6 +22,8 @@ import { getOpenableExternalUrl, toDisplayUrl } from '../describe-page/browser-p import type { BrowserOverlayViewport } from '../describe-page/browser-annotation-geometry' import type { BrowserPagePaneProps } from '../describe-page/browser-page-types' import { BrowserPageChromeHeader } from './browser-page-chrome-header' +import { CloudDesktopTabSurface } from '../../cloud-remote-desktop/CloudDesktopTabSurface' +import { isCloudRemoteDesktopUrl } from '../../../../../shared/hosted-sandbox/cloud-remote-desktop' import { BrowserPageContextMenu } from './browser-page-context-menu' import { BrowserPageViewportOverlays } from './browser-page-viewport-overlays' import { useBrowserPageAnnotationSend } from '../annotate/use-browser-page-annotation-send' @@ -329,33 +331,46 @@ export function BrowserPagePane({ webviewRef={webviewRef} onReload={() => reload.reloadWebviewOrRecoverGuest(false)} /> - setFindOpen(true)} - markupIsActive={markup.isActive} - markupStart={markup.start} - markupCancel={markup.cancel} - grabElementShortcut={grabElementShortcut} - shareableArtifactFile={shareableArtifactFile} - currentBrowserUrl={currentBrowserUrl} - externalUrl={externalUrl} - isBlankTab={isBlankTab} - resourceNotice={resourceNotice} - setResourceNotice={setResourceNotice} - /> + {isCloudRemoteDesktopUrl(browserTab.url) ? ( + // A remote desktop tab has no address bar: its own toolbar, and a cover while it can't show. + reload.reloadWebviewOrRecoverGuest(false)} + navigate={nav.navigateToUrl} + viewportContainer={pageViewport?.container ?? null} + /> + ) : ( + setFindOpen(true)} + markupIsActive={markup.isActive} + markupStart={markup.start} + markupCancel={markup.cancel} + grabElementShortcut={grabElementShortcut} + shareableArtifactFile={shareableArtifactFile} + currentBrowserUrl={currentBrowserUrl} + externalUrl={externalUrl} + isBlankTab={isBlankTab} + resourceNotice={resourceNotice} + setResourceNotice={setResourceNotice} + /> + )} {pageViewport?.container ? createPortal( + phase: CloudDesktopPhase + onReconnect: () => void +}): React.JSX.Element { + const t = useTranslate() + const busy = phase.kind === 'reconnecting' || phase.kind === 'waking' + const sandboxDown = + phase.kind === 'asleep' || phase.kind === 'archived' || phase.kind === 'wakeFailed' + return ( +
+
+ + + {t('components.cloudRemoteDesktop.tabTitle', 'Remote desktop')} + + {t('components.cloudRemoteDesktop.beta', 'Beta')} + + + {phaseLabel(t, phase)} + + + {phase.kind === 'connected' ? ( + + {t( + 'components.cloudRemoteDesktop.tab.releaseHint', + '{{chord}} returns keys to Orca', + { + chord: remoteDesktopReleaseChordLabel() + } + )} + + ) : null} + + +
+
+ ) +} + +function CoverCard({ + busy, + title, + detail, + action +}: { + busy?: boolean + title: string + detail?: string + action?: React.ReactNode +}): React.JSX.Element { + return ( +
+ + {busy ? ( + + ) : ( + + )} + +
+

{title}

+ {detail ?

{detail}

: null} +
+ {action} +
+ ) +} + +/** + * Over the desktop page whenever there is no live desktop to show: the sandbox is asleep (Wake), + * waking (it reconnects by itself), archived, or reopening it failed. Connected, connecting and + * paused pages show the page itself (noVNC paints its own connect and pause states). + */ +export function CloudDesktopTabCover({ + worktreeId, + phase, + onReconnect +}: { + worktreeId: string + phase: CloudDesktopPhase + onReconnect: () => void +}): React.JSX.Element | null { + const t = useTranslate() + let body: React.ReactNode + switch (phase.kind) { + case 'connected': + case 'connecting': + case 'paused': + return null + case 'reconnecting': + body = ( + + ) + break + case 'waking': + body = ( + + ) + break + case 'asleep': + case 'wakeFailed': { + const failed = phase.kind === 'wakeFailed' + body = ( + void wakeCloudWorkspace(worktreeId)} + > + + {failed + ? t('components.cloudRemoteDesktop.retry', 'Try again') + : t('orcaCloudWorkspace.wake', 'Wake')} + + } + /> + ) + break + } + case 'archived': + body = ( + void runUnarchiveCloudWorkspace(worktreeId)} + > + {t('components.cloudRemoteDesktop.unarchive', 'Unarchive')} + + } + /> + ) + break + case 'failed': { + const copy = failureCopy(t, phase.code) + const signIn = copy.action === 'sign_in' + body = ( +
+ + signIn ? void useAppStore.getState().connectCurrentOrcaProfile() : onReconnect() + } + > + {signIn + ? actionLabel(t, 'sign_in') + : t('components.cloudRemoteDesktop.reconnect', 'Reconnect')} + + } + /> +
+ ) + break + } + } + return ( +
+ {body} +
+ ) +} diff --git a/src/renderer/src/components/cloud-remote-desktop/CloudDesktopTabSurface.tsx b/src/renderer/src/components/cloud-remote-desktop/CloudDesktopTabSurface.tsx new file mode 100644 index 00000000000..9333e6b31c5 --- /dev/null +++ b/src/renderer/src/components/cloud-remote-desktop/CloudDesktopTabSurface.tsx @@ -0,0 +1,48 @@ +import type React from 'react' +import type { RefObject } from 'react' +import { createPortal } from 'react-dom' +import { useCloudDesktopConnection } from '@/lib/cloud-remote-desktop/use-cloud-desktop-connection' +import { CloudDesktopTabCover, CloudDesktopTabToolbar } from './CloudDesktopTabChrome' + +/** A remote desktop tab's chrome: a toolbar in place of the address bar, and a cover over the page. */ +export function CloudDesktopTabSurface({ + chromeHeaderRef, + worktreeId, + browserPageId, + url, + reload, + navigate, + viewportContainer +}: { + chromeHeaderRef: RefObject + worktreeId: string + browserPageId: string + url: string + reload: () => void + navigate: (url: string) => void + viewportContainer: HTMLElement | null +}): React.JSX.Element { + const { phase, reconnect } = useCloudDesktopConnection({ + enabled: true, + worktreeId, + browserPageId, + url, + reload, + navigate + }) + return ( + <> + + {viewportContainer + ? createPortal( + , + viewportContainer + ) + : null} + + ) +} diff --git a/src/renderer/src/components/cloud-remote-desktop/CloudRemoteDesktopToast.tsx b/src/renderer/src/components/cloud-remote-desktop/CloudRemoteDesktopToast.tsx index 80d1f85f836..3477fad70f5 100644 --- a/src/renderer/src/components/cloud-remote-desktop/CloudRemoteDesktopToast.tsx +++ b/src/renderer/src/components/cloud-remote-desktop/CloudRemoteDesktopToast.tsx @@ -21,7 +21,7 @@ export type CloudRemoteDesktopToastState = | { kind: 'waking'; via: 'wake' | 'unarchive' } | { kind: 'failed'; code: CloudRemoteDesktopToastFailure } -type FailureCopy = { +export type FailureCopy = { title: string detail: string action: CloudRemoteDesktopNextAction | null @@ -31,7 +31,7 @@ type FailureCopy = { tone?: 'neutral' } -function failureCopy(t: Translate, code: CloudRemoteDesktopToastFailure): FailureCopy { +export function failureCopy(t: Translate, code: CloudRemoteDesktopToastFailure): FailureCopy { switch (code) { case 'not_cloud': return { @@ -139,7 +139,7 @@ function failureCopy(t: Translate, code: CloudRemoteDesktopToastFailure): Failur } } -function actionLabel(t: Translate, action: CloudRemoteDesktopNextAction): string { +export function actionLabel(t: Translate, action: CloudRemoteDesktopNextAction): string { switch (action) { case 'wake': return t('components.cloudRemoteDesktop.wake', 'Wake sandbox') diff --git a/src/renderer/src/components/cmd-j/remote-desktop-quick-action.ts b/src/renderer/src/components/cmd-j/remote-desktop-quick-action.ts index fb7517c94cd..805f5612157 100644 --- a/src/renderer/src/components/cmd-j/remote-desktop-quick-action.ts +++ b/src/renderer/src/components/cmd-j/remote-desktop-quick-action.ts @@ -37,7 +37,7 @@ export function getRemoteDesktopQuickAction(): CmdJQuickAction { title: translate('components.cloudRemoteDesktop.openMenuItem', 'Open remote desktop'), description: translate( 'components.cloudRemoteDesktop.paletteDescription', - 'Open the sandbox’s desktop in a browser tab.' + 'Open the sandbox’s desktop in a tab.' ), icon: Monitor, verbKeywords: [ diff --git a/src/renderer/src/components/tab-bar/BrowserTab.tsx b/src/renderer/src/components/tab-bar/BrowserTab.tsx index 382282ae121..ea43c0abb82 100644 --- a/src/renderer/src/components/tab-bar/BrowserTab.tsx +++ b/src/renderer/src/components/tab-bar/BrowserTab.tsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import { useSortable } from '@dnd-kit/sortable' -import { X, Pin, PinOff, Volume2, VolumeX } from 'lucide-react' +import { X, Pin, PinOff, Volume2, VolumeX, Monitor } from 'lucide-react' import { ContextMenu, ContextMenuContent, @@ -13,6 +13,7 @@ import '../../../../shared/constants' import { ORCA_BROWSER_BLANK_URL } from '../../../../shared/browser/browser-blank-page' import { redactKagiSessionToken } from '../../../../shared/browser-url' import type { BrowserWorkspace } from '../../../../shared/browser-workspace-types' +import { isCloudRemoteDesktopUrl } from '../../../../shared/hosted-sandbox/cloud-remote-desktop' import { CLOSE_ALL_CONTEXT_MENUS_EVENT } from '@/lib/close-all-context-menus' import { getLiveBrowserUrl } from '../browser-pane/describe-page/live-browser-url-registry' import type { TabDragItemData } from '../tab-group/useTabDragSplit' @@ -55,6 +56,10 @@ export function formatBrowserTabUrlLabel(url: string, t: Translate = translate): } export function getBrowserTabLabel(tab: BrowserWorkspace, t?: Translate): string { + // A remote desktop tab is named for what it is, not for its localhost forward. + if (isCloudRemoteDesktopUrl(tab.url)) { + return (t ?? translate)('components.cloudRemoteDesktop.tabTitle', 'Remote desktop') + } if ( !tab.title || tab.title === tab.url || @@ -122,6 +127,7 @@ export default function BrowserTab({ // invalid URL — leave disabled } const tabLabel = getBrowserTabLabel(tab, t) + const isRemoteDesktop = isCloudRemoteDesktopUrl(tab.url) const audible = useAppStore((s) => (s.browserPagesByWorkspace[tab.id] ?? []).some((page) => s.browserAudiblePageIds[page.id]) ) @@ -206,6 +212,8 @@ export default function BrowserTab({ /> + ) : isRemoteDesktop ? ( + ) : ( } + icon={ + isRemoteDesktop ? ( + + ) : ( + + ) + } programName={ agentDriving ? agentDrivingLabel diff --git a/src/renderer/src/components/tab-bar/TabBarCreateEntryRow.tsx b/src/renderer/src/components/tab-bar/TabBarCreateEntryRow.tsx index 31305c1f9ab..586400c1e40 100644 --- a/src/renderer/src/components/tab-bar/TabBarCreateEntryRow.tsx +++ b/src/renderer/src/components/tab-bar/TabBarCreateEntryRow.tsx @@ -8,6 +8,7 @@ import { Globe, Loader2, MessageSquare, + Monitor, Search, Smartphone, TerminalSquare @@ -279,6 +280,8 @@ function getActionPresentation( const icon = option.option.kind === 'new-browser' ? (