Improve chat recovery

Author: ericdallo

src/bridge/transport.ts

@@ -116,9 +116,17 @@ export class WebBridge {
    */
   private subagentChatIds = new Set<string>();
 
-  constructor(host: string, password: string, protocol?: Protocol) {
+  /**
+   * The preferred chat ID to restore on connect. When set (e.g. from
+   * persisted storage), `restoreChats()` will select this chat instead
+   * of the most recent one — giving the user continuity across sessions.
+   */
+  private preferredChatId: string | null = null;
+
+  constructor(host: string, password: string, protocol?: Protocol, lastChatId?: string) {
     this.host = host;
     this.api = new EcaRemoteApi(host, password, protocol);
+    this.preferredChatId = lastChatId ?? null;
   }
 
   // ---------------------------------------------------------------------------
@@ -755,11 +763,15 @@ export class WebBridge {
       });
     }
 
-    // Auto-select and load the most recent chat
-    const lastChat = summaries[summaries.length - 1];
-    if (lastChat?.id) {
-      this.currentChatId = lastChat.id;
-      await this.loadChatMessages(lastChat.id);
+    // Auto-select the preferred chat (from previous session) or fall back
+    // to the most recent chat in the list.
+    const preferred = this.preferredChatId
+      ? summaries.find((s) => s.id === this.preferredChatId)
+      : null;
+    const chatToSelect = preferred ?? summaries[summaries.length - 1];
+    if (chatToSelect?.id) {
+      this.currentChatId = chatToSelect.id;
+      await this.loadChatMessages(chatToSelect.id);
     }
 
     this.notifyChatListChange();

src/pages/ConnectionBar.tsx

@@ -22,6 +22,8 @@ export interface ConnectionEntry {
   error?: string;
   /** Workspace folders reported by the server once the session is connected. */
   workspaceFolders?: (WorkspaceFolder | string)[];
+  /** ID of the last viewed chat — restored when reconnecting to this server. */
+  lastChatId?: string;
 }
 
 interface ConnectionBarProps {

src/pages/RemoteProduct.tsx

@@ -52,7 +52,7 @@ export function RemoteProduct() {
   // --- Persistence ---
 
   useEffect(() => {
-    saveConnections(entries.map(({ id, host, password, protocol, workspaceFolders }) => ({ id, host, password, protocol, workspaceFolders })));
+    saveConnections(entries.map(({ id, host, password, protocol, workspaceFolders, lastChatId }) => ({ id, host, password, protocol, workspaceFolders, lastChatId })));
   }, [entries]);
 
   useEffect(() => {
@@ -270,6 +270,16 @@ export function RemoteProduct() {
       bridge.onChatListChanged((entries, selected) => {
         setChatEntries(entries);
         setSelectedChatId(selected);
+        // Persist the last viewed chat ID so it can be restored on reconnect.
+        if (connId && selected) {
+          setEntries((prev) => {
+            const entry = prev.find((e) => e.id === connId);
+            if (entry?.lastChatId === selected) return prev; // no change — keep same reference
+            return prev.map((e) =>
+              e.id === connId ? { ...e, lastChatId: selected } : e,
+            );
+          });
+        }
         // Workspace folders become available after session:connected,
         // which fires before chats are restored — so pick them up here.
         syncFolders();
@@ -334,6 +344,7 @@ export function RemoteProduct() {
               host={activeEntry.host}
               password={activeEntry.password}
               protocol={activeEntry.protocol}
+              lastChatId={activeEntry.lastChatId}
               onStatusChange={(status, error) =>
                 handleStatusChange(activeEntry.id, status, error)
               }

src/pages/RemoteSession.tsx

@@ -55,12 +55,14 @@ interface RemoteSessionProps {
   host: string;
   password: string;
   protocol?: Protocol;
+  /** ID of the last viewed chat — used to restore the previous chat on reconnect. */
+  lastChatId?: string;
   onStatusChange: (status: SessionStatus, error?: string) => void;
   /** Called when the bridge instance changes (connected or disconnected). */
   onBridgeChange?: (bridge: WebBridge | null) => void;
 }
 
-export function RemoteSession({ host, password, protocol, onStatusChange, onBridgeChange }: RemoteSessionProps) {
+export function RemoteSession({ host, password, protocol, lastChatId, onStatusChange, onBridgeChange }: RemoteSessionProps) {
   const [state, setState] = useState<
     | { status: 'connecting' }
     | { status: 'connected' }
@@ -72,6 +74,8 @@ export function RemoteSession({ host, password, protocol, onStatusChange, onBrid
 
   const bridgeRef = useRef<WebBridge | null>(null);
   const mountedRef = useRef(true);
+  const lastChatIdRef = useRef(lastChatId);
+  lastChatIdRef.current = lastChatId;
   const onStatusChangeRef = useRef(onStatusChange);
   const onBridgeChangeRef = useRef(onBridgeChange);
   onStatusChangeRef.current = onStatusChange;
@@ -85,7 +89,7 @@ export function RemoteSession({ host, password, protocol, onStatusChange, onBrid
     // Disconnect any existing bridge
     bridgeRef.current?.disconnect();
 
-    const bridge = new WebBridge(host, password, protocol);
+    const bridge = new WebBridge(host, password, protocol, lastChatIdRef.current);
     bridgeRef.current = bridge;
 
     // Subscribe to reconnection events

src/storage/connections.ts

@@ -19,6 +19,8 @@ export interface Connection {
   protocol?: Protocol;
   /** Cached workspace folders from the last successful session. */
   workspaceFolders?: (WorkspaceFolder | string)[];
+  /** ID of the last viewed chat — restored when reconnecting to this server. */
+  lastChatId?: string;
 }
 
 // ---------------------------------------------------------------------------