refactor: move workspace tab navigation logic to prepareWorkspaceTab

packages/app/src/app/h/[serverId]/agent/[agentId].tsx

@@ -4,8 +4,8 @@ import { useSessionStore } from "@/stores/session-store";
 import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
 import {
   buildHostRootRoute,
-  buildHostWorkspaceAgentRoute,
 } from "@/utils/host-routes";
+import { prepareWorkspaceTab } from "@/utils/workspace-navigation";
 
 export default function HostAgentReadyRoute() {
   const router = useRouter();
@@ -39,7 +39,11 @@ export default function HostAgentReadyRoute() {
     if (normalizedCwd) {
       redirectedRef.current = true;
       router.replace(
-        buildHostWorkspaceAgentRoute(serverId, normalizedCwd, agentId) as any
+        prepareWorkspaceTab({
+          serverId,
+          workspaceId: normalizedCwd,
+          target: { kind: "agent", agentId },
+        }) as any
       );
     }
   }, [agentCwd, agentId, router, serverId]);
@@ -78,7 +82,13 @@ export default function HostAgentReadyRoute() {
         const cwd = result?.agent?.cwd?.trim();
         redirectedRef.current = true;
         if (cwd) {
-          router.replace(buildHostWorkspaceAgentRoute(serverId, cwd, agentId) as any);
+          router.replace(
+            prepareWorkspaceTab({
+              serverId,
+              workspaceId: cwd,
+              target: { kind: "agent", agentId },
+            }) as any
+          );
           return;
         }
         router.replace(buildHostRootRoute(serverId) as any);

packages/app/src/app/h/[serverId]/index.tsx

@@ -5,9 +5,9 @@ import { useFormPreferences } from "@/hooks/use-form-preferences";
 import {
   buildHostOpenProjectRoute,
   buildHostRootRoute,
-  buildHostWorkspaceAgentRoute,
   buildHostWorkspaceRoute,
 } from "@/utils/host-routes";
+import { prepareWorkspaceTab } from "@/utils/workspace-navigation";
 
 const HOST_ROOT_REDIRECT_DELAY_MS = 300;
 
@@ -59,11 +59,11 @@ export default function HostIndexRoute() {
       const primaryAgent = visibleAgents[0];
       if (primaryAgent?.cwd?.trim()) {
         router.replace(
-          buildHostWorkspaceAgentRoute(
+          prepareWorkspaceTab({
             serverId,
-            primaryAgent.cwd.trim(),
-            primaryAgent.id
-          ) as any
+            workspaceId: primaryAgent.cwd.trim(),
+            target: { kind: "agent", agentId: primaryAgent.id },
+          }) as any
         );
         return;
       }

packages/app/src/app/h/[serverId]/workspace/[workspaceId]/_layout.tsx

@@ -1,11 +1,42 @@
-import { useGlobalSearchParams, useLocalSearchParams } from 'expo-router'
+import { useEffect, useRef } from 'react'
+import { useGlobalSearchParams, useLocalSearchParams, useRouter } from 'expo-router'
+import type { WorkspaceTabTarget } from '@/stores/workspace-tabs-store'
 import { WorkspaceScreen } from '@/screens/workspace/workspace-screen'
 import {
+  buildHostWorkspaceRoute,
   decodeWorkspaceIdFromPathSegment,
   parseWorkspaceOpenIntent,
+  type WorkspaceOpenIntent,
 } from '@/utils/host-routes'
+import { prepareWorkspaceTab } from '@/utils/workspace-navigation'
+
+function getParamValue(value: string | string[] | undefined): string {
+  if (typeof value === 'string') {
+    return value.trim()
+  }
+  if (Array.isArray(value)) {
+    const firstValue = value[0]
+    return typeof firstValue === 'string' ? firstValue.trim() : ''
+  }
+  return ''
+}
+
+function getOpenIntentTarget(openIntent: WorkspaceOpenIntent): WorkspaceTabTarget {
+  if (openIntent.kind === 'agent') {
+    return { kind: 'agent', agentId: openIntent.agentId }
+  }
+  if (openIntent.kind === 'terminal') {
+    return { kind: 'terminal', terminalId: openIntent.terminalId }
+  }
+  if (openIntent.kind === 'file') {
+    return { kind: 'file', path: openIntent.path }
+  }
+  return { kind: 'draft', draftId: openIntent.draftId }
+}
 
 export default function HostWorkspaceLayout() {
+  const router = useRouter()
+  const consumedIntentRef = useRef<string | null>(null)
   const params = useLocalSearchParams<{
     serverId?: string | string[]
     workspaceId?: string | string[]
@@ -13,21 +44,44 @@ export default function HostWorkspaceLayout() {
   const globalParams = useGlobalSearchParams<{
     open?: string | string[]
   }>()
-  const serverValue = Array.isArray(params.serverId) ? params.serverId[0] : params.serverId
-  const workspaceValue = Array.isArray(params.workspaceId)
-    ? params.workspaceId[0]
-    : params.workspaceId
-  const serverId = serverValue?.trim() ?? ''
+  const serverId = getParamValue(params.serverId)
+  const workspaceValue = getParamValue(params.workspaceId)
   const workspaceId = workspaceValue ? (decodeWorkspaceIdFromPathSegment(workspaceValue) ?? '') : ''
-  const openValue = Array.isArray(globalParams.open) ? globalParams.open[0] : globalParams.open
-  const openIntent = parseWorkspaceOpenIntent(openValue)
+  const openValue = getParamValue(globalParams.open)
+
+  useEffect(() => {
+    if (!openValue) {
+      return
+    }
+
+    const consumptionKey = `${serverId}:${workspaceId}:${openValue}`
+    if (consumedIntentRef.current === consumptionKey) {
+      return
+    }
+    consumedIntentRef.current = consumptionKey
+
+    const openIntent = parseWorkspaceOpenIntent(openValue)
+    const route = openIntent
+      ? prepareWorkspaceTab({
+          serverId,
+          workspaceId,
+          target: getOpenIntentTarget(openIntent),
+          pin: openIntent.kind === 'agent',
+        })
+      : buildHostWorkspaceRoute(serverId, workspaceId)
+
+    router.replace(route as any)
+  }, [openValue, router, serverId, workspaceId])
+
+  if (openValue) {
+    return null
+  }
 
   return (
     <WorkspaceScreen
       key={`${serverId}:${workspaceId}`}
       serverId={serverId}
       workspaceId={workspaceId}
-      openIntent={openIntent}
     />
   )
 }