@co0ontty/wand 1.17.2 → 1.17.5

package/dist/server.js

@@ -60,13 +60,31 @@ async function checkNpmLatestVersion(forceRefresh = false) {
     };
 }
 function compareSemver(a, b) {
-    const pa = a.split(".").map(Number);
-    const pb = b.split(".").map(Number);
+    const parse = (v) => {
+        const [main, ...rest] = v.split("-");
+        const pre = rest.join("-");
+        const mainParts = main.split(".").map((n) => Number(n) || 0);
+        return { mainParts, pre };
+    };
+    const pa = parse(a);
+    const pb = parse(b);
     for (let i = 0; i < 3; i++) {
-        const diff = (pa[i] || 0) - (pb[i] || 0);
+        const diff = (pa.mainParts[i] || 0) - (pb.mainParts[i] || 0);
         if (diff !== 0)
             return diff;
     }
+    // Main version equal — apply semver prerelease rule: no prerelease > with prerelease.
+    if (!pa.pre && pb.pre)
+        return 1;
+    if (pa.pre && !pb.pre)
+        return -1;
+    if (!pa.pre && !pb.pre)
+        return 0;
+    // Both have prerelease: lexical compare handles debug.MMDDHHMM ordering.
+    if (pa.pre < pb.pre)
+        return -1;
+    if (pa.pre > pb.pre)
+        return 1;
     return 0;
 }
 let cachedGitHubApk = null;

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

@@ -201,6 +201,7 @@
         claudeHistoryLoaded: false,
         claudeHistoryExpanded: true,
         claudeHistoryExpandedDirs: {},
+        archivedExpanded: false,
         sessionsManageMode: false,
         selectedSessionIds: {},
         selectedClaudeHistoryIds: {},
@@ -1256,7 +1257,7 @@
                       '<button id="attach-btn" class="btn-circle btn-circle-attach" type="button" title="附加文件">' +
                         '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21.44 11.05l-9.19 9.19a6 6 0 0 1-8.49-8.49l9.19-9.19a4 4 0 0 1 5.66 5.66l-9.2 9.19a2 2 0 0 1-2.83-2.83l8.49-8.48"/></svg>' +
                       '</button>' +
-                      '<input type="file" id="file-upload-input" multiple style="display:none">' +
+                      '<input type="file" id="file-upload-input" multiple style="position:absolute;width:1px;height:1px;opacity:0;overflow:hidden;clip:rect(0,0,0,0);pointer-events:none">' +
                       '<select id="chat-mode-select" class="chat-mode-select" title="仅对新建会话生效">' +
                         renderModeOptions(preferredTool, composerMode) +
                       '</select>' +
@@ -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,42 @@
         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");
+        // Remeasure against real container: the refresh button used to only
+        // reset+write, so a stale cols/rows (set at mount time with hidden
+        // container) would survive the refresh and keep wrapping output wrong.
+        ensureTerminalFit("refresh");
+        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 || "");
@@ -4643,6 +4712,10 @@
           initTerminalResizeHandle();
           observeTerminalResize();
           startTerminalHealthCheck();
+          // Container may have been hidden / zero-width at construction
+          // time (hard-coded 120x36). Remeasure against the real container
+          // so wterm reflows the just-written history to the correct cols.
+          ensureTerminalFit("mount");
         }).catch(function(err) {
           state.terminalInitializing = false;
           console.error("[wand] wterm init failed:", err);
@@ -5131,6 +5204,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) {
@@ -5444,11 +5528,9 @@
 
             if (state.terminal && id === state.selectedId && data.output !== undefined) {
               syncTerminalBuffer(id, data.output, { mode: "append" });
-              if (state.terminal.remeasure) {
-                requestAnimationFrame(function() {
-                  if (state.terminal) state.terminal.remeasure();
-                });
-              }
+              // Session-switch / history replay: force a real fit so wterm
+              // reflows the just-written output against the real container.
+              ensureTerminalFit("session-switch");
             }
 
             var selectedSession = state.sessions.find(function(s) { return s.id === id; });
@@ -6274,6 +6356,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 +6377,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) {
@@ -7796,6 +7890,10 @@
         }
         applyCurrentView();
         focusInputBox(true);
+        // Container just flipped from hidden -> visible (or geometry changed
+        // because chat/terminal panels swapped). Refit now so the terminal
+        // picks up the real cols/rows instead of keeping the stale ones.
+        if (!structured) ensureTerminalFit("view-switch");
       }
 
 
@@ -10001,6 +10099,15 @@
           state.visualViewportHandler = function() { scheduleTerminalResize(true); };
           window.visualViewport.addEventListener("resize", state.visualViewportHandler);
         }
+        // Page returning from background: container dimensions may have
+        // drifted (PWA standalone, tab switch, iOS address-bar toggle).
+        state.visibilityHandler = function() {
+          if (!document.hidden) ensureTerminalFit("visibility");
+        };
+        document.addEventListener("visibilitychange", state.visibilityHandler);
+        // Mobile device rotation — large geometry change.
+        state.orientationHandler = function() { ensureTerminalFit("orientation"); };
+        window.addEventListener("orientationchange", state.orientationHandler);
         requestAnimationFrame(function() { scheduleTerminalResize(true); });
       }
 
@@ -10010,17 +10117,14 @@
           if (!state.terminal || state.currentView !== "terminal" || document.hidden) return;
           var selectedSession = state.sessions.find(function(s) { return s.id === state.selectedId; });
           if (!selectedSession || selectedSession.sessionKind === "structured") return;
-          // Lightweight remeasure every 5s
-          if (state.terminal.remeasure) state.terminal.remeasure();
-          // Full re-sync every 30s during output pauses
+          // Lightweight fit every 5s: gated + double-rAF + remeasure.
+          ensureTerminalFit("health");
+          // Full re-sync every 30s during output pauses — also refits.
           var now = Date.now();
           var chunkPause = state.lastChunkAt > 0 && (now - state.lastChunkAt > 300);
           var resyncDue = (now - state.lastTerminalResyncAt) > 30000;
           if (resyncDue && (chunkPause || selectedSession.status !== "running") && state.terminalOutput) {
-            state.lastTerminalResyncAt = now;
-            state.terminal.reset();
-            state.terminal.write(state.terminalOutput);
-            maybeScrollTerminalToBottom("output");
+            softResyncTerminal();
           }
         }, 5000);
       }
@@ -10050,6 +10154,14 @@
           window.visualViewport.removeEventListener("resize", state.visualViewportHandler);
           state.visualViewportHandler = null;
         }
+        if (state.visibilityHandler) {
+          document.removeEventListener("visibilitychange", state.visibilityHandler);
+          state.visibilityHandler = null;
+        }
+        if (state.orientationHandler) {
+          window.removeEventListener("orientationchange", state.orientationHandler);
+          state.orientationHandler = null;
+        }
         [["mousemove", "resizeMouseMove"], ["mouseup", "resizeMouseUp"],
          ["touchmove", "resizeTouchMove"], ["touchend", "resizeTouchEnd"]
         ].forEach(function(pair) {
@@ -10113,10 +10225,30 @@
         }
       }
 
-      function ensureTerminalFit() {
-        if (!state.terminal) return;
-        maybeScrollTerminalToBottom("resize");
-        sendTerminalResize(state.terminal.cols, state.terminal.rows);
+      // Unified entry point for re-fitting the xterm grid to its container.
+      // Why: wterm's `autoResize` ResizeObserver only fires on subsequent
+      // container size changes. If the terminal is mounted or written to
+      // while the container is hidden/zero-width, cols/rows stay wrong and
+      // new output renders with broken wrapping (content visually piles at
+      // the top). Call this after any layout change that might have altered
+      // container geometry (mount, session switch, view switch, refresh).
+      function ensureTerminalFit(reason) {
+        if (!state.terminal) return false;
+        var el = document.getElementById("output");
+        if (!el || el.offsetWidth === 0 || el.offsetHeight === 0) return false;
+        requestAnimationFrame(function() {
+          requestAnimationFrame(function() {
+            if (!state.terminal) return;
+            if (typeof state.terminal.remeasure === "function") {
+              state.terminal.remeasure();
+            }
+            sendTerminalResize(state.terminal.cols, state.terminal.rows);
+            if (state.terminalAutoFollow || isTerminalNearBottom()) {
+              maybeScrollTerminalToBottom("resize");
+            }
+          });
+        });
+        return true;
       }
 
       function scheduleTerminalResize(immediate) {
@@ -10181,10 +10313,9 @@
             // Flush pending messages after reconnection
             flushPendingMessages();
             // Re-fit terminal on reconnect — the viewport may have changed
-            // while disconnected, and the PTY needs up-to-date dimensions.
-            if (state.terminal) {
-              sendTerminalResize(state.terminal.cols, state.terminal.rows);
-            }
+            // while disconnected, so remeasure against real container size
+            // rather than sending stale cols/rows from before the disconnect.
+            ensureTerminalFit("ws-reconnect");
           };
 
           ws.onmessage = function(event) {
@@ -13113,6 +13244,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 +13427,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.5",
   "description": "A web terminal for local CLI tools like Claude.",
   "type": "module",
   "bin": {