refactor: remove daemon connections context, use host runtime directly

packages/app/src/hooks/use-aggregated-agents.ts

@@ -1,6 +1,6 @@
-import { useMemo, useCallback } from "react";
+import { useMemo, useCallback, useSyncExternalStore } from "react";
 import { useShallow } from "zustand/shallow";
-import { useDaemonConnections } from "@/contexts/daemon-connections-context";
+import { useDaemonRegistry } from "@/contexts/daemon-registry-context";
 import { useSessionStore } from "@/stores/session-store";
 import type { AgentDirectoryEntry } from "@/types/agent-directory";
 import type { Agent } from "@/stores/session-store";
@@ -20,8 +20,13 @@ export interface AggregatedAgentsResult {
 }
 
 export function useAggregatedAgents(): AggregatedAgentsResult {
-  const { connectionStates } = useDaemonConnections();
+  const { daemons } = useDaemonRegistry();
   const runtime = getHostRuntimeStore();
+  const runtimeVersion = useSyncExternalStore(
+    (onStoreChange) => runtime.subscribeAll(onStoreChange),
+    () => runtime.getVersion(),
+    () => runtime.getVersion()
+  );
 
   const sessionAgents = useSessionStore(
     useShallow((state) => {
@@ -39,13 +44,16 @@ export function useAggregatedAgents(): AggregatedAgentsResult {
 
   const result = useMemo(() => {
     const allAgents: AggregatedAgent[] = [];
+    const serverLabelById = new Map(
+      daemons.map((daemon) => [daemon.serverId, daemon.label] as const)
+    );
 
     // Derive agent directory from all sessions
     for (const [serverId, agents] of Object.entries(sessionAgents)) {
       if (!agents || agents.size === 0) {
         continue;
       }
-      const serverLabel = connectionStates.get(serverId)?.daemon.label ?? serverId;
+      const serverLabel = serverLabelById.get(serverId) ?? serverId;
       for (const agent of agents.values()) {
         const nextAgent: AggregatedAgent = {
           id: agent.id,
@@ -85,11 +93,12 @@ export function useAggregatedAgents(): AggregatedAgentsResult {
     const hasAnyData = allAgents.length > 0;
 
     // Align list loading with the runtime directory-sync machine.
-    const isLoading = Array.from(connectionStates.values()).some(
-      (connection) =>
-        connection.agentDirectoryStatus === "initial_loading" ||
-        connection.agentDirectoryStatus === "revalidating"
-    );
+    const isLoading = daemons.some((daemon) => {
+      const status =
+        runtime.getSnapshot(daemon.serverId)?.agentDirectoryStatus ??
+        "initial_loading";
+      return status === "initial_loading" || status === "revalidating";
+    });
     const isInitialLoad = isLoading && !hasAnyData;
     const isRevalidating = isLoading && hasAnyData;
 
@@ -99,7 +108,7 @@ export function useAggregatedAgents(): AggregatedAgentsResult {
       isInitialLoad,
       isRevalidating,
     };
-  }, [sessionAgents, connectionStates]);
+  }, [daemons, runtime, runtimeVersion, sessionAgents]);
 
   return {
     ...result,

packages/app/src/hooks/use-all-agents-list.ts

@@ -1,5 +1,5 @@
 import { useCallback, useMemo } from "react";
-import { useDaemonConnections } from "@/contexts/daemon-connections-context";
+import { useDaemonRegistry } from "@/contexts/daemon-registry-context";
 import { useSessionStore, type Agent } from "@/stores/session-store";
 import {
   getHostRuntimeStore,
@@ -37,7 +37,7 @@ function toAggregatedAgent(params: {
 export function useAllAgentsList(options?: {
   serverId?: string | null;
 }): AggregatedAgentsResult {
-  const { connectionStates } = useDaemonConnections();
+  const { daemons } = useDaemonRegistry();
   const runtime = getHostRuntimeStore();
 
   const serverId = useMemo(() => {
@@ -64,7 +64,8 @@ export function useAllAgentsList(options?: {
     if (!serverId || !liveAgents) {
       return [];
     }
-    const serverLabel = connectionStates.get(serverId)?.daemon.label ?? serverId;
+    const serverLabel =
+      daemons.find((daemon) => daemon.serverId === serverId)?.label ?? serverId;
     const list: AggregatedAgent[] = [];
 
     for (const agent of liveAgents.values()) {
@@ -95,7 +96,7 @@ export function useAllAgentsList(options?: {
     });
 
     return list;
-  }, [connectionStates, liveAgents, serverId]);
+  }, [daemons, liveAgents, serverId]);
 
   const isDirectoryLoading = Boolean(serverId && isHostRuntimeDirectoryLoading(snapshot));
   const isInitialLoad = isDirectoryLoading && agents.length === 0;

packages/app/src/hooks/use-sidebar-agents-list.ts

@@ -1,5 +1,5 @@
 import { useCallback, useMemo } from "react";
-import { useDaemonConnections } from "@/contexts/daemon-connections-context";
+import { useDaemonRegistry } from "@/contexts/daemon-registry-context";
 import { useSessionStore, type Agent } from "@/stores/session-store";
 import {
   getHostRuntimeStore,
@@ -149,7 +149,7 @@ export function useSidebarAgentsList(options?: {
   serverId?: string | null;
   selectedProjectFilterKeys?: string[];
 }): SidebarAgentsListResult {
-  const { connectionStates } = useDaemonConnections();
+  const { daemons } = useDaemonRegistry();
   const runtime = getHostRuntimeStore();
   const serverId = useMemo(() => {
     const value = options?.serverId;
@@ -184,7 +184,8 @@ export function useSidebarAgentsList(options?: {
       };
     }
 
-    const serverLabel = connectionStates.get(serverId)?.daemon.label ?? serverId;
+    const serverLabel =
+      daemons.find((daemon) => daemon.serverId === serverId)?.label ?? serverId;
     const seenAgentIds = new Set<string>();
     const byProject = new Map<string, SidebarProjectFilterOption>();
     const mergedEntries: SidebarAgentListEntry[] = [];
@@ -261,7 +262,7 @@ export function useSidebarAgentsList(options?: {
       hasAnyData: ordered.entries.length > 0,
       hasMoreEntries: ordered.hasMore,
     };
-  }, [connectionStates, liveAgents, selectedProjectFilterKeys, serverId]);
+  }, [daemons, liveAgents, selectedProjectFilterKeys, serverId]);
 
   const refreshAll = useCallback(() => {
     if (!serverId || snapshot?.connectionStatus !== "online") {