Unify app connection state around host runtime

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

@@ -18,6 +18,10 @@ import { shortenPath } from "@/utils/shorten-path";
 import { deriveBranchLabel, deriveProjectPath } from "@/utils/agent-display-info";
 import { type AggregatedAgent } from "@/hooks/use-aggregated-agents";
 import { useSessionStore } from "@/stores/session-store";
+import {
+  getHostRuntimeStore,
+  isHostRuntimeConnected,
+} from "@/runtime/host-runtime";
 import { AgentStatusDot } from "@/components/agent-status-dot";
 import {
   CHECKOUT_STATUS_STALE_TIME,
@@ -154,9 +158,9 @@ export function AgentList({
           continue;
         }
 
-        const session = useSessionStore.getState().sessions[agent.serverId];
-        const client = session?.client ?? null;
-        const isConnected = session?.connection.isConnected ?? false;
+        const runtime = getHostRuntimeStore();
+        const client = runtime.getClient(agent.serverId);
+        const isConnected = isHostRuntimeConnected(runtime.getSnapshot(agent.serverId));
         if (!client || !isConnected) {
           continue;
         }

packages/app/src/components/multi-daemon-session-host.tsx

@@ -24,7 +24,7 @@ function ManagedDaemonSession({ daemon }: { daemon: HostProfile }) {
     );
   }, [daemon.serverId, hasConnectionRecord, snapshot, updateConnectionStatus]);
 
-  if (!snapshot?.activeConnection || !client) {
+  if (!client) {
     return null;
   }
 

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

@@ -28,7 +28,10 @@ import {
   DraggableList,
   type DraggableRenderItemInfo,
 } from "./draggable-list";
-import { useSessionStore } from "@/stores/session-store";
+import {
+  getHostRuntimeStore,
+  isHostRuntimeConnected,
+} from "@/runtime/host-runtime";
 import {
   buildAgentNavigationKey,
   startNavigationTiming,
@@ -490,7 +493,6 @@ export function SidebarAgentList({
   }, [projectOptions, selectedProjectKeys]);
   const showProjectFilters = projectOptions.length > 0;
 
-  const sessions = useSessionStore((state) => state.sessions);
   const projectIconRequests = useMemo(() => {
     const unique = new Map<string, { serverId: string; cwd: string }>();
     for (const option of projectOptions) {
@@ -517,8 +519,7 @@ export function SidebarAgentList({
     queries: projectIconRequests.map((request) => ({
       queryKey: projectIconQueryKey(request.serverId, request.cwd),
       queryFn: async () => {
-        const client =
-          useSessionStore.getState().sessions[request.serverId]?.client ?? null;
+        const client = getHostRuntimeStore().getClient(request.serverId);
         if (!client) {
           return null;
         }
@@ -526,8 +527,10 @@ export function SidebarAgentList({
         return result.icon;
       },
       enabled: Boolean(
-        sessions[request.serverId]?.client &&
-          sessions[request.serverId]?.connection.isConnected &&
+        getHostRuntimeStore().getClient(request.serverId) &&
+          isHostRuntimeConnected(
+            getHostRuntimeStore().getSnapshot(request.serverId)
+          ) &&
           request.cwd
       ),
       staleTime: Infinity,

packages/app/src/components/terminal-pane.tsx

@@ -17,7 +17,7 @@ import Svg, {
 } from "react-native-svg";
 import { StyleSheet, UnistylesRuntime, useUnistyles } from "react-native-unistyles";
 import type { ListTerminalsResponse } from "@server/shared/messages";
-import { useSessionStore } from "@/stores/session-store";
+import { useHostRuntimeSession } from "@/runtime/host-runtime";
 import {
   hasPendingTerminalModifiers,
   normalizeTerminalTransportKey,
@@ -135,10 +135,7 @@ export function TerminalPane({ serverId, cwd }: TerminalPaneProps) {
     UnistylesRuntime.breakpoint === "xs" || UnistylesRuntime.breakpoint === "sm";
 
   const queryClient = useQueryClient();
-  const client = useSessionStore((state) => state.sessions[serverId]?.client ?? null);
-  const isConnected = useSessionStore(
-    (state) => state.sessions[serverId]?.connection.isConnected ?? false
-  );
+  const { client, isConnected } = useHostRuntimeSession(serverId);
 
   const scopeKey = useMemo(() => terminalScopeKey({ serverId, cwd }), [serverId, cwd]);
   const terminalsQueryKey = useMemo(() => ["terminals", serverId, cwd] as const, [cwd, serverId]);