@co0ontty/wand 1.25.5 → 1.29.0

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

@@ -123,6 +123,9 @@
         sidebarPinned: (function() {
           try { return localStorage.getItem("wand-sidebar-pinned") === "true"; } catch (e) { return false; }
         })(),
+        sidebarCollapsed: (function() {
+          try { return localStorage.getItem("wand-sidebar-collapsed") === "true"; } catch (e) { return false; }
+        })(),
         modalOpen: false,
         presetValue: "",
         cwdValue: "",
@@ -150,6 +153,11 @@
         showInstallPrompt: false,
         ws: null,
         wsConnected: false,
+        // 上一次从服务器收到任意 WS 消息（包括 ping）的时间戳。心跳 stale 检测
+        // 用它来判断半开连接：长时间没消息 → forceReconnect。0 表示尚未连接过。
+        lastWsMessageAt: 0,
+        // 心跳检查 timer 句柄。每 10s 跑一次 evaluateWsHeartbeatStale()。
+        wsHeartbeatCheckTimer: null,
         _updateBubbleShown: false,
         notificationHistory: {},
         delayedNotificationTimer: null,
@@ -195,7 +203,20 @@
         quickCommitSubmitting: false,
         quickCommitGenerating: false,
         quickCommitError: "",
-        quickCommitForm: { autoMessage: false, customMessage: "", makeTag: false, tag: "", push: false },
+        // primaryAction: "commit" (commit only, no push) or "commit-push" (commit then push).
+        // Whether the commit is also tagged is controlled by `makeTag` independently —
+        // that keeps "commit + tag, push later" possible.
+        quickCommitForm: { customMessage: "", makeTag: false, tag: "", primaryAction: "commit" },
+        // Which inline panel/dropdown is open. Only one can be open at a time, so a
+        // single field beats juggling three sibling booleans with mutual-exclusion code.
+        // Values: null | "action" | "push" | "tag-head".
+        quickCommitOpenMenu: null,
+        quickCommitTagHeadForm: { tag: "", push: false },
+        quickCommitTagHeadSubmitting: false,
+        quickCommitTagHeadGenerating: false,
+        quickCommitTagHeadError: "",
+        quickCommitPushing: false,
+        quickCommitPushError: "",
         // Telegram 风格的"贴底"状态：true = 用户当前贴在底部，新消息会自然出现；
         // false = 用户向上滚了，未读会累积到气泡里，不会自动滚他们的视图。
         chatStickToBottom: true,
@@ -1013,6 +1034,11 @@
       function syncOnForeground(reason, force) {
         if (!state.config) return Promise.resolve();
         if (document.hidden) return Promise.resolve();
+        // 切回前台时立刻评估一次心跳 stale。setInterval 在 background 会被
+        // 浏览器节流（最低 1Hz，部分浏览器更慢），所以如果挂了 1 分钟回来，
+        // 不主动跑这一次的话要等到下一个 10s tick 才会发现，前 10s 会继续
+        // 往一条死 socket 上推消息。
+        evaluateWsHeartbeatStale();
         // On Android resume the previous WS may still report OPEN/CONNECTING
         // for a few seconds because the close frame hasn't been delivered
         // yet (TCP keepalive / Doze suspended the network stack). Force a
@@ -1154,6 +1180,10 @@
               if (_apkVersion) {
                 checkApkAutoUpdate();
               }
+              // macOS DMG auto-update check on startup
+              if (_macAppVersion) {
+                checkDmgAutoUpdate();
+              }
               if (state.claudeHistoryExpanded && !state.claudeHistoryLoaded) {
                 loadClaudeHistory();
               }
@@ -1398,6 +1428,9 @@
                   '<button id="sidebar-pin-btn" class="btn btn-ghost btn-sm sidebar-pin-toggle' + (state.sidebarPinned ? ' pinned' : '') + '" type="button" title="' + (state.sidebarPinned ? '取消固定侧栏' : '固定侧栏') + '">' +
                     '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="12" y1="17" x2="12" y2="22"/><path d="M5 17h14v-1.76a2 2 0 0 0-1.11-1.79l-1.78-.9A2 2 0 0 1 15 10.76V6h1a2 2 0 0 0 0-4H8a2 2 0 0 0 0 4h1v4.76a2 2 0 0 1-1.11 1.79l-1.78.9A2 2 0 0 0 5 15.24z"/></svg>' +
                   '</button>' +
+                  '<button id="sidebar-collapse-btn" class="btn btn-ghost btn-sm sidebar-collapse-toggle" type="button" title="收起为窄条" aria-label="收起为窄条">' +
+                    '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="14 6 8 12 14 18"/><line x1="4" y1="5" x2="4" y2="19"/></svg>' +
+                  '</button>' +
                   '<button id="close-drawer-button" class="btn btn-ghost btn-icon sidebar-close drawer-close-btn" type="button" aria-label="关闭菜单"><svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" aria-hidden="true"><line x1="6" y1="6" x2="18" y2="18"/><line x1="18" y1="6" x2="6" y2="18"/></svg></button>' +
                 '</div>' +
               '</div>' +
@@ -1434,6 +1467,15 @@
                   '</button>' +
                 '</div>' +
               '</div>' +
+              '<div class="sidebar-rail" id="sidebar-rail" aria-hidden="true">' +
+                '<button class="sidebar-rail-expand" id="sidebar-rail-expand" type="button" title="展开侧栏" aria-label="展开侧栏">' +
+                  '<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="10 6 16 12 10 18"/><line x1="20" y1="5" x2="20" y2="19"/></svg>' +
+                '</button>' +
+                '<div class="sidebar-rail-list" id="sidebar-rail-list">' + renderRailSessions() + '</div>' +
+                '<button class="sidebar-rail-new" id="sidebar-rail-new" type="button" title="新会话" aria-label="新会话">' +
+                  '<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>' +
+                '</button>' +
+              '</div>' +
             '</aside>' +
             '<main class="main-content">' +
               '<div class="main-header-row">' +
@@ -1777,13 +1819,38 @@
       }
 
       var quickCommitEscHandler = null;
+      var quickCommitDocClickHandler = null;
+
+      // Restore the user's last "primary action" choice so the split button feels sticky.
+      function readSavedPrimaryAction() {
+        try {
+          var v = localStorage.getItem("wand.quickCommit.primaryAction");
+          if (v === "commit" || v === "commit-push") return v;
+        } catch (e) { /* localStorage may be blocked */ }
+        return "commit";
+      }
+      function savePrimaryAction(value) {
+        try { localStorage.setItem("wand.quickCommit.primaryAction", value); } catch (e) { /* no-op */ }
+      }
 
       function openQuickCommitModal() {
         if (!state.selectedId) return;
         state.quickCommitOpen = true;
         state.quickCommitSubmitting = false;
         state.quickCommitError = "";
-        state.quickCommitForm = { autoMessage: false, customMessage: "", makeTag: false, tag: "", push: false };
+        state.quickCommitForm = {
+          customMessage: "",
+          makeTag: false,
+          tag: "",
+          primaryAction: readSavedPrimaryAction(),
+        };
+        state.quickCommitOpenMenu = null;
+        state.quickCommitTagHeadForm = { tag: "", push: false };
+        state.quickCommitTagHeadSubmitting = false;
+        state.quickCommitTagHeadGenerating = false;
+        state.quickCommitTagHeadError = "";
+        state.quickCommitPushing = false;
+        state.quickCommitPushError = "";
         closeWorktreeMergeModal();
         closeSessionModal();
         closeSettingsModal();
@@ -1796,11 +1863,33 @@
         }
         if (quickCommitEscHandler) document.removeEventListener("keydown", quickCommitEscHandler);
         quickCommitEscHandler = function(e) {
-          if (e.key === "Escape" && state.quickCommitOpen && !state.quickCommitSubmitting) {
+          if (e.key === "Escape" && state.quickCommitOpen && !state.quickCommitSubmitting && !state.quickCommitTagHeadSubmitting && !state.quickCommitPushing) {
+            // First Esc closes any open dropdown; second closes the modal.
+            if (state.quickCommitOpenMenu) {
+              state.quickCommitOpenMenu = null;
+              rerenderQuickCommitModal();
+              return;
+            }
             closeQuickCommitModal();
           }
         };
         document.addEventListener("keydown", quickCommitEscHandler);
+        if (quickCommitDocClickHandler) document.removeEventListener("click", quickCommitDocClickHandler, true);
+        quickCommitDocClickHandler = function(e) {
+          if (!state.quickCommitOpen) return;
+          // tag-head is an inline drawer, not a dropdown — clicking outside shouldn't close it.
+          if (state.quickCommitOpenMenu !== "action" && state.quickCommitOpenMenu !== "push") return;
+          var modalEl = document.getElementById("quick-commit-modal");
+          if (!modalEl) return;
+          var t = e.target;
+          while (t && t !== modalEl) {
+            if (t.dataset && (t.dataset.qcDropdownToggle || t.dataset.qcDropdownMenu)) return;
+            t = t.parentNode;
+          }
+          state.quickCommitOpenMenu = null;
+          rerenderQuickCommitModal();
+        };
+        document.addEventListener("click", quickCommitDocClickHandler, true);
         loadGitStatus(state.selectedId, { force: true }).then(function() {
           if (!state.quickCommitOpen) return;
           rerenderQuickCommitModal();
@@ -1811,6 +1900,7 @@
         state.quickCommitOpen = false;
         state.quickCommitSubmitting = false;
         state.quickCommitError = "";
+        state.quickCommitOpenMenu = null;
         var modal = document.getElementById("quick-commit-modal");
         if (modal) modal.classList.add("hidden");
         if (focusTrapHandler) {
@@ -1821,6 +1911,10 @@
           document.removeEventListener("keydown", quickCommitEscHandler);
           quickCommitEscHandler = null;
         }
+        if (quickCommitDocClickHandler) {
+          document.removeEventListener("click", quickCommitDocClickHandler, true);
+          quickCommitDocClickHandler = null;
+        }
         if (lastFocusedElement && typeof lastFocusedElement.focus === "function") {
           lastFocusedElement.focus();
         }
@@ -1843,6 +1937,7 @@
         if (closeBtn) closeBtn.addEventListener("click", closeQuickCommitModal);
         var cancelBtn = document.getElementById("quick-commit-cancel-btn");
         if (cancelBtn) cancelBtn.addEventListener("click", closeQuickCommitModal);
+
         var submitBtn = document.getElementById("quick-commit-submit-btn");
         if (submitBtn) submitBtn.addEventListener("click", submitQuickCommit);
         var aiBtn = document.getElementById("quick-commit-ai-btn");
@@ -1861,10 +1956,96 @@
         if (tagInput) tagInput.addEventListener("input", function() {
           state.quickCommitForm.tag = tagInput.value;
         });
-        var pushCb = document.getElementById("quick-commit-push");
-        if (pushCb) pushCb.addEventListener("change", function() {
-          state.quickCommitForm.push = pushCb.checked;
+
+        var actionCaret = document.getElementById("quick-commit-action-caret");
+        if (actionCaret) actionCaret.addEventListener("click", function(e) {
+          e.stopPropagation();
+          state.quickCommitOpenMenu = state.quickCommitOpenMenu === "action" ? null : "action";
+          rerenderQuickCommitModal();
+        });
+        var actionMenu = document.getElementById("quick-commit-action-menu");
+        if (actionMenu) {
+          var actionItems = actionMenu.querySelectorAll("[data-qc-action]");
+          for (var i = 0; i < actionItems.length; i++) {
+            (function(btn) {
+              btn.addEventListener("click", function() {
+                var value = btn.getAttribute("data-qc-action");
+                if (value === "commit" || value === "commit-push") {
+                  state.quickCommitForm.primaryAction = value;
+                  savePrimaryAction(value);
+                }
+                state.quickCommitOpenMenu = null;
+                rerenderQuickCommitModal();
+              });
+            })(actionItems[i]);
+          }
+        }
+
+        var tagHeadToggle = document.getElementById("quick-commit-tag-head-toggle");
+        if (tagHeadToggle) tagHeadToggle.addEventListener("click", function() {
+          var willOpen = state.quickCommitOpenMenu !== "tag-head";
+          state.quickCommitOpenMenu = willOpen ? "tag-head" : null;
+          if (willOpen) state.quickCommitTagHeadError = "";
+          rerenderQuickCommitModal();
+          if (willOpen) {
+            var inp = document.getElementById("quick-commit-tag-head-input");
+            if (inp) inp.focus();
+          }
+        });
+        var tagHeadCancel = document.getElementById("quick-commit-tag-head-cancel");
+        if (tagHeadCancel) tagHeadCancel.addEventListener("click", function() {
+          if (state.quickCommitOpenMenu === "tag-head") state.quickCommitOpenMenu = null;
+          state.quickCommitTagHeadError = "";
+          rerenderQuickCommitModal();
         });
+        var tagHeadInput = document.getElementById("quick-commit-tag-head-input");
+        if (tagHeadInput) {
+          tagHeadInput.addEventListener("input", function() {
+            state.quickCommitTagHeadForm.tag = tagHeadInput.value;
+          });
+          tagHeadInput.addEventListener("keydown", function(e) {
+            if (e.key === "Enter") {
+              e.preventDefault();
+              submitTagHead(false);
+            }
+          });
+        }
+        var tagHeadAi = document.getElementById("quick-commit-tag-head-ai");
+        if (tagHeadAi) tagHeadAi.addEventListener("click", generateTagHeadAI);
+        var tagHeadPushCb = document.getElementById("quick-commit-tag-head-push");
+        if (tagHeadPushCb) tagHeadPushCb.addEventListener("change", function() {
+          state.quickCommitTagHeadForm.push = tagHeadPushCb.checked;
+        });
+        var tagHeadSubmit = document.getElementById("quick-commit-tag-head-submit");
+        if (tagHeadSubmit) tagHeadSubmit.addEventListener("click", function() {
+          submitTagHead(false);
+        });
+
+        var pushBtn = document.getElementById("quick-commit-push-btn");
+        if (pushBtn) pushBtn.addEventListener("click", function() {
+          submitPushOnly({ pushCommits: true, pushTags: false });
+        });
+        var pushCaret = document.getElementById("quick-commit-push-caret");
+        if (pushCaret) pushCaret.addEventListener("click", function(e) {
+          e.stopPropagation();
+          state.quickCommitOpenMenu = state.quickCommitOpenMenu === "push" ? null : "push";
+          rerenderQuickCommitModal();
+        });
+        var pushMenu = document.getElementById("quick-commit-push-menu");
+        if (pushMenu) {
+          var pushItems = pushMenu.querySelectorAll("[data-qc-push]");
+          for (var j = 0; j < pushItems.length; j++) {
+            (function(btn) {
+              btn.addEventListener("click", function() {
+                var value = btn.getAttribute("data-qc-push");
+                state.quickCommitOpenMenu = null;
+                if (value === "commits") submitPushOnly({ pushCommits: true, pushTags: false });
+                else if (value === "tags") submitPushOnly({ pushCommits: false, pushTags: true });
+                else if (value === "both") submitPushOnly({ pushCommits: true, pushTags: true });
+              });
+            })(pushItems[j]);
+          }
+        }
       }
 
       function generateCommitMessageAI() {
@@ -1925,13 +2106,14 @@
           rerenderQuickCommitModal();
           return;
         }
+        var willPush = form.primaryAction === "commit-push";
         // 开了 tag 开关但没填 → 由后端在提交时调 AI 生成
         var payload = {
           autoMessage: false,
           customMessage: message,
           tag: userTag,
           autoTag: !!(form.makeTag && !userTag),
-          push: !!form.push
+          push: willPush
         };
         state.quickCommitSubmitting = true;
         state.quickCommitError = "";
@@ -1950,9 +2132,12 @@
             var data = result.data || {};
             var hash = data.commit && data.commit.hash ? data.commit.hash.substring(0, 7) : "";
             var tagName = data.tag && data.tag.name ? data.tag.name : "";
-            var base = "已提交" + (hash ? " " + hash : "") + (tagName ? "，已打 tag " + tagName : "");
-            var pushRequested = !!payload.push;
-            if (pushRequested && data.pushError) {
+            var subCommits = Array.isArray(data.submoduleCommits) ? data.submoduleCommits : [];
+            var subPrefix = subCommits.length > 0
+              ? "已先提交 " + subCommits.length + " 个 submodule（" + subCommits.map(function(c) { return c.path; }).join("、") + "），"
+              : "";
+            var base = subPrefix + "已提交" + (hash ? " " + hash : "") + (tagName ? "，已打 tag " + tagName : "");
+            if (willPush && data.pushError) {
               var msg = base + "；push 失败：" + data.pushError;
               if (typeof showToast === "function") showToast(msg, "error");
             } else {
@@ -1971,13 +2156,135 @@
           });
       }
 
-      function renderQuickCommitModal() {
-        var s = state.gitStatus || {};
-        var f = state.quickCommitForm || { autoMessage: false, customMessage: "", makeTag: false, tag: "", push: false };
-        var langValue = (state.config && (state.config.language || "")) || "";
-        var langLabel = langValue ? langValue : "中文";
-        var files = Array.isArray(s.files) ? s.files : [];
-        var fileRows = files.map(function(item) {
+      // ── AI generate a tag for the existing HEAD (no commit involved) ──
+      function generateTagHeadAI() {
+        if (!state.selectedId || state.quickCommitTagHeadGenerating) return;
+        var inp = document.getElementById("quick-commit-tag-head-input");
+        if (inp) state.quickCommitTagHeadForm.tag = inp.value;
+        state.quickCommitTagHeadGenerating = true;
+        state.quickCommitTagHeadError = "";
+        rerenderQuickCommitModal();
+        // Reuse the existing generator — it stages and asks for {message, tag}.
+        // We only consume `suggestedTag` here.
+        fetch("/api/sessions/" + encodeURIComponent(state.selectedId) + "/generate-commit-message", {
+          method: "POST",
+          credentials: "same-origin",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({})
+        })
+          .then(function(res) { return res.json().then(function(data) { return { ok: res.ok, data: data }; }); })
+          .then(function(result) {
+            if (!result.ok) throw new Error((result.data && result.data.error) || "AI 生成失败。");
+            var aiTag = (result.data && typeof result.data.suggestedTag === "string") ? result.data.suggestedTag.trim() : "";
+            var currentTag = (state.quickCommitTagHeadForm.tag || "").trim();
+            if (!currentTag && aiTag) {
+              state.quickCommitTagHeadForm.tag = aiTag;
+            } else if (!aiTag) {
+              throw new Error("AI 没有给出 tag 建议。");
+            }
+          })
+          .catch(function(error) {
+            state.quickCommitTagHeadError = (error && error.message) || "AI 生成失败。";
+          })
+          .finally(function() {
+            state.quickCommitTagHeadGenerating = false;
+            if (state.quickCommitOpen) rerenderQuickCommitModal();
+          });
+      }
+
+      // Tag the existing HEAD without making a new commit.
+      function submitTagHead(silent) {
+        if (!state.selectedId || state.quickCommitTagHeadSubmitting) return;
+        var inp = document.getElementById("quick-commit-tag-head-input");
+        if (inp) state.quickCommitTagHeadForm.tag = inp.value;
+        var tag = (state.quickCommitTagHeadForm.tag || "").trim();
+        if (!tag) {
+          state.quickCommitTagHeadError = "请填写 tag 名称，或点击 AI 建议。";
+          rerenderQuickCommitModal();
+          return;
+        }
+        state.quickCommitTagHeadSubmitting = true;
+        state.quickCommitTagHeadError = "";
+        rerenderQuickCommitModal();
+        fetch("/api/sessions/" + encodeURIComponent(state.selectedId) + "/git/tag-head", {
+          method: "POST",
+          credentials: "same-origin",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ tag: tag, push: !!state.quickCommitTagHeadForm.push })
+        })
+          .then(function(res) { return res.json().then(function(data) { return { ok: res.ok, data: data }; }); })
+          .then(function(result) {
+            if (!result.ok) throw new Error((result.data && result.data.error) || "打 tag 失败。");
+            var data = result.data || {};
+            var name = data.tag && data.tag.name ? data.tag.name : tag;
+            var pushed = !!data.pushed;
+            var pushErr = data.pushError;
+            var base = "已为 HEAD 打 tag " + name;
+            if (state.quickCommitTagHeadForm.push && pushErr) {
+              if (typeof showToast === "function") showToast(base + "；push tag 失败：" + pushErr, "error");
+            } else {
+              if (typeof showToast === "function") showToast(base + (pushed ? "，已 push" : ""), "success");
+            }
+            if (state.quickCommitOpenMenu === "tag-head") state.quickCommitOpenMenu = null;
+            state.quickCommitTagHeadForm = { tag: "", push: false };
+            if (state.selectedId) loadGitStatus(state.selectedId, { force: true }).then(function() {
+              if (state.quickCommitOpen) rerenderQuickCommitModal();
+            });
+          })
+          .catch(function(error) {
+            state.quickCommitTagHeadError = (error && error.message) || "打 tag 失败。";
+          })
+          .finally(function() {
+            state.quickCommitTagHeadSubmitting = false;
+            if (state.quickCommitOpen) rerenderQuickCommitModal();
+          });
+      }
+
+      function submitPushOnly(opts) {
+        if (!state.selectedId || state.quickCommitPushing) return;
+        var pushCommits = !!(opts && opts.pushCommits);
+        var pushTags = !!(opts && opts.pushTags);
+        if (!pushCommits && !pushTags) return;
+        state.quickCommitPushing = true;
+        state.quickCommitPushError = "";
+        rerenderQuickCommitModal();
+        fetch("/api/sessions/" + encodeURIComponent(state.selectedId) + "/git/push", {
+          method: "POST",
+          credentials: "same-origin",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ pushCommits: pushCommits, pushTags: pushTags })
+        })
+          .then(function(res) { return res.json().then(function(data) { return { ok: res.ok, data: data }; }); })
+          .then(function(result) {
+            var data = result.data || {};
+            if (!result.ok) throw new Error((data && data.error) || "推送失败。");
+            // Backend marks `ok: false` on partial failure but still returns 200 — surface error toast.
+            if (data.error) {
+              state.quickCommitPushError = data.error;
+              if (typeof showToast === "function") showToast("推送失败：" + data.error, "error");
+              return;
+            }
+            var parts = [];
+            if (data.pushedCommits) parts.push("commits");
+            if (data.pushedTags) parts.push("tags");
+            var label = parts.length ? parts.join(" 和 ") : "（无内容）";
+            if (typeof showToast === "function") showToast("已推送 " + label, "success");
+            if (state.selectedId) loadGitStatus(state.selectedId, { force: true }).then(function() {
+              if (state.quickCommitOpen) rerenderQuickCommitModal();
+            });
+          })
+          .catch(function(error) {
+            state.quickCommitPushError = (error && error.message) || "推送失败。";
+            if (typeof showToast === "function") showToast(state.quickCommitPushError, "error");
+          })
+          .finally(function() {
+            state.quickCommitPushing = false;
+            if (state.quickCommitOpen) rerenderQuickCommitModal();
+          });
+      }
+
+      function renderQuickCommitFileRows(files) {
+        var rows = files.map(function(item) {
           var status = (item.status || "  ").substring(0, 2);
           var flag = status.trim() || "?";
           var cls = "qc-flag";
@@ -1998,48 +2305,209 @@
           }
           return '<div class="qc-file-row"><span class="' + cls + '">' + escapeHtml(status) + '</span><span class="qc-file-path">' + escapeHtml(item.path || "") + '</span>' + subBadge + '</div>';
         }).join("");
-        if (!fileRows) fileRows = '<div class="qc-empty">工作区干净，没有可提交的改动。</div>';
+        return rows || '<div class="qc-empty">没有可提交的改动。</div>';
+      }
+
+      function isQuickCommitOpInFlight() {
+        return state.quickCommitSubmitting || state.quickCommitTagHeadSubmitting || state.quickCommitPushing;
+      }
+
+      function renderQuickCommitPrimary(hasChanges) {
+        var f = state.quickCommitForm;
+        var label;
+        if (state.quickCommitSubmitting) label = "提交中…";
+        else if (f.primaryAction === "commit-push") label = "提交并 push";
+        else label = "仅提交";
+        var disabled = !hasChanges || isQuickCommitOpInFlight();
+        var menuOpen = state.quickCommitOpenMenu === "action";
+        var caretActive = menuOpen ? " is-active" : "";
+        var menuItems = [
+          { value: "commit", label: "仅提交", desc: "只 commit，不 push" },
+          { value: "commit-push", label: "提交并 push", desc: "commit 后立即 push 到远端" }
+        ];
+        var menuHtml = menuItems.map(function(item) {
+          var sel = f.primaryAction === item.value ? " is-selected" : "";
+          return '<button type="button" class="qc-dropdown-item' + sel + '" data-qc-action="' + item.value + '">' +
+            '<span class="qc-dropdown-item-title">' + escapeHtml(item.label) + '</span>' +
+            '<span class="qc-dropdown-item-desc">' + escapeHtml(item.desc) + '</span>' +
+            '</button>';
+        }).join("");
+        return '<div class="qc-split-button">' +
+          '<button id="quick-commit-submit-btn" class="btn btn-primary qc-split-main" type="button"' + (disabled ? ' disabled' : '') + '>' +
+            escapeHtml(label) +
+          '</button>' +
+          '<button id="quick-commit-action-caret" class="btn btn-primary qc-split-caret' + caretActive + '" type="button" data-qc-dropdown-toggle="action"' + (disabled ? ' disabled' : '') + ' aria-haspopup="menu" aria-expanded="' + (menuOpen ? 'true' : 'false') + '" aria-label="更多提交方式">' +
+            '<svg viewBox="0 0 12 12" width="10" height="10" aria-hidden="true"><path d="M2 4l4 4 4-4" stroke="currentColor" stroke-width="1.6" fill="none" stroke-linecap="round" stroke-linejoin="round"/></svg>' +
+          '</button>' +
+          (menuOpen ?
+            '<div id="quick-commit-action-menu" class="qc-dropdown-menu" data-qc-dropdown-menu="action" role="menu">' + menuHtml + '</div>' : '') +
+          '</div>';
+      }
+
+      function renderQuickCommitStatusChips(s) {
+        var chips = [];
+        var hasUpstream = !!s.upstream;
+        if (typeof s.ahead === "number" && s.ahead > 0) {
+          chips.push('<span class="qc-chip qc-chip--ahead" title="本地领先 ' + s.ahead + ' 个 commit">↑ ' + s.ahead + ' 待推送</span>');
+        }
+        if (typeof s.behind === "number" && s.behind > 0) {
+          chips.push('<span class="qc-chip qc-chip--behind" title="远端领先 ' + s.behind + ' 个 commit">↓ ' + s.behind + ' 待拉取</span>');
+        }
+        if (!hasUpstream) {
+          chips.push('<span class="qc-chip qc-chip--warn" title="当前分支没有 upstream，将首次推送时自动设置">无 upstream</span>');
+        } else if (!chips.length) {
+          chips.push('<span class="qc-chip qc-chip--clean">与远端同步</span>');
+        }
+        return '<div class="qc-status-chips">' + chips.join("") + '</div>';
+      }
+
+      // Inline drawer used by the "为 HEAD 打 tag" toggle.
+      function renderQuickCommitTagHeadPanel() {
+        var thf = state.quickCommitTagHeadForm || { tag: "", push: false };
+        var submitting = state.quickCommitTagHeadSubmitting;
+        var generating = state.quickCommitTagHeadGenerating;
+        return '<div class="qc-tag-head-panel">' +
+          '<div class="qc-tag-head-row">' +
+            '<input type="text" id="quick-commit-tag-head-input" class="field-input" placeholder="输入 tag 名（例如 v1.2.0），或点 AI 建议" value="' + escapeHtml(thf.tag || "") + '"' + (submitting ? ' disabled' : '') + '>' +
+            '<button type="button" id="quick-commit-tag-head-ai" class="btn btn-ghost btn-sm"' + (generating || submitting ? ' disabled' : '') + '>' + (generating ? '建议中…' : 'AI 建议') + '</button>' +
+          '</div>' +
+          '<label class="qc-tag-head-push">' +
+            '<input type="checkbox" id="quick-commit-tag-head-push"' + (thf.push ? ' checked' : '') + (submitting ? ' disabled' : '') + '>' +
+            '<span>打完 tag 立即推送这个 tag</span>' +
+          '</label>' +
+          (state.quickCommitTagHeadError ? '<p class="error-message">' + escapeHtml(state.quickCommitTagHeadError) + '</p>' : '') +
+          '<div class="qc-tag-head-actions">' +
+            '<button type="button" id="quick-commit-tag-head-cancel" class="btn btn-ghost btn-sm"' + (submitting ? ' disabled' : '') + '>收起</button>' +
+            '<button type="button" id="quick-commit-tag-head-submit" class="btn btn-secondary btn-sm"' + (submitting ? ' disabled' : '') + '>' + (submitting ? '打 tag 中…' : '为 HEAD 打 tag') + '</button>' +
+          '</div>' +
+        '</div>';
+      }
+
+      function renderQuickCommitPushButton(s) {
+        var ahead = typeof s.ahead === "number" ? s.ahead : 0;
+        var hasUpstream = !!s.upstream;
+        // Allow pushing commits if we're ahead, if upstream is missing (first push will set it up),
+        // or if ahead is simply unknown — backend will surface real errors.
+        var canPushCommits = ahead > 0 || !hasUpstream || typeof s.ahead !== "number";
+        // Tag count isn't computed locally (would require a network probe). Let the user try.
+        var canPushTags = true;
+        var disabled = isQuickCommitOpInFlight() || (!canPushCommits && !canPushTags);
+        var mainLabel = state.quickCommitPushing ? "推送中…" : "推送";
+        var menuOpen = state.quickCommitOpenMenu === "push";
+        var caretActive = menuOpen ? " is-active" : "";
+        var items = [
+          { value: "commits", label: "推送 commits", desc: ahead ? "推送 " + ahead + " 个 commit" : "推送当前分支", disabled: !canPushCommits },
+          { value: "tags", label: "推送 tags", desc: "推送所有本地 tag", disabled: !canPushTags },
+          { value: "both", label: "推送 commits 和 tags", desc: "二合一", disabled: !(canPushCommits || canPushTags) }
+        ];
+        var menuHtml = items.map(function(it) {
+          var dis = it.disabled ? " is-disabled" : "";
+          return '<button type="button" class="qc-dropdown-item' + dis + '" data-qc-push="' + it.value + '"' + (it.disabled ? ' disabled' : '') + '>' +
+            '<span class="qc-dropdown-item-title">' + escapeHtml(it.label) + '</span>' +
+            '<span class="qc-dropdown-item-desc">' + escapeHtml(it.desc) + '</span>' +
+            '</button>';
+        }).join("");
+        return '<div class="qc-split-button qc-split-button--secondary">' +
+          '<button id="quick-commit-push-btn" class="btn btn-secondary qc-split-main" type="button"' + (disabled ? ' disabled' : '') + '>' +
+            escapeHtml(mainLabel) +
+          '</button>' +
+          '<button id="quick-commit-push-caret" class="btn btn-secondary qc-split-caret' + caretActive + '" type="button" data-qc-dropdown-toggle="push"' + (disabled ? ' disabled' : '') + ' aria-haspopup="menu" aria-expanded="' + (menuOpen ? 'true' : 'false') + '" aria-label="更多推送方式">' +
+            '<svg viewBox="0 0 12 12" width="10" height="10" aria-hidden="true"><path d="M2 4l4 4 4-4" stroke="currentColor" stroke-width="1.6" fill="none" stroke-linecap="round" stroke-linejoin="round"/></svg>' +
+          '</button>' +
+          (menuOpen ?
+            '<div id="quick-commit-push-menu" class="qc-dropdown-menu qc-dropdown-menu--right" data-qc-dropdown-menu="push" role="menu">' + menuHtml + '</div>' : '') +
+          '</div>';
+      }
+
+      function renderQuickCommitModal() {
+        var s = state.gitStatus || {};
+        var f = state.quickCommitForm || { customMessage: "", makeTag: false, tag: "", primaryAction: "commit" };
         var hasChanges = (s.modifiedCount || 0) > 0;
+        var files = Array.isArray(s.files) ? s.files : [];
+        var fileRows = renderQuickCommitFileRows(files);
+
+        // Subtitle: branch · N 改动 · ↑X ↓Y
+        var subParts = [];
+        subParts.push(s.branch || "(no branch)");
+        subParts.push((s.modifiedCount || 0) + " 个改动");
+        if (typeof s.ahead === "number" && s.ahead > 0) subParts.push("↑" + s.ahead);
+        if (typeof s.behind === "number" && s.behind > 0) subParts.push("↓" + s.behind);
+
+        // Section 1: changes + commit form (only when there are changes)
+        var section1 = "";
+        if (hasChanges) {
+          section1 = '<section class="qc-section qc-section--changes">' +
+            '<div class="qc-section-head"><span class="qc-section-title">暂存改动</span><span class="qc-section-meta">' + escapeHtml(s.modifiedCount + " 个文件") + '</span></div>' +
+            '<div class="qc-files-wrap">' + fileRows + '</div>' +
+            '<div class="qc-message-row" id="quick-commit-message-row">' +
+              '<div class="qc-message-header"><label class="field-label" for="quick-commit-message">commit message</label>' +
+                '<button type="button" id="quick-commit-ai-btn" class="btn btn-ghost btn-sm"' + (state.quickCommitGenerating ? ' disabled' : '') + '>' + (state.quickCommitGenerating ? '生成中…' : 'AI 生成') + '</button>' +
+              '</div>' +
+              '<textarea id="quick-commit-message" class="field-input" rows="2" placeholder="输入 commit message 或点击 AI 生成"' + (state.quickCommitSubmitting ? ' disabled' : '') + '>' + escapeHtml(f.customMessage || "") + '</textarea>' +
+            '</div>' +
+            '<div class="qc-checkbox-row">' +
+              '<label class="qc-checkbox-label" for="quick-commit-make-tag">同时为本次 commit 打 tag</label>' +
+              '<label class="qc-switch">' +
+                '<input type="checkbox" id="quick-commit-make-tag" class="switch-toggle"' + (f.makeTag ? ' checked' : '') + '>' +
+                '<span class="switch-slider"></span>' +
+              '</label>' +
+            '</div>' +
+            '<div class="qc-tag-row' + (f.makeTag ? '' : ' hidden') + '" id="quick-commit-tag-row">' +
+              '<input type="text" id="quick-commit-tag" class="field-input" placeholder="输入 tag 名称；留空将由 AI 在提交时自动生成" value="' + escapeHtml(f.tag || "") + '"' + (state.quickCommitSubmitting ? ' disabled' : '') + '>' +
+            '</div>' +
+            (state.quickCommitError ? '<p class="error-message">' + escapeHtml(state.quickCommitError) + '</p>' : '') +
+            '<div class="qc-section-actions">' +
+              '<button id="quick-commit-cancel-btn" class="btn btn-ghost btn-sm" type="button">取消</button>' +
+              renderQuickCommitPrimary(hasChanges) +
+            '</div>' +
+          '</section>';
+        } else {
+          section1 = '<section class="qc-section qc-section--empty">' +
+            '<div class="qc-empty-state">' +
+              '<span class="qc-empty-icon">✓</span>' +
+              '<div><div class="qc-empty-title">工作区干净</div><div class="qc-empty-sub">没有暂存改动可提交。仍可在下方为 HEAD 打 tag 或推送。</div></div>' +
+            '</div>' +
+          '</section>';
+        }
+
+        // Section 2: repo status + secondary actions (always show when there's at least one commit)
+        var section2 = "";
+        if (!s.initialCommit && s.isGit !== false) {
+          var lc = s.lastCommit || {};
+          var headLine = lc.shortHash ? lc.shortHash + " · " + (lc.subject || "") : (s.head ? s.head.substring(0, 7) : "(no commit)");
+          var upstreamLine = s.upstream ? escapeHtml(s.branch || "") + " → " + escapeHtml(s.upstream) : escapeHtml(s.branch || "(no branch)") + " · 无 upstream";
+          section2 = '<section class="qc-section qc-section--repo">' +
+            '<div class="qc-section-head"><span class="qc-section-title">仓库状态</span><span class="qc-section-meta">' + upstreamLine + '</span></div>' +
+            '<div class="qc-head-card">' +
+              '<span class="qc-head-label">HEAD</span>' +
+              '<code class="qc-head-text">' + escapeHtml(headLine) + '</code>' +
+            '</div>' +
+            renderQuickCommitStatusChips(s) +
+            (state.quickCommitOpenMenu === "tag-head" ? renderQuickCommitTagHeadPanel() : '') +
+            '<div class="qc-section-actions qc-section-actions--secondary">' +
+              '<button id="quick-commit-tag-head-toggle" class="btn btn-ghost btn-sm" type="button"' + (state.quickCommitPushing ? ' disabled' : '') + '>' +
+                '<svg viewBox="0 0 16 16" width="14" height="14" aria-hidden="true" style="vertical-align:-2px;margin-right:4px;"><path d="M2 2h6.5l5 5-5.5 5.5L2 7.5V2z" fill="none" stroke="currentColor" stroke-width="1.4" stroke-linejoin="round"/><circle cx="5" cy="5" r="1" fill="currentColor"/></svg>' +
+                (state.quickCommitOpenMenu === "tag-head" ? '收起' : '为 HEAD 打 tag') +
+              '</button>' +
+              renderQuickCommitPushButton(s) +
+            '</div>' +
+          '</section>';
+        }
+
+        var subtitleHtml = subParts.map(escapeHtml).join(" · ");
 
         return '<section id="quick-commit-modal" class="modal-backdrop' + (state.quickCommitOpen ? '' : ' hidden') + '">' +
           '<div class="modal quick-commit-modal" role="dialog" aria-labelledby="quick-commit-title">' +
             '<div class="modal-header">' +
               '<div>' +
                 '<h2 id="quick-commit-title" class="modal-title">快捷提交</h2>' +
-                '<p class="modal-subtitle">' + escapeHtml((s.branch || "(no branch)") + ' · ' + (s.modifiedCount || 0) + ' 个改动') + '</p>' +
+                '<p class="modal-subtitle">' + subtitleHtml + '</p>' +
               '</div>' +
               '<button id="quick-commit-close-btn" class="btn btn-ghost btn-icon modal-close-btn" type="button" aria-label="关闭"><svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" aria-hidden="true"><line x1="6" y1="6" x2="18" y2="18"/><line x1="18" y1="6" x2="6" y2="18"/></svg></button>' +
             '</div>' +
             '<div class="modal-body">' +
-              '<div class="qc-files-wrap">' + fileRows + '</div>' +
-              '<div class="qc-message-row" id="quick-commit-message-row">' +
-                '<div class="qc-message-header"><label class="field-label" for="quick-commit-message">commit message</label>' +
-                  '<button type="button" id="quick-commit-ai-btn" class="btn btn-ghost btn-sm"' + (state.quickCommitGenerating ? ' disabled' : '') + '>' + (state.quickCommitGenerating ? '生成中…' : 'AI 生成') + '</button>' +
-                '</div>' +
-                '<textarea id="quick-commit-message" class="field-input" rows="2" placeholder="输入 commit message 或点击 AI 生成">' + escapeHtml(f.customMessage || "") + '</textarea>' +
-              '</div>' +
-              '<div class="qc-checkbox-row">' +
-                '<label class="qc-checkbox-label" for="quick-commit-make-tag">提交后打 tag</label>' +
-                '<label class="qc-switch">' +
-                  '<input type="checkbox" id="quick-commit-make-tag" class="switch-toggle"' + (f.makeTag ? ' checked' : '') + '>' +
-                  '<span class="switch-slider"></span>' +
-                '</label>' +
-              '</div>' +
-              '<div class="qc-tag-row' + (f.makeTag ? '' : ' hidden') + '" id="quick-commit-tag-row">' +
-                '<input type="text" id="quick-commit-tag" class="field-input" placeholder="输入 tag 名称；留空将由 AI 在提交时自动生成" value="' + escapeHtml(f.tag || "") + '">' +
-              '</div>' +
-              '<div class="qc-checkbox-row">' +
-                '<label class="qc-checkbox-label" for="quick-commit-push">提交后 push 到远端</label>' +
-                '<label class="qc-switch">' +
-                  '<input type="checkbox" id="quick-commit-push" class="switch-toggle"' + (f.push ? ' checked' : '') + '>' +
-                  '<span class="switch-slider"></span>' +
-                '</label>' +
-              '</div>' +
-              '<p id="quick-commit-error" class="error-message' + (state.quickCommitError ? '' : ' hidden') + '">' + escapeHtml(state.quickCommitError || "") + '</p>' +
-              '<div class="worktree-merge-actions">' +
-                '<button id="quick-commit-cancel-btn" class="btn btn-secondary" type="button">取消</button>' +
-                '<button id="quick-commit-submit-btn" class="btn btn-primary" type="button"' + (hasChanges && !state.quickCommitSubmitting ? '' : ' disabled') + '>' + (state.quickCommitSubmitting ? '提交中…' : '执行') + '</button>' +
-              '</div>' +
+              section1 +
+              section2 +
             '</div>' +
           '</div>' +
         '</section>';
@@ -2188,6 +2656,40 @@
                   '</div>' +
                   '<p id="android-apk-message" class="hint hidden"></p>' +
                 '</div>' +
+                '<div class="settings-update-section hidden" id="macos-dmg-section">' +
+                  '<div class="settings-section-head">' +
+                    '<span class="settings-section-icon">🖥️</span>' +
+                    '<div class="settings-section-head-text">' +
+                      '<h4 class="settings-section-heading">macOS App</h4>' +
+                      '<p class="settings-section-sub">原生客户端版本与 DMG 下载</p>' +
+                    '</div>' +
+                  '</div>' +
+                  '<div id="macos-dmg-current-row" class="settings-about-row hidden">' +
+                    '<span class="settings-label">当前版本</span>' +
+                    '<span class="settings-value" id="settings-macos-dmg-current">-</span>' +
+                  '</div>' +
+                  '<div id="macos-dmg-github-row" class="settings-about-row settings-about-row-action hidden">' +
+                    '<span class="settings-label">线上版本</span>' +
+                    '<span class="settings-value settings-value-flex" id="settings-macos-dmg-github">-</span>' +
+                    '<button id="download-github-dmg-btn" class="btn btn-secondary btn-sm hidden" type="button">下载</button>' +
+                  '</div>' +
+                  '<div id="macos-dmg-local-row" class="settings-about-row settings-about-row-action hidden">' +
+                    '<span class="settings-label">本地版本</span>' +
+                    '<span class="settings-value settings-value-flex" id="settings-macos-dmg-local">-</span>' +
+                    '<button id="download-local-dmg-btn" class="btn btn-secondary btn-sm hidden" type="button">下载</button>' +
+                  '</div>' +
+                  '<div id="macos-auto-update-row" class="settings-toggle-row hidden">' +
+                    '<div class="settings-toggle-text">' +
+                      '<span class="settings-toggle-title">自动更新</span>' +
+                      '<span class="settings-toggle-desc" id="macos-auto-update-hint">检测到新版 DMG 将自动下载并挂载。</span>' +
+                    '</div>' +
+                    '<label class="settings-switch">' +
+                      '<input type="checkbox" id="auto-update-dmg-toggle" class="switch-toggle">' +
+                      '<span class="switch-slider"></span>' +
+                    '</label>' +
+                  '</div>' +
+                  '<p id="macos-dmg-message" class="hint hidden"></p>' +
+                '</div>' +
                 '<div class="settings-update-section" id="android-connect-section">' +
                   '<div class="settings-section-head">' +
                     '<span class="settings-section-icon">🔗</span>' +
@@ -5128,6 +5630,10 @@
         if (autoUpdateApkToggle) autoUpdateApkToggle.addEventListener("change", function() {
           toggleAutoUpdate("apk", autoUpdateApkToggle.checked);
         });
+        var autoUpdateDmgToggle = document.getElementById("auto-update-dmg-toggle");
+        if (autoUpdateDmgToggle) autoUpdateDmgToggle.addEventListener("change", function() {
+          toggleAutoUpdate("dmg", autoUpdateDmgToggle.checked);
+        });
         var copyConnectCodeBtn = document.getElementById("copy-connect-code-button");
         if (copyConnectCodeBtn) copyConnectCodeBtn.addEventListener("click", function() {
           var text = document.getElementById("android-connect-code");
@@ -6827,7 +7333,13 @@
           var delta = normalizedOutput.slice(currentOutput.length);
           if (delta) {
             wandTerminalWrite(state.terminal, delta);
-            maybeScheduleResyncForChunk(delta);
+            // 不在流式 chunk 路径触发 softResyncTerminal —— resync 会
+            // resetTerminal() + 完整重放整段 buffer，重放期间所有 cursor-home
+            // + 重画序列把"被覆盖的中间帧"反复塞进 main-screen scrollback，
+            // 表现为 PTY 视图里同一段回答被画 N 遍（PC 端列宽大、Claude TUI
+            // 重画序列密集时最严重）。响应结束的 thinking→idle 边界已经做了
+            // 一次 softResync 兜底，足以清掉流式残留的错位光标 DOM；流式
+            // 过程中持续重放只是纯粹的重复制造器。
             wrote = true;
           }
         } else if (currentOutput && currentOutput.startsWith(normalizedOutput)) {
@@ -8770,6 +9282,8 @@
             if (autoUpdateWebToggle) autoUpdateWebToggle.checked = !!autoUpdate.web;
             var autoUpdateApkToggle = document.getElementById("auto-update-apk-toggle");
             if (autoUpdateApkToggle) autoUpdateApkToggle.checked = !!autoUpdate.apk;
+            var autoUpdateDmgToggle = document.getElementById("auto-update-dmg-toggle");
+            if (autoUpdateDmgToggle) autoUpdateDmgToggle.checked = !!autoUpdate.dmg;
 
             // ── Android APK version display ──
             var apkSection = document.getElementById("android-apk-section");
@@ -8889,6 +9403,119 @@
               }
             }
 
+            // ── macOS DMG version display ──
+            var dmgSection = document.getElementById("macos-dmg-section");
+            var dmgCurrentRow = document.getElementById("macos-dmg-current-row");
+            var dmgCurrentEl = document.getElementById("settings-macos-dmg-current");
+            var dmgGithubRow = document.getElementById("macos-dmg-github-row");
+            var dmgGithubEl = document.getElementById("settings-macos-dmg-github");
+            var dmgGithubBtn = document.getElementById("download-github-dmg-btn");
+            var dmgLocalRow = document.getElementById("macos-dmg-local-row");
+            var dmgLocalEl = document.getElementById("settings-macos-dmg-local");
+            var dmgLocalBtn = document.getElementById("download-local-dmg-btn");
+            var dmgMessageEl = document.getElementById("macos-dmg-message");
+            var macosDmg = data.macosDmg || {};
+            var isInMacApp = !!_macAppVersion;
+            var hasDmgInfo = isInMacApp || !!macosDmg.github || !!macosDmg.local;
+            if (dmgSection) {
+              if (hasDmgInfo) dmgSection.classList.remove("hidden");
+              else dmgSection.classList.add("hidden");
+            }
+
+            if (isInMacApp) {
+              // ── macOS 壳内：显示当前版本 + 线上 + 本地 + 下载安装按钮 ──
+              if (dmgCurrentRow && dmgCurrentEl) {
+                dmgCurrentEl.textContent = "v" + _macAppVersion;
+                dmgCurrentRow.classList.remove("hidden");
+              }
+              if (macosDmg.github && dmgGithubRow && dmgGithubEl) {
+                var dghLabel = macosDmg.github.version ? ("v" + macosDmg.github.version) : macosDmg.github.fileName;
+                if (typeof macosDmg.github.size === "number") dghLabel += " · " + formatBytes(macosDmg.github.size);
+                dmgGithubEl.textContent = dghLabel;
+                dmgGithubRow.classList.remove("hidden");
+                if (dmgGithubBtn) {
+                  dmgGithubBtn.textContent = "下载安装";
+                  dmgGithubBtn.classList.remove("hidden");
+                  dmgGithubBtn.onclick = function() {
+                    try {
+                      WandNative.downloadUpdate(macosDmg.github.downloadUrl, macosDmg.github.fileName || "wand-update.dmg", "github");
+                    } catch (e) {
+                      if (typeof window.wandAlert === "function") {
+                        window.wandAlert("调用下载失败: " + e.message, { type: "danger", title: "下载失败" });
+                      } else if (typeof showToast === "function") {
+                        showToast("调用下载失败: " + e.message, "error");
+                      } else {
+                        alert("调用下载失败: " + e.message);
+                      }
+                    }
+                  };
+                }
+              }
+              if (macosDmg.local && dmgLocalRow && dmgLocalEl) {
+                var dlcLabel = macosDmg.local.version ? ("v" + macosDmg.local.version) : macosDmg.local.fileName;
+                if (typeof macosDmg.local.size === "number") dlcLabel += " · " + formatBytes(macosDmg.local.size);
+                dmgLocalEl.textContent = dlcLabel;
+                dmgLocalRow.classList.remove("hidden");
+                if (dmgLocalBtn) {
+                  dmgLocalBtn.textContent = "下载安装";
+                  dmgLocalBtn.classList.remove("hidden");
+                  dmgLocalBtn.onclick = function() {
+                    try {
+                      WandNative.downloadUpdate(macosDmg.local.downloadUrl, macosDmg.local.fileName || "wand-update.dmg", "local");
+                    } catch (e) {
+                      if (typeof window.wandAlert === "function") {
+                        window.wandAlert("调用下载失败: " + e.message, { type: "danger", title: "下载失败" });
+                      } else if (typeof showToast === "function") {
+                        showToast("调用下载失败: " + e.message, "error");
+                      } else {
+                        alert("调用下载失败: " + e.message);
+                      }
+                    }
+                  };
+                }
+              }
+              if (!macosDmg.github && !macosDmg.local && dmgMessageEl) {
+                dmgMessageEl.textContent = "暂无可用更新";
+                dmgMessageEl.classList.remove("hidden");
+              }
+              var dmgAutoRow = document.getElementById("macos-auto-update-row");
+              var dmgAutoHint = document.getElementById("macos-auto-update-hint");
+              if (dmgAutoRow) dmgAutoRow.classList.remove("hidden");
+              if (dmgAutoHint) dmgAutoHint.classList.remove("hidden");
+            } else {
+              // ── 浏览器模式：仅展示下载入口 ──
+              if (macosDmg.github && dmgGithubRow && dmgGithubEl) {
+                var dghLabel2 = macosDmg.github.version ? ("v" + macosDmg.github.version) : macosDmg.github.fileName;
+                if (typeof macosDmg.github.size === "number") dghLabel2 += " · " + formatBytes(macosDmg.github.size);
+                dmgGithubEl.textContent = dghLabel2;
+                dmgGithubRow.classList.remove("hidden");
+                if (dmgGithubBtn) {
+                  dmgGithubBtn.textContent = "下载";
+                  dmgGithubBtn.classList.remove("hidden");
+                  dmgGithubBtn.onclick = function() {
+                    window.open(macosDmg.github.downloadUrl, "_blank");
+                  };
+                }
+              }
+              if (macosDmg.local && dmgLocalRow && dmgLocalEl) {
+                var dlcLabel2 = macosDmg.local.version ? ("v" + macosDmg.local.version) : macosDmg.local.fileName;
+                if (typeof macosDmg.local.size === "number") dlcLabel2 += " · " + formatBytes(macosDmg.local.size);
+                dmgLocalEl.textContent = dlcLabel2;
+                dmgLocalRow.classList.remove("hidden");
+                if (dmgLocalBtn) {
+                  dmgLocalBtn.textContent = "下载";
+                  dmgLocalBtn.classList.remove("hidden");
+                  dmgLocalBtn.onclick = function() {
+                    window.open(macosDmg.local.downloadUrl, "_self");
+                  };
+                }
+              }
+              if (!macosDmg.github && !macosDmg.local && dmgMessageEl) {
+                dmgMessageEl.textContent = "暂未提供";
+                dmgMessageEl.classList.remove("hidden");
+              }
+            }
+
             // App connect code (encrypted)
             var connectCodeEl = document.getElementById("android-connect-code");
             var connectQrCanvas = document.getElementById("android-connect-qr");
@@ -9258,6 +9885,24 @@
           .catch(function() {});
       }
 
+      function checkDmgAutoUpdate() {
+        if (!_macAppVersion) return;
+        fetch("/api/auto-update", { credentials: "same-origin" })
+          .then(function(res) { return res.json(); })
+          .then(function(autoData) {
+            if (!autoData.dmg) return;
+            return fetch("/api/macos-dmg-update?currentVersion=" + encodeURIComponent(_macAppVersion), { credentials: "same-origin" })
+              .then(function(res) { return res.json(); })
+              .then(function(data) {
+                if (!data.updateAvailable || !data.downloadUrl) return;
+                try {
+                  WandNative.downloadUpdate(data.downloadUrl, data.fileName || "wand-update.dmg", data.source || "local");
+                } catch (_e) {}
+              });
+          })
+          .catch(function() {});
+      }
+
       function toggleAutoUpdate(type, enabled) {
         var body = {};
         body[type] = enabled;
@@ -9272,8 +9917,10 @@
           // Sync toggle state with server response
           var webToggle = document.getElementById("auto-update-web-toggle");
           var apkToggle = document.getElementById("auto-update-apk-toggle");
+          var dmgToggle = document.getElementById("auto-update-dmg-toggle");
           if (webToggle) webToggle.checked = !!data.web;
           if (apkToggle) apkToggle.checked = !!data.apk;
+          if (dmgToggle) dmgToggle.checked = !!data.dmg;
         })
         .catch(function() {
           // Revert toggle on failure
@@ -13418,6 +14065,35 @@
 
       // Drop any in-flight socket and start a new one *now* — used by the
       // Android resume bridge to recover from zombie connections (socket
+      // 客户端 WS 心跳检测：每 10s 跑一次，看 lastWsMessageAt 距今多久。
+      // 服务端每 20s 主动下推 {type:"ping"}，所以 40s 没消息就明确是半开。
+      // 浏览器在 background 时 setInterval 会被节流到 ~1Hz 或更慢，但
+      // 我们也在 visibilitychange→visible 里做了一次主动评估，所以
+      // 切回前台时不会拖很久才发现 stale。
+      var WS_HEARTBEAT_CHECK_MS = 10_000;
+      var WS_HEARTBEAT_STALE_MS = 40_000;
+      function startWsHeartbeatCheck() {
+        stopWsHeartbeatCheck();
+        state.wsHeartbeatCheckTimer = setInterval(evaluateWsHeartbeatStale, WS_HEARTBEAT_CHECK_MS);
+      }
+      function stopWsHeartbeatCheck() {
+        if (state.wsHeartbeatCheckTimer) {
+          clearInterval(state.wsHeartbeatCheckTimer);
+          state.wsHeartbeatCheckTimer = null;
+        }
+      }
+      function evaluateWsHeartbeatStale() {
+        if (!state.ws || state.ws.readyState !== WebSocket.OPEN) return;
+        // 第一帧（包括 onopen）会刷新 lastWsMessageAt；如果还是 0 说明刚连上
+        // 但服务端没下发任何东西（连 init 都没发出来）——交给下一轮检查。
+        if (!state.lastWsMessageAt) return;
+        var idle = Date.now() - state.lastWsMessageAt;
+        if (idle > WS_HEARTBEAT_STALE_MS) {
+          forceReconnectWebSocket("heartbeat-stale-" + Math.round(idle / 1000) + "s");
+        }
+      }
+
+      // Force a fresh WebSocket connection even if the existing one
       // still says OPEN, but the TCP path was torn down by Doze). Skips
       // the backoff timer; the caller has already decided this is urgent.
       function forceReconnectWebSocket(reason) {
@@ -13428,6 +14104,13 @@
           // reconnect path while we're already starting a fresh one.
           try { stale.onclose = null; } catch (e) { /* ignore */ }
           try { stale.onerror = null; } catch (e) { /* ignore */ }
+          // 也清掉 onmessage：close() 是异步的，TCP RST/Close 帧到达之前，浏览器
+          // socket 缓冲区里可能还有几条 in-flight 帧没派发。一旦它们在新 ws 已
+          // open + init 之后再触发，老 ws 的 output 会被 handleWebSocketMessage
+          // 当成"新增量"写进 wterm，造成"刚才那段又被画了一遍"。stale 心跳触发
+          // 的 force reconnect 比 onclose 触发更早，老 ws 仍处于 OPEN，这个窗口
+          // 更宽，必须显式 detach。
+          try { stale.onmessage = null; } catch (e) { /* ignore */ }
           try { stale.close(); } catch (e) { /* ignore */ }
           state.ws = null;
         }
@@ -13474,6 +14157,7 @@
           ws.onopen = function() {
             state.ws = ws;
             state.wsConnected = true;
+            state.lastWsMessageAt = Date.now();
             // Reset backoff on a successful connect so the next disconnect
             // starts the ladder from 500ms again.
             state.wsReconnectAttempts = 0;
@@ -13481,6 +14165,9 @@
             // Server's per-client output sequence counter restarts on every
             // new socket; clear ours so the first init isn't treated as a gap.
             state.lastSeqBySession = {};
+            // 启动客户端心跳检测：每 10s 检查一次 lastWsMessageAt，超过 40s
+            // 没收到任何消息（包括服务端 20s 一次的 ping）就视为半开连接。
+            startWsHeartbeatCheck();
             // Subscribe to current session if any
             subscribeToSession(state.selectedId);
             // Flush pending messages after reconnection
@@ -13495,8 +14182,20 @@
           };
 
           ws.onmessage = function(event) {
+            // 任意服务端消息都说明连接活着，先刷新心跳计时。
+            state.lastWsMessageAt = Date.now();
             try {
               var msg = JSON.parse(event.data);
+              // 应用层 ping：立刻回 pong。同时也让服务端能算 RTT。
+              // 这条消息处理完就 return，不进入下面的 sessionId 分发流程。
+              if (msg && msg.type === "ping") {
+                if (state.ws && state.ws.readyState === WebSocket.OPEN) {
+                  try {
+                    state.ws.send(JSON.stringify({ type: "pong", t: msg.t }));
+                  } catch (sendErr) { /* ignore */ }
+                }
+                return;
+              }
               if (msg && msg.type === "resync_required" && msg.sessionId) {
                 // Server dropped some output events under backpressure and
                 // is asking us for a fresh snapshot. Send a resync so the
@@ -13543,6 +14242,7 @@
           ws.onclose = function() {
             state.ws = null;
             state.wsConnected = false;
+            stopWsHeartbeatCheck();
             scheduleWsReconnect();
           };
 
@@ -13676,7 +14376,9 @@
                 // 变化的视觉错位无法被自愈，直到用户手动改窗口才修。现在让
                 // wterm 内部 ResizeObserver 独占 cols 跟踪职责。
                 wandTerminalWrite(state.terminal, msg.data.chunk);
-                maybeScheduleResyncForChunk(msg.data.chunk);
+                // 同 syncTerminalBuffer 的 delta 分支：流式 chunk 不再触发
+                // softResyncTerminal，避免完整重放把 cursor-home + 重画的
+                // "被覆盖中间帧"反复塞进 scrollback。thinking→idle 兜底就够了。
                 state.terminalSessionId = msg.sessionId;
                 if (msg.data.output) {
                   state.terminalOutput = clampClientTerminalOutput(normalizeTerminalOutput(msg.data.output));
@@ -13812,10 +14514,24 @@
               renderChat(true);
               updateTaskDisplay();
               updateApprovalStats();
-              // 订阅返回的是服务端 ring buffer 最新窗口，与客户端 terminalOutput
-              // 可能不连续。强制 replace（reset + 按当前 cols 重写）是订阅时唯一
-              // 可信的全量基线，避免 append 的 prefix 检查走错分支。
-              updateTerminalOutput(msg.data.output || "", msg.sessionId, "replace");
+              // 服务端 ring buffer 在多数场景下是当前已渲染输出的严格 superset
+              // （同一 PTY，buffer 只增不减）。这种情况下走 append delta 就够了，
+              // 不应该强制 replace。replace 会触发 resetTerminal + 全量重放整段
+              // output，wterm 把 ANSI cursor-home 重画的"中间帧"全部塞进
+              // scrollback，造成"同一段回答在 PTY 视图里被画 N 遍"——尤其是
+              // 锁屏 / 切回前台 / 心跳 stale 触发 reconnect 时，每次 init 都重放
+              // 一次，累积重复非常显著。
+              //
+              // 只有真的不连续（会话切换、ring buffer 截断了头部、output 不是
+              // currentOutput 的严格前缀延伸）才回退到 replace 的全量基线。
+              var initOutput = msg.data.output || "";
+              var sameTerminalSession = state.terminalSessionId === msg.sessionId;
+              var currTerminalOutput = state.terminalOutput || "";
+              var canAppendDelta = sameTerminalSession
+                && currTerminalOutput.length > 0
+                && initOutput.length >= currTerminalOutput.length
+                && initOutput.startsWith(currTerminalOutput);
+              updateTerminalOutput(initOutput, msg.sessionId, canAppendDelta ? "append" : "replace");
               // wterm 启动 cols=120，replace 写入可能落在错的列宽上；ResizeObserver
               // 回调异步，用 fit-with-retry 兜一次确保按真实宽度重排。
               ensureTerminalFitWithRetry("init");
@@ -17310,11 +18026,43 @@
 
       // ── Browser Notification API ──
 
+      // macOS WKWebView shim: Android shell injects a global WandNative via
+      // addJavascriptInterface, but WKWebView only exposes
+      // webkit.messageHandlers.<name>.postMessage(...). To keep call-sites
+      // identical across platforms, we synthesize a WandNative-shaped object
+      // when running inside the macOS shell.
+      try {
+        var _macUaMatch = navigator.userAgent.match(/WandPlatform\/macOS/);
+        var _macHandler = (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.wandNative) || null;
+        if (_macUaMatch && _macHandler && typeof window.WandNative === "undefined") {
+          window.WandNative = {
+            // Only downloadUpdate is wired for now; other Android-specific
+            // methods (notifications, haptics, screen wake) intentionally
+            // omitted so feature detection falls back to web APIs on macOS.
+            downloadUpdate: function(url, fileName, source) {
+              try {
+                _macHandler.postMessage({
+                  type: "downloadUpdate",
+                  url: String(url || ""),
+                  fileName: String(fileName || "wand-update.dmg"),
+                  source: String(source || "local"),
+                });
+              } catch (_e) {}
+            },
+          };
+        }
+      } catch (_e) {}
+
       // Detect Android APK native bridge
       var _hasNativeBridge = typeof WandNative !== "undefined" && typeof WandNative.sendNotification === "function";
-      // Detect if running inside APK and extract installed version from User-Agent
-      var _apkVersionMatch = navigator.userAgent.match(/WandApp\/([^\s]+)/);
-      var _apkVersion = _apkVersionMatch ? _apkVersionMatch[1] : null;
+      // Extract WandApp/<version> from User-Agent (set by both Android and macOS shells).
+      // We distinguish platforms by the additional WandPlatform/<name> token —
+      // macOS UA ends with "WandApp/X WandPlatform/macOS".
+      var _wandAppMatch = navigator.userAgent.match(/WandApp\/([^\s]+)/);
+      var _isMacApp = /WandPlatform\/macOS/.test(navigator.userAgent);
+      var _isAndroidApp = !!_wandAppMatch && !_isMacApp;
+      var _apkVersion = (_wandAppMatch && _isAndroidApp) ? _wandAppMatch[1] : null;
+      var _macAppVersion = (_wandAppMatch && _isMacApp) ? _wandAppMatch[1] : null;
 
       function _vibrate(pattern) {
         if (!_hasNativeBridge || typeof WandNative.vibrate !== "function") return;