refactor: centralize host route builders and add dedicated new-agent route

packages/app/src/hooks/use-command-center.ts

@@ -3,21 +3,12 @@ import type { TextInput } from "react-native";
 import { router, usePathname, type Href } from "expo-router";
 import { useKeyboardShortcutsStore } from "@/stores/keyboard-shortcuts-store";
 import { useAggregatedAgents, type AggregatedAgent } from "@/hooks/use-aggregated-agents";
-import { useSessionStore } from "@/stores/session-store";
-import {
-  checkoutStatusQueryKey,
-  type CheckoutStatusPayload,
-} from "@/hooks/use-checkout-status-query";
-import { queryClient } from "@/query/query-client";
 import {
   clearCommandCenterFocusRestoreElement,
   takeCommandCenterFocusRestoreElement,
 } from "@/utils/command-center-focus-restore";
 import {
-  buildNewAgentRoute,
-  resolveNewAgentWorkingDir,
-} from "@/utils/new-agent-routing";
-import {
+  buildHostNewAgentRoute,
   buildHostWorkspaceAgentTabRoute,
   buildHostSettingsRoute,
   parseHostAgentRouteFromPathname,
@@ -63,12 +54,6 @@ function parseAgentKeyFromPathname(pathname: string): string | null {
   return `${match.serverId}:${match.agentId}`;
 }
 
-function parseAgentRouteFromPathname(
-  pathname: string
-): { serverId: string; agentId: string } | null {
-  return parseHostAgentRouteFromPathname(pathname);
-}
-
 type CommandCenterActionDefinition = {
   id: string;
   title: string;
@@ -157,24 +142,7 @@ export function useCommandCenter() {
   const newAgentRoute = useMemo<Href>(() => {
     const serverIdFromPath =
       parseServerIdFromPathname(pathname) ?? fallbackServerId;
-    const routeAgent = parseAgentRouteFromPathname(pathname);
-    if (!routeAgent) {
-      return serverIdFromPath ? (buildNewAgentRoute(serverIdFromPath) as Href) : "/";
-    }
-
-    const { serverId, agentId } = routeAgent;
-    const currentAgent = useSessionStore.getState().sessions[serverId]?.agents?.get(agentId);
-    const cwd = currentAgent?.cwd?.trim();
-    if (!cwd) {
-      return buildNewAgentRoute(serverId) as Href;
-    }
-
-    const checkout =
-      queryClient.getQueryData<CheckoutStatusPayload>(
-        checkoutStatusQueryKey(serverId, cwd)
-      ) ?? null;
-    const workingDir = resolveNewAgentWorkingDir(cwd, checkout);
-    return buildNewAgentRoute(serverId, workingDir) as Href;
+    return serverIdFromPath ? (buildHostNewAgentRoute(serverIdFromPath) as Href) : "/";
   }, [fallbackServerId, pathname]);
 
   const settingsRoute = useMemo<Href>(() => {

packages/app/src/hooks/use-keyboard-shortcuts.ts

@@ -6,16 +6,7 @@ import { useSessionStore } from "@/stores/session-store";
 import { useKeyboardShortcutsStore } from "@/stores/keyboard-shortcuts-store";
 import { setCommandCenterFocusRestoreElement } from "@/utils/command-center-focus-restore";
 import {
-  checkoutStatusQueryKey,
-  type CheckoutStatusPayload,
-} from "@/hooks/use-checkout-status-query";
-import { queryClient } from "@/query/query-client";
-import {
-  buildNewAgentRoute,
-  resolveSelectedAgentForNewAgent,
-  resolveNewAgentWorkingDir,
-} from "@/utils/new-agent-routing";
-import {
+  buildHostNewAgentRoute,
   buildHostWorkspaceRoute,
   parseHostAgentRouteFromPathname,
   parseHostWorkspaceRouteFromPathname,
@@ -85,26 +76,6 @@ export function useKeyboardShortcuts({
 
     const navigateToNewAgent = (): boolean => {
       let targetServerId = parseServerIdFromPathname(pathname);
-      let targetWorkingDir: string | null = null;
-      const selectedAgent = resolveSelectedAgentForNewAgent({
-        pathname,
-        selectedAgentId,
-      });
-      if (selectedAgent) {
-        targetServerId = selectedAgent.serverId;
-        const agent = useSessionStore
-          .getState()
-          .sessions[selectedAgent.serverId]
-          ?.agents?.get(selectedAgent.agentId);
-        const cwd = agent?.cwd?.trim();
-        if (cwd) {
-          const checkout =
-            queryClient.getQueryData<CheckoutStatusPayload>(
-              checkoutStatusQueryKey(selectedAgent.serverId, cwd)
-            ) ?? null;
-          targetWorkingDir = resolveNewAgentWorkingDir(cwd, checkout);
-        }
-      }
 
       if (!targetServerId) {
         const sessionServerIds = Object.keys(useSessionStore.getState().sessions);
@@ -115,7 +86,7 @@ export function useKeyboardShortcuts({
         return false;
       }
 
-      router.push(buildNewAgentRoute(targetServerId, targetWorkingDir) as any);
+      router.push(buildHostNewAgentRoute(targetServerId) as any);
       return true;
     };