@co0ontty/wand 1.17.2 → 1.17.4

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

@@ -201,6 +201,7 @@
         claudeHistoryLoaded: false,
         claudeHistoryExpanded: true,
         claudeHistoryExpandedDirs: {},
+        archivedExpanded: false,
         sessionsManageMode: false,
         selectedSessionIds: {},
         selectedClaudeHistoryIds: {},
@@ -1733,7 +1734,7 @@
           groups.push(renderRecentGroup(activeSessions, recentHistorySessions));
         }
         if (archivedSessions.length > 0) {
-          groups.push(renderSessionGroup("已归档", archivedSessions, "sessions"));
+          groups.push(renderArchivedGroup(archivedSessions));
         }
         groups.push(renderClaudeHistorySection());
         if (activeSessions.length === 0 && archivedSessions.length === 0 && recentHistorySessions.length === 0) {
@@ -1754,12 +1755,17 @@
         var historyCount = getSelectedClaudeHistoryIds().length;
         var totalCount = sessionCount + historyCount;
         var hasAny = totalCount > 0;
+        var selectable = countSelectableItems();
+        var allSelected = selectable > 0 && totalCount >= selectable;
+        var selectAllLabel = allSelected ? "取消全选" : "全选";
+        var selectAllAction = allSelected ? "clear-selection" : "select-all-visible";
+        var selectAllDisabled = selectable === 0 ? ' disabled' : '';
 
         return '<div class="session-manage-bar active">' +
           '<div class="session-manage-summary">已选择 ' + totalCount + ' 项</div>' +
           '<div class="session-manage-actions">' +
-            '<button class="session-manage-btn" data-action="select-all-visible" type="button">全选</button>' +
-            '<button class="session-manage-btn" data-action="clear-selection" type="button">清空</button>' +
+            '<button class="session-manage-btn" data-action="' + selectAllAction + '" type="button"' + selectAllDisabled + '>' + selectAllLabel + '</button>' +
+            '<button class="session-manage-btn" data-action="clear-selection" type="button"' + (hasAny ? '' : ' disabled') + '>清空</button>' +
             '<button class="session-manage-btn danger" data-action="delete-selected" type="button"' + (hasAny ? '' : ' disabled') + '>删除所选</button>' +
             '<button class="session-manage-btn" data-action="toggle-manage-mode" type="button">完成</button>' +
           '</div>' +
@@ -1773,6 +1779,20 @@
         '</section>';
       }
 
+      function renderArchivedGroup(archivedSessions) {
+        var expanded = !!state.archivedExpanded;
+        var chevron = expanded ? "&#9662;" : "&#9656;";
+        var header = '<div class="session-group-title claude-history-toggle" data-action="toggle-archived-group">' +
+          '<span class="chevron">' + chevron + '</span> 已归档 ' +
+          '<span class="history-count">' + archivedSessions.length + '</span>' +
+          '</div>';
+        if (!expanded) {
+          return '<section class="session-group">' + header + '</section>';
+        }
+        var items = archivedSessions.map(function(session) { return renderSessionItem(session, "sessions"); }).join("");
+        return '<section class="session-group">' + header + items + '</section>';
+      }
+
       function renderRecentGroup(activeSessions, recentHistorySessions) {
         var html = '<section class="session-group">' +
           '<div class="session-group-title">最近</div>';
@@ -1864,11 +1884,19 @@
         updateSessionsList();
       }
 
+      function getSelectableSessions() {
+        return state.sessions.filter(function(session) {
+          return session.archived || !session.resumedToSessionId;
+        });
+      }
+
+      function countSelectableItems() {
+        return getSelectableSessions().length + getVisibleClaudeHistorySessions().length;
+      }
+
       function selectAllVisibleItems() {
         var nextSessionIds = {};
-        state.sessions.filter(function(session) {
-          return !session.resumedToSessionId;
-        }).forEach(function(session) {
+        getSelectableSessions().forEach(function(session) {
           nextSessionIds[session.id] = true;
         });
         var nextHistoryIds = {};
@@ -2507,15 +2535,8 @@
         // Ordered lists
         escaped = escaped.replace(/^\d+\.\s+(.*)$/gm, '<li>$1</li>');
 
-        // Tables
-        escaped = escaped.replace(/\|(.+)\|/g, function(match) {
-          var cells = match.split("|").slice(1, -1);
-          if (cells.every(function(c) { return /^[\-:]+$/.test(c.trim()); })) {
-            return "";
-          }
-          return '<tr>' + cells.map(function(c) { return '<td>' + c.trim() + '</td>'; }).join("") + '</tr>';
-        });
-        escaped = escaped.replace(/(<tr>.*<\/tr>\n?)+/g, '<table>$&</table>');
+        // Tables (GFM)
+        escaped = parseMarkdownTables(escaped);
 
         // Paragraphs
         var paragraphs = escaped.split(/\n{2,}/);
@@ -3635,7 +3656,16 @@
         if (scaleDownBtn) scaleDownBtn.addEventListener("click", function() { adjustTerminalScale(-0.25); });
         if (scaleUpBtn) scaleUpBtn.addEventListener("click", function() { adjustTerminalScale(0.25); });
         var pageRefreshBtn = document.getElementById("page-refresh-btn");
-        if (pageRefreshBtn) pageRefreshBtn.addEventListener("click", function() { location.reload(); });
+        if (pageRefreshBtn) pageRefreshBtn.addEventListener("click", function(ev) {
+          // Soft refresh: replay terminal buffer + rebuild chat view.
+          // Fixes residual DOM from CSI cursor-jump sequences without losing page state.
+          // Hold Shift to force a full page reload as an escape hatch.
+          if (ev && ev.shiftKey) {
+            location.reload();
+            return;
+          }
+          softRefreshCurrentView();
+        });
         var jumpBottomBtn = document.getElementById("terminal-jump-bottom");
         if (jumpBottomBtn) jumpBottomBtn.addEventListener("click", function() {
           maybeScrollTerminalToBottom("force");
@@ -4125,6 +4155,9 @@
             }
           } else if (actionButton.dataset.action === "clear-all-history") {
             clearAllClaudeHistory();
+          } else if (actionButton.dataset.action === "toggle-archived-group") {
+            state.archivedExpanded = !state.archivedExpanded;
+            updateSessionsList();
           } else if (actionButton.dataset.action === "resume" && actionButton.dataset.sessionId) {
             handleResumeAction(actionButton);
           } else if (actionButton.dataset.action === "resume-history" && actionButton.dataset.claudeSessionId) {
@@ -4493,6 +4526,38 @@
         state.terminal.reset();
       }
 
+      // Soft resync terminal: reset WASM grid and replay full output buffer.
+      // Clears any stale DOM rows left over from CSI cursor-jump sequences
+      // (e.g. Claude permission menus redrawing in place while user holds arrow keys).
+      function softResyncTerminal() {
+        if (!state.terminal || !state.terminalOutput) return false;
+        resetTerminal();
+        state.terminal.write(state.terminalOutput);
+        state.lastTerminalResyncAt = Date.now();
+        maybeScrollTerminalToBottom("output");
+        return true;
+      }
+
+      // Soft refresh the whole current view without losing page state:
+      // - Replays terminal buffer to clear residue
+      // - Clears chat render cache and forces a full rebuild
+      // Used by the refresh button and by automatic triggers
+      // (e.g. permission escalation appearing/disappearing).
+      function softRefreshCurrentView() {
+        softResyncTerminal();
+        if (typeof resetChatRenderCache === "function") resetChatRenderCache();
+        if (typeof scheduleChatRender === "function") scheduleChatRender(true);
+        else if (typeof render === "function") render();
+      }
+
+      function scheduleSoftResyncTerminal(delayMs) {
+        if (state.softResyncTimer) clearTimeout(state.softResyncTimer);
+        state.softResyncTimer = setTimeout(function() {
+          state.softResyncTimer = null;
+          softResyncTerminal();
+        }, typeof delayMs === "number" ? delayMs : 150);
+      }
+
       function syncTerminalBuffer(sessionId, output, options) {
         if (!state.terminal) return false;
         var normalizedOutput = normalizeTerminalOutput(output || "");
@@ -5131,6 +5196,17 @@
         if (normalizedSnapshot.id === state.selectedId) {
           reconcileInteractiveState();
           updateTaskDisplay();
+          // Escalation/permission toggles are the common trigger for CSI cursor-jump
+          // redraw sequences from Claude CLI. When they appear or dismiss, schedule a
+          // debounced terminal resync so residual DOM rows get cleaned up automatically
+          // — same fix the user used to have to reach for via the refresh button.
+          var prevEsc = prevSession && prevSession.pendingEscalation ? 1 : 0;
+          var nextEsc = updatedSession && updatedSession.pendingEscalation ? 1 : 0;
+          var prevBlocked = prevSession && prevSession.permissionBlocked ? 1 : 0;
+          var nextBlocked = updatedSession && updatedSession.permissionBlocked ? 1 : 0;
+          if (prevEsc !== nextEsc || prevBlocked !== nextBlocked) {
+            scheduleSoftResyncTerminal(200);
+          }
         }
         // When a session transitions to a non-running state, try flushing cross-session queue
         if (normalizedSnapshot.status && normalizedSnapshot.status !== "running" && state.crossSessionQueue.length > 0) {
@@ -6274,6 +6350,9 @@
           defaultModel: (document.getElementById("cfg-default-model") || {}).value || "",
         };
 
+        var previousDefaultModel = (state.config && state.config.defaultModel) || "";
+        var nextDefaultModel = body.defaultModel || "";
+
         fetch("/api/settings/config", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
@@ -6292,6 +6371,15 @@
             }
             msgEl.classList.remove("hidden");
           }
+          if (!data || !data.error) {
+            if (state.config) state.config.defaultModel = nextDefaultModel;
+            state.configDefaultModel = nextDefaultModel;
+            if (nextDefaultModel !== previousDefaultModel) {
+              state.chatModel = "";
+              try { localStorage.removeItem("wand-chat-model"); } catch (e) {}
+              syncComposerModelSelect(getSelectedSession());
+            }
+          }
         })
         .catch(function() {
           if (msgEl) {
@@ -13113,6 +13201,65 @@
         return deduped.join(newline);
       }
 
+      function parseMarkdownTables(source) {
+        var NL = "\n";
+        var lines = source.split(NL);
+        var out = [];
+        var i = 0;
+
+        function splitRow(line) {
+          var s = line.trim();
+          if (s.charAt(0) === "|") s = s.slice(1);
+          if (s.charAt(s.length - 1) === "|") s = s.slice(0, -1);
+          return s.split("|");
+        }
+        function styleAttr(a) { return a ? ' style="text-align:' + a + '"' : ""; }
+        function buildTable(headers, aligns, rows) {
+          var thead = "<thead><tr>" + headers.map(function(c, idx) {
+            return "<th" + styleAttr(aligns[idx]) + ">" + c.trim() + "</th>";
+          }).join("") + "</tr></thead>";
+          var tbody = rows.length ? ("<tbody>" + rows.map(function(r) {
+            return "<tr>" + r.map(function(c, idx) {
+              return "<td" + styleAttr(aligns[idx]) + ">" + c.trim() + "</td>";
+            }).join("") + "</tr>";
+          }).join("") + "</tbody>") : "";
+          return '<div class="md-table-wrap"><table class="md-table">' + thead + tbody + "</table></div>";
+        }
+
+        while (i < lines.length) {
+          var header = lines[i];
+          if (header.indexOf("|") !== -1 && i + 1 < lines.length) {
+            var sep = lines[i + 1].trim();
+            if (/^\|?\s*:?-+:?(\s*\|\s*:?-+:?)+\s*\|?$/.test(sep)) {
+              var headers = splitRow(header);
+              var aligns = splitRow(sep).map(function(c) {
+                var t = c.trim();
+                var L = t.charAt(0) === ":";
+                var R = t.charAt(t.length - 1) === ":";
+                if (L && R) return "center";
+                if (R) return "right";
+                if (L) return "left";
+                return "";
+              });
+              var rows = [];
+              var j = i + 2;
+              while (j < lines.length) {
+                var trimmed = lines[j].trim();
+                if (!trimmed || trimmed.indexOf("|") === -1) break;
+                rows.push(splitRow(lines[j]));
+                j += 1;
+              }
+              out.push("", buildTable(headers, aligns, rows), "");
+              i = j;
+              continue;
+            }
+          }
+          out.push(header);
+          i += 1;
+        }
+        return out.join(NL);
+      }
+
       function renderMarkdown(text) {
         if (!text) return "";
 
@@ -13237,6 +13384,7 @@
         result = replaceLinePrefix(result, "- ", '<li>', '</li>');
         result = replaceLinePrefix(result, "* ", '<li>', '</li>');
         result = replaceOrderedList(result);
+        result = parseMarkdownTables(result);
 
         var lines = result.split(newline);
         var grouped = [];

package/dist/web-ui/content/styles.css

@@ -4463,6 +4463,33 @@
       padding: 2px 5px;
       border-radius: 4px;
     }
+    .markdown-content .md-table-wrap {
+      margin: 12px 0;
+      overflow-x: auto;
+      border: 1px solid var(--border);
+      border-radius: var(--radius-sm);
+      -webkit-overflow-scrolling: touch;
+    }
+    .markdown-content .md-table {
+      border-collapse: collapse;
+      width: 100%;
+      font-size: 0.8125rem;
+      white-space: normal;
+    }
+    .markdown-content .md-table th,
+    .markdown-content .md-table td {
+      border: 1px solid var(--border);
+      padding: 6px 10px;
+      text-align: left;
+      vertical-align: top;
+    }
+    .markdown-content .md-table th {
+      background: rgba(150, 118, 85, 0.1);
+      font-weight: 600;
+    }
+    .markdown-content .md-table tbody tr:nth-child(even) {
+      background: rgba(150, 118, 85, 0.04);
+    }
     .markdown-content .code-block {
       margin: 12px 0;
       border-radius: var(--radius-md);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@co0ontty/wand",
-  "version": "1.17.2",
+  "version": "1.17.4",
   "description": "A web terminal for local CLI tools like Claude.",
   "type": "module",
   "bin": {