refactor: move workspace tab navigation logic to prepareWorkspaceTab

packages/app/src/components/agent-list.tsx

@@ -9,14 +9,14 @@ import {
 } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import { useCallback, useMemo, useState, type ReactElement } from 'react'
-import { router, type Href } from 'expo-router'
+import { router } from 'expo-router'
 import { StyleSheet, UnistylesRuntime, useUnistyles } from 'react-native-unistyles'
 import { formatTimeAgo } from '@/utils/time'
 import { shortenPath } from '@/utils/shorten-path'
 import { type AggregatedAgent } from '@/hooks/use-aggregated-agents'
 import { useSessionStore } from '@/stores/session-store'
 import { AgentStatusDot } from '@/components/agent-status-dot'
-import { buildHostWorkspaceAgentRoute } from '@/utils/host-routes'
+import { prepareWorkspaceTab } from '@/utils/workspace-navigation'
 
 interface AgentListProps {
   agents: AggregatedAgent[]
@@ -272,8 +272,12 @@ export function AgentList({
 
       onAgentSelect?.()
 
-      const route: Href = buildHostWorkspaceAgentRoute(serverId, agent.cwd, agentId) as Href
-      router.navigate(route)
+      const route = prepareWorkspaceTab({
+        serverId,
+        workspaceId: agent.cwd,
+        target: { kind: 'agent', agentId },
+      })
+      router.navigate(route as any)
     },
     [isActionSheetVisible, onAgentSelect]
   )

packages/app/src/components/agent-stream-view.tsx

@@ -67,8 +67,8 @@ import {
 import { createMarkdownStyles } from "@/styles/markdown-styles";
 import { MAX_CONTENT_WIDTH } from "@/constants/layout";
 import { getMarkdownListMarker } from "@/utils/markdown-list";
-import { buildHostWorkspaceFileRoute } from "@/utils/host-routes";
 import { normalizeInlinePathTarget } from "@/utils/inline-path";
+import { prepareWorkspaceTab } from "@/utils/workspace-navigation";
 import {
   getWorkingIndicatorDotStrength,
   WORKING_INDICATOR_CYCLE_MS,
@@ -171,12 +171,12 @@ export const AgentStreamView = forwardRef<AgentStreamViewHandle, AgentStreamView
           return;
         }
 
-        const route = buildHostWorkspaceFileRoute(
-          resolvedServerId,
+        const route = prepareWorkspaceTab({
+          serverId: resolvedServerId,
           workspaceId,
-          normalized.file
-        );
-        router.replace(route as any);
+          target: { kind: "file", path: normalized.file },
+        });
+        router.navigate(route as any);
         return;
       }
 

packages/app/src/components/sidebar-workspace-list.tsx

@@ -33,9 +33,9 @@ import { getHostRuntimeStore, isHostRuntimeConnected } from '@/runtime/host-runt
 import { getIsDesktop } from '@/constants/layout'
 import { projectIconQueryKey } from '@/hooks/use-project-icon-query'
 import {
-  buildHostWorkspaceRouteWithOpenIntent,
   parseHostWorkspaceRouteFromPathname,
 } from '@/utils/host-routes'
+import { prepareWorkspaceTab } from '@/utils/workspace-navigation'
 import {
   type SidebarProjectEntry,
   type SidebarWorkspaceEntry,
@@ -1649,10 +1649,11 @@ export function SidebarWorkspaceList({
           }, 3000)
         )
         onWorkspacePress?.()
-        router.replace(
-          buildHostWorkspaceRouteWithOpenIntent(serverId, workspace.id, {
-            kind: 'draft',
-            draftId: 'new',
+        router.navigate(
+          prepareWorkspaceTab({
+            serverId,
+            workspaceId: workspace.id,
+            target: { kind: 'draft', draftId: 'new' },
           }) as any
         )
       } catch (error) {