@co0ontty/wand 1.43.0 → 1.43.2

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
-  "commit": "a2fcf61e1ef6825cb1767b63fb9593e8f6e4ecea",
-  "builtAt": "2026-05-31T02:16:53.049Z",
-  "version": "1.43.0",
+  "commit": "968ab29608433dbadc5cd58b11323ba51f757d2d",
+  "builtAt": "2026-05-31T05:44:17.877Z",
+  "version": "1.43.2",
   "channel": "stable"
 }

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

@@ -1563,7 +1563,7 @@
 
       // ===== 桌面：点 sidebar 外的空白处自动收起 =====
       // 只对「临时打开但未锁定」的全尺寸侧栏生效；已锁定的 pinned 侧栏
-      // 必须保持常驻，除非用户明确点 X / hamburger 关闭。
+      // 必须保持常驻，除非用户明确点 X 关闭。
       // - 仅 desktop + 未锁定 + 全尺寸（非窄条）+ 已打开 时生效
       // - 窄条态不触发（窄条本来就是稳定常驻形态）
       // - 手机端由 .drawer-backdrop 元素自己接住点击，不在这里重复处理
@@ -1588,7 +1588,7 @@
           ".folder-picker-dropdown, .path-suggestions, " +
           ".permission-prompt-overlay, .restart-overlay"
         )) return;
-        closeSessionsDrawer();
+        closeTransientSessionsDrawer();
       }, true);
 
       renderBootLoading();
@@ -1783,6 +1783,7 @@
         var terminalInfo = selectedSession ? (selectedSession.mode + " | " + selectedSession.status) : "点击上方「新对话」开始";
         var currentDraft = state.selectedId ? (state.drafts[state.selectedId] || "") : "";
         var drawerClass = state.sessionsDrawerOpen ? " open" : "";
+        var backdropClass = shouldShowSessionsBackdrop() ? " open" : "";
         var preferredTool = getComposerTool();
         var composerMode = getSafeModeForTool(preferredTool, state.chatMode);
 
@@ -1796,7 +1797,7 @@
         var collapsedCls = isCollapsed ? ' sidebar-collapsed' : '';
         var sidebarCollapsedCls = isCollapsed ? ' collapsed' : '';
         return '<div class="app-container">' +
-          '<div id="sessions-drawer-backdrop" class="drawer-backdrop' + drawerClass + '"></div>' +
+          '<div id="sessions-drawer-backdrop" class="drawer-backdrop' + backdropClass + '"></div>' +
           '<div class="main-layout' + (state.sessionsDrawerOpen ? ' sidebar-open' : '') + (isAnchored ? ' sidebar-pinned' : '') + collapsedCls + '">' +
             '<aside id="sessions-drawer" class="sidebar' + drawerClass + (isAnchored ? ' pinned' : '') + sidebarCollapsedCls + '">' +
               '<div class="sidebar-header">' +
@@ -2245,7 +2246,11 @@
       var quickCommitDragState = null;
 
       function normalizeQuickCommitAction(value) {
-        if (value === "commit-tag" || value === "commit-tag-push") return value;
+        if (
+          value === "commit-tag" ||
+          value === "commit-tag-push" ||
+          value === "commit-push"
+        ) return value;
         return "commit";
       }
 
@@ -2258,7 +2263,7 @@
             verb: "提交、打 Tag 并推送",
             withTag: true,
             push: true,
-            tone: "push",
+            tone: "all",
           };
         }
         if (action === "commit-tag") {
@@ -2271,6 +2276,16 @@
             tone: "tag",
           };
         }
+        if (action === "commit-push") {
+          return {
+            action: action,
+            label: "Commit + Push",
+            verb: "提交并推送",
+            withTag: false,
+            push: true,
+            tone: "push",
+          };
+        }
         return {
           action: "commit",
           label: "Commit",
@@ -2281,16 +2296,11 @@
         };
       }
 
-      function getQuickCommitActionFromRatio(ratio) {
-        if (ratio >= 0.74) return "commit-tag-push";
-        if (ratio >= 0.38) return "commit-tag";
-        return "commit";
-      }
-
       function openQuickCommitModal() {
         if (!state.selectedId) return;
         state.quickCommitOpen = true;
         state.quickCommitSubmitting = false;
+        state.quickCommitAutoGenerating = false;
         state.quickCommitError = "";
         state.quickCommitForm = {
           customMessage: "",
@@ -2416,121 +2426,194 @@
         attachQuickCommitDrag();
       }
 
-      function updateQuickCommitDragVisual(action, ratio) {
-        action = normalizeQuickCommitAction(action);
-        state.quickCommitDragAction = action;
-        var track = document.getElementById("quick-commit-drag-track");
-        if (!track) return;
-        var meta = getQuickCommitActionMeta(action);
-        var progress = typeof ratio === "number"
-          ? Math.max(0, Math.min(1, ratio))
-          : (action === "commit-tag-push" ? 1 : (action === "commit-tag" ? 0.5 : 0));
-        track.setAttribute("data-action", action);
-        track.style.setProperty("--qc-progress", (progress * 100).toFixed(1) + "%");
-        var knob = document.getElementById("quick-commit-drag-action");
-        if (knob) {
-          var maxX = Math.max(0, track.clientWidth - knob.offsetWidth - 14);
-          track.style.setProperty("--qc-knob-x", (maxX * progress).toFixed(1) + "px");
-        }
-        var label = document.getElementById("quick-commit-drag-label");
-        if (label) label.textContent = state.quickCommitSubmitting ? "执行中..." : meta.label;
-        var stages = track.querySelectorAll("[data-qc-stage]");
-        var order = { "commit": 0, "commit-tag": 1, "commit-tag-push": 2 };
-        for (var i = 0; i < stages.length; i++) {
-          var stageAction = stages[i].getAttribute("data-qc-stage");
-          var passed = order[stageAction] <= order[action];
-          stages[i].classList.toggle("is-active", stageAction === action);
-          stages[i].classList.toggle("is-passed", passed);
-        }
+      // Compose the final action from which stations the orb attached during the drag.
+      // Commit is implicit — every action starts with a commit.
+      function composeOrbAction(attached) {
+        var hasTag  = !!(attached && attached.tag);
+        var hasPush = !!(attached && attached.push);
+        if (hasTag && hasPush) return "commit-tag-push";
+        if (hasTag)  return "commit-tag";
+        if (hasPush) return "commit-push";
+        return "commit";
+      }
+
+      // How close (px) the pointer must come to a loose chip's home before that chip is
+      // magnetically picked up into the chip currently being dragged.
+      var QC_DOCK_PICKUP_R = 58;
+
+      // A plain tap on a chip fires its own action directly (tag/push imply a commit too).
+      function qcChipTapAction(id) {
+        if (id === "tag") return "commit-tag";
+        if (id === "push") return "commit-push";
+        return "commit";
       }
 
+      // Magnetic dock: three loose chips (Commit / Tag / Push) rest in a field. Grab ANY chip and
+      // drag it; whenever the pointer brushes another chip it sticks to the travelling cluster and
+      // moves along (ordered Commit → Tag → Push). Fling the cluster into the right-side ▶ pad to
+      // fire compose(members) — a commit is always implied. Release anywhere else and every chip
+      // springs back home. A plain tap (no drag) on a chip fires that chip's own action.
       function attachQuickCommitDrag() {
-        var track = document.getElementById("quick-commit-drag-track");
-        var knob = document.getElementById("quick-commit-drag-action");
-        if (!track || !knob) return;
-        updateQuickCommitDragVisual(state.quickCommitDragAction || "commit");
+        var field   = document.getElementById("qc-dock-field");
+        var stage   = document.getElementById("qc-dock-stage");
+        var launch  = document.getElementById("qc-dock-launch");
+        var cluster = document.getElementById("qc-dock-cluster");
+        if (!field || !stage || !launch || !cluster) return;
+
+        var ORDER = ["commit", "tag", "push"];
+        var chips = {};
+        ORDER.forEach(function(id) { chips[id] = field.querySelector('[data-chip="' + id + '"]'); });
+        if (!chips.commit || !chips.tag || !chips.push) return;
+
+        function cw(id) { return chips[id] ? chips[id].offsetWidth : 90; }
+        function chH()  { return chips.commit ? chips.commit.offsetHeight : 38; }
+
+        // Resting (home) positions — the three chips in one centered row.
+        function homePositions() {
+          var fw = field.clientWidth, fh = field.clientHeight, H = chH();
+          var gap = 14;
+          var total = ORDER.reduce(function(s, id) { return s + cw(id); }, 0) + (ORDER.length - 1) * gap;
+          var x = Math.max(8, (fw - total) / 2);
+          var y = (fh - H) / 2;
+          var pos = {};
+          ORDER.forEach(function(id) { pos[id] = { x: x, y: y }; x += cw(id) + gap; });
+          return pos;
+        }
+
+        var home = {};
+        function placeChip(id, x, y) {
+          if (chips[id]) chips[id].style.transform = "translate(" + x.toFixed(1) + "px," + y.toFixed(1) + "px)";
+        }
+        function layoutHome(animated) {
+          home = homePositions();
+          ORDER.forEach(function(id) {
+            chips[id].classList.toggle("qc-chip--anim", !!animated);
+            placeChip(id, home[id].x, home[id].y);
+          });
+        }
+        layoutHome(false);
+
+        var drag = null;
+
+        // Lay the current cluster members in a tight row centered on (cx, cy) within the field.
+        function layoutCluster(members, cx, cy) {
+          var H = chH(), gapIn = 5;
+          var ids = ORDER.filter(function(id) { return members.indexOf(id) >= 0; });
+          var total = ids.reduce(function(s, id) { return s + cw(id); }, 0) + Math.max(0, ids.length - 1) * gapIn;
+          var fh = field.clientHeight;
+          var x = cx - total / 2;
+          var y = Math.max(2, Math.min(fh - H - 2, cy - H / 2));
+          ids.forEach(function(id) { placeChip(id, x, y); x += cw(id) + gapIn; });
+          return { x: cx - total / 2 - 7, y: y - 7, w: total + 14, h: H + 14 };
+        }
+        function showCluster(box) {
+          cluster.classList.add("is-active");
+          cluster.style.transform = "translate(" + box.x.toFixed(1) + "px," + box.y.toFixed(1) + "px)";
+          cluster.style.width  = box.w.toFixed(1) + "px";
+          cluster.style.height = box.h.toFixed(1) + "px";
+        }
+        function hideCluster() { cluster.classList.remove("is-active"); }
+
+        function clusterAction(members) {
+          return composeOrbAction({
+            commit: true,
+            tag: members.indexOf("tag") >= 0,
+            push: members.indexOf("push") >= 0,
+          });
+        }
+        function setLaunchLabel(t) {
+          var l = document.getElementById("qc-dock-launch-label");
+          if (l) l.textContent = t;
+        }
+        function pointInLaunch(x, y) {
+          var r = launch.getBoundingClientRect();
+          return x >= r.left && x <= r.right && y >= r.top && y <= r.bottom;
+        }
 
-        var onPointerDown = function(e) {
-          if (knob.disabled || isQuickCommitOpInFlight()) return;
-          var rect = track.getBoundingClientRect();
-          quickCommitDragState = {
-            pointerId: e.pointerId,
-            rect: rect,
-            moved: false,
-            action: "commit",
+        function onDown(id) {
+          return function(e) {
+            if (chips[id].disabled || isQuickCommitOpInFlight()) return;
+            drag = { anchor: id, pointerId: e.pointerId, startX: e.clientX, startY: e.clientY, moved: false, members: [id] };
+            ORDER.forEach(function(m) { chips[m].classList.remove("qc-chip--anim"); });
+            chips[id].classList.add("is-grabbing");
+            try { chips[id].setPointerCapture(e.pointerId); } catch (err) { /* ignored */ }
+            stage.classList.add("is-dragging");
+            e.preventDefault();
           };
-          knob.setPointerCapture(e.pointerId);
-          track.classList.add("is-dragging");
-          updateQuickCommitDragVisual("commit", 0);
-          e.preventDefault();
-        };
-        var onPointerMove = function(e) {
-          if (!quickCommitDragState || quickCommitDragState.pointerId !== e.pointerId) return;
-          var rect = quickCommitDragState.rect;
-          var ratio = rect.width > 0 ? (e.clientX - rect.left) / rect.width : 0;
-          ratio = Math.max(0, Math.min(1, ratio));
-          if (Math.abs(e.clientX - rect.left) > 6) quickCommitDragState.moved = true;
-          var action = getQuickCommitActionFromRatio(ratio);
-          quickCommitDragState.action = action;
-          updateQuickCommitDragVisual(action, ratio);
-        };
-        var finish = function(e, cancelled) {
-          if (!quickCommitDragState) return;
-          var current = quickCommitDragState;
-          quickCommitDragState = null;
-          track.classList.remove("is-dragging");
-          try {
-            if (typeof knob.releasePointerCapture === "function") knob.releasePointerCapture(current.pointerId);
-          } catch (err) { /* ignored */ }
-          if (cancelled) {
-            updateQuickCommitDragVisual("commit");
+        }
+        function onMove(e) {
+          if (!drag || drag.pointerId !== e.pointerId) return;
+          if (Math.abs(e.clientX - drag.startX) > 3 || Math.abs(e.clientY - drag.startY) > 3) drag.moved = true;
+          var fr = field.getBoundingClientRect();
+          var fx = e.clientX - fr.left, fy = e.clientY - fr.top;
+          // magnetic pickup: any loose chip whose home center is near the pointer joins the cluster.
+          ORDER.forEach(function(id) {
+            if (drag.members.indexOf(id) >= 0) return;
+            var hx = home[id].x + cw(id) / 2, hy = home[id].y + chH() / 2;
+            var dx = fx - hx, dy = fy - hy;
+            if (Math.sqrt(dx * dx + dy * dy) < QC_DOCK_PICKUP_R) {
+              drag.members.push(id);
+              chips[id].classList.remove("qc-chip--anim");
+              chips[id].classList.add("is-attached");
+            }
+          });
+          var box = layoutCluster(drag.members, fx, fy);
+          var hot = pointInLaunch(e.clientX, e.clientY);
+          stage.setAttribute("data-hot", hot ? "1" : "0");
+          stage.setAttribute("data-action", clusterAction(drag.members));
+          if (drag.members.length > 1) showCluster(box); else hideCluster();
+          setLaunchLabel(hot ? "松手执行" : "提交");
+        }
+        function endDrag(e, cancelled) {
+          if (!drag || drag.pointerId !== e.pointerId) return;
+          var cur = drag; drag = null;
+          stage.classList.remove("is-dragging");
+          stage.setAttribute("data-hot", "0");
+          setLaunchLabel("提交");
+          hideCluster();
+          ORDER.forEach(function(m) { chips[m].classList.remove("is-grabbing", "is-attached"); });
+          try { chips[cur.anchor].releasePointerCapture(cur.pointerId); } catch (err) { /* ignored */ }
+
+          if (!cancelled && !cur.moved) {
+            // plain tap → fire this chip's own action
+            submitQuickCommit(qcChipTapAction(cur.anchor));
             return;
           }
-          var action = current.moved ? current.action : "commit";
-          updateQuickCommitDragVisual(action);
-          submitQuickCommit(action);
-          if (e && typeof e.preventDefault === "function") e.preventDefault();
-        };
-        var onPointerUp = function(e) {
-          if (!quickCommitDragState || quickCommitDragState.pointerId !== e.pointerId) return;
-          finish(e, false);
-        };
-        var onPointerCancel = function(e) {
-          if (!quickCommitDragState || quickCommitDragState.pointerId !== e.pointerId) return;
-          finish(e, true);
-        };
-        var onKeyDown = function(e) {
-          if (knob.disabled || isQuickCommitOpInFlight()) return;
-          if (e.key === "ArrowRight") {
-            e.preventDefault();
-            var next = state.quickCommitDragAction === "commit"
-              ? "commit-tag"
-              : (state.quickCommitDragAction === "commit-tag" ? "commit-tag-push" : "commit-tag-push");
-            updateQuickCommitDragVisual(next);
-          } else if (e.key === "ArrowLeft") {
-            e.preventDefault();
-            var prev = state.quickCommitDragAction === "commit-tag-push"
-              ? "commit-tag"
-              : (state.quickCommitDragAction === "commit-tag" ? "commit" : "commit");
-            updateQuickCommitDragVisual(prev);
-          } else if (e.key === "Enter" || e.key === " ") {
-            e.preventDefault();
-            submitQuickCommit(state.quickCommitDragAction || "commit");
+          if (!cancelled && pointInLaunch(e.clientX, e.clientY)) {
+            submitQuickCommit(clusterAction(cur.members));
+            return;
           }
-        };
+          // released loose → everyone springs back home
+          stage.setAttribute("data-action", "commit");
+          layoutHome(true);
+        }
+
+        var onResize = function() { if (state.quickCommitOpen && !drag) layoutHome(false); };
+        window.addEventListener("resize", onResize);
+
+        ORDER.forEach(function(id) {
+          var c = chips[id];
+          c.addEventListener("pointerdown", onDown(id));
+          c.addEventListener("pointermove", onMove);
+          c.addEventListener("pointerup", function(e) { endDrag(e, false); });
+          c.addEventListener("pointercancel", function(e) { endDrag(e, true); });
+          c.addEventListener("keydown", function(e) {
+            if (c.disabled || isQuickCommitOpInFlight()) return;
+            if (e.key === "Enter" || e.key === " " || e.key === "Spacebar") {
+              e.preventDefault();
+              submitQuickCommit(qcChipTapAction(id));
+            }
+          });
+        });
+
+        launch.addEventListener("click", function() {
+          if (launch.disabled || isQuickCommitOpInFlight() || drag) return;
+          submitQuickCommit("commit");
+        });
 
-        knob.addEventListener("pointerdown", onPointerDown);
-        knob.addEventListener("pointermove", onPointerMove);
-        knob.addEventListener("pointerup", onPointerUp);
-        knob.addEventListener("pointercancel", onPointerCancel);
-        knob.addEventListener("keydown", onKeyDown);
         quickCommitDragCleanup = function() {
-          knob.removeEventListener("pointerdown", onPointerDown);
-          knob.removeEventListener("pointermove", onPointerMove);
-          knob.removeEventListener("pointerup", onPointerUp);
-          knob.removeEventListener("pointercancel", onPointerCancel);
-          knob.removeEventListener("keydown", onKeyDown);
-          quickCommitDragState = null;
+          window.removeEventListener("resize", onResize);
+          drag = null;
         };
       }
 
@@ -2592,11 +2675,9 @@
         var withTag = meta.withTag;
         var userTag = withTag ? (form.tag || "").trim() : "";
         var message = (form.customMessage || "").trim();
-        if (!message) {
-          state.quickCommitError = "请填写提交信息，或点击「AI 生成」。";
-          rerenderQuickCommitModal();
-          return;
-        }
+        // Auto-generate flow: empty commit message → ask backend to write one (autoMessage:true).
+        // Empty tag (when withTag) → ask backend to derive one (autoTag:true). Both go in one round-trip.
+        var autoMessage = !message;
         var before = {
           branch: (state.gitStatus || {}).branch || "",
           commitHash: (state.gitStatus || {}).lastCommit && (state.gitStatus || {}).lastCommit.shortHash
@@ -2608,13 +2689,14 @@
           tag: (state.gitStatus || {}).latestTag || "",
         };
         var payload = {
-          autoMessage: false,
-          customMessage: message,
+          autoMessage: autoMessage,
+          customMessage: autoMessage ? "" : message,
           tag: userTag,
           autoTag: !!(withTag && !userTag),
           push: !!meta.push
         };
         state.quickCommitSubmitting = true;
+        state.quickCommitAutoGenerating = autoMessage || payload.autoTag;
         state.quickCommitError = "";
         state.quickCommitPushError = "";
         state.quickCommitResult = null;
@@ -2668,6 +2750,7 @@
           })
           .finally(function() {
             state.quickCommitSubmitting = false;
+            state.quickCommitAutoGenerating = false;
             if (state.quickCommitOpen) rerenderQuickCommitModal();
           });
       }
@@ -2790,23 +2873,40 @@
       }
 
       function renderQuickCommitDragControl(hasChanges) {
-        var action = normalizeQuickCommitAction(state.quickCommitDragAction || "commit");
-        var meta = getQuickCommitActionMeta(action);
         var disabled = !hasChanges || isQuickCommitOpInFlight();
-        var label = state.quickCommitSubmitting ? "执行中..." : meta.label;
-        return '<div class="qc-drag-wrap">' +
-          '<div id="quick-commit-drag-track" class="qc-drag-track" data-action="' + escapeHtml(action) + '" style="--qc-progress: ' + (action === "commit-tag-push" ? "100%" : (action === "commit-tag" ? "50%" : "0%")) + ';">' +
-            '<div class="qc-drag-progress" aria-hidden="true"></div>' +
-            '<div class="qc-drag-stages" aria-hidden="true">' +
-              '<span class="qc-drag-stage is-active is-passed" data-qc-stage="commit">Commit</span>' +
-              '<span class="qc-drag-stage' + (action !== "commit" ? ' is-passed' : '') + (action === "commit-tag" ? ' is-active' : '') + '" data-qc-stage="commit-tag">Tag</span>' +
-              '<span class="qc-drag-stage' + (action === "commit-tag-push" ? ' is-active is-passed' : '') + '" data-qc-stage="commit-tag-push">Push</span>' +
+        // Busy panel — replaces the dock entirely while the request is in flight.
+        if (state.quickCommitSubmitting) {
+          var busyLabel = state.quickCommitAutoGenerating ? "AI 生成 + 提交中…" : "执行中…";
+          return '<div class="qc-dock-wrap">' +
+            '<div class="qc-dock-busy" role="status"><span class="qc-dock-busy-dot"></span>' + escapeHtml(busyLabel) + '</div>' +
+          '</div>';
+        }
+        function chip(id, label) {
+          return '<button type="button" class="qc-chip qc-chip--' + id + '"' +
+            ' data-chip="' + id + '"' + (disabled ? ' disabled' : '') + '>' +
+            '<span class="qc-chip-dot" aria-hidden="true"></span>' +
+            '<span class="qc-chip-label">' + label + '</span>' +
+          '</button>';
+        }
+        var hint = disabled
+          ? (!hasChanges ? "工作区干净，无可提交" : "")
+          : "拖一个去碰另一个会黏在一起 · 整串丢进 ▶ 执行组合 · 单击直接执行该项";
+        return '<div class="qc-dock-wrap"' + (disabled ? ' data-disabled="1"' : '') + '>' +
+          '<div id="qc-dock-stage" class="qc-dock-stage" data-action="commit" data-hot="0">' +
+            '<div id="qc-dock-field" class="qc-dock-field">' +
+              '<div id="qc-dock-cluster" class="qc-dock-cluster" aria-hidden="true"></div>' +
+              chip("commit", "Commit") +
+              chip("tag", "Tag") +
+              chip("push", "Push") +
             '</div>' +
-            '<button id="quick-commit-drag-action" class="qc-drag-action" type="button"' + (disabled ? ' disabled' : '') + ' aria-label="' + escapeHtml(meta.verb) + '">' +
-              '<span id="quick-commit-drag-label">' + escapeHtml(label) + '</span>' +
-              '<svg viewBox="0 0 24 24" width="16" height="16" aria-hidden="true"><path d="M5 12h14"/><path d="M13 6l6 6-6 6" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/></svg>' +
+            '<button type="button" id="qc-dock-launch" class="qc-dock-launch"' + (disabled ? ' disabled' : '') + ' aria-label="执行提交">' +
+              '<span class="qc-dock-launch-arrow" aria-hidden="true">' +
+                '<svg viewBox="0 0 24 24" width="22" height="22" fill="none" stroke="currentColor" stroke-width="2.3" stroke-linecap="round" stroke-linejoin="round"><path d="M5 12h12M13 6l6 6-6 6"/></svg>' +
+              '</span>' +
+              '<span id="qc-dock-launch-label" class="qc-dock-launch-label">提交</span>' +
             '</button>' +
           '</div>' +
+          '<div class="qc-dock-hint">' + escapeHtml(hint) + '</div>' +
         '</div>';
       }
 
@@ -4040,6 +4140,10 @@
         return window.innerWidth <= 768;
       }
 
+      function shouldShowSessionsBackdrop() {
+        return !!state.sessionsDrawerOpen && (isMobileLayout() || !state.sidebarPinned);
+      }
+
       function setFilePanelOpen(nextOpen) {
         state.filePanelOpen = nextOpen;
         try {
@@ -9722,7 +9826,7 @@
           drawer.classList.toggle("open", state.sessionsDrawerOpen);
         }
         if (backdrop) {
-          backdrop.classList.toggle("open", state.sessionsDrawerOpen);
+          backdrop.classList.toggle("open", shouldShowSessionsBackdrop());
         }
         if (mainLayout) {
           mainLayout.classList.toggle("sidebar-open", state.sessionsDrawerOpen);
@@ -9737,17 +9841,14 @@
       function toggleSessionsDrawer() {
         var isMobile = isMobileLayout();
         if (!isMobile) {
-          // 桌面：呼出 = 常驻全尺寸；再次点击 = 完全收起（floating-toggle 重新出现）。
-          // 取消了独立的「图钉」概念，sidebarPinned 现在由呼出/关闭自动管理。
-          var willOpen = !state.sidebarPinned;
-          state.sidebarPinned = willOpen;
+          // 桌面：hamburger 只负责临时打开/关闭；锁定常驻由图钉按钮控制。
+          var willOpen = state.sidebarPinned ? false : !state.sessionsDrawerOpen;
           state.sessionsDrawerOpen = willOpen;
           if (willOpen) {
             // 桌面重新呼出默认回到全尺寸；窄条形态需用户主动点 collapse 按钮切换。
             state.sidebarCollapsed = false;
             writeStoredBoolean("wand-sidebar-collapsed", false);
           }
-          writeStoredBoolean("wand-sidebar-pinned", willOpen);
           writeStoredBoolean("wand-sidebar-open", state.sessionsDrawerOpen);
           updateLayoutState();
           scheduleTerminalRefitAfterPaddingTransition();
@@ -9788,6 +9889,19 @@
         updateLayoutState();
       }
 
+      function closeTransientSessionsDrawer() {
+        if (isMobileLayout()) {
+          closeSessionsDrawer();
+          return;
+        }
+        if (state.sidebarPinned || state.sidebarCollapsed || !state.sessionsDrawerOpen) return;
+        closeSwipedItem();
+        state.sessionsDrawerOpen = false;
+        writeStoredBoolean("wand-sidebar-open", false);
+        updateLayoutState();
+        scheduleTerminalRefitAfterPaddingTransition();
+      }
+
       // 把"浮在内容上的 drawer/backdrop"关掉，但保留桌面常驻栏与窄条形态。
       // 用法：从 input focus / send 按钮 / 选中会话 / 新建会话回调里调，这些场
       // 景只想避免遮罩挡住内容，并不想撤掉用户主动开启的常驻侧栏。