@co0ontty/wand 1.2.0 → 1.2.3

package/dist/server.js

@@ -56,11 +56,11 @@ import { ensureAvatarSeed, getAvatarSvg } from "./avatar.js";
 import { createSession, revokeSession, setAuthStorage, validateSession } from "./auth.js";
 import { ensureCertificates } from "./cert.js";
 import { isExecutionMode, resolveConfigDir, saveConfig } from "./config.js";
-import { ProcessManager, SessionInputError } from "./process-manager.js";
+import { ProcessManager } from "./process-manager.js";
+import { generatePwaManifest, generateServiceWorker } from "./pwa.js";
+import { registerClaudeHistoryRoutes, registerSessionRoutes } from "./server-session-routes.js";
 import { resolveDatabasePath, WandStorage } from "./storage.js";
 import { renderApp } from "./web-ui/index.js";
-import { parseMessages } from "./message-parser.js";
-import { generatePwaManifest, generateServiceWorker } from "./pwa.js";
 import { WsBroadcastManager } from "./ws-broadcast.js";
 import { checkRateLimit, recordFailedLogin, resetRateLimit } from "./middleware/rate-limit.js";
 import { isPathWithinBase, isBlockedFolderPath, normalizeFolderPath } from "./middleware/path-safety.js";
@@ -68,35 +68,6 @@ import { isPathWithinBase, isBlockedFolderPath, normalizeFolderPath } from "./mi
 function getErrorMessage(error, fallback) {
     return error instanceof Error ? error.message : fallback;
 }
-function getInputErrorResponse(error, sessionId) {
-    if (error instanceof SessionInputError) {
-        const statusCode = error.code === "SESSION_NOT_FOUND" ? 404 : 409;
-        return {
-            statusCode,
-            payload: {
-                error: error.message,
-                errorCode: error.code,
-                sessionId,
-                sessionStatus: error.sessionStatus ?? null,
-            },
-        };
-    }
-    return {
-        statusCode: 400,
-        payload: {
-            error: getErrorMessage(error, "会话已结束，请启动新会话。"),
-            errorCode: "INPUT_SEND_FAILED",
-            sessionId,
-            sessionStatus: null,
-        },
-    };
-}
-function getInputDebugMeta(error) {
-    if (error instanceof Error) {
-        return { name: error.name, message: error.message, stack: error.stack };
-    }
-    return { error };
-}
 // ── Git helpers ──
 async function isGitRepo(dirPath) {
     try {
@@ -509,152 +480,8 @@ export async function startServer(config, configPath) {
             updateInFlight = false;
         }
     });
-    app.get("/api/sessions", (_req, res) => {
-        res.json(processes.list());
-    });
-    app.get("/api/claude-history", (_req, res) => {
-        try {
-            const sessions = processes.listClaudeHistorySessions();
-            const hidden = getHiddenClaudeSessionIds(storage);
-            const filtered = hidden.size > 0
-                ? sessions.filter((s) => !s.claudeSessionId || !hidden.has(s.claudeSessionId))
-                : sessions;
-            res.json(filtered);
-        }
-        catch (error) {
-            res.status(500).json({ error: getErrorMessage(error, "无法扫描 Claude 历史会话。") });
-        }
-    });
-    app.delete("/api/claude-history/:claudeSessionId", (req, res) => {
-        const claudeSessionId = req.params.claudeSessionId?.trim();
-        if (!claudeSessionId) {
-            res.status(400).json({ error: "会话 ID 不能为空。" });
-            return;
-        }
-        const session = processes.listClaudeHistorySessions()
-            .find((s) => s.claudeSessionId === claudeSessionId);
-        if (session) {
-            processes.deleteClaudeHistoryFiles([{ claudeSessionId, cwd: session.cwd }]);
-            removeFromHiddenClaudeSessionIds(storage, [claudeSessionId]);
-        }
-        else {
-            const hidden = getHiddenClaudeSessionIds(storage);
-            if (!hidden.has(claudeSessionId)) {
-                hidden.add(claudeSessionId);
-                saveHiddenClaudeSessionIds(storage, hidden);
-            }
-        }
-        res.json({ ok: true });
-    });
-    app.delete("/api/claude-history", (req, res) => {
-        const cwd = typeof req.query.cwd === "string" ? req.query.cwd.trim() : "";
-        if (!cwd) {
-            res.status(400).json({ error: "目录不能为空。" });
-            return;
-        }
-        try {
-            const sessions = processes.listClaudeHistorySessions();
-            const toDelete = [];
-            for (const session of sessions) {
-                if (session.claudeSessionId && session.cwd === cwd) {
-                    toDelete.push({ claudeSessionId: session.claudeSessionId, cwd: session.cwd });
-                }
-            }
-            const deleted = processes.deleteClaudeHistoryFiles(toDelete);
-            removeFromHiddenClaudeSessionIds(storage, toDelete.map((s) => s.claudeSessionId));
-            res.json({ ok: true, deleted });
-        }
-        catch (error) {
-            res.status(500).json({ error: getErrorMessage(error, "无法删除该目录下的历史会话。") });
-        }
-    });
-    app.post("/api/claude-history/batch-delete", express.json(), (req, res) => {
-        const claudeSessionIds = Array.isArray(req.body?.claudeSessionIds)
-            ? req.body.claudeSessionIds.filter((value) => typeof value === "string" && value.trim().length > 0)
-            : [];
-        if (claudeSessionIds.length === 0) {
-            res.status(400).json({ error: "至少提供一个历史会话 ID。" });
-            return;
-        }
-        try {
-            const allSessions = processes.listClaudeHistorySessions();
-            const sessionMap = new Map();
-            for (const s of allSessions) {
-                if (s.claudeSessionId)
-                    sessionMap.set(s.claudeSessionId, s.cwd);
-            }
-            const toDelete = [];
-            const toHide = [];
-            for (const id of claudeSessionIds) {
-                const cwd = sessionMap.get(id);
-                if (cwd) {
-                    toDelete.push({ claudeSessionId: id, cwd });
-                }
-                else {
-                    toHide.push(id);
-                }
-            }
-            const deleted = processes.deleteClaudeHistoryFiles(toDelete);
-            removeFromHiddenClaudeSessionIds(storage, toDelete.map((s) => s.claudeSessionId));
-            if (toHide.length > 0) {
-                const hidden = getHiddenClaudeSessionIds(storage);
-                let added = 0;
-                for (const id of toHide) {
-                    if (!hidden.has(id)) {
-                        hidden.add(id);
-                        added++;
-                    }
-                }
-                if (added > 0)
-                    saveHiddenClaudeSessionIds(storage, hidden);
-            }
-            res.json({ ok: true, deleted: deleted + toHide.length });
-        }
-        catch (error) {
-            res.status(500).json({ error: getErrorMessage(error, "无法批量删除历史会话。") });
-        }
-    });
-    app.post("/api/sessions/batch-delete", express.json(), (req, res) => {
-        const sessionIds = Array.isArray(req.body?.sessionIds)
-            ? req.body.sessionIds.filter((value) => typeof value === "string" && value.trim().length > 0)
-            : [];
-        if (sessionIds.length === 0) {
-            res.status(400).json({ error: "至少提供一个会话 ID。" });
-            return;
-        }
-        let deleted = 0;
-        const failed = [];
-        for (const sessionId of sessionIds) {
-            try {
-                processes.delete(sessionId);
-                deleted += 1;
-            }
-            catch {
-                failed.push(sessionId);
-            }
-        }
-        if (deleted === 0 && failed.length > 0) {
-            res.status(400).json({ error: "无法批量删除会话。", failed });
-            return;
-        }
-        res.json({ ok: true, deleted, failed });
-    });
-    app.get("/api/sessions/:id", (req, res) => {
-        const snapshot = processes.get(req.params.id);
-        if (!snapshot) {
-            res.status(404).json({ error: "未找到该会话，可能已被删除。" });
-            return;
-        }
-        if (req.query.format === "chat") {
-            const messages = snapshot.messages && snapshot.messages.length > 0
-                ? snapshot.messages
-                : parseMessages(snapshot.output);
-            res.json({ ...snapshot, messages });
-        }
-        else {
-            res.json(snapshot);
-        }
-    });
+    registerSessionRoutes(app, processes, storage, config.defaultMode);
+    registerClaudeHistoryRoutes(app, processes, storage);
     // ── Path suggestion ──
     app.get("/api/path-suggestions", async (req, res) => {
         const query = typeof req.query.q === "string" ? req.query.q : "";
@@ -982,156 +809,6 @@ export async function startServer(config, configPath) {
             res.status(400).json({ error: getErrorMessage(error, "无法启动命令。请检查命令是否安装。") });
         }
     });
-    app.post("/api/sessions/:id/resume", (req, res) => {
-        const sessionId = req.params.id;
-        const body = req.body;
-        try {
-            const existingSession = processes.get(sessionId) || storage.getSession(sessionId);
-            if (!existingSession) {
-                res.status(404).json({ error: "会话不存在。" });
-                return;
-            }
-            const claudeSessionId = existingSession.claudeSessionId;
-            if (!claudeSessionId) {
-                res.status(400).json({ error: "此会话没有 Claude 会话 ID，无法恢复。" });
-                return;
-            }
-            const command = existingSession.command.trim();
-            if (!/^claude\b/.test(command)) {
-                res.status(400).json({ error: "只有 Claude 命令支持恢复功能。" });
-                return;
-            }
-            const newMode = body.mode
-                ? normalizeMode(body.mode, config.defaultMode)
-                : normalizeMode(existingSession.mode, config.defaultMode);
-            const resumeCommand = `${command} --resume ${claudeSessionId}`;
-            const newSnapshot = processes.start(resumeCommand, existingSession.cwd, newMode, undefined, { resumedFromSessionId: sessionId });
-            storage.saveSession({ ...existingSession, resumedToSessionId: newSnapshot.id });
-            res.status(201).json({ resumedFromSessionId: sessionId, ...newSnapshot });
-        }
-        catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法恢复会话。") });
-        }
-    });
-    app.post("/api/claude-sessions/:claudeSessionId/resume", (req, res) => {
-        const claudeSessionId = String(req.params.claudeSessionId || "").trim();
-        const body = req.body;
-        try {
-            if (!claudeSessionId) {
-                res.status(400).json({ error: "Claude 会话 ID 不能为空。" });
-                return;
-            }
-            const existingSession = storage.getLatestSessionByClaudeSessionId(claudeSessionId);
-            if (existingSession) {
-                const command = existingSession.command.trim();
-                if (!/^claude\b/.test(command)) {
-                    res.status(400).json({ error: "只有 Claude 命令支持按 Claude Session ID 恢复。" });
-                    return;
-                }
-                if (!existingSession.cwd || !processes.hasClaudeSessionFile(existingSession.cwd, claudeSessionId)) {
-                    res.status(400).json({ error: "对应的 Claude 历史会话文件不存在，无法恢复。" });
-                    return;
-                }
-                const newMode = body.mode
-                    ? normalizeMode(body.mode, config.defaultMode)
-                    : normalizeMode(existingSession.mode, config.defaultMode);
-                const resumeCommand = `${command} --resume ${claudeSessionId}`;
-                const newSnapshot = processes.start(resumeCommand, existingSession.cwd, newMode, undefined, { resumedFromSessionId: existingSession.id });
-                storage.saveSession({ ...existingSession, resumedToSessionId: newSnapshot.id });
-                res.status(201).json({ resumedFromSessionId: existingSession.id, resumedClaudeSessionId: claudeSessionId, ...newSnapshot });
-            }
-            else {
-                // No existing wand session — resume directly with cwd from request body
-                const cwd = body.cwd?.trim();
-                if (!cwd) {
-                    res.status(400).json({ error: "未找到对应的会话记录，请提供工作目录 (cwd)。" });
-                    return;
-                }
-                const newMode = normalizeMode(body.mode, config.defaultMode);
-                const resumeCommand = `claude --resume ${claudeSessionId}`;
-                const newSnapshot = processes.start(resumeCommand, cwd, newMode);
-                res.status(201).json({ resumedClaudeSessionId: claudeSessionId, ...newSnapshot });
-            }
-        }
-        catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法按 Claude 会话 ID 恢复会话。") });
-        }
-    });
-    app.post("/api/sessions/:id/input", (req, res) => {
-        const body = req.body;
-        const sessionId = req.params.id;
-        const input = body.input ?? "";
-        const view = body.view;
-        const shortcutKey = body.shortcutKey;
-        console.error("[wand] Input request received", { sessionId, inputLength: input.length, view: view ?? "chat" });
-        try {
-            const snapshot = processes.sendInput(sessionId, input, view, shortcutKey);
-            console.error("[wand] Input request succeeded", { sessionId, status: snapshot.status, inputLength: input.length, view: view ?? "chat" });
-            res.json(snapshot);
-        }
-        catch (error) {
-            const response = getInputErrorResponse(error, sessionId);
-            console.error("[wand] Input request failed", {
-                sessionId, inputLength: input.length, view: view ?? "chat",
-                responseStatus: response.statusCode, responsePayload: response.payload,
-                error: getInputDebugMeta(error),
-            });
-            res.status(response.statusCode).json(response.payload);
-        }
-    });
-    app.post("/api/sessions/:id/resize", (req, res) => {
-        const body = req.body;
-        try {
-            const snapshot = processes.resize(req.params.id, body.cols ?? 0, body.rows ?? 0);
-            res.json(snapshot);
-        }
-        catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法调整终端大小。") });
-        }
-    });
-    app.post("/api/sessions/:id/approve-permission", (req, res) => {
-        try {
-            res.json(processes.approvePermission(req.params.id));
-        }
-        catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法批准该授权请求。") });
-        }
-    });
-    app.post("/api/sessions/:id/deny-permission", (req, res) => {
-        try {
-            res.json(processes.denyPermission(req.params.id));
-        }
-        catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法拒绝该授权请求。") });
-        }
-    });
-    app.post("/api/sessions/:id/escalations/:requestId/resolve", (req, res) => {
-        try {
-            const { requestId } = req.params;
-            const body = req.body;
-            res.json(processes.resolveEscalation(req.params.id, requestId, body.resolution));
-        }
-        catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法处理该授权请求。") });
-        }
-    });
-    app.post("/api/sessions/:id/stop", (req, res) => {
-        try {
-            res.json(processes.stop(req.params.id));
-        }
-        catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法停止会话。") });
-        }
-    });
-    app.delete("/api/sessions/:id", (req, res) => {
-        try {
-            processes.delete(req.params.id);
-            res.json({ ok: true });
-        }
-        catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法删除会话。") });
-        }
-    });
     // ── WebSocket broadcast layer ──
     const server = useHttps
         ? (() => {

package/dist/web-ui/content/scripts.js

@@ -349,22 +349,25 @@
         }
       }
 
+      function renderShortcutKeys() {
+        return '<button class="shortcut-key' + (state.modifiers.ctrl ? ' active' : '') + '" data-key="ctrl" type="button">Ctrl</button>' +
+          '<button class="shortcut-key' + (state.modifiers.alt ? ' active' : '') + '" data-key="alt" type="button">Alt</button>' +
+          '<span class="shortcut-sep">·</span>' +
+          '<button class="shortcut-key shortcut-dir" data-key="up" type="button">↑</button>' +
+          '<button class="shortcut-key shortcut-dir" data-key="down" type="button">↓</button>' +
+          '<button class="shortcut-key shortcut-dir" data-key="left" type="button">←</button>' +
+          '<button class="shortcut-key shortcut-dir" data-key="right" type="button">→</button>' +
+          '<span class="shortcut-sep">·</span>' +
+          '<button class="shortcut-key" data-key="enter" type="button">↵</button>' +
+          '<button class="shortcut-key" data-key="ctrl_enter" type="button">C-↵</button>' +
+          '<button class="shortcut-key" data-key="escape" type="button">Esc</button>';
+      }
+
       function renderInlineKeyboard() {
         if (!state.selectedId) return "";
         var isTerminal = state.currentView === "terminal";
         if (!isTerminal) return "";
-        var keys =
-            '<button class="shortcut-key' + (state.modifiers.ctrl ? ' active' : '') + '" data-key="ctrl" type="button">Ctrl</button>' +
-            '<button class="shortcut-key' + (state.modifiers.alt ? ' active' : '') + '" data-key="alt" type="button">Alt</button>' +
-            '<span class="shortcut-sep">·</span>' +
-            '<button class="shortcut-key shortcut-dir" data-key="up" type="button">↑</button>' +
-            '<button class="shortcut-key shortcut-dir" data-key="down" type="button">↓</button>' +
-            '<button class="shortcut-key shortcut-dir" data-key="left" type="button">←</button>' +
-            '<button class="shortcut-key shortcut-dir" data-key="right" type="button">→</button>' +
-            '<span class="shortcut-sep">·</span>' +
-            '<button class="shortcut-key" data-key="enter" type="button">↵</button>' +
-            '<button class="shortcut-key" data-key="ctrl_enter" type="button">C-↵</button>' +
-            '<button class="shortcut-key" data-key="escape" type="button">Esc</button>';
+        var keys = renderShortcutKeys();
         var arrow = state.shortcutsExpanded ? '›' : '‹';
         return '<div class="inline-shortcuts-wrap' + (state.shortcutsExpanded ? ' expanded' : '') + '">' +
             '<button class="shortcuts-toggle' + (state.shortcutsExpanded ? ' active' : '') + '" type="button" title="快捷键">' + arrow + '</button>' +
@@ -373,9 +376,11 @@
           '</div>';
       }
 
-      function renderMiniKeyboard() {
-        // Mini keyboard is now inline, rendered in input-composer-right
-        return "";
+      function renderExpandedShortcutsRow() {
+        if (!state.selectedId) return "";
+        var isTerminal = state.currentView === "terminal";
+        if (!isTerminal) return "";
+        return '<div class="inline-shortcuts-expanded-row' + (state.shortcutsExpanded ? ' visible' : '') + '">' + renderShortcutKeys() + '</div>';
       }
 
       function renderLogin() {
@@ -573,6 +578,7 @@
                       '</button>' +
                     '</div>' +
                   '</div>' +
+                  renderExpandedShortcutsRow() +
                   // Session info bar at bottom
                   '<div class="input-session-info-bar">' +
                     '<span id="session-cwd-display" class="session-cwd-display">' + (selectedSession && selectedSession.cwd ? escapeHtml(selectedSession.cwd) : '未设置目录') + '</span>' +
@@ -1985,6 +1991,8 @@
         // Inline shortcuts click handler
         var inlineShortcutsWrap = document.querySelector(".inline-shortcuts-wrap");
         if (inlineShortcutsWrap) inlineShortcutsWrap.addEventListener("click", handleInlineKeyboardClick);
+        var expandedShortcutsRow = document.querySelector(".inline-shortcuts-expanded-row");
+        if (expandedShortcutsRow) expandedShortcutsRow.addEventListener("click", handleInlineKeyboardClick);
         // Shortcuts toggle (mobile fold/unfold)
         var shortcutsToggleBtn = document.querySelector(".shortcuts-toggle");
         if (shortcutsToggleBtn) shortcutsToggleBtn.addEventListener("click", function(e) {
@@ -1992,7 +2000,9 @@
           state.shortcutsExpanded = !state.shortcutsExpanded;
           var wrap = document.querySelector(".inline-shortcuts-wrap");
           var toggle = document.querySelector(".shortcuts-toggle");
+          var row = document.querySelector(".inline-shortcuts-expanded-row");
           if (wrap) wrap.classList.toggle("expanded", state.shortcutsExpanded);
+          if (row) row.classList.toggle("visible", state.shortcutsExpanded);
           if (toggle) {
             toggle.classList.toggle("active", state.shortcutsExpanded);
             toggle.textContent = state.shortcutsExpanded ? "\u203a" : "\u2039";
@@ -2002,9 +2012,12 @@
         document.addEventListener("click", function(e) {
           if (!state.shortcutsExpanded) return;
           var wrap = document.querySelector(".inline-shortcuts-wrap");
-          if (wrap && !wrap.contains(e.target)) {
+          var expandedRow = document.querySelector(".inline-shortcuts-expanded-row");
+          var clickedInsideRow = expandedRow && expandedRow.contains(e.target);
+          if (wrap && !wrap.contains(e.target) && !clickedInsideRow) {
             state.shortcutsExpanded = false;
             wrap.classList.remove("expanded");
+            if (expandedRow) expandedRow.classList.remove("visible");
             var toggle = document.querySelector(".shortcuts-toggle");
             if (toggle) {
               toggle.classList.remove("active");
@@ -3310,6 +3323,58 @@
         }
       }
 
+      function subscribeToSession(sessionId) {
+        if (!sessionId || !state.ws || state.ws.readyState !== WebSocket.OPEN) return;
+        state.ws.send(JSON.stringify({ type: "subscribe", sessionId: sessionId }));
+      }
+
+      function mergeServerSession(localSession, serverSession) {
+        if (!localSession) return serverSession;
+
+        var merged = Object.assign({}, localSession, serverSession);
+        var localOutput = localSession.output || "";
+        var serverOutput = serverSession.output || "";
+        var keepLocalOutput = localOutput.length > serverOutput.length;
+
+        if (keepLocalOutput) {
+          merged.output = localOutput;
+        }
+
+        if (localSession.id === state.selectedId) {
+          if (localSession.permissionBlocked && serverSession.permissionBlocked === false) {
+            // server explicitly resolved it; keep resolved state
+          } else if (localSession.permissionBlocked && !serverSession.permissionBlocked) {
+            merged.permissionBlocked = true;
+          }
+
+          if (localSession.pendingEscalation && !serverSession.pendingEscalation && serverSession.permissionBlocked !== false) {
+            merged.pendingEscalation = localSession.pendingEscalation;
+          }
+
+          if (localSession.messages && localSession.messages.length > 0 && (!serverSession.messages || serverSession.messages.length === 0)) {
+            merged.messages = localSession.messages;
+          }
+        }
+
+        return merged;
+      }
+
+      function getPreferredMessages(session, fallbackOutput, allowFallback) {
+        if (session && session.messages && session.messages.length > 0) {
+          return session.messages;
+        }
+        if (!allowFallback) {
+          return [];
+        }
+        var output = typeof fallbackOutput === "string"
+          ? fallbackOutput
+          : (session && session.output) || "";
+        if (!output) {
+          return [];
+        }
+        return parseMessages(output, session && session.command);
+      }
+
       function getPreferredSessionId(sessions) {
         if (!sessions || !sessions.length) return null;
         // Keep currently selected session as long as it still exists
@@ -3344,10 +3409,7 @@
 
             state.sessions = serverSessions.map(function(serverSession) {
               var localSession = state.sessions.find(function(s) { return s.id === serverSession.id; });
-              if (localSession && localSession.output && localSession.output.length > (serverSession.output || '').length) {
-                return localSession;
-              }
-              return serverSession;
+              return mergeServerSession(localSession, serverSession);
             });
 
             state.selectedId = getPreferredSessionId(state.sessions);
@@ -3471,7 +3533,7 @@
             updateShellChrome();
 
             var selectedSession = state.sessions.find(function(s) { return s.id === id; });
-            state.currentMessages = data.messages || [];
+            state.currentMessages = getPreferredMessages(selectedSession, data.output, false);
 
             if (state.terminal) {
               syncTerminalBuffer(id, data.output || "", { mode: "replace" });
@@ -3506,6 +3568,7 @@
           refreshFileExplorer();
         }
         loadOutput(id).then(function() { focusInputBox(true); });
+        subscribeToSession(id);
       }
 
       function updateDrawerState() {
@@ -4553,9 +4616,7 @@
           switchToSessionView(data.id);
           updateSessionSnapshot(data);
           updateSessionsList();
-          if (state.ws && state.ws.readyState === WebSocket.OPEN) {
-            state.ws.send(JSON.stringify({ type: "subscribe", sessionId: data.id }));
-          }
+          subscribeToSession(data.id);
           loadOutput(data.id).then(function() {
             focusInputBox(true);
           });
@@ -4616,9 +4677,7 @@
           updateSessionSnapshot(data);
           updateSessionsList();
           // Subscribe to new session via WebSocket
-          if (state.ws && state.ws.readyState === WebSocket.OPEN) {
-            state.ws.send(JSON.stringify({ type: 'subscribe', sessionId: data.id }));
-          }
+          subscribeToSession(data.id);
           return loadOutput(data.id);
         })
         .catch(function(error) {
@@ -4791,9 +4850,7 @@
           updateSessionSnapshot(data);
           updateSessionsList();
           switchToSessionView(data.id);
-          if (state.ws && state.ws.readyState === WebSocket.OPEN) {
-            state.ws.send(JSON.stringify({ type: "subscribe", sessionId: data.id }));
-          }
+          subscribeToSession(data.id);
           return loadOutput(data.id).then(function() {
             focusInputBox(true);
             return data;
@@ -5506,9 +5563,7 @@
         switchToSessionView(data.id);
         updateSessionSnapshot(data);
         updateSessionsList();
-        if (state.ws && state.ws.readyState === WebSocket.OPEN) {
-          state.ws.send(JSON.stringify({ type: "subscribe", sessionId: data.id }));
-        }
+        subscribeToSession(data.id);
         return loadOutput(data.id).then(function() {
           focusInputBox(true);
         });
@@ -6722,9 +6777,7 @@
             state.ws = ws;
             state.wsConnected = true;
             // Subscribe to current session if any
-            if (state.selectedId) {
-              ws.send(JSON.stringify({ type: 'subscribe', sessionId: state.selectedId }));
-            }
+            subscribeToSession(state.selectedId);
             // Flush pending messages after reconnection
             flushPendingMessages();
           };
@@ -6774,9 +6827,7 @@
               }
               updateSessionSnapshot(snapshot);
               if (msg.sessionId === state.selectedId) {
-                if (msg.data.messages) {
-                  state.currentMessages = msg.data.messages;
-                }
+                state.currentMessages = getPreferredMessages(snapshot, msg.data.output, false);
                 updateTaskDisplay();
                 scheduleChatRender();
               }
@@ -7119,12 +7170,7 @@
           // Re-parse messages from the latest session output (fallback for edge cases)
           var selectedSession = state.sessions.find(function(s) { return s.id === state.selectedId; });
           if (selectedSession) {
-            // Prefer structured messages from JSON chat mode
-            if (selectedSession.messages && selectedSession.messages.length > 0) {
-              state.currentMessages = selectedSession.messages;
-            } else if (selectedSession.output) {
-              state.currentMessages = parseMessages(selectedSession.output, selectedSession.command);
-            }
+            state.currentMessages = getPreferredMessages(selectedSession, selectedSession.output, true);
           }
           renderChat();
         }, 30);