diff --git a/packages/app/src/config/session-debug.ts b/packages/app/src/config/session-debug.ts
deleted file mode 100644
index bdc04ba0c..000000000
--- a/packages/app/src/config/session-debug.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export const SESSION_DEBUG_PERSIST_FULL_SNAPSHOT =
-  typeof process !== "undefined" && process.env?.EXPO_PUBLIC_SESSION_DEBUG_FULL_SNAPSHOT === "1";
-
diff --git a/packages/app/src/contexts/session-context.tsx b/packages/app/src/contexts/session-context.tsx
index 509ee96b1..3690f5e09 100644
--- a/packages/app/src/contexts/session-context.tsx
+++ b/packages/app/src/contexts/session-context.tsx
@@ -33,9 +33,6 @@ import * as FileSystem from 'expo-file-system';
 import { useDaemonConnections } from "./daemon-connections-context";
 import { useSessionStore } from "@/stores/session-store";
 import type { AgentDirectoryEntry } from "@/types/agent-directory";
-import { SESSION_DEBUG_PERSIST_FULL_SNAPSHOT } from "@/config/session-debug";
-import { publishSessionHeavyState, clearSessionHeavyState } from "@/stores/session-heavy-state";
-import type { SessionHeavyState } from "@/stores/session-heavy-state";
 
 const derivePendingPermissionKey = (agentId: string, request: AgentPermissionRequest) => {
   const fallbackId =
@@ -207,137 +204,42 @@ const pushHistory = (history: string[], path: string): string[] => {
 };
 
 const SESSION_SNAPSHOT_STORAGE_PREFIX = "@paseo:session-snapshot:";
-const SESSION_SNAPSHOT_VERSION = 2;
-export const MAX_MESSAGES_PER_AGENT = 200;
-export const MAX_STREAM_ITEMS_PER_AGENT = 200;
 
-const EMPTY_MESSAGES: MessageEntry[] = [];
-const EMPTY_AGENT_STREAM_STATE = new Map<string, StreamItem[]>();
-const DEFAULT_AGENT_CAPABILITIES: AgentCapabilityFlags = {
-  supportsStreaming: false,
-  supportsSessionPersistence: false,
-  supportsDynamicModes: false,
-  supportsMcpServers: false,
-  supportsReasoningStream: false,
-  supportsToolInvocations: false,
-};
-
-type PersistedDirectoryEntry = Omit<AgentDirectoryEntry, "lastActivityAt"> & {
-  lastActivityAt: string;
-};
-
-type LegacySessionSnapshot = {
+type PersistedSessionSnapshot = {
   agents: AgentSnapshotPayload[];
   commands: Command[];
   savedAt: string;
 };
 
-type LightweightSessionSnapshot = {
-  version: typeof SESSION_SNAPSHOT_VERSION;
-  directory: PersistedDirectoryEntry[];
-  savedAt: string;
-  full?: {
-    agents: AgentSnapshotPayload[];
-    commands: Command[];
-  };
-};
-
-type LoadedSessionSnapshot =
-  | {
-      kind: "legacy";
-      agents: AgentSnapshotPayload[];
-      commands: Command[];
-      savedAt: string;
-    }
-  | {
-      kind: "lightweight";
-      directory: AgentDirectoryEntry[];
-      savedAt: string;
-      full?: {
-        agents: AgentSnapshotPayload[];
-        commands: Command[];
-      };
-    };
-
 const getSessionSnapshotStorageKey = (serverId: string): string => {
   return `${SESSION_SNAPSHOT_STORAGE_PREFIX}${serverId}`;
 };
 
-function isLegacySessionSnapshot(payload: any): payload is LegacySessionSnapshot {
-  return Array.isArray(payload?.agents) && Array.isArray(payload?.commands);
-}
-
-function isLightweightSessionSnapshot(payload: any): payload is LightweightSessionSnapshot {
-  return (
-    payload?.version === SESSION_SNAPSHOT_VERSION &&
-    Array.isArray(payload?.directory)
-  );
-}
-
-function deserializePersistedDirectoryEntry(entry: PersistedDirectoryEntry): AgentDirectoryEntry {
-  return {
-    ...entry,
-    lastActivityAt: new Date(entry.lastActivityAt),
-  };
-}
-
-function serializeDirectoryEntry(entry: AgentDirectoryEntry): PersistedDirectoryEntry {
-  return {
-    ...entry,
-    lastActivityAt: entry.lastActivityAt.toISOString(),
-  };
-}
-
-async function loadPersistedSessionSnapshot(serverId: string): Promise<LoadedSessionSnapshot | null> {
+async function loadPersistedSessionSnapshot(serverId: string): Promise<PersistedSessionSnapshot | null> {
   try {
     const raw = await AsyncStorage.getItem(getSessionSnapshotStorageKey(serverId));
     if (!raw) {
       return null;
     }
-    const parsed = JSON.parse(raw);
-    if (isLightweightSessionSnapshot(parsed)) {
-      return {
-        kind: "lightweight",
-        directory: parsed.directory.map(deserializePersistedDirectoryEntry),
-        savedAt: parsed.savedAt,
-        full: parsed.full,
-      };
-    }
-    if (!isLegacySessionSnapshot(parsed)) {
+    const parsed = JSON.parse(raw) as PersistedSessionSnapshot;
+    if (!Array.isArray(parsed?.agents) || !Array.isArray(parsed?.commands)) {
       return null;
     }
-    return {
-      kind: "legacy",
-      agents: parsed.agents,
-      commands: parsed.commands,
-      savedAt: parsed.savedAt,
-    };
+    return parsed;
   } catch (error) {
     console.error(`[Session] Failed to load persisted snapshot for ${serverId}`, error);
     return null;
   }
 }
 
-async function persistSessionSnapshot(
-  serverId: string,
-  snapshot: { agents: AgentSnapshotPayload[]; commands: Command[]; directory: AgentDirectoryEntry[] }
-) {
+async function persistSessionSnapshot(serverId: string, snapshot: { agents: AgentSnapshotPayload[]; commands: Command[] }) {
   try {
-    const payload: LightweightSessionSnapshot = {
-      version: SESSION_SNAPSHOT_VERSION,
-      directory: snapshot.directory.map(serializeDirectoryEntry),
+    const payload: PersistedSessionSnapshot = {
+      agents: snapshot.agents,
+      commands: snapshot.commands,
       savedAt: new Date().toISOString(),
-      ...(SESSION_DEBUG_PERSIST_FULL_SNAPSHOT
-        ? { full: { agents: snapshot.agents, commands: snapshot.commands } }
-        : {}),
     };
-    const persistenceMode = SESSION_DEBUG_PERSIST_FULL_SNAPSHOT ? "full" : "directory";
     await AsyncStorage.setItem(getSessionSnapshotStorageKey(serverId), JSON.stringify(payload));
-    console.log("[Session] Persisted snapshot", {
-      serverId,
-      agentCount: snapshot.directory.length,
-      mode: persistenceMode,
-    });
   } catch (error) {
     console.error(`[Session] Failed to persist snapshot for ${serverId}`, error);
   }
@@ -410,92 +312,6 @@ function buildAgentDirectoryEntries(serverId: string, agents: Map<string, Agent>
   return entries;
 }
 
-function buildAgentsFromDirectoryEntries(serverId: string, entries: AgentDirectoryEntry[]) {
-  const agents = new Map<string, Agent>();
-  for (const entry of entries) {
-    const lastActivity = entry.lastActivityAt ?? new Date();
-    agents.set(entry.id, {
-      serverId,
-      id: entry.id,
-      provider: entry.provider,
-      status: entry.status,
-      createdAt: lastActivity,
-      updatedAt: lastActivity,
-      lastUserMessageAt: null,
-      lastActivityAt: lastActivity,
-      sessionId: null,
-      capabilities: DEFAULT_AGENT_CAPABILITIES,
-      currentModeId: null,
-      availableModes: [],
-      pendingPermissions: [],
-      persistence: null,
-      lastUsage: undefined,
-      lastError: null,
-      title: entry.title ?? null,
-      cwd: entry.cwd,
-      model: null,
-    });
-  }
-  return agents;
-}
-
-function capMessages(entries: MessageEntry[], serverId: string): MessageEntry[] {
-  if (entries.length <= MAX_MESSAGES_PER_AGENT) {
-    return entries;
-  }
-  const trimmed = entries.slice(-MAX_MESSAGES_PER_AGENT);
-  console.log("[Session] Trimmed messages", {
-    serverId,
-    before: entries.length,
-    after: trimmed.length,
-    cap: MAX_MESSAGES_PER_AGENT,
-  });
-  return trimmed;
-}
-
-function capAgentStreamState(map: Map<string, StreamItem[]>, serverId: string): Map<string, StreamItem[]> {
-  let trimmed = false;
-  const trimmedAgents: Array<{ agentId: string; before: number; after: number }> = [];
-  const next = new Map(map);
-
-  for (const [agentId, stream] of map.entries()) {
-    if (stream.length <= MAX_STREAM_ITEMS_PER_AGENT) {
-      continue;
-    }
-    trimmed = true;
-    const capped = stream.slice(-MAX_STREAM_ITEMS_PER_AGENT);
-    next.set(agentId, capped);
-    trimmedAgents.push({
-      agentId,
-      before: stream.length,
-      after: capped.length,
-    });
-  }
-
-  if (trimmed) {
-    console.log("[Session] Trimmed stream buffers", {
-      serverId,
-      cap: MAX_STREAM_ITEMS_PER_AGENT,
-      agents: trimmedAgents,
-    });
-    return next;
-  }
-
-  return map;
-}
-
-function filterSessionStorePayload(payload: Partial<SessionContextValue>): Partial<SessionContextValue> {
-  const { messages: _messages, agentStreamState: _agentStreamState, ...rest } = payload;
-  const next: Partial<SessionContextValue> = { ...rest };
-  if (_messages !== undefined) {
-    next.messages = EMPTY_MESSAGES;
-  }
-  if (_agentStreamState !== undefined) {
-    next.agentStreamState = EMPTY_AGENT_STREAM_STATE;
-  }
-  return next;
-}
-
 
 export interface SessionContextValue {
   serverId: string;
@@ -647,15 +463,14 @@ export function SessionProvider({ children, serverUrl, serverId }: SessionProvid
 
   const syncSessionPartial = useCallback(
     (partial: Partial<SessionContextValue>) => {
-      const filtered = filterSessionStorePayload(partial);
       if (!hasRegisteredSessionRef.current) {
         pendingSessionUpdatesRef.current = {
           ...pendingSessionUpdatesRef.current,
-          ...filtered,
+          ...partial,
         };
         return;
       }
-      updateSession(serverId, filtered);
+      updateSession(serverId, partial);
     },
     [serverId, updateSession]
   );
@@ -717,35 +532,9 @@ export function SessionProvider({ children, serverUrl, serverId }: SessionProvid
   }, [updateIsPlayingAudio]);
   const [focusedAgentOverride, setFocusedAgentOverride] = useState<string | null>(null);
   const [orchestratorFocusedAgentId, setOrchestratorFocusedAgentId] = useState<string | null>(null);
-  const [messages, setLocalMessages] = useState<MessageEntry[]>([]);
-  const setMessages = useCallback<SessionContextValue["setMessages"]>(
-    (valueOrUpdater) => {
-      setLocalMessages((previous) => {
-        const next =
-          typeof valueOrUpdater === "function"
-            ? (valueOrUpdater as (prev: MessageEntry[]) => MessageEntry[])(previous)
-            : valueOrUpdater;
-        return capMessages(next, serverId);
-      });
-    },
-    [serverId]
-  );
+  const [messages, setMessages] = useSyncedSessionState("messages", () => [], syncSessionField);
   const [currentAssistantMessage, setCurrentAssistantMessage] = useSyncedSessionState("currentAssistantMessage", "", syncSessionField);
-  const [agentStreamState, setLocalAgentStreamState] = useState<Map<string, StreamItem[]>>(
-    () => new Map<string, StreamItem[]>()
-  );
-  const setAgentStreamState = useCallback<SessionContextValue["setAgentStreamState"]>(
-    (valueOrUpdater) => {
-      setLocalAgentStreamState((previous) => {
-        const next =
-          typeof valueOrUpdater === "function"
-            ? (valueOrUpdater as (prev: Map<string, StreamItem[]>) => Map<string, StreamItem[]>)(previous)
-            : valueOrUpdater;
-        return capAgentStreamState(next, serverId);
-      });
-    },
-    [serverId]
-  );
+  const [agentStreamState, setAgentStreamState] = useSyncedSessionState("agentStreamState", () => new Map<string, StreamItem[]>(), syncSessionField);
   const [initializingAgents, setInitializingAgents] = useSyncedSessionState("initializingAgents", () => new Map<string, boolean>(), syncSessionField);
   const [hasHydratedAgents, setHasHydratedAgents] = useSyncedSessionState("hasHydratedAgents", false, syncSessionField);
 
@@ -774,24 +563,6 @@ export function SessionProvider({ children, serverUrl, serverId }: SessionProvid
     });
   }, []);
   const [queuedMessages, setQueuedMessages] = useSyncedSessionState("queuedMessages", () => new Map(), syncSessionField);
-  const heavyStateRef = useRef<SessionHeavyState>({
-    messages,
-    agentStreamState,
-  });
-
-  useEffect(() => {
-    heavyStateRef.current = {
-      messages,
-      agentStreamState,
-    };
-    publishSessionHeavyState(serverId, heavyStateRef.current);
-  }, [agentStreamState, messages, serverId]);
-
-  useEffect(() => {
-    return () => {
-      clearSessionHeavyState(serverId);
-    };
-  }, [serverId]);
   const activeAudioGroupsRef = useRef<Set<string>>(new Set());
   const previousAgentStatusRef = useRef<Map<string, AgentLifecycleStatus>>(new Map());
   const providerModelRequestIdsRef = useRef<Map<AgentProvider, string>>(new Map());
@@ -830,66 +601,33 @@ export function SessionProvider({ children, serverUrl, serverId }: SessionProvid
         return;
       }
 
-      const hasFullSnapshot = snapshot.kind === "legacy" || Boolean(snapshot.full);
-      const snapshotMode = hasFullSnapshot ? "full" : "directory";
-      const agentCount =
-        snapshot.kind === "legacy"
-          ? snapshot.agents.length
-          : snapshot.directory.length;
-
-      console.log("[Session] Hydrating snapshot", {
+      const { agents: hydratedAgents, pendingPermissions: hydratedPermissions } = buildSessionStateFromSnapshots(
         serverId,
-        mode: snapshotMode,
-        agentCount,
+        snapshot.agents
+      );
+
+      let applied = false;
+      setAgents((prev) => {
+        if (prev.size > 0) {
+          return prev;
+        }
+        applied = true;
+        return hydratedAgents;
       });
 
-      if (hasFullSnapshot) {
-        const fullAgents = snapshot.kind === "legacy" ? snapshot.agents : snapshot.full?.agents ?? [];
-        const fullCommands = snapshot.kind === "legacy" ? snapshot.commands : snapshot.full?.commands ?? [];
-
-        const { agents: hydratedAgents, pendingPermissions: hydratedPermissions } =
-          buildSessionStateFromSnapshots(serverId, fullAgents);
-
-        let applied = false;
-        setAgents((prev) => {
-          if (prev.size > 0) {
-            return prev;
-          }
-          applied = true;
-          return hydratedAgents;
-        });
-
-        if (!applied) {
-          return;
-        }
-
-        setPendingPermissions(hydratedPermissions);
-        setCommands((prev) => {
-          if (prev.size > 0) {
-            return prev;
-          }
-          return new Map(fullCommands.map((command) => [command.id, command]));
-        });
-      } else {
-        const stubAgents = buildAgentsFromDirectoryEntries(serverId, snapshot.directory);
-        let applied = false;
-        setAgents((prev) => {
-          if (prev.size > 0) {
-            return prev;
-          }
-          applied = true;
-          return stubAgents;
-        });
-
-        if (!applied) {
-          return;
-        }
-
-        setPendingPermissions(new Map());
-        setCommands((prev) => (prev.size > 0 ? prev : new Map()));
+      if (!applied) {
+        return;
       }
 
-      setHasHydratedAgents(true);
+    setPendingPermissions(hydratedPermissions);
+    const commandEntries = snapshot.commands ?? [];
+    setCommands((prev) => {
+      if (prev.size > 0) {
+        return prev;
+      }
+      return new Map(commandEntries.map((command) => [command.id, command]));
+    });
+    setHasHydratedAgents(true);
     };
 
     void hydrateFromSnapshot();
@@ -1094,7 +832,6 @@ export function SessionProvider({ children, serverUrl, serverId }: SessionProvid
         serverId,
         agentsList
       );
-      const directoryEntries = buildAgentDirectoryEntries(serverId, hydratedAgents);
       const normalizedCommands = commandsList.map((command) => command as Command);
 
       setAgents(hydratedAgents);
@@ -1136,7 +873,7 @@ export function SessionProvider({ children, serverUrl, serverId }: SessionProvid
 
         return changed ? next : prev;
       });
-      void persistSessionSnapshot(serverId, { agents: agentsList, commands: normalizedCommands, directory: directoryEntries });
+      void persistSessionSnapshot(serverId, { agents: agentsList, commands: normalizedCommands });
       setHasHydratedAgents(true);
       updateConnectionStatus(serverId, { status: "online", lastOnlineAt: new Date().toISOString(), sessionReady: true });
     });
@@ -2306,10 +2043,10 @@ export function SessionProvider({ children, serverUrl, serverId }: SessionProvid
 
   useEffect(() => {
     const initialSnapshot = initialSessionValueRef.current as SessionContextValue;
-    const initialPayload = filterSessionStorePayload({
+    const initialPayload = {
       ...initialSnapshot,
       ...pendingSessionUpdatesRef.current,
-    }) as SessionContextValue;
+    };
     pendingSessionUpdatesRef.current = {};
     setSession(serverId, initialPayload);
     hasRegisteredSessionRef.current = true;
diff --git a/packages/app/src/hooks/use-daemon-session.ts b/packages/app/src/hooks/use-daemon-session.ts
index 6fa342cc6..9bfcf9b07 100644
--- a/packages/app/src/hooks/use-daemon-session.ts
+++ b/packages/app/src/hooks/use-daemon-session.ts
@@ -1,9 +1,8 @@
-import { useCallback, useMemo, useRef } from "react";
+import { useCallback, useRef } from "react";
 import { Alert } from "react-native";
 import type { SessionContextValue } from "@/contexts/session-context";
 import { useDaemonConnections } from "@/contexts/daemon-connections-context";
 import { useSessionStore } from "@/stores/session-store";
-import { useSessionHeavyState } from "@/stores/session-heavy-state";
 
 export class DaemonSessionUnavailableError extends Error {
   serverId: string;
@@ -38,21 +37,7 @@ export function useDaemonSession(serverId?: string | null, options?: UseDaemonSe
     },
     [serverId]
   );
-  const baseSession = useSessionStore(selectSession);
-  const heavyState = useSessionHeavyState(serverId ?? null);
-  const session = useMemo(() => {
-    if (!baseSession) {
-      return null;
-    }
-    if (!serverId || !heavyState) {
-      return baseSession;
-    }
-    return {
-      ...baseSession,
-      messages: heavyState.messages,
-      agentStreamState: heavyState.agentStreamState,
-    } as SessionContextValue;
-  }, [baseSession, heavyState, serverId]);
+  const session = useSessionStore(selectSession);
   const { connectionStates } = useDaemonConnections();
   const alertedDaemonsRef = useRef<Set<string>>(new Set());
   const loggedDaemonsRef = useRef<Set<string>>(new Set());
diff --git a/packages/app/src/hooks/use-session-directory.ts b/packages/app/src/hooks/use-session-directory.ts
index fee24503b..8f41bcc33 100644
--- a/packages/app/src/hooks/use-session-directory.ts
+++ b/packages/app/src/hooks/use-session-directory.ts
@@ -1,28 +1,13 @@
 import { useCallback, useMemo } from "react";
 import { useStoreWithEqualityFn } from "zustand/traditional";
 import { useSessionStore, type SessionData } from "@/stores/session-store";
-import { useSessionHeavyDirectory } from "@/stores/session-heavy-state";
 
 export function useSessionDirectory(): Map<string, SessionData> {
   const sessions = useSessionStore((state) => state.sessions);
-  const heavyDirectory = useSessionHeavyDirectory();
 
   return useMemo(() => {
-    const merged = new Map<string, SessionData>();
-    for (const [serverId, session] of Object.entries(sessions)) {
-      const heavy = heavyDirectory.get(serverId);
-      if (heavy) {
-        merged.set(serverId, {
-          ...session,
-          messages: heavy.messages,
-          agentStreamState: heavy.agentStreamState,
-        });
-      } else {
-        merged.set(serverId, session);
-      }
-    }
-    return merged;
-  }, [heavyDirectory, sessions]);
+    return new Map<string, SessionData>(Object.entries(sessions));
+  }, [sessions]);
 }
 
 type SessionSelector<T> = (session: SessionData | null) => T;
diff --git a/packages/app/src/stores/session-heavy-state.ts b/packages/app/src/stores/session-heavy-state.ts
deleted file mode 100644
index 1afc194a9..000000000
--- a/packages/app/src/stores/session-heavy-state.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import { useSyncExternalStore } from "react";
-import type { MessageEntry } from "@/contexts/session-context";
-import type { StreamItem } from "@/types/stream";
-
-export type SessionHeavyState = {
-  messages: MessageEntry[];
-  agentStreamState: Map<string, StreamItem[]>;
-};
-
-const EMPTY_MESSAGES: MessageEntry[] = [];
-const EMPTY_AGENT_STREAM_STATE = new Map<string, StreamItem[]>();
-const EMPTY_HEAVY_STATE: SessionHeavyState = {
-  messages: EMPTY_MESSAGES,
-  agentStreamState: EMPTY_AGENT_STREAM_STATE,
-};
-
-const heavyStateRegistry = new Map<string, SessionHeavyState>();
-const heavyStateListeners = new Map<string, Set<() => void>>();
-const directoryListeners = new Set<() => void>();
-
-function getServerListeners(serverId: string): Set<() => void> {
-  let listeners = heavyStateListeners.get(serverId);
-  if (!listeners) {
-    listeners = new Set();
-    heavyStateListeners.set(serverId, listeners);
-  }
-  return listeners;
-}
-
-function notifyServer(serverId: string) {
-  const listeners = heavyStateListeners.get(serverId);
-  if (listeners) {
-    for (const listener of listeners) {
-      listener();
-    }
-  }
-  for (const listener of directoryListeners) {
-    listener();
-  }
-}
-
-export function publishSessionHeavyState(serverId: string, state: SessionHeavyState) {
-  heavyStateRegistry.set(serverId, state);
-  notifyServer(serverId);
-}
-
-export function clearSessionHeavyState(serverId: string) {
-  if (heavyStateRegistry.delete(serverId)) {
-    notifyServer(serverId);
-  }
-}
-
-export function getSessionHeavyState(serverId: string): SessionHeavyState | null {
-  return heavyStateRegistry.get(serverId) ?? null;
-}
-
-function subscribeToServer(serverId: string | null, listener: () => void) {
-  if (!serverId) {
-    return () => {};
-  }
-  const listeners = getServerListeners(serverId);
-  listeners.add(listener);
-  return () => {
-    listeners.delete(listener);
-  };
-}
-
-function subscribeToDirectory(listener: () => void) {
-  directoryListeners.add(listener);
-  return () => {
-    directoryListeners.delete(listener);
-  };
-}
-
-function getServerSnapshot(serverId: string | null): SessionHeavyState {
-  if (!serverId) {
-    return EMPTY_HEAVY_STATE;
-  }
-  return heavyStateRegistry.get(serverId) ?? EMPTY_HEAVY_STATE;
-}
-
-function getDirectorySnapshot(): Map<string, SessionHeavyState> {
-  return new Map(heavyStateRegistry.entries());
-}
-
-export function useSessionHeavyState(serverId: string | null): SessionHeavyState | null {
-  const snapshot = useSyncExternalStore(
-    (listener) => subscribeToServer(serverId, listener),
-    () => getServerSnapshot(serverId),
-    () => getServerSnapshot(serverId)
-  );
-  if (!serverId) {
-    return null;
-  }
-  return snapshot;
-}
-
-export function useSessionHeavyDirectory(): Map<string, SessionHeavyState> {
-  return useSyncExternalStore(subscribeToDirectory, getDirectorySnapshot, getDirectorySnapshot);
-}
-