Fix duplicate workspace shell navigation

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

@@ -21,7 +21,7 @@ import { Archive } from "lucide-react-native";
 import { getProviderIcon } from "@/components/provider-icons";
 import { buildHostAgentDetailRoute } from "@/utils/host-routes";
 import { resolveWorkspaceIdByExecutionDirectory } from "@/utils/workspace-execution";
-import { prepareWorkspaceTab } from "@/utils/workspace-navigation";
+import { navigateToPreparedWorkspaceTab } from "@/utils/workspace-navigation";
 import type { Agent } from "@/stores/session-store";
 import { useArchiveAgent } from "@/hooks/use-archive-agent";
 
@@ -324,13 +324,12 @@ export function AgentList({
       }
 
       rememberArchivedAgentDetail(agent);
-      const route = prepareWorkspaceTab({
+      navigateToPreparedWorkspaceTab({
         serverId,
         workspaceId,
         target: { kind: "agent", agentId },
         pin: Boolean(agent.archivedAt),
       });
-      router.navigate(route);
     },
     [isActionSheetVisible, onAgentSelect],
   );

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

@@ -21,7 +21,6 @@ import {
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { useMutation } from "@tanstack/react-query";
-import { useRouter } from "expo-router";
 import Animated, {
   FadeIn,
   FadeOut,
@@ -83,7 +82,7 @@ import {
 import { MAX_CONTENT_WIDTH } from "@/constants/layout";
 import { normalizeInlinePathTarget } from "@/utils/inline-path";
 import { resolveWorkspaceIdByExecutionDirectory } from "@/utils/workspace-execution";
-import { prepareWorkspaceTab } from "@/utils/workspace-navigation";
+import { navigateToPreparedWorkspaceTab } from "@/utils/workspace-navigation";
 import { useStableEvent } from "@/hooks/use-stable-event";
 import {
   getWorkingIndicatorDotStrength,
@@ -135,7 +134,6 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
     ref,
   ) {
     const viewportRef = useRef<StreamViewportHandle | null>(null);
-    const router = useRouter();
     const isMobile = useIsCompactFormFactor();
     const streamRenderStrategy = useMemo(
       () =>
@@ -213,12 +211,11 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
           }
 
           if (workspaceId) {
-            const route = prepareWorkspaceTab({
+            navigateToPreparedWorkspaceTab({
               serverId: resolvedServerId,
               workspaceId,
               target: { kind: "file", path: normalized.file },
             });
-            router.navigate(route);
           }
           return;
         }
@@ -247,7 +244,6 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
         onOpenWorkspaceFile,
         requestDirectoryListing,
         resolvedServerId,
-        router,
         setExplorerTabForCheckout,
         openWorkspaceFile,
         workspaceId,