@co0ontty/wand 1.39.1 → 1.40.0

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

@@ -277,10 +277,9 @@
         quickCommitSubmitting: false,
         quickCommitGenerating: false,
         quickCommitError: "",
-        // 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" },
+        // commitMode: "commit-tag" (commit + version tag) | "commit" (commit only).
+        // Pushing is a separate, standalone action — never bundled into the commit button.
+        quickCommitForm: { customMessage: "", tag: "", tagEdited: false, commitMode: "commit-tag" },
         // 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".
@@ -1531,8 +1530,14 @@
               if (_macAppVersion) {
                 checkDmgAutoUpdate();
               }
-              if (state.claudeHistoryExpanded && !state.claudeHistoryLoaded) {
-                ensureClaudeHistoryLoaded();
+              // Warm up history in the background a beat after first paint so
+              // the inline 历史会话 count is real (not "···") and recent CLI
+              // sessions merge into the list without a manual expand. Deferred
+              // to avoid competing with the initial session/output load.
+              if (!state.claudeHistoryLoaded) {
+                setTimeout(function() {
+                  if (!state.claudeHistoryLoaded) ensureClaudeHistoryLoaded();
+                }, 600);
               }
             });
           })
@@ -1785,7 +1790,9 @@
         // isAnchored = 边栏占据布局空间（推开主内容）。桌面 pin 或 任意端窄条都算 anchored。
         var isMobile = isMobileLayout();
         var isCollapsed = !!state.sidebarPinned && !!state.sidebarCollapsed;
-        var isAnchored = isCollapsed || (!!state.sidebarPinned && !isMobile);
+        // 桌面端任何「可见」的侧栏都停靠（推开内容），绝不悬浮遮挡——避免主区被压到
+        // 侧栏下面。pinned 只表示「锁定常驻」，open 则是临时可见，两者都算停靠。
+        var isAnchored = isCollapsed || (!isMobile && (!!state.sidebarPinned || !!state.sessionsDrawerOpen));
         var collapsedCls = isCollapsed ? ' sidebar-collapsed' : '';
         var sidebarCollapsedCls = isCollapsed ? ' collapsed' : '';
         return '<div class="app-container">' +
@@ -1814,7 +1821,10 @@
                       '</button>' +
                     '</div>' +
                   '</div>' +
-                  '<button id="sidebar-collapse-btn" class="btn btn-ghost btn-sm sidebar-collapse-toggle' + (isCollapsed ? ' collapsed' : '') + '" type="button" title="' + (isCollapsed ? '展开侧栏' : '收起为窄条') + '" aria-label="' + (isCollapsed ? '展开侧栏' : '收起为窄条') + '">' +
+                  '<button id="sidebar-pin-btn" class="btn btn-ghost btn-sm sidebar-pin-toggle' + (state.sidebarPinned ? ' pinned' : '') + '" type="button" title="' + (state.sidebarPinned ? '已固定常驻（点击解除锁定）' : '固定侧栏常驻') + '" aria-label="' + (state.sidebarPinned ? '解除固定常驻' : '固定侧栏常驻') + '" aria-pressed="' + (state.sidebarPinned ? 'true' : 'false') + '">' +
+                    '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><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' + (isCollapsed ? ' collapsed' : '') + '" type="button" title="' + (isCollapsed ? '展开为全尺寸' : '收起为窄条') + '" aria-label="' + (isCollapsed ? '展开为全尺寸' : '收起为窄条') + '">' +
                     (isCollapsed
                       ? '<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="10 6 16 12 10 18"/><line x1="20" y1="5" x2="20" y2="19"/></svg>'
                       : '<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>') +
@@ -1827,7 +1837,6 @@
                   '<div class="sessions-list" id="sessions-list">' + renderSessionsListContent() + '</div>' +
                 '</div>' +
               '</div>' +
-              '<div id="sidebar-history-region" class="sidebar-history-region">' + renderClaudeHistoryRegion() + '</div>' +
               '<div class="sidebar-footer">' +
                 '<button id="drawer-new-session-button" class="btn btn-primary btn-block"><span>+</span> 新会话</button>' +
                 '<div class="sidebar-footer-actions">' +
@@ -2057,13 +2066,14 @@
                     '</div>' +
                   '</div>' +
                   renderExpandedShortcutsRow() +
-                  // Session info bar at bottom — 仅保留信息类徽章（Claude session id / exit code）。
+                  // Session info bar at bottom — 仅保留信息类徽章（历史会话 id / exit code）。
                   // 自动批准已从这里移到主 pill 行（renderAutoApproveChip）。
                   (selectedSession
                     ? (function() {
                         var bits = "";
-                        if (selectedSession.provider === "claude" && selectedSession.claudeSessionId) {
-                          bits += '<span id="claude-session-id-badge" class="claude-session-id-badge" data-claude-id="' + escapeHtml(selectedSession.claudeSessionId) + '" title="点击复制 Claude 会话 ID">' + iconSvg("cloud", { size: 11, strokeWidth: 1.7, cls: "claude-session-id-icon" }) + '<span class="claude-session-id-text">' + escapeHtml(selectedSession.claudeSessionId.slice(0, 8)) + '</span></span>';
+                        if ((selectedSession.provider === "claude" || selectedSession.provider === "codex") && selectedSession.claudeSessionId) {
+                          var historyIdTitle = selectedSession.provider === "codex" ? "点击复制 Codex thread ID" : "点击复制 Claude 会话 ID";
+                          bits += '<span id="claude-session-id-badge" class="claude-session-id-badge" data-claude-id="' + escapeHtml(selectedSession.claudeSessionId) + '" title="' + historyIdTitle + '">' + iconSvg("cloud", { size: 11, strokeWidth: 1.7, cls: "claude-session-id-icon" }) + '<span class="claude-session-id-text">' + escapeHtml(selectedSession.claudeSessionId.slice(0, 8)) + '</span></span>';
                         }
                         // 非结构化会话：进程退出后展示退出码（哪怕 0，告诉用户已正常结束）。
                         // 结构化会话：只在退出码非 0（即真有失败）时展示，避免成功的多轮对话也挂个 "退出码=0" 误导。
@@ -2162,7 +2172,8 @@
 
         var infoItems = "";
         if (hasClaudeId) {
-          infoItems += '<button class="topbar-more-item" data-action="copy-claude-session-id" type="button" role="menuitem">' + cloudIconSvg + '<span>复制 Claude 会话 ID</span></button>';
+          var historyIdLabel = session.provider === "codex" ? "复制 Codex thread ID" : "复制 Claude 会话 ID";
+          infoItems += '<button class="topbar-more-item" data-action="copy-claude-session-id" type="button" role="menuitem">' + cloudIconSvg + '<span>' + historyIdLabel + '</span></button>';
         }
         if (hasCwd) {
           infoItems += '<button class="topbar-more-item" data-action="copy-cwd" type="button" role="menuitem">' + folderIconSvg + '<span>复制工作目录</span></button>';
@@ -2232,16 +2243,17 @@
       var quickCommitEscHandler = null;
       var quickCommitDocClickHandler = null;
 
-      // Restore the user's last "primary action" choice so the split button feels sticky.
-      function readSavedPrimaryAction() {
+      // Restore the user's last commit-mode choice so the split button feels sticky.
+      // Modes: "commit-tag" (commit + version tag) | "commit" (commit only).
+      function readSavedCommitMode() {
         try {
-          var v = localStorage.getItem("wand.quickCommit.primaryAction");
-          if (v === "commit" || v === "commit-push") return v;
+          var v = localStorage.getItem("wand.quickCommit.commitMode");
+          if (v === "commit" || v === "commit-tag") return v;
         } catch (e) { /* localStorage may be blocked */ }
-        return "commit";
+        return "commit-tag"; // default: commit + tag
       }
-      function savePrimaryAction(value) {
-        try { localStorage.setItem("wand.quickCommit.primaryAction", value); } catch (e) { /* no-op */ }
+      function saveCommitMode(value) {
+        try { localStorage.setItem("wand.quickCommit.commitMode", value); } catch (e) { /* no-op */ }
       }
 
       function openQuickCommitModal() {
@@ -2251,9 +2263,11 @@
         state.quickCommitError = "";
         state.quickCommitForm = {
           customMessage: "",
-          makeTag: false,
           tag: "",
-          primaryAction: readSavedPrimaryAction(),
+          // Whether the user has manually edited the tag (so we stop auto-overwriting it).
+          tagEdited: false,
+          // "commit-tag" → commit + version tag; "commit" → commit only.
+          commitMode: readSavedCommitMode(),
         };
         state.quickCommitOpenMenu = null;
         state.quickCommitTagHeadForm = { tag: "", push: false };
@@ -2303,6 +2317,12 @@
         document.addEventListener("click", quickCommitDocClickHandler, true);
         loadGitStatus(state.selectedId, { force: true }).then(function() {
           if (!state.quickCommitOpen) return;
+          // Seed the tag field with the locally-derived suggestion so a tag is
+          // always shown by default (greyed until the toggle is turned on).
+          var st = state.gitStatus || {};
+          if (!state.quickCommitForm.tagEdited && st.suggestedTag) {
+            state.quickCommitForm.tag = st.suggestedTag;
+          }
           rerenderQuickCommitModal();
         });
       }
@@ -2354,23 +2374,31 @@
         var aiBtn = document.getElementById("quick-commit-ai-btn");
         if (aiBtn) aiBtn.addEventListener("click", generateCommitMessageAI);
         var msgEl = document.getElementById("quick-commit-message");
-        if (msgEl) msgEl.addEventListener("input", function() {
-          state.quickCommitForm.customMessage = msgEl.value;
-        });
-        var tagCb = document.getElementById("quick-commit-make-tag");
-        if (tagCb) tagCb.addEventListener("change", function() {
-          state.quickCommitForm.makeTag = tagCb.checked;
-          var row = document.getElementById("quick-commit-tag-row");
-          if (row) row.classList.toggle("hidden", !tagCb.checked);
-          if (tagCb.checked) {
-            var input = document.getElementById("quick-commit-tag");
-            if (input) setTimeout(function() { input.focus(); }, 0);
-          }
-        });
+        if (msgEl) {
+          msgEl.addEventListener("input", function() {
+            state.quickCommitForm.customMessage = msgEl.value;
+          });
+          // Cmd/Ctrl+Enter submits, matching the common editor shortcut.
+          msgEl.addEventListener("keydown", function(e) {
+            if ((e.metaKey || e.ctrlKey) && e.key === "Enter") {
+              e.preventDefault();
+              submitQuickCommit();
+            }
+          });
+        }
         var tagInput = document.getElementById("quick-commit-tag");
-        if (tagInput) tagInput.addEventListener("input", function() {
-          state.quickCommitForm.tag = tagInput.value;
-        });
+        if (tagInput) {
+          tagInput.addEventListener("input", function() {
+            state.quickCommitForm.tag = tagInput.value;
+            state.quickCommitForm.tagEdited = true;
+          });
+          tagInput.addEventListener("keydown", function(e) {
+            if (e.key === "Enter") {
+              e.preventDefault();
+              submitQuickCommit();
+            }
+          });
+        }
 
         var actionCaret = document.getElementById("quick-commit-action-caret");
         if (actionCaret) actionCaret.addEventListener("click", function(e) {
@@ -2380,17 +2408,24 @@
         });
         var actionMenu = document.getElementById("quick-commit-action-menu");
         if (actionMenu) {
-          var actionItems = actionMenu.querySelectorAll("[data-qc-action]");
+          var actionItems = actionMenu.querySelectorAll("[data-qc-commit-mode]");
           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);
+                // Keep what the user typed before the re-render.
+                var liveTag = document.getElementById("quick-commit-tag");
+                if (liveTag && !liveTag.disabled) state.quickCommitForm.tag = liveTag.value;
+                var value = btn.getAttribute("data-qc-commit-mode");
+                if (value === "commit" || value === "commit-tag") {
+                  state.quickCommitForm.commitMode = value;
+                  saveCommitMode(value);
                 }
                 state.quickCommitOpenMenu = null;
                 rerenderQuickCommitModal();
+                if (value === "commit-tag") {
+                  var inp = document.getElementById("quick-commit-tag");
+                  if (inp) setTimeout(function() { inp.focus(); var v = inp.value; inp.value = ""; inp.value = v; }, 0);
+                }
               });
             })(actionItems[i]);
           }
@@ -2400,7 +2435,14 @@
         if (tagHeadToggle) tagHeadToggle.addEventListener("click", function() {
           var willOpen = state.quickCommitOpenMenu !== "tag-head";
           state.quickCommitOpenMenu = willOpen ? "tag-head" : null;
-          if (willOpen) state.quickCommitTagHeadError = "";
+          if (willOpen) {
+            state.quickCommitTagHeadError = "";
+            // Pre-fill with the locally-derived suggestion (unless already set).
+            var sug = (state.gitStatus || {}).suggestedTag;
+            if (sug && !(state.quickCommitTagHeadForm.tag || "").trim()) {
+              state.quickCommitTagHeadForm.tag = sug;
+            }
+          }
           rerenderQuickCommitModal();
           if (willOpen) {
             var inp = document.getElementById("quick-commit-tag-head-input");
@@ -2487,14 +2529,19 @@
             var data = result.data || {};
             var aiMessage = typeof data.message === "string" ? data.message : "";
             var aiTag = typeof data.suggestedTag === "string" ? data.suggestedTag.trim() : "";
-            // Only fill fields that are currently empty; never overwrite user input.
+            // "AI 生成" recommends BOTH a commit message and a version tag.
+            // Fill the message only when empty (never clobber what the user typed).
             var currentMessage = (state.quickCommitForm.customMessage || "").trim();
             if (!currentMessage && aiMessage) {
               state.quickCommitForm.customMessage = aiMessage;
             }
-            var currentTag = (state.quickCommitForm.tag || "").trim();
-            if (state.quickCommitForm.makeTag && !currentTag && aiTag) {
-              state.quickCommitForm.tag = aiTag;
+            // Adopt the AI tag (smarter than the local patch-bump default) unless the
+            // user has manually edited it, and switch to "commit + tag" so the
+            // recommendation is actually applied on commit.
+            if (aiTag) {
+              if (!state.quickCommitForm.tagEdited) state.quickCommitForm.tag = aiTag;
+              state.quickCommitForm.commitMode = "commit-tag";
+              saveCommitMode("commit-tag");
             }
           })
           .catch(function(error) {
@@ -2513,21 +2560,22 @@
         var tagEl = document.getElementById("quick-commit-tag");
         if (tagEl) state.quickCommitForm.tag = tagEl.value;
         var form = state.quickCommitForm || {};
-        var userTag = form.makeTag ? (form.tag || "").trim() : "";
+        var withTag = form.commitMode === "commit-tag";
+        var userTag = withTag ? (form.tag || "").trim() : "";
         var message = (form.customMessage || "").trim();
         if (!message) {
-          state.quickCommitError = "请填写 commit message，或点击 AI 生成。";
+          state.quickCommitError = "请填写提交信息，或点击「AI 生成」。";
           rerenderQuickCommitModal();
           return;
         }
-        var willPush = form.primaryAction === "commit-push";
-        // 开了 tag 开关但没填 → 由后端在提交时调 AI 生成
+        // Commit no longer pushes — pushing is a separate, standalone action.
+        // 选了「提交并打 Tag」但 tag 留空 → 由后端在提交时调 AI 生成。
         var payload = {
           autoMessage: false,
           customMessage: message,
           tag: userTag,
-          autoTag: !!(form.makeTag && !userTag),
-          push: willPush
+          autoTag: !!(withTag && !userTag),
+          push: false
         };
         state.quickCommitSubmitting = true;
         state.quickCommitError = "";
@@ -2550,14 +2598,8 @@
             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 {
-              var okMsg = base + (data.pushed ? "，已 push" : "");
-              if (typeof showToast === "function") showToast(okMsg, "success");
-            }
+            var base = subPrefix + "已提交" + (hash ? " " + hash : "") + (tagName ? "，已打 Tag " + tagName : "");
+            if (typeof showToast === "function") showToast(base + "。可在「同步」区推送到远端。", "success");
             closeQuickCommitModal();
             if (state.selectedId) loadGitStatus(state.selectedId, { force: true });
           })
@@ -2697,16 +2739,37 @@
           });
       }
 
+      // Map a porcelain status (XY two-char, e.g. " M", "A.", "??") to a single
+      // VS-Code-style letter badge: pick the first meaningful char, color by kind.
+      function qcStatusBadge(status) {
+        var raw = (status || "").trim();
+        if (raw === "??") return { letter: "U", cls: "untracked", title: "未跟踪" };
+        if (raw === "!!") return { letter: "I", cls: "ignored", title: "已忽略" };
+        var c = "";
+        for (var i = 0; i < status.length; i++) {
+          if (status[i] && status[i] !== "." && status[i] !== " ") { c = status[i]; break; }
+        }
+        c = (c || raw[0] || "?").toUpperCase();
+        var map = {
+          A: { cls: "add", title: "新增" },
+          M: { cls: "mod", title: "修改" },
+          D: { cls: "del", title: "删除" },
+          R: { cls: "ren", title: "重命名" },
+          C: { cls: "ren", title: "复制" },
+          T: { cls: "mod", title: "类型变更" },
+          U: { cls: "del", title: "冲突" }
+        };
+        var hit = map[c] || { cls: "other", title: "已更改" };
+        return { letter: c, cls: hit.cls, title: hit.title };
+      }
+
       function renderQuickCommitFileRows(files) {
         var rows = files.map(function(item) {
-          var status = (item.status || "  ").substring(0, 2);
-          var flag = status.trim() || "?";
-          var cls = "qc-flag";
-          if (flag === "A" || status[0] === "A") cls += " qc-flag-add";
-          else if (flag === "D" || status[0] === "D") cls += " qc-flag-del";
-          else if (flag === "M" || status[0] === "M") cls += " qc-flag-mod";
-          else if (flag === "??" || status === "??") cls += " qc-flag-untracked";
-          else if (flag === "R") cls += " qc-flag-ren";
+          var badge = qcStatusBadge(item.status || "");
+          var fullPath = item.path || "";
+          var slash = fullPath.lastIndexOf("/");
+          var dir = slash >= 0 ? fullPath.slice(0, slash + 1) : "";
+          var base = slash >= 0 ? fullPath.slice(slash + 1) : fullPath;
           var subBadge = "";
           if (item.isSubmodule) {
             var st = item.submoduleState || {};
@@ -2717,7 +2780,13 @@
             var label = parts.length ? "submodule · " + parts.join(" / ") : "submodule";
             subBadge = '<span class="qc-submodule-badge">' + escapeHtml(label) + '</span>';
           }
-          return '<div class="qc-file-row"><span class="' + cls + '">' + escapeHtml(status) + '</span><span class="qc-file-path">' + escapeHtml(item.path || "") + '</span>' + subBadge + '</div>';
+          return '<div class="qc-file-row" title="' + escapeHtml(fullPath) + '">' +
+            '<span class="qc-file-badge qc-badge-' + badge.cls + '" title="' + escapeHtml(badge.title) + '">' + escapeHtml(badge.letter) + '</span>' +
+            '<span class="qc-file-path">' +
+              (dir ? '<span class="qc-file-dir">' + escapeHtml(dir) + '</span>' : '') +
+              '<span class="qc-file-name">' + escapeHtml(base) + '</span>' +
+            '</span>' + subBadge +
+          '</div>';
         }).join("");
         return rows || '<div class="qc-empty">没有可提交的改动。</div>';
       }
@@ -2726,23 +2795,25 @@
         return state.quickCommitSubmitting || state.quickCommitTagHeadSubmitting || state.quickCommitPushing;
       }
 
-      function renderQuickCommitPrimary(hasChanges) {
+      function renderQuickCommitCommitButton(hasChanges) {
         var f = state.quickCommitForm;
+        var withTag = f.commitMode === "commit-tag";
         var label;
         if (state.quickCommitSubmitting) label = "提交中…";
-        else if (f.primaryAction === "commit-push") label = "提交并 push";
-        else label = "仅提交";
+        else label = withTag ? "提交并打 Tag" : "提交";
         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 到远端" }
+          { value: "commit-tag", label: "提交并打 Tag", desc: "创建 commit，并为它打一个版本 Tag" },
+          { value: "commit", label: "仅提交", desc: "只创建 commit，不打 Tag" }
         ];
         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>' +
+          var sel = f.commitMode === item.value ? " is-selected" : "";
+          return '<button type="button" class="qc-dropdown-item' + sel + '" data-qc-commit-mode="' + item.value + '" role="menuitemradio" aria-checked="' + (f.commitMode === item.value ? 'true' : 'false') + '">' +
+            '<span class="qc-dropdown-item-main"><span class="qc-dropdown-check" aria-hidden="true">' +
+              (f.commitMode === item.value ? '<svg viewBox="0 0 16 16" width="13" height="13"><path d="M13 4.5l-6 6L3 7" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"/></svg>' : '') +
+            '</span><span class="qc-dropdown-item-title">' + escapeHtml(item.label) + '</span></span>' +
             '<span class="qc-dropdown-item-desc">' + escapeHtml(item.desc) + '</span>' +
             '</button>';
         }).join("");
@@ -2750,7 +2821,7 @@
           '<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="更多提交方式">' +
+          '<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 ?
@@ -2781,18 +2852,19 @@
         var submitting = state.quickCommitTagHeadSubmitting;
         var generating = state.quickCommitTagHeadGenerating;
         return '<div class="qc-tag-head-panel">' +
+          '<div class="qc-tag-head-hint">为当前最新提交（HEAD）打 Tag，不创建新提交。</div>' +
           '<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' : '') + '>' +
+            '<input type="text" id="quick-commit-tag-head-input" class="field-input" placeholder="版本号，如 v1.2.0" 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>' +
+            '<span>打完后立即推送这个 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>' +
+            '<button type="button" id="quick-commit-tag-head-submit" class="btn btn-secondary btn-sm"' + (submitting ? ' disabled' : '') + '>' + (submitting ? '打 Tag 中…' : '打 Tag') + '</button>' +
           '</div>' +
         '</div>';
       }
@@ -2835,56 +2907,53 @@
 
       function renderQuickCommitModal() {
         var s = state.gitStatus || {};
-        var f = state.quickCommitForm || { customMessage: "", makeTag: false, tag: "", primaryAction: "commit" };
+        var f = state.quickCommitForm || { customMessage: "", tag: "", tagEdited: false, commitMode: "commit-tag" };
         var hasChanges = (s.modifiedCount || 0) > 0;
         var files = Array.isArray(s.files) ? s.files : [];
         var fileRows = renderQuickCommitFileRows(files);
 
-        // Subtitle: branch · N 改动 · ↑X ↓Y
+        // Subtitle: branch · N 改动 · ↑X ↓Y  (clean repos show a small ✓ badge instead of "0 个改动")
         var subParts = [];
         subParts.push(s.branch || "(no branch)");
-        subParts.push((s.modifiedCount || 0) + " 个改动");
+        if (hasChanges) 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) {
+          var genBusy = state.quickCommitGenerating;
+          var withTag = f.commitMode === "commit-tag";
           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-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>' +
-                '<div class="qc-ai-controls">' +
-                  '<button type="button" id="quick-commit-ai-btn" class="btn btn-ghost btn-sm"' + (state.quickCommitGenerating ? ' disabled' : '') + '>' + (state.quickCommitGenerating ? '生成中…' : 'AI 生成') + '</button>' +
-                  '<label class="qc-ai-tag-toggle" title="开启后，AI 会一并建议 tag，提交时会为本次 commit 打 tag">' +
-                    '<span class="qc-ai-tag-label">含 tag</span>' +
-                    '<span class="qc-switch qc-switch--compact">' +
-                      '<input type="checkbox" id="quick-commit-make-tag" class="switch-toggle" aria-label="同时为本次 commit 打 tag"' + (f.makeTag ? ' checked' : '') + ((state.quickCommitSubmitting || state.quickCommitGenerating) ? ' disabled' : '') + '>' +
-                      '<span class="switch-slider"></span>' +
-                    '</span>' +
-                  '</label>' +
-                '</div>' +
+              '<div class="qc-message-header">' +
+                '<label class="field-label qc-message-label" for="quick-commit-message">提交信息</label>' +
+                '<button type="button" id="quick-commit-ai-btn" class="btn btn-ghost btn-sm qc-ai-btn"' + (genBusy ? ' disabled' : '') + ' title="读取改动，用 AI 生成提交信息与版本 Tag">' +
+                  '<svg viewBox="0 0 16 16" width="13" height="13" aria-hidden="true"><path d="M8 1.5l1.4 3.6L13 6.5 9.4 7.9 8 11.5 6.6 7.9 3 6.5l3.6-1.4L8 1.5zM12.5 10.5l.7 1.8 1.8.7-1.8.7-.7 1.8-.7-1.8-1.8-.7 1.8-.7.7-1.8z" fill="currentColor"/></svg>' +
+                  '<span>' + (genBusy ? '生成中…' : 'AI 生成') + '</span>' +
+                '</button>' +
               '</div>' +
-              '<textarea id="quick-commit-message" class="field-input" rows="2" placeholder="输入 commit message 或点击 AI 生成"' + (state.quickCommitSubmitting ? ' disabled' : '') + '>' + escapeHtml(f.customMessage || "") + '</textarea>' +
+              '<textarea id="quick-commit-message" class="field-input qc-message-input" rows="3" placeholder="描述这次改动；或点「AI 生成」自动填写" ' + (state.quickCommitSubmitting ? 'disabled' : '') + '>' + escapeHtml(f.customMessage || "") + '</textarea>' +
             '</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 class="qc-tag-field' + (withTag ? '' : ' is-off') + '">' +
+              '<span class="qc-tag-field-label" title="' + (withTag ? '这次提交会打上这个版本 Tag' : '当前为「仅提交」，不会打 Tag') + '">Tag</span>' +
+              '<input type="text" id="quick-commit-tag" class="field-input qc-tag-field-input" placeholder="版本号，如 v1.2.0" value="' + escapeHtml(f.tag || "") + '"' + ((!withTag || state.quickCommitSubmitting) ? ' disabled' : '') + '>' +
+              (withTag ? '' : '<span class="qc-tag-field-note">仅提交</span>') +
             '</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 class="qc-action-group">' +
+                renderQuickCommitCommitButton(hasChanges) +
+                renderQuickCommitPushButton(s) +
+              '</div>' +
             '</div>' +
           '</section>';
         }
+        // When clean, we skip the big "changes" card entirely — a small green
+        // indicator in the header subtitle is enough of a signal (see below).
 
         // Section 2: repo status + secondary actions (always show when there's at least one commit)
         var section2 = "";
@@ -2892,32 +2961,38 @@
           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";
+          var tagHeadOpen = state.quickCommitOpenMenu === "tag-head";
           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-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() : '') +
+            (tagHeadOpen ? 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 id="quick-commit-tag-head-toggle" class="btn btn-secondary btn-sm qc-tag-head-btn' + (tagHeadOpen ? ' is-open' : '') + '" type="button"' + (state.quickCommitPushing ? ' disabled' : '') + ' title="给当前最新提交（HEAD）打 Tag，不会创建新提交">' +
+                '<svg viewBox="0 0 16 16" width="14" height="14" aria-hidden="true"><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>' +
+                '<span>' + (tagHeadOpen ? '收起' : '为当前提交打 Tag') + '</span>' +
               '</button>' +
-              renderQuickCommitPushButton(s) +
+              // Push lives in the commit footer when there are changes; show it here otherwise.
+              (hasChanges ? '' : renderQuickCommitPushButton(s)) +
             '</div>' +
           '</section>';
         }
 
         var subtitleHtml = subParts.map(escapeHtml).join(" · ");
+        // Small "clean" badge shown inline in the header subtitle (replaces the old empty-state card).
+        var cleanBadge = (!hasChanges && s.isGit !== false)
+          ? '<span class="qc-clean-badge" title="工作区干净，没有待提交的改动"><svg viewBox="0 0 16 16" width="11" height="11" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M13 4.5l-6 6L3 7"/></svg>干净</span>'
+          : '';
 
         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">' + subtitleHtml + '</p>' +
+                '<p class="modal-subtitle">' + subtitleHtml + cleanBadge + '</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>' +
@@ -3509,14 +3584,16 @@
       }
 
       function renderSessions() {
-        // Claude history is no longer inlined here — it lives in its own
-        // collapsible region between .sidebar-body and .sidebar-footer, so
-        // the scrolling sessions list focuses on recent / archived sessions.
+        // Claude/Codex history is rendered INLINE as the final collapsible
+        // group of this same scrolling list (see renderClaudeHistoryGroup),
+        // styled like 已归档. There is no separate docked region anymore —
+        // that previously stranded an empty void above the footer.
         var archivedSessions = state.sessions.filter(function(session) { return session.archived; });
         var groups = [];
         groups.push(renderSessionManageBar());
 
         var recentEntries = getRecentEntries();
+        var historyGroup = renderClaudeHistoryGroup();
 
         if (recentEntries.length > 0) {
           groups.push(renderRecentGroup(recentEntries));
@@ -3524,9 +3601,12 @@
         if (archivedSessions.length > 0) {
           groups.push(renderArchivedGroup(archivedSessions));
         }
-        if (recentEntries.length === 0 && archivedSessions.length === 0) {
+        if (recentEntries.length === 0 && archivedSessions.length === 0 && !historyGroup) {
           return renderSessionManageBar() + '<div class="empty-state"><strong>还没有会话记录</strong><br>点击上方「新对话」开始你的第一次对话。</div>';
         }
+        if (historyGroup) {
+          groups.push(historyGroup);
+        }
         return groups.join("");
       }
 
@@ -3583,19 +3663,21 @@
         var selectAllAction = allSelected ? "clear-selection" : "select-all-visible";
         var selectAllDisabled = selectable === 0 ? ' disabled' : '';
 
-        // Linear-style toolbar:
-        //   [N selected]  ─────────  [全选] [清空]  [delete (danger)] [完成 (primary)]
+        // Flat in-place toolbar (NOT a popped card): the same sub-header row
+        // morphs to [✕]  N 已选 ........ 全选/取消全选  删除. Sticky to the top
+        // of the scroll so the count + delete stay reachable while selecting.
+        var exitBtn = '<button class="session-manage-exit" data-action="toggle-manage-mode" type="button" aria-label="退出管理模式" title="退出管理模式">' +
+          '<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>';
+        var summary = hasAny
+          ? '<span class="session-manage-count">' + totalCount + '</span><span class="session-manage-summary-label">已选择</span>'
+          : '<span class="session-manage-summary-label muted">选择要管理的项目</span>';
         return '<div class="session-manage-bar active">' +
-          '<div class="session-manage-summary">' +
-            '<span class="session-manage-count">' + totalCount + '</span>' +
-            '<span class="session-manage-summary-label">已选择</span>' +
-          '</div>' +
+          exitBtn +
+          '<div class="session-manage-summary">' + summary + '</div>' +
           '<div class="session-manage-actions">' +
             '<button class="btn btn-ghost btn-xs" data-action="' + selectAllAction + '" type="button"' + selectAllDisabled + '>' + selectAllLabel + '</button>' +
-            '<button class="btn btn-ghost btn-xs" data-action="clear-selection" type="button"' + (hasAny ? '' : ' disabled') + '>清空</button>' +
-            '<span class="session-manage-divider"></span>' +
-            '<button class="btn btn-danger btn-xs" data-action="delete-selected" type="button"' + (hasAny ? '' : ' disabled') + '>删除</button>' +
-            '<button class="btn btn-primary btn-xs" data-action="toggle-manage-mode" type="button">完成</button>' +
+            '<button class="btn btn-danger btn-xs" data-action="delete-selected" type="button"' + (hasAny ? '' : ' disabled') + '>删除' + (hasAny ? ' ' + totalCount : '') + '</button>' +
           '</div>' +
         '</div>';
       }
@@ -3622,8 +3704,9 @@
       }
 
       function renderRecentGroup(entries) {
-        var html = '<section class="session-group">' +
-          '<div class="session-group-title">最近</div>';
+        // No "最近" group title here — the section intro ("最近的会话记录") above
+        // already labels this group, so a second label would be redundant.
+        var html = '<section class="session-group session-group--recent">';
         html += entries.map(function(e) {
           return e.kind === "session"
             ? renderSessionItem(e.ref, "sessions")
@@ -3642,46 +3725,30 @@
         });
       }
 
-      // Render the docked Claude-history region that lives between
-      // `.sidebar-body` and `.sidebar-footer`. Collapsed by default — only
-      // shows a slim header ("历史消息" + count bubble). Expanded reveals the
-      // grouped-by-cwd list inside a scroll cap.
-      function renderClaudeHistoryRegion() {
+      // Render history as the final INLINE collapsible group of #sessions-list,
+      // styled like the 已归档 group. Returns '' when history is fully loaded
+      // and empty, so a workspace with no older CLI history shows no stray
+      // "历史会话 0" row (and no stranded bar above the footer).
+      function renderClaudeHistoryGroup() {
         var visibleHistory = getClaudeHistoryRegionItems();
-        var expanded = !!state.claudeHistoryExpanded;
         var loaded = !!state.claudeHistoryLoaded;
         var codexVisible = getVisibleCodexHistorySessions();
         var codexLoaded = !!state.codexHistoryLoaded;
+        var fullyLoaded = loaded && codexLoaded;
         var count = (loaded ? visibleHistory.length : 0) + (codexLoaded ? codexVisible.length : 0);
+        if (fullyLoaded && count === 0) return '';
 
-        var badgeCls = "history-bubble";
-        var badgeContent;
-        if (!loaded) {
-          badgeCls += " loading";
-          badgeContent = "···";
-        } else if (count === 0) {
-          badgeCls += " empty";
-          badgeContent = "0";
-        } else {
-          badgeContent = count > 999 ? "999+" : String(count);
-        }
-        var badge = '<span class="' + badgeCls + '">' + badgeContent + '</span>';
-
-        // Chevron rotates: collapsed → up (▲, suggests "expand upward"),
-        // expanded → down (▼, suggests "collapse downward").
-        var chevronSvg = '<svg class="sidebar-history-chevron" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="6 15 12 9 18 15"/></svg>';
-
-        var headerCls = "sidebar-history-header" + (expanded ? " expanded" : "");
-        var header = '<button type="button" class="' + headerCls + '" id="claude-history-toggle" aria-expanded="' + expanded + '" aria-controls="sidebar-history-body" title="' + (expanded ? "收起历史消息" : "展开历史消息") + '">' +
-          '<span class="sidebar-history-label">历史消息</span>' +
-          '<span class="sidebar-history-right">' + badge + chevronSvg + '</span>' +
-        '</button>';
-
+        var expanded = !!state.claudeHistoryExpanded;
+        var chevron = expanded ? "&#9662;" : "&#9656;";
+        var countContent = fullyLoaded ? (count > 999 ? "999+" : String(count)) : "···";
+        var header = '<div class="session-group-title claude-history-toggle session-history-toggle" id="claude-history-toggle" role="button" tabindex="0" aria-expanded="' + expanded + '" title="' + (expanded ? "收起历史会话" : "展开历史会话") + '">' +
+          '<span class="chevron">' + chevron + '</span> 历史会话 ' +
+          '<span class="history-count' + (fullyLoaded ? '' : ' loading') + '">' + countContent + '</span>' +
+        '</div>';
         var body = expanded
-          ? '<div class="sidebar-history-body" id="sidebar-history-body">' + renderClaudeHistoryBodyContent(visibleHistory) + renderCodexHistoryBodyContent(codexVisible) + '</div>'
+          ? '<div class="session-history-body">' + renderClaudeHistoryBodyContent(visibleHistory) + renderCodexHistoryBodyContent(codexVisible) + '</div>'
           : '';
-
-        return header + body;
+        return '<section class="session-group session-group--history">' + header + body + '</section>';
       }
 
       function renderClaudeHistoryBodyContent(visibleHistory) {
@@ -3689,7 +3756,9 @@
           return '<div class="claude-history-loading">扫描历史会话中…</div>';
         }
         if (visibleHistory.length === 0) {
-          return '<div class="claude-history-loading">没有更早的 Claude 历史会话</div>';
+          // Group is only rendered when there is content somewhere (Claude or
+          // Codex); a Claude-empty/Codex-present case shows just the Codex list.
+          return '';
         }
         var groups = {};
         var groupOrder = [];
@@ -3715,14 +3784,6 @@
         return toolbar + '<div class="sidebar-history-scroll">' + listHtml + '</div>';
       }
 
-      // Re-render only the docked history region in place. Called by
-      // updateSessionsList() so existing callers (load complete, delete, etc.)
-      // keep working without changes.
-      function updateClaudeHistoryRegion() {
-        var region = document.getElementById("sidebar-history-region");
-        if (region) region.innerHTML = renderClaudeHistoryRegion();
-      }
-
       function getVisibleClaudeHistorySessions() {
         var managedIds = new Set();
         state.sessions.forEach(function(s) {
@@ -5536,9 +5597,10 @@
         var resumeButton = "";
         var checkbox = renderManageCheckbox("sessions", session.id, "选择会话 " + session.command);
 
-        if (session.provider === "claude" && session.claudeSessionId) {
+        if ((session.provider === "claude" || session.provider === "codex") && session.claudeSessionId) {
           if (session.status !== "running" && !state.sessionsManageMode && !isStructuredSession(session)) {
-            resumeButton = '<button class="session-action-btn" data-action="resume" data-session-id="' + session.id + '" type="button" aria-label="恢复会话" title="恢复 Claude 会话"><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="M1 4v6h6"/><path d="M3.51 15a9 9 0 105.64-11.36L3 10"/></svg></button>';
+            var resumeTitle = session.provider === "codex" ? "恢复 Codex 会话" : "恢复 Claude 会话";
+            resumeButton = '<button class="session-action-btn" data-action="resume" data-session-id="' + session.id + '" type="button" aria-label="' + resumeTitle + '" title="' + resumeTitle + '"><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="M1 4v6h6"/><path d="M3.51 15a9 9 0 105.64-11.36L3 10"/></svg></button>';
           }
         }
 
@@ -5557,7 +5619,7 @@
         // Title: summary or command
         var titleHtml = session.summary
           ? '<div class="session-title">' + escapeHtml(session.summary) + '</div>'
-          : '<div class="session-command">' + escapeHtml(session.resumedFromSessionId ? session.command.replace(/\s+--resume\s+\S+/, '') : session.command) + '</div>';
+          : '<div class="session-command">' + escapeHtml(session.resumedFromSessionId ? session.command.replace(/\s+--resume\s+\S+/, '').replace(/\s+resume\s+[0-9a-f-]+/, '') : session.command) + '</div>';
 
         // Activity description for running sessions
         var activityDesc = getSessionActivityDesc(session);
@@ -6121,15 +6183,9 @@
           sessionsList.addEventListener("mouseout", handleCollapsedTileLeave);
           initSwipeToDelete(sessionsList);
         }
-        // The docked history region lives outside #sessions-list now, but it
-        // still wants the same delegated handlers (toggle button, directory
-        // expand/collapse, history-item clicks, clear-all, etc.). Reuse the
-        // same callbacks so behavior stays identical.
-        var historyRegion = document.getElementById("sidebar-history-region");
-        if (historyRegion) {
-          historyRegion.addEventListener("click", handleSessionItemClick);
-          historyRegion.addEventListener("keydown", handleSessionItemKeydown);
-        }
+        // History now renders inline as the final group inside #sessions-list,
+        // so the delegated handlers above already cover its toggle / directory
+        // expand-collapse / item clicks / clear-all — no separate region wiring.
         window.addEventListener("scroll", hideCollapsedTileBubble, true);
         window.addEventListener("resize", hideCollapsedTileBubble);
 
@@ -6192,6 +6248,8 @@
         if (closeDrawerBtn) closeDrawerBtn.addEventListener("click", closeSessionsDrawer);
         var collapseBtn = document.getElementById("sidebar-collapse-btn");
         if (collapseBtn) collapseBtn.addEventListener("click", toggleSidebarCollapsed);
+        var pinBtn = document.getElementById("sidebar-pin-btn");
+        if (pinBtn) pinBtn.addEventListener("click", toggleSidebarPin);
         var sidebarMoreBtn = document.getElementById("sidebar-more-btn");
         var sidebarOverflow = document.getElementById("sidebar-overflow-menu");
         if (sidebarMoreBtn && sidebarOverflow) {
@@ -6673,7 +6731,7 @@
             topbarMoreBtn.setAttribute("aria-expanded", "false");
             switch (action) {
               case "copy-claude-session-id":
-                copySelectedSessionField("claudeSessionId", "Claude 会话 ID 已复制");
+                copySelectedSessionField("claudeSessionId", getSelectedSession() && getSelectedSession().provider === "codex" ? "Codex thread ID 已复制" : "Claude 会话 ID 已复制");
                 break;
               case "copy-cwd":
                 copySelectedSessionField("cwd", "工作目录已复制");
@@ -8583,7 +8641,7 @@
         state.sessions = [];
         state.claudeHistory = [];
         state.claudeHistoryLoaded = false;
-        state.claudeHistoryExpanded = true;
+        state.claudeHistoryExpanded = false;
         state.claudeHistoryExpandedDirs = {};
         state.sessionsDrawerOpen = false;
         render();
@@ -9520,10 +9578,8 @@
         var countEl = document.getElementById("session-count");
         if (listEl) listEl.innerHTML = renderSessionsListContent();
         if (countEl) countEl.textContent = String(state.sessions.length);
-        // The docked history region lives outside #sessions-list — refresh it
-        // too so callers that mutate state.claudeHistory (load complete,
-        // delete, clear) don't need to know about it.
-        updateClaudeHistoryRegion();
+        // History renders inline inside #sessions-list now, so the line above
+        // already refreshed it — no separate docked region to update.
         if (typeof hideCollapsedTileBubble === "function") hideCollapsedTileBubble();
         updateShellChrome();
         // Re-render cross-session queue (container may have been destroyed by DOM rebuild)
@@ -9737,7 +9793,7 @@
         // 与 renderAppShell 保持一致：手机端只允许窄条形态 anchored。
         var isMobile = isMobileLayout();
         var isCollapsed = !!state.sidebarPinned && !!state.sidebarCollapsed;
-        var isAnchored = isCollapsed || (!!state.sidebarPinned && !isMobile);
+        var isAnchored = isCollapsed || (!isMobile && (!!state.sidebarPinned || !!state.sessionsDrawerOpen));
         if (drawer) {
           drawer.classList.toggle("pinned", isAnchored);
           drawer.classList.toggle("collapsed", isCollapsed);
@@ -9746,6 +9802,13 @@
           mainLayout.classList.toggle("sidebar-pinned", isAnchored);
           mainLayout.classList.toggle("sidebar-collapsed", isCollapsed);
         }
+        var pinBtn = document.getElementById("sidebar-pin-btn");
+        if (pinBtn) {
+          pinBtn.classList.toggle("pinned", !!state.sidebarPinned);
+          pinBtn.title = state.sidebarPinned ? "已固定常驻（点击解除锁定）" : "固定侧栏常驻";
+          pinBtn.setAttribute("aria-label", state.sidebarPinned ? "解除固定常驻" : "固定侧栏常驻");
+          pinBtn.setAttribute("aria-pressed", state.sidebarPinned ? "true" : "false");
+        }
       }
 
       function updateDrawerState() {
@@ -9950,6 +10013,26 @@
         scheduleTerminalRefitAfterPaddingTransition();
       }
 
+      // 常驻（图钉）开关：把侧栏「留在原地」并排停靠 ⟷ 悬浮抽屉。
+      //   - 常驻 ON：停靠并推开内容；配合「收起为窄条」可在全尺寸/窄条间切换。
+      //   - 常驻 OFF：变为悬浮抽屉，交互时自动收起（非常驻）。
+      // 手机端不支持常驻（屏幕太窄），保持抽屉行为。
+      // 「图钉」只切换「是否锁定常驻」，绝不收起 / 隐藏侧栏——这是用户两次反馈的核心：
+      // 点图钉不该让侧栏消失，也不该把主区压到侧栏下面。
+      //   - 锁定（pinned）：常驻停靠，不会被「关闭(X)」一键收走的语义区分开。
+      //   - 解除锁定（unpinned）：仍然停靠可见（因为 isAnchored 把 open 也算停靠），
+      //     只是变成「可被 X 关闭」的临时态。
+      // 全尺寸 / 窄条由「收起为窄条」按钮控制，与图钉正交。
+      function toggleSidebarPin() {
+        if (isMobileLayout()) return;
+        state.sidebarPinned = !state.sidebarPinned;
+        // 关键：保持侧栏可见停靠，无论锁定与否，点图钉都不让它消失。
+        state.sessionsDrawerOpen = true;
+        try { localStorage.setItem("wand-sidebar-pinned", String(state.sidebarPinned)); } catch (e) {}
+        updateLayoutState();
+        scheduleTerminalRefitAfterPaddingTransition();
+      }
+
       // 收窄按钮的图标/title/状态随 collapsed 切换。抽出来给轻量更新路径用，
       // 避免为了换一个箭头方向就走全量 render()。
       function updateSidebarCollapseButton() {
@@ -12812,7 +12895,7 @@
 
             return ensureSessionReadyForInput(selectedSession).then(function(readySession) {
               if (!readySession) {
-                // ensureSessionReadyForInput / resumeClaudeSessionById 已经在失败路径里
+                // ensureSessionReadyForInput / resumeSession 已经在失败路径里
                 // 自行 toast，这里不再重复提示，避免叠两条消息。
                 return null;
               }
@@ -13606,14 +13689,14 @@
         var isCodex = selectedSession && selectedSession.provider === "codex";
         if (error && (error.errorCode === "SESSION_NOT_RUNNING" || error.errorCode === "SESSION_NO_PTY")) {
           return isCodex
-            ? "Codex 会话已结束，请新建会话后继续。"
+            ? "Codex 会话已结束；若存在 Codex 历史会话，将在你下次发送消息时自动恢复。"
             : "会话已结束；若存在 Claude 历史会话，将在你下次发送消息时自动恢复。";
         }
         if (error && error.errorCode === "SESSION_NOT_FOUND") {
           return "会话不存在，请重新选择或新建会话。";
         }
         return (error && error.message) || (isCodex
-          ? "Codex 会话暂不可用，请检查终端视图或新建会话。"
+          ? "Codex 会话暂不可用；若存在 Codex 历史会话，将自动尝试恢复。"
           : "会话暂不可用；若存在 Claude 历史会话，将自动尝试恢复。");
       }
 
@@ -13654,10 +13737,10 @@
       }
 
       function canAutoResumeSession(session) {
-        // 只要是 Claude provider + 非运行中 + 有 claudeSessionId，
+        // 只要是 Claude/Codex PTY provider + 非运行中 + 有可恢复历史 id，
         // 就允许在用户发送时静默触发恢复。不再要求 messages 里同时
         // 有 user + assistant 文本（slim 列表/截断历史会让该判断失真）。
-        return !!(session && session.provider === "claude" && session.status !== "running" && session.claudeSessionId);
+        return !!(session && !isStructuredSession(session) && (session.provider === "claude" || session.provider === "codex") && session.status !== "running" && session.claudeSessionId);
       }
 
       function ensureSessionReadyForInput(session, errorEl) {
@@ -13670,12 +13753,13 @@
           return Promise.resolve(session);
         }
         if (!canAutoResumeSession(session)) {
-          showToast("该会话没有可恢复的 Claude 历史上下文，请新建会话。", "error");
+          var providerLabel = session && session.provider === "codex" ? "Codex" : "Claude";
+          showToast("该会话没有可恢复的 " + providerLabel + " 历史上下文，请新建会话。", "error");
           return Promise.resolve(null);
         }
 
         // 静默恢复：不再弹 "正在恢复历史会话…" 提示，让用户发送动作看起来无缝。
-        return resumeClaudeSessionById(session.claudeSessionId, errorEl).then(function(data) {
+        return resumeSession(session.id, errorEl).then(function(data) {
           if (!data) return null;
           updateSessionSnapshot(data);
           updateSessionsList();
@@ -14114,7 +14198,7 @@
               : "Enter 发送 · Shift+Enter 换行";
           }
         }
-        // 历史会话只要可自动恢复（Claude provider + 有 claudeSessionId），输入框/发送按钮
+        // 历史会话只要可自动恢复（Claude/Codex PTY + 有历史 id），输入框/发送按钮
         // 就保持可用——发送时由 ensureSessionReadyForInput 透明完成恢复。
         var canResumeOnSend = !structured && !isRunning && canAutoResumeSession(selectedSession);
         if (composer) {
@@ -14649,9 +14733,15 @@
         return resumeSession(sessionId).then(function(data) {
           if (!data) return null;
           if (data.claudeSessionId) {
-            state.claudeHistory = state.claudeHistory.filter(function(s) {
-              return s.claudeSessionId !== data.claudeSessionId;
-            });
+            if (data.provider === "codex") {
+              state.codexHistory = state.codexHistory.filter(function(s) {
+                return s.claudeSessionId !== data.claudeSessionId;
+              });
+            } else {
+              state.claudeHistory = state.claudeHistory.filter(function(s) {
+                return s.claudeSessionId !== data.claudeSessionId;
+              });
+            }
           }
           return activateSession(data).then(function() {
             return data;