@@ -35,7 +35,12 @@ import {
3535 useThreadPreviewState ,
3636} from "~/previewStateStore" ;
3737import { resolveDiscoveredServerUrl } from "~/browser/browserTargetResolver" ;
38- import { useEnvironmentHttpBaseUrl } from "~/state/environments" ;
38+ import { useEnvironmentSupportsServerBrowser } from "~/state/entities" ;
39+ import {
40+ useEnvironment ,
41+ useEnvironmentHttpBaseUrl ,
42+ usePrimaryEnvironmentId ,
43+ } from "~/state/environments" ;
3944import { previewEnvironment } from "~/state/preview" ;
4045import { useAtomCommand } from "~/state/use-atom-command" ;
4146import {
@@ -48,6 +53,7 @@ import { useRightPanelStore } from "~/rightPanelStore";
4853
4954import { previewBridge } from "./previewBridge" ;
5055import { subscribePreviewAction } from "./previewActionBus" ;
56+ import { closePreviewSession } from "./closePreviewSession" ;
5157import { openPreviewSession } from "./openPreviewSession" ;
5258import { PreviewChromeRow } from "./PreviewChromeRow" ;
5359import { PreviewEmptyState } from "./PreviewEmptyState" ;
@@ -66,7 +72,7 @@ import { revealInFileExplorerLabel } from "./fileExplorerLabel";
6672import { shouldShowPreviewEmptyState } from "./previewEmptyStateLogic" ;
6773import { Badge } from "~/components/ui/badge" ;
6874import { BrowserSurfaceSlot } from "~/browser/BrowserSurfaceSlot" ;
69- import { useRendersServerTabNatively } from "~/browser/previewRuntime" ;
75+ import { alternatePreviewRuntime , useRendersServerTabNatively } from "~/browser/previewRuntime" ;
7076import { ServerBrowserSurface , type ServerBrowserHandle } from "~/browser/ServerBrowserSurface" ;
7177import { cn } from "~/lib/utils" ;
7278import { useBrowserSurfaceStore } from "~/browser/browserSurfaceStore" ;
@@ -141,6 +147,10 @@ export function PreviewView({
141147 ? new URL ( environmentHttpBaseUrl ) . hostname
142148 : null ;
143149 const open = useAtomCommand ( previewEnvironment . open ) ;
150+ const closePreview = useAtomCommand ( previewEnvironment . close , "preview close" ) ;
151+ const environmentLabel = useEnvironment ( threadRef . environmentId ) ?. label ?? "the environment" ;
152+ const primaryEnvironmentId = usePrimaryEnvironmentId ( ) ;
153+ const serverBrowser = useEnvironmentSupportsServerBrowser ( threadRef . environmentId ) ;
144154 const resize = useAtomCommand ( previewEnvironment . resize , "preview viewport resize" ) ;
145155 const adjust = useAtomCommand ( previewEnvironment . adjust , "preview appearance or zoom" ) ;
146156
@@ -410,6 +420,48 @@ export function PreviewView({
410420 void localApi . shell . openExternal ( url ) . catch ( ( ) => undefined ) ;
411421 } , [ url ] ) ;
412422
423+ // A desktop tab of a remote environment can only reach what this computer
424+ // reaches; the environment's browser reaches its own network, and its agents.
425+ const moveTarget = alternatePreviewRuntime (
426+ threadRef . environmentId ,
427+ primaryEnvironmentId ,
428+ serverBrowser ,
429+ snapshot ,
430+ ) ;
431+ const moveLabel =
432+ moveTarget === "server" ? `Open in ${ environmentLabel } 's browser` : "Open on this computer" ;
433+ const handleMoveTab = useCallback ( async ( ) => {
434+ if ( ! moveTarget || ! tabId || ! snapshot ) return ;
435+ const result = await openPreviewSession ( {
436+ openPreview : open ,
437+ threadRef,
438+ // Loopback means the environment's machine, which this computer reaches by its address.
439+ ...( url
440+ ? {
441+ url :
442+ moveTarget === "desktop"
443+ ? resolveDiscoveredServerUrl ( threadRef . environmentId , url )
444+ : url ,
445+ }
446+ : { } ) ,
447+ viewport,
448+ ...( snapshot . profileId === undefined ? { } : { profileId : snapshot . profileId } ) ,
449+ runtime : moveTarget ,
450+ } ) ;
451+ if ( result . _tag === "Failure" ) {
452+ if ( isAtomCommandInterrupted ( result ) ) return ;
453+ const error = squashAtomCommandFailure ( result ) ;
454+ toastManager . add ( {
455+ type : "error" ,
456+ title : "Unable to move the browser tab" ,
457+ description : error instanceof Error ? error . message : "An error occurred." ,
458+ } ) ;
459+ return ;
460+ }
461+ useRightPanelStore . getState ( ) . openBrowser ( threadRef , result . value . tabId ) ;
462+ await closePreviewSession ( { closePreview, snapshot, tabId, threadRef } ) ;
463+ } , [ closePreview , moveTarget , open , snapshot , tabId , threadRef , url , viewport ] ) ;
464+
413465 const handlePictureInPicture = useCallback ( ( ) => {
414466 if ( ! tabId ) return ;
415467 if ( miniPlayerTabId === tabId ) {
@@ -949,6 +1001,9 @@ export function PreviewView({
9491001 ( serverOwnsRendering || ( desktopOverlay ?. hasWebContents ?? false ) )
9501002 }
9511003 actions = { moreMenuActions }
1004+ { ...( moveTarget
1005+ ? { move : { label : moveLabel , onMove : ( ) => void handleMoveTab ( ) } }
1006+ : { } ) }
9521007 profileName = { activeProfileName }
9531008 zoomFactor = {
9541009 serverOwnsRendering ? serverZoomFactor : ( desktopOverlay ?. zoomFactor ?? 1 )
@@ -1050,6 +1105,9 @@ export function PreviewView({
10501105 code = { navStatus . code }
10511106 description = { navStatus . description }
10521107 onReload = { handleRefresh }
1108+ { ...( moveTarget === "server"
1109+ ? { move : { label : moveLabel , onMove : ( ) => void handleMoveTab ( ) } }
1110+ : { } ) }
10531111 />
10541112 </ div >
10551113 ) : null }
0 commit comments