@co0ontty/wand 1.21.16 → 1.21.18

package/dist/git-quick-commit.d.ts

@@ -6,6 +6,7 @@ interface QuickCommitOptions {
     autoMessage: boolean;
     customMessage?: string;
     tag?: string;
+    /** When `tag` is empty, ask Claude to generate one based on the diff + commit message. */
     autoTag?: boolean;
     push?: boolean;
 }
@@ -13,6 +14,11 @@ export declare class QuickCommitError extends Error {
     readonly code: string;
     constructor(message: string, code: string);
 }
-export declare function generateCommitMessageOnly(cwd: string, language: string): Promise<string>;
+export interface GenerateCommitMessageResult {
+    message: string;
+    /** AI-suggested next tag derived from the staged diff and the latest existing tag. */
+    suggestedTag?: string;
+}
+export declare function generateCommitMessageOnly(cwd: string, language: string): Promise<GenerateCommitMessageResult>;
 export declare function runQuickCommit(opts: QuickCommitOptions): Promise<QuickCommitResult>;
 export {};

package/dist/git-quick-commit.js

@@ -141,17 +141,6 @@ export function getGitStatus(cwd) {
     }
     const allEntries = parsePorcelainV2(porcelain);
     const files = allEntries.slice(0, MAX_FILE_ENTRIES);
-    let latestTag;
-    let suggestedNextTag;
-    try {
-        latestTag = runGit(["describe", "--tags", "--abbrev=0"], cwd);
-    }
-    catch {
-        latestTag = undefined;
-    }
-    if (latestTag) {
-        suggestedNextTag = bumpPatchTag(latestTag);
-    }
     return {
         isGit: true,
         branch,
@@ -160,20 +149,8 @@ export function getGitStatus(cwd) {
         head,
         repoRoot,
         initialCommit,
-        latestTag,
-        suggestedNextTag,
     };
 }
-function bumpPatchTag(tag) {
-    const m = tag.match(/^(v?)(\d+)\.(\d+)\.(\d+)(.*)/);
-    if (!m)
-        return "";
-    const prefix = m[1];
-    const major = m[2];
-    const minor = m[3];
-    const patch = parseInt(m[4], 10) + 1;
-    return `${prefix}${major}.${minor}.${patch}`;
-}
 export class QuickCommitError extends Error {
     code;
     constructor(message, code) {
@@ -210,7 +187,7 @@ function callClaudeText(prompt, cwd) {
         child.stdin?.end(prompt);
     });
 }
-async function generateCommitMessage(cwd, language) {
+function collectStagedDiff(cwd) {
     let diff;
     try {
         diff = runGit(["diff", "--cached", "--submodule=log"], cwd, 5000);
@@ -229,6 +206,10 @@ async function generateCommitMessage(cwd, language) {
     if (diff.length > MAX_DIFF_FOR_AI) {
         diff = diff.slice(0, MAX_DIFF_FOR_AI) + "\n\n... (diff truncated) ...";
     }
+    return diff;
+}
+async function generateCommitMessage(cwd, language) {
+    const diff = collectStagedDiff(cwd);
     const lang = language.trim() || "中文";
     const prompt = `阅读以下 git diff，用${lang}写一条简洁的 commit message。要求：祈使句，不超过 50 字，描述「做了什么」。只输出 message 本身，不要引号、不要 Markdown 格式、不要任何额外说明。\n\n${diff}`;
     const raw = await callClaudeText(prompt, cwd);
@@ -238,6 +219,73 @@ async function generateCommitMessage(cwd, language) {
     }
     return message;
 }
+function tryParseJson(raw) {
+    let text = raw.trim();
+    // Strip ```json … ``` or ``` … ``` fences if Claude wrapped the response
+    text = text.replace(/^```(?:json)?\s*/i, "").replace(/\s*```$/i, "").trim();
+    // Find the first balanced-looking JSON object substring
+    const start = text.indexOf("{");
+    const end = text.lastIndexOf("}");
+    if (start === -1 || end === -1 || end <= start)
+        return null;
+    try {
+        return JSON.parse(text.slice(start, end + 1));
+    }
+    catch {
+        return null;
+    }
+}
+function sanitizeSuggestedTag(value) {
+    if (typeof value !== "string")
+        return undefined;
+    const cleaned = value.trim().replace(/^["'`]+|["'`]+$/g, "").trim();
+    if (!cleaned)
+        return undefined;
+    // Accept common semver-ish forms (v1.2.3, 1.2.3, v1.2.3-rc.1, v1.2.3+build.5)
+    if (!/^v?\d+\.\d+\.\d+([.\-+][0-9A-Za-z.\-+]*)?$/.test(cleaned))
+        return undefined;
+    return cleaned;
+}
+async function generateCommitMessageWithTag(cwd, language) {
+    const diff = collectStagedDiff(cwd);
+    let latestTag;
+    try {
+        latestTag = runGit(["describe", "--tags", "--abbrev=0"], cwd) || undefined;
+    }
+    catch {
+        latestTag = undefined;
+    }
+    const lang = language.trim() || "中文";
+    const tagHint = latestTag
+        ? `当前最新 tag 是 \`${latestTag}\`，请基于它给出下一个版本号（保持原有前缀风格，例如有 \`v\` 就保留 \`v\`）。`
+        : `仓库还没有任何 tag，请直接给一个起始版本号（建议 \`v0.0.1\` / \`v0.1.0\` / \`v1.0.0\` 之一，按改动幅度选择）。`;
+    const prompt = `阅读以下 git diff，完成两件事：
+1. 用${lang}写一条简洁的 commit message（祈使句，不超过 50 字，描述「做了什么」）。
+2. 根据改动幅度推荐下一个语义化版本 tag（破坏性变更 → 升 major；新增功能 → 升 minor；修复 / 文档 / 重构 / 维护 → 升 patch）。${tagHint}
+
+请严格输出**单行 JSON 对象**，不要 Markdown 代码块、不要任何解释文字、不要多余引号。格式：
+{"message":"...","tag":"v1.2.3"}
+
+git diff:
+${diff}`;
+    const raw = await callClaudeText(prompt, cwd);
+    const parsed = tryParseJson(raw);
+    let message;
+    let suggestedTag;
+    if (parsed && typeof parsed.message === "string") {
+        message = parsed.message.replace(/^["'`]+|["'`]+$/g, "").trim();
+        suggestedTag = sanitizeSuggestedTag(parsed.tag);
+    }
+    else {
+        // Fallback: treat whole output as message, no tag suggestion
+        message = raw.replace(/^["'`]+|["'`]+$/g, "").trim();
+        suggestedTag = undefined;
+    }
+    if (!message) {
+        throw new QuickCommitError("Claude 返回了空的 commit message。", "EMPTY_AI_MESSAGE");
+    }
+    return { message, suggestedTag };
+}
 export async function generateCommitMessageOnly(cwd, language) {
     if (!cwd || !existsSync(cwd)) {
         throw new QuickCommitError("工作目录不存在。", "CWD_MISSING");
@@ -248,7 +296,65 @@ export async function generateCommitMessageOnly(cwd, language) {
     catch {
         // best-effort staging so the diff is complete
     }
-    return generateCommitMessage(cwd, language);
+    return generateCommitMessageWithTag(cwd, language);
+}
+/**
+ * Ask Claude for a single tag string. Called from `runQuickCommit` after the commit has
+ * already landed, so we look at `git show HEAD` and use `HEAD~1` for the previous tag.
+ */
+async function generateTagAfterCommit(cwd, language, commitMessage) {
+    let diff;
+    try {
+        diff = runGit(["show", "HEAD", "--no-color", "--submodule=log"], cwd, 5000);
+    }
+    catch {
+        diff = "";
+    }
+    if (!diff) {
+        try {
+            diff = runGit(["show", "HEAD", "--name-only"], cwd, 3000);
+        }
+        catch {
+            diff = "(no diff available)";
+        }
+    }
+    if (diff.length > MAX_DIFF_FOR_AI) {
+        diff = diff.slice(0, MAX_DIFF_FOR_AI) + "\n\n... (diff truncated) ...";
+    }
+    let latestTag;
+    try {
+        // We just made a commit, so look for the most recent tag reachable from HEAD~1.
+        latestTag = runGit(["describe", "--tags", "--abbrev=0", "HEAD~1"], cwd) || undefined;
+    }
+    catch {
+        latestTag = undefined;
+    }
+    const lang = language.trim() || "中文";
+    const tagHint = latestTag
+        ? `当前最新 tag 是 \`${latestTag}\`，请基于它给出下一个版本号（保持原有前缀风格，例如有 \`v\` 就保留 \`v\`）。`
+        : `仓库还没有任何 tag，请给一个起始版本号（建议 \`v0.0.1\` / \`v0.1.0\` / \`v1.0.0\` 之一，按改动幅度选择）。`;
+    const prompt = `根据以下 commit message 和 git diff 推荐一个语义化版本 tag（破坏性变更 → 升 major；新增功能 → 升 minor；修复 / 文档 / 重构 / 维护 → 升 patch）。${tagHint}
+
+请用${lang}思考但严格输出**单行 JSON 对象**，不要 Markdown 代码块、不要任何解释文字、不要多余引号。格式：
+{"tag":"v1.2.3"}
+
+commit message：${commitMessage}
+
+git diff：
+${diff}`;
+    const raw = await callClaudeText(prompt, cwd);
+    const parsed = tryParseJson(raw);
+    let suggested;
+    if (parsed && typeof parsed.tag === "string") {
+        suggested = sanitizeSuggestedTag(parsed.tag);
+    }
+    else {
+        suggested = sanitizeSuggestedTag(raw);
+    }
+    if (!suggested) {
+        throw new QuickCommitError("AI 没有给出合法的 tag，请手动填写。", "INVALID_AI_TAG");
+    }
+    return suggested;
 }
 // ── Direct git operations ──
 export async function runQuickCommit(opts) {
@@ -310,29 +416,19 @@ export async function runQuickCommit(opts) {
         commitHash = "";
     }
     // Step 5: tag
-    const makeTag = !!(autoTag || (tag && tag.trim()));
-    let tagName = "";
-    if (makeTag) {
-        if (tag && tag.trim()) {
-            tagName = tag.trim();
-        }
-        else {
-            let latestTag;
-            try {
-                latestTag = runGit(["describe", "--tags", "--abbrev=0"], cwd);
-            }
-            catch {
-                latestTag = undefined;
-            }
-            tagName = bumpPatchTag(latestTag || "v0.0.0");
+    // - explicit `tag` wins
+    // - if `tag` is empty and `autoTag` is on, ask Claude to generate one
+    // - otherwise no tag
+    let tagName = (tag || "").trim();
+    if (!tagName && autoTag) {
+        tagName = await generateTagAfterCommit(cwd, language, message);
+    }
+    if (tagName) {
+        try {
+            runGit(["tag", tagName], cwd);
         }
-        if (tagName) {
-            try {
-                runGit(["tag", tagName], cwd);
-            }
-            catch (error) {
-                throw new QuickCommitError(`git tag 失败：${getGitErrorMessage(error)}`, "GIT_TAG_FAILED");
-            }
+        catch (error) {
+            throw new QuickCommitError(`git tag 失败：${getGitErrorMessage(error)}`, "GIT_TAG_FAILED");
         }
     }
     // Step 6: push

package/dist/server-session-routes.js

@@ -377,8 +377,8 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             return;
         }
         try {
-            const message = await generateCommitMessageOnly(snapshot.cwd, config.language ?? "");
-            res.json({ message });
+            const result = await generateCommitMessageOnly(snapshot.cwd, config.language ?? "");
+            res.json(result);
         }
         catch (error) {
             if (error instanceof QuickCommitError) {

package/dist/types.d.ts

@@ -169,10 +169,6 @@ export interface GitStatusResult {
     repoRoot?: string;
     /** Truthy when the repo has no commits yet (initial state). */
     initialCommit?: boolean;
-    /** Most recent reachable tag (e.g. "v1.2.3"). */
-    latestTag?: string;
-    /** Auto-suggested next tag derived by bumping the patch segment. */
-    suggestedNextTag?: string;
     error?: string;
 }
 export interface QuickCommitResult {

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

@@ -1735,8 +1735,11 @@
 
       function generateCommitMessageAI() {
         if (!state.selectedId || state.quickCommitGenerating) return;
+        // Sync any in-flight DOM input back into state so "empty?" checks read the latest value
         var msgEl = document.getElementById("quick-commit-message");
         if (msgEl) state.quickCommitForm.customMessage = msgEl.value;
+        var tagEl = document.getElementById("quick-commit-tag");
+        if (tagEl) state.quickCommitForm.tag = tagEl.value;
         state.quickCommitGenerating = true;
         state.quickCommitError = "";
         rerenderQuickCommitModal();
@@ -1751,9 +1754,19 @@
           })
           .then(function(result) {
             if (!result.ok) throw new Error((result.data && result.data.error) || "AI 生成失败。");
-            state.quickCommitForm.customMessage = (result.data && result.data.message) || "";
-            var currentMsgEl = document.getElementById("quick-commit-message");
-            if (currentMsgEl) currentMsgEl.value = state.quickCommitForm.customMessage;
+            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.
+            var currentMessage = (state.quickCommitForm.customMessage || "").trim();
+            if (!currentMessage && aiMessage) {
+              state.quickCommitForm.customMessage = aiMessage;
+            }
+            var currentTag = (state.quickCommitForm.tag || "").trim();
+            if (!currentTag && aiTag) {
+              state.quickCommitForm.tag = aiTag;
+              state.quickCommitForm.makeTag = true;
+            }
           })
           .catch(function(error) {
             state.quickCommitError = (error && error.message) || "AI 生成失败。";
@@ -1768,21 +1781,24 @@
         if (!state.selectedId || state.quickCommitSubmitting) return;
         var msgEl = document.getElementById("quick-commit-message");
         if (msgEl) state.quickCommitForm.customMessage = msgEl.value;
+        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 message = (form.customMessage || "").trim();
+        if (!message) {
+          state.quickCommitError = "请填写 commit message，或点击 AI 生成。";
+          rerenderQuickCommitModal();
+          return;
+        }
+        // 开了 tag 开关但没填 → 由后端在提交时调 AI 生成
         var payload = {
           autoMessage: false,
           customMessage: message,
           tag: userTag,
-          autoTag: form.makeTag && !userTag,
+          autoTag: !!(form.makeTag && !userTag),
           push: !!form.push
         };
-        if (!message) {
-          state.quickCommitError = "请填写 commit message，或点击 AI 生成。";
-          rerenderQuickCommitModal();
-          return;
-        }
         state.quickCommitSubmitting = true;
         state.quickCommitError = "";
         rerenderQuickCommitModal();
@@ -1869,14 +1885,14 @@
                 '<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' + (s.latestTag ? '（当前：' + escapeHtml(s.latestTag) + '）' : '') + '</label>' +
+                '<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="留空自动 bump patch' + (s.suggestedNextTag ? '（如 ' + escapeHtml(s.suggestedNextTag) + '）' : '') + '" value="' + escapeHtml(f.tag || "") + '">' +
+                '<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>' +
@@ -2643,8 +2659,13 @@
         '</label>';
       }
 
-      function confirmDelete(message) {
-        return window.confirm(message);
+      // Returns a Promise<boolean>. Uses the Liquid Glass styled wandConfirm
+      // when available, falls back to native confirm during early page boot.
+      function confirmDelete(message, options) {
+        if (typeof window.wandConfirm === "function") {
+          return window.wandConfirm(message, Object.assign({ type: "danger", danger: true, okLabel: "删除" }, options || {}));
+        }
+        return Promise.resolve(window.confirm(message));
       }
 
       function batchDeleteSelected() {
@@ -2652,44 +2673,46 @@
         var historyIds = getSelectedClaudeHistoryIds();
         var total = sessionIds.length + historyIds.length;
         if (!total) return;
-        if (!confirmDelete('确认删除所选 ' + total + ' 项吗？')) {
-          return;
-        }
-
-        var requests = [];
-        if (sessionIds.length > 0) {
-          requests.push(fetch('/api/sessions/batch-delete', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            credentials: 'same-origin',
-            body: JSON.stringify({ sessionIds: sessionIds })
-          }).then(function(res) { return res.json(); }));
-        }
-        if (historyIds.length > 0) {
-          requests.push(fetch('/api/claude-history/batch-delete', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            credentials: 'same-origin',
-            body: JSON.stringify({ claudeSessionIds: historyIds })
-          }).then(function(res) { return res.json(); }));
-        }
-
-        Promise.all(requests)
-          .then(function() {
-            if (sessionIds.indexOf(state.selectedId) !== -1) {
-              state.selectedId = null;
-              persistSelectedId();
-            }
-            state.claudeHistory = state.claudeHistory.filter(function(session) {
-              return historyIds.indexOf(session.claudeSessionId) === -1;
+        confirmDelete('确认删除所选 ' + total + ' 项吗？此操作无法撤销。', {
+          title: "删除所选 " + total + " 项",
+        }).then(function(ok) {
+          if (!ok) return;
+
+          var requests = [];
+          if (sessionIds.length > 0) {
+            requests.push(fetch('/api/sessions/batch-delete', {
+              method: 'POST',
+              headers: { 'Content-Type': 'application/json' },
+              credentials: 'same-origin',
+              body: JSON.stringify({ sessionIds: sessionIds })
+            }).then(function(res) { return res.json(); }));
+          }
+          if (historyIds.length > 0) {
+            requests.push(fetch('/api/claude-history/batch-delete', {
+              method: 'POST',
+              headers: { 'Content-Type': 'application/json' },
+              credentials: 'same-origin',
+              body: JSON.stringify({ claudeSessionIds: historyIds })
+            }).then(function(res) { return res.json(); }));
+          }
+
+          Promise.all(requests)
+            .then(function() {
+              if (sessionIds.indexOf(state.selectedId) !== -1) {
+                state.selectedId = null;
+                persistSelectedId();
+              }
+              state.claudeHistory = state.claudeHistory.filter(function(session) {
+                return historyIds.indexOf(session.claudeSessionId) === -1;
+              });
+              clearManageSelections();
+              return refreshAll();
+            })
+            .catch(function() {
+              var errorEl = document.getElementById('action-error');
+              showError(errorEl, '无法批量删除所选项目。');
             });
-            clearManageSelections();
-            return refreshAll();
-          })
-          .catch(function() {
-            var errorEl = document.getElementById('action-error');
-            showError(errorEl, '无法批量删除所选项目。');
-          });
+        });
       }
 
       function clearAllClaudeHistory() {
@@ -2698,11 +2721,13 @@
           return !s.timestamp || new Date(s.timestamp).getTime() <= cutoff;
         });
         if (!visibleHistory.length) return;
-        if (!confirmDelete('确认清空当前显示的 ' + visibleHistory.length + ' 条 Claude 历史吗？')) {
-          return;
-        }
-        var deleteIds = visibleHistory.map(function(session) { return session.claudeSessionId; });
-        return fetch('/api/claude-history/batch-delete', {
+        return confirmDelete('确认清空当前显示的 ' + visibleHistory.length + ' 条 Claude 历史吗？', {
+          title: "清空 Claude 历史",
+          okLabel: "清空",
+        }).then(function(ok) {
+          if (!ok) return;
+          var deleteIds = visibleHistory.map(function(session) { return session.claudeSessionId; });
+          return fetch('/api/claude-history/batch-delete', {
           method: 'POST',
           headers: { 'Content-Type': 'application/json' },
           credentials: 'same-origin',
@@ -2723,6 +2748,7 @@
             var errorEl = document.getElementById('action-error');
             showError(errorEl, '无法清空历史会话。');
           });
+        });
       }
 
       function renderClaudeHistoryDirectoryHeader(cwd, cwdShort, count, isExpanded) {
@@ -4989,10 +5015,10 @@
                 break;
               case "delete-session":
                 if (state.selectedId) {
-                  var pendingId = state.selectedId;
-                  if (confirm("确定要删除当前会话吗？")) {
-                    deleteSession(pendingId);
-                  }
+                  (function(pendingId) {
+                    confirmDelete("确定要删除当前会话吗？此操作无法撤销。", { title: "删除当前会话" })
+                      .then(function(ok) { if (ok) deleteSession(pendingId); });
+                  })(state.selectedId);
                 }
                 break;
             }
@@ -5526,25 +5552,34 @@
           } else if (actionButton.dataset.action === "toggle-selection") {
             toggleManagedItemSelection(actionButton.dataset.kind, actionButton.dataset.id);
           } else if (actionButton.dataset.action === "delete-session" && actionButton.dataset.sessionId) {
-            if (confirmDelete("确认删除这个会话吗？")) {
-              deleteSession(actionButton.dataset.sessionId);
-            }
+            (function(sid) {
+              confirmDelete("确认删除这个会话吗？此操作无法撤销。", { title: "删除会话" }).then(function(ok) {
+                if (ok) deleteSession(sid);
+              });
+            })(actionButton.dataset.sessionId);
           } else if (actionButton.dataset.action === "delete-history" && actionButton.dataset.claudeSessionId) {
-            if (confirmDelete("确认隐藏这条 Claude 历史吗？")) {
-              executeDeleteHistory(actionButton.dataset.claudeSessionId, actionButton.closest(".session-item"));
-            }
+            (function(cid, item) {
+              confirmDelete("确认隐藏这条 Claude 历史吗？", { title: "隐藏历史会话", okLabel: "隐藏" }).then(function(ok) {
+                if (ok) executeDeleteHistory(cid, item);
+              });
+            })(actionButton.dataset.claudeSessionId, actionButton.closest(".session-item"));
           } else if (actionButton.dataset.action === "toggle-history-directory" && actionButton.dataset.cwd) {
             var dirCwd = actionButton.dataset.cwd;
             state.claudeHistoryExpandedDirs[dirCwd] = !state.claudeHistoryExpandedDirs[dirCwd];
             updateSessionsList();
           } else if (actionButton.dataset.action === "delete-history-directory" && actionButton.dataset.cwd) {
-            var deleteCwd = actionButton.dataset.cwd;
-            var items = getHistoryItemsByCwd(deleteCwd);
-            var dirCount = getVisibleClaudeHistorySessions().filter(function(s) { return s.cwd === deleteCwd; }).length;
-            if (confirmDelete("确认清空此目录下的 " + dirCount + " 条 Claude 历史吗？")) {
-              setDeletingState(items, true);
-              deleteClaudeHistoryDirectory(deleteCwd, actionButton, items);
-            }
+            (function(deleteCwd, btn) {
+              var items = getHistoryItemsByCwd(deleteCwd);
+              var dirCount = getVisibleClaudeHistorySessions().filter(function(s) { return s.cwd === deleteCwd; }).length;
+              confirmDelete("确认清空此目录下的 " + dirCount + " 条 Claude 历史吗？", {
+                title: "清空目录历史",
+                okLabel: "清空",
+              }).then(function(ok) {
+                if (!ok) return;
+                setDeletingState(items, true);
+                deleteClaudeHistoryDirectory(deleteCwd, btn, items);
+              });
+            })(actionButton.dataset.cwd, actionButton);
           } else if (actionButton.dataset.action === "clear-all-history") {
             clearAllClaudeHistory();
           } else if (actionButton.dataset.action === "toggle-archived-group") {
@@ -8257,7 +8292,13 @@
                     try {
                       WandNative.downloadUpdate(androidApk.github.downloadUrl, androidApk.github.fileName || "wand-update.apk", "github");
                     } catch (e) {
-                      alert("调用下载失败: " + e.message);
+                      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);
+                      }
                     }
                   };
                 }
@@ -8275,7 +8316,13 @@
                     try {
                       WandNative.downloadUpdate(androidApk.local.downloadUrl, androidApk.local.fileName || "wand-update.apk", "local");
                     } catch (e) {
-                      alert("调用下载失败: " + e.message);
+                      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);
+                      }
                     }
                   };
                 }
@@ -14069,9 +14116,10 @@
           }
         }
 
-        // 显示当前执行步骤 = 已完成 + 正在进行（如果有）
-        var currentStep = completed + inProgress;
+        // 显示"正在干第 N 个"（1-indexed）：已完成 + 1，封顶到总数
+        // 这样 pending → in_progress → completed 的过渡空档不会出现 0/N 或漏一位的现象
         var allDone = completed === todos.length;
+        var currentStep = allDone ? todos.length : Math.min(completed + 1, todos.length);
         if (allDone) {
           // Hide todo when all tasks are completed
           container.classList.add("hidden");
@@ -16161,6 +16209,274 @@
         }, type === "error" ? 4000 : 2200);
       }
 
+      // ── Wand Dialog (alert / confirm / prompt) ──
+      // Replaces window.alert / window.confirm / window.prompt with a Liquid Glass
+      // styled modal so confirmations and notices match the rest of wand's UI.
+
+      var _wandDialogStack = [];
+
+      function _wandDialogIcon(type) {
+        switch (type) {
+          case "warning": return "!";
+          case "danger":  return "⚠︎"; // ⚠ (text style)
+          case "success": return "✓";       // ✓
+          case "question": return "?";
+          default: return "i";
+        }
+      }
+
+      /**
+       * Open a Liquid-Glass styled dialog. Returns a Promise resolving to the
+       * value returned by the clicked button's `value`, or `cancelValue` if
+       * dismissed via Esc / backdrop click / cancel button.
+       *
+       * @param {object} opts
+       * @param {string} [opts.title]
+       * @param {string} [opts.message]
+       * @param {"info"|"warning"|"danger"|"success"|"question"} [opts.type]
+       * @param {string} [opts.icon] - Override icon glyph.
+       * @param {Array<{label:string, value:any, kind?:"primary"|"secondary"|"ghost"|"outline"|"danger", autofocus?:boolean}>} opts.buttons
+       * @param {boolean} [opts.input] - Show a single-line text input (prompt).
+       * @param {string} [opts.inputValue] - Initial text input value.
+       * @param {string} [opts.inputPlaceholder]
+       * @param {any} [opts.cancelValue] - Value resolved on Esc / backdrop click. Default: false for confirm, null for prompt, undefined for alert.
+       * @param {boolean} [opts.dismissable] - Allow Esc / backdrop close (default true).
+       * @returns {Promise<any>}
+       */
+      function openWandDialog(opts) {
+        opts = opts || {};
+        var dismissable = opts.dismissable !== false;
+        var type = opts.type || "info";
+        var iconChar = opts.icon || _wandDialogIcon(type);
+        var hasInput = !!opts.input;
+
+        return new Promise(function(resolve) {
+          var backdrop = document.createElement("div");
+          backdrop.className = "wand-dialog-backdrop";
+          backdrop.setAttribute("role", "presentation");
+
+          var dialog = document.createElement("div");
+          dialog.className = "wand-dialog";
+          dialog.setAttribute("role", hasInput ? "dialog" : "alertdialog");
+          dialog.setAttribute("aria-modal", "true");
+          if (opts.title) dialog.setAttribute("aria-label", opts.title);
+
+          // Header
+          var header = document.createElement("div");
+          header.className = "wand-dialog-header";
+
+          var iconEl = document.createElement("div");
+          iconEl.className = "wand-dialog-icon " + type;
+          iconEl.textContent = iconChar;
+          header.appendChild(iconEl);
+
+          var textWrap = document.createElement("div");
+          textWrap.className = "wand-dialog-textwrap";
+          if (opts.title) {
+            var titleEl = document.createElement("div");
+            titleEl.className = "wand-dialog-title";
+            titleEl.textContent = opts.title;
+            textWrap.appendChild(titleEl);
+          }
+          if (opts.message) {
+            var msgEl = document.createElement("div");
+            msgEl.className = "wand-dialog-message";
+            msgEl.textContent = opts.message;
+            textWrap.appendChild(msgEl);
+          }
+          header.appendChild(textWrap);
+          dialog.appendChild(header);
+
+          // Optional input (prompt mode)
+          var inputEl = null;
+          if (hasInput) {
+            var bodyEl = document.createElement("div");
+            bodyEl.className = "wand-dialog-body";
+            inputEl = document.createElement("input");
+            inputEl.type = "text";
+            inputEl.className = "wand-dialog-input";
+            if (opts.inputPlaceholder) inputEl.placeholder = opts.inputPlaceholder;
+            if (opts.inputValue != null) inputEl.value = String(opts.inputValue);
+            bodyEl.appendChild(inputEl);
+            dialog.appendChild(bodyEl);
+          }
+
+          // Footer / buttons
+          var buttons = (opts.buttons && opts.buttons.length) ? opts.buttons : [
+            { label: "好", value: true, kind: "primary", autofocus: true },
+          ];
+
+          var footer = document.createElement("div");
+          footer.className = "wand-dialog-footer";
+
+          var firstFocusable = null;
+          var autofocusTarget = null;
+
+          function close(value) {
+            if (backdrop.classList.contains("closing")) return;
+            backdrop.classList.add("closing");
+            document.removeEventListener("keydown", keyHandler, true);
+            var idx = _wandDialogStack.indexOf(close);
+            if (idx >= 0) _wandDialogStack.splice(idx, 1);
+            setTimeout(function() {
+              if (backdrop.parentNode) backdrop.parentNode.removeChild(backdrop);
+              resolve(value);
+            }, 160);
+          }
+
+          buttons.forEach(function(btnSpec) {
+            var btn = document.createElement("button");
+            var kind = btnSpec.kind || "secondary";
+            btn.className = "btn btn-" + kind;
+            btn.type = "button";
+            btn.textContent = btnSpec.label;
+            btn.addEventListener("click", function() {
+              if (hasInput && btnSpec.kind === "primary") {
+                close(inputEl ? inputEl.value : "");
+              } else {
+                close(btnSpec.value);
+              }
+            });
+            if (!firstFocusable) firstFocusable = btn;
+            if (btnSpec.autofocus) autofocusTarget = btn;
+            footer.appendChild(btn);
+          });
+          dialog.appendChild(footer);
+
+          backdrop.appendChild(dialog);
+
+          // Backdrop click → cancel (if dismissable)
+          backdrop.addEventListener("click", function(e) {
+            if (e.target === backdrop && dismissable) {
+              close(opts.cancelValue !== undefined ? opts.cancelValue : (hasInput ? null : false));
+            }
+          });
+
+          // Key handler — Esc cancels, Enter triggers primary (when not in textarea-like input)
+          function keyHandler(e) {
+            // Only handle keys for the topmost dialog
+            if (_wandDialogStack[_wandDialogStack.length - 1] !== close) return;
+            if (e.key === "Escape" && dismissable) {
+              e.preventDefault();
+              e.stopPropagation();
+              close(opts.cancelValue !== undefined ? opts.cancelValue : (hasInput ? null : false));
+              return;
+            }
+            if (e.key === "Enter") {
+              // For prompt: Enter on input → submit. For alert/confirm: Enter → primary action.
+              var primary = null;
+              for (var i = 0; i < buttons.length; i++) {
+                if (buttons[i].kind === "primary") {
+                  primary = buttons[i];
+                  break;
+                }
+              }
+              if (!primary) primary = buttons[buttons.length - 1];
+              if (primary) {
+                e.preventDefault();
+                e.stopPropagation();
+                if (hasInput && primary.kind === "primary") {
+                  close(inputEl ? inputEl.value : "");
+                } else {
+                  close(primary.value);
+                }
+              }
+            }
+          }
+          document.addEventListener("keydown", keyHandler, true);
+          _wandDialogStack.push(close);
+
+          document.body.appendChild(backdrop);
+
+          // Focus the most appropriate target
+          requestAnimationFrame(function() {
+            if (hasInput && inputEl) {
+              inputEl.focus();
+              try { inputEl.select(); } catch (e2) {}
+            } else if (autofocusTarget) {
+              autofocusTarget.focus();
+            } else if (firstFocusable) {
+              firstFocusable.focus();
+            }
+          });
+        });
+      }
+
+      /**
+       * Liquid-glass replacement for window.alert.
+       * @param {string} message
+       * @param {object} [options] - { title, type, okLabel }
+       * @returns {Promise<void>}
+       */
+      function wandAlert(message, options) {
+        options = options || {};
+        return openWandDialog({
+          title: options.title || "提示",
+          message: typeof message === "string" ? message : String(message == null ? "" : message),
+          type: options.type || "info",
+          buttons: [
+            { label: options.okLabel || "好", value: undefined, kind: "primary", autofocus: true },
+          ],
+        });
+      }
+
+      /**
+       * Liquid-glass replacement for window.confirm. Resolves to true/false.
+       * @param {string} message
+       * @param {object} [options] - { title, type ("question"|"warning"|"danger"), okLabel, cancelLabel, danger }
+       * @returns {Promise<boolean>}
+       */
+      function wandConfirm(message, options) {
+        options = options || {};
+        var danger = !!options.danger || options.type === "danger";
+        return openWandDialog({
+          title: options.title || (danger ? "确认操作" : "请确认"),
+          message: typeof message === "string" ? message : String(message == null ? "" : message),
+          type: options.type || (danger ? "danger" : "question"),
+          cancelValue: false,
+          buttons: [
+            { label: options.cancelLabel || "取消", value: false, kind: "secondary" },
+            {
+              label: options.okLabel || (danger ? "删除" : "确定"),
+              value: true,
+              kind: danger ? "danger" : "primary",
+              autofocus: !danger,
+            },
+          ],
+        }).then(function(v) { return v === true; });
+      }
+
+      /**
+       * Liquid-glass replacement for window.prompt. Resolves to entered string,
+       * or null if cancelled.
+       * @param {string} message
+       * @param {string} [defaultValue]
+       * @param {object} [options] - { title, placeholder, okLabel, cancelLabel }
+       * @returns {Promise<string|null>}
+       */
+      function wandPrompt(message, defaultValue, options) {
+        options = options || {};
+        return openWandDialog({
+          title: options.title || "请输入",
+          message: typeof message === "string" ? message : String(message == null ? "" : message),
+          type: options.type || "question",
+          input: true,
+          inputValue: defaultValue == null ? "" : String(defaultValue),
+          inputPlaceholder: options.placeholder || "",
+          cancelValue: null,
+          buttons: [
+            { label: options.cancelLabel || "取消", value: null, kind: "secondary" },
+            { label: options.okLabel || "确定", value: undefined, kind: "primary" },
+          ],
+        });
+      }
+
+      // Expose globally for ad-hoc use from inline handlers / future code
+      window.wandAlert = wandAlert;
+      window.wandConfirm = wandConfirm;
+      window.wandPrompt = wandPrompt;
+      window.openWandDialog = openWandDialog;
+
       // ── Notification Bubble System ──
 
       var notificationStack = [];
@@ -16448,7 +16764,7 @@
       // ── Native Live Progress Sync ──
 
       var _progressSyncTimers = {};
-      var _PROGRESS_SYNC_DEBOUNCE_MS = 100;
+      var _PROGRESS_SYNC_DEBOUNCE_MS = 30;
 
       // Strip markdown formatting and clamp to a single short line so the
       // native Live Activity / lock-screen card stays readable. 100 chars

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

@@ -9050,21 +9050,22 @@
     }
     .toast-message {
       position: fixed;
-      bottom: 24px;
+      top: 24px;
       left: 50%;
       transform: translateX(-50%);
       padding: 10px 20px;
       border-radius: var(--radius-md);
       font-size: 0.875rem;
       z-index: 9999;
-      animation: toast-in 0.2s ease;
+      box-shadow: var(--shadow-lg);
+      animation: toast-in 0.22s cubic-bezier(0.34, 1.56, 0.64, 1);
     }
     .toast-error {
       background: var(--danger);
       color: white;
     }
     @keyframes toast-in {
-      from { opacity: 0; transform: translateX(-50%) translateY(8px); }
+      from { opacity: 0; transform: translateX(-50%) translateY(-12px); }
       to { opacity: 1; transform: translateX(-50%) translateY(0); }
     }
 
@@ -10963,9 +10964,9 @@
     /* ── Mini toast for in-app feedback ── */
     .wand-mini-toast {
       position: fixed;
-      bottom: 30px;
+      top: 30px;
       left: 50%;
-      transform: translate(-50%, 14px);
+      transform: translate(-50%, -14px);
       z-index: 1200;
       padding: 8px 16px;
       background: rgba(20, 20, 20, 0.92);
@@ -12946,4 +12947,210 @@
       .qc-files-wrap { max-height: 160px; }
     }
 
+    /* ============================================================ */
+    /* ── Wand Dialog (alert / confirm / prompt)                  ── */
+    /* Replaces window.alert / window.confirm / window.prompt with  */
+    /* a Liquid Glass styled modal that matches the rest of wand.   */
+    /* ============================================================ */
+
+    .wand-dialog-backdrop {
+      position: fixed;
+      inset: 0;
+      z-index: 9000;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      padding: 24px;
+      background: rgba(20, 14, 8, 0.34);
+      backdrop-filter: blur(18px) saturate(140%);
+      -webkit-backdrop-filter: blur(18px) saturate(140%);
+      animation: wandDialogBackdropIn 0.22s cubic-bezier(0.16, 1, 0.3, 1) both;
+    }
+    .wand-dialog-backdrop.closing {
+      animation: wandDialogBackdropOut 0.16s cubic-bezier(0.4, 0, 0.2, 1) both;
+      pointer-events: none;
+    }
+    @keyframes wandDialogBackdropIn { from { opacity: 0; } to { opacity: 1; } }
+    @keyframes wandDialogBackdropOut { from { opacity: 1; } to { opacity: 0; } }
+
+    .wand-dialog {
+      position: relative;
+      width: 100%;
+      max-width: 420px;
+      display: flex;
+      flex-direction: column;
+      background:
+        radial-gradient(120% 120% at 0% 0%, var(--accent-muted) 0%, transparent 55%),
+        linear-gradient(180deg, var(--bg-elevated) 0%, var(--bg-secondary) 100%);
+      border: 0.5px solid var(--border-subtle);
+      border-radius: 22px;
+      overflow: hidden;
+      backdrop-filter: blur(40px) saturate(180%);
+      -webkit-backdrop-filter: blur(40px) saturate(180%);
+      box-shadow:
+        0 24px 64px -12px rgba(89, 58, 32, 0.28),
+        0 6px 20px -6px rgba(89, 58, 32, 0.16),
+        0 0 0 0.5px rgba(125, 91, 57, 0.08),
+        inset 0 1px 0 rgba(255, 255, 255, 0.7);
+      animation: wandDialogIn 0.28s cubic-bezier(0.34, 1.4, 0.64, 1) both;
+    }
+    .wand-dialog-backdrop.closing .wand-dialog {
+      animation: wandDialogOut 0.16s cubic-bezier(0.4, 0, 0.2, 1) both;
+    }
+    @keyframes wandDialogIn {
+      from { opacity: 0; transform: scale(0.92) translateY(10px); }
+      to   { opacity: 1; transform: scale(1) translateY(0); }
+    }
+    @keyframes wandDialogOut {
+      from { opacity: 1; transform: scale(1); }
+      to   { opacity: 0; transform: scale(0.96) translateY(4px); }
+    }
+
+    .wand-dialog-header {
+      display: flex;
+      align-items: flex-start;
+      gap: 14px;
+      padding: 22px 24px 12px;
+    }
+    .wand-dialog-icon {
+      flex-shrink: 0;
+      width: 40px;
+      height: 40px;
+      border-radius: 50%;
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 20px;
+      font-weight: 700;
+      line-height: 1;
+      box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.5);
+    }
+    .wand-dialog-icon.info {
+      background: linear-gradient(180deg, var(--accent-soft) 0%, var(--accent-hover) 100%);
+      color: #fff;
+    }
+    .wand-dialog-icon.warning {
+      background: linear-gradient(180deg, #f0c891 0%, var(--warning) 100%);
+      color: #fff;
+    }
+    .wand-dialog-icon.danger {
+      background: linear-gradient(180deg, #d98178 0%, var(--danger) 100%);
+      color: #fff;
+    }
+    .wand-dialog-icon.success {
+      background: linear-gradient(180deg, #8caf94 0%, var(--success) 100%);
+      color: #fff;
+    }
+    .wand-dialog-icon.question {
+      background: linear-gradient(180deg, var(--accent-soft) 0%, var(--accent) 100%);
+      color: #fff;
+    }
+    .wand-dialog-textwrap {
+      flex: 1 1 auto;
+      min-width: 0;
+      display: flex;
+      flex-direction: column;
+      gap: 6px;
+      padding-top: 4px;
+    }
+    .wand-dialog-title {
+      font-size: 1.0625rem;
+      font-weight: 700;
+      letter-spacing: -0.01em;
+      color: var(--text-primary);
+      line-height: 1.3;
+      word-break: break-word;
+    }
+    .wand-dialog-message {
+      font-size: 0.9rem;
+      font-weight: 400;
+      color: var(--text-secondary);
+      line-height: 1.55;
+      white-space: pre-wrap;
+      word-break: break-word;
+    }
+
+    .wand-dialog-body {
+      padding: 4px 24px 14px;
+    }
+    .wand-dialog-input {
+      width: 100%;
+      background: var(--bg-surface);
+      border: 1px solid var(--border-subtle);
+      border-radius: 12px;
+      padding: 11px 14px;
+      font-family: var(--font-sans);
+      font-size: 0.9rem;
+      color: var(--text-primary);
+      box-shadow: inset 0 1px 1.5px rgba(125, 91, 57, 0.04);
+      transition: border-color 0.15s ease, box-shadow 0.15s ease, background 0.15s ease;
+      box-sizing: border-box;
+    }
+    .wand-dialog-input:focus {
+      outline: none;
+      background: var(--bg-elevated);
+      border-color: var(--accent);
+      box-shadow:
+        inset 0 1px 1.5px rgba(125, 91, 57, 0.04),
+        0 0 0 3px var(--accent-glow);
+    }
+
+    .wand-dialog-footer {
+      display: flex;
+      gap: 8px;
+      justify-content: flex-end;
+      padding: 14px 20px 20px;
+      border-top: 1px solid var(--border-subtle);
+      margin-top: 6px;
+    }
+    .wand-dialog-footer .btn {
+      min-width: 84px;
+    }
+    /* Danger primary variant for destructive confirms */
+    .wand-dialog .btn-danger {
+      background: linear-gradient(180deg, var(--danger-hover) 0%, var(--danger) 100%);
+      color: var(--text-inverse);
+      border-color: transparent;
+      box-shadow:
+        0 1px 2px var(--danger-muted),
+        0 4px 10px -2px var(--danger-muted),
+        inset 0 1px 0 rgba(255, 255, 255, 0.22),
+        inset 0 -1px 0 rgba(96, 30, 24, 0.18);
+    }
+    .wand-dialog .btn-danger:hover {
+      background: linear-gradient(180deg, #c96055 0%, #b24f45 100%);
+      transform: translateY(-1px);
+      box-shadow:
+        0 2px 4px var(--danger-muted),
+        0 8px 20px -4px var(--danger-glow),
+        inset 0 1px 0 rgba(255, 255, 255, 0.28),
+        inset 0 -1px 0 rgba(96, 30, 24, 0.18);
+    }
+    .wand-dialog .btn-danger:active {
+      transform: translateY(0);
+      background: linear-gradient(180deg, var(--danger) 0%, #93392f 100%);
+      transition-duration: 0.06s;
+    }
+
+    @media (prefers-reduced-motion: reduce) {
+      .wand-dialog-backdrop,
+      .wand-dialog-backdrop.closing,
+      .wand-dialog,
+      .wand-dialog-backdrop.closing .wand-dialog {
+        animation: none !important;
+      }
+    }
+
+    @supports not ((backdrop-filter: blur(1px)) or (-webkit-backdrop-filter: blur(1px))) {
+      .wand-dialog-backdrop { background: rgba(20, 14, 8, 0.6); }
+      .wand-dialog { background: var(--bg-elevated); border-color: var(--border-subtle); }
+    }
+
+    @media (max-width: 480px) {
+      .wand-dialog-backdrop { padding: 16px; align-items: center; }
+      .wand-dialog { max-width: 100%; border-radius: 20px; }
+      .wand-dialog-footer { flex-wrap: wrap; }
+      .wand-dialog-footer .btn { flex: 1 1 auto; }
+    }
+
     /* 结束标记 */

package/package.json

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