@zjex/git-workflow 0.2.16 → 0.2.18

package/dist/index.js

@@ -75,6 +75,7 @@ import ora from "ora";
 // src/config.ts
 import { existsSync, readFileSync } from "fs";
 import { join } from "path";
+import { homedir } from "os";
 var defaultConfig = {
   featurePrefix: "feature",
   hotfixPrefix: "hotfix",
@@ -108,19 +109,47 @@ function findConfigFile() {
   }
   return null;
 }
+function findGlobalConfigFile() {
+  const globalConfigPath = join(homedir(), ".gwrc.json");
+  return existsSync(globalConfigPath) ? globalConfigPath : null;
+}
 function loadConfig() {
-  const configPath = findConfigFile();
-  if (!configPath) {
-    return defaultConfig;
+  let config2 = { ...defaultConfig };
+  const globalConfigPath = findGlobalConfigFile();
+  if (globalConfigPath) {
+    try {
+      const content = readFileSync(globalConfigPath, "utf-8");
+      const globalConfig = JSON.parse(content);
+      config2 = {
+        ...config2,
+        ...globalConfig,
+        aiCommit: {
+          ...config2.aiCommit,
+          ...globalConfig.aiCommit
+        }
+      };
+    } catch (e) {
+      console.warn(`\u5168\u5C40\u914D\u7F6E\u6587\u4EF6\u89E3\u6790\u5931\u8D25: ${globalConfigPath}`);
+    }
   }
-  try {
-    const content = readFileSync(configPath, "utf-8");
-    const userConfig = JSON.parse(content);
-    return { ...defaultConfig, ...userConfig };
-  } catch (e) {
-    console.warn(`\u914D\u7F6E\u6587\u4EF6\u89E3\u6790\u5931\u8D25: ${configPath}`);
-    return defaultConfig;
+  const projectConfigPath = findConfigFile();
+  if (projectConfigPath) {
+    try {
+      const content = readFileSync(projectConfigPath, "utf-8");
+      const projectConfig = JSON.parse(content);
+      config2 = {
+        ...config2,
+        ...projectConfig,
+        aiCommit: {
+          ...config2.aiCommit,
+          ...projectConfig.aiCommit
+        }
+      };
+    } catch (e) {
+      console.warn(`\u9879\u76EE\u914D\u7F6E\u6587\u4EF6\u89E3\u6790\u5931\u8D25: ${projectConfigPath}`);
+    }
   }
+  return config2;
 }
 var config = null;
 function getConfig() {
@@ -860,8 +889,9 @@ async function release() {
 
 // src/commands/init.ts
 import { existsSync as existsSync2, writeFileSync as writeFileSync2 } from "fs";
+import { join as join2 } from "path";
+import { homedir as homedir2 } from "os";
 import { select as select4, input as input3 } from "@inquirer/prompts";
-var CONFIG_FILE = ".gwrc.json";
 var DEFAULT_COMMIT_EMOJIS = {
   feat: "\u2728",
   fix: "\u{1F41B}",
@@ -876,9 +906,30 @@ var DEFAULT_COMMIT_EMOJIS = {
   revert: "\u23EA"
 };
 async function init() {
-  if (existsSync2(CONFIG_FILE)) {
+  console.log("");
+  console.log(colors.bold("\u2699\uFE0F  \u521D\u59CB\u5316 git-workflow \u914D\u7F6E"));
+  console.log("");
+  const configScope = await select4({
+    message: "\u9009\u62E9\u914D\u7F6E\u8303\u56F4:",
+    choices: [
+      {
+        name: "\u5168\u5C40\u914D\u7F6E\uFF08\u6240\u6709\u9879\u76EE\u751F\u6548\uFF09",
+        value: "global",
+        description: "\u4FDD\u5B58\u5230 ~/.gwrc.json\uFF0C\u6240\u6709\u9879\u76EE\u90FD\u4F1A\u4F7F\u7528\u6B64\u914D\u7F6E"
+      },
+      {
+        name: "\u9879\u76EE\u914D\u7F6E\uFF08\u4EC5\u5F53\u524D\u9879\u76EE\uFF09",
+        value: "project",
+        description: "\u4FDD\u5B58\u5230\u5F53\u524D\u76EE\u5F55 .gwrc.json\uFF0C\u4EC5\u5F53\u524D\u9879\u76EE\u4F7F\u7528"
+      }
+    ],
+    theme
+  });
+  const isGlobal = configScope === "global";
+  const configFile = isGlobal ? join2(homedir2(), ".gwrc.json") : ".gwrc.json";
+  if (existsSync2(configFile)) {
     const overwrite = await select4({
-      message: `${CONFIG_FILE} \u5DF2\u5B58\u5728\uFF0C\u662F\u5426\u8986\u76D6?`,
+      message: `${isGlobal ? "\u5168\u5C40" : "\u9879\u76EE"}\u914D\u7F6E\u6587\u4EF6\u5DF2\u5B58\u5728\uFF0C\u662F\u5426\u8986\u76D6?`,
       choices: [
         { name: "\u5426\uFF0C\u53D6\u6D88", value: false },
         { name: "\u662F\uFF0C\u8986\u76D6", value: true }
@@ -903,13 +954,13 @@ async function init() {
     default: "feature",
     theme
   });
-  if (featurePrefix !== "feature") config2.featurePrefix = featurePrefix;
+  config2.featurePrefix = featurePrefix;
   const hotfixPrefix = await input3({
     message: "Hotfix \u5206\u652F\u524D\u7F00:",
     default: "hotfix",
     theme
   });
-  if (hotfixPrefix !== "hotfix") config2.hotfixPrefix = hotfixPrefix;
+  config2.hotfixPrefix = hotfixPrefix;
   divider();
   const requireId = await select4({
     message: "\u662F\u5426\u8981\u6C42\u5FC5\u586B ID (Story ID / Issue ID)?",
@@ -919,19 +970,19 @@ async function init() {
     ],
     theme
   });
-  if (requireId) config2.requireId = true;
+  config2.requireId = requireId;
   const featureIdLabel = await input3({
     message: "Feature \u5206\u652F ID \u6807\u7B7E:",
     default: "Story ID",
     theme
   });
-  if (featureIdLabel !== "Story ID") config2.featureIdLabel = featureIdLabel;
+  config2.featureIdLabel = featureIdLabel;
   const hotfixIdLabel = await input3({
     message: "Hotfix \u5206\u652F ID \u6807\u7B7E:",
     default: "Issue ID",
     theme
   });
-  if (hotfixIdLabel !== "Issue ID") config2.hotfixIdLabel = hotfixIdLabel;
+  config2.hotfixIdLabel = hotfixIdLabel;
   divider();
   const defaultTagPrefix = await input3({
     message: "\u9ED8\u8BA4 Tag \u524D\u7F00 (\u7559\u7A7A\u5219\u6BCF\u6B21\u9009\u62E9):",
@@ -947,8 +998,11 @@ async function init() {
     ],
     theme
   });
-  if (autoPushChoice === "yes") config2.autoPush = true;
-  if (autoPushChoice === "no") config2.autoPush = false;
+  if (autoPushChoice === "yes") {
+    config2.autoPush = true;
+  } else if (autoPushChoice === "no") {
+    config2.autoPush = false;
+  }
   divider();
   const autoStage = await select4({
     message: "Commit \u65F6\u662F\u5426\u81EA\u52A8\u6682\u5B58\u6240\u6709\u66F4\u6539?",
@@ -958,7 +1012,7 @@ async function init() {
     ],
     theme
   });
-  if (!autoStage) config2.autoStage = false;
+  config2.autoStage = autoStage;
   const useEmoji = await select4({
     message: "Commit \u65F6\u662F\u5426\u4F7F\u7528 emoji?",
     choices: [
@@ -967,7 +1021,7 @@ async function init() {
     ],
     theme
   });
-  if (!useEmoji) config2.useEmoji = false;
+  config2.useEmoji = useEmoji;
   config2.commitEmojis = DEFAULT_COMMIT_EMOJIS;
   divider();
   console.log(
@@ -990,11 +1044,6 @@ async function init() {
           value: "github",
           description: "\u4F7F\u7528 GitHub \u8D26\u53F7\uFF0C\u6BCF\u5929 150 \u6B21\u514D\u8D39"
         },
-        {
-          name: "Groq\uFF08\u514D\u8D39\uFF09",
-          value: "groq",
-          description: "\u9700\u8981\u6CE8\u518C\uFF0C\u6BCF\u5929 14,400 \u6B21\u514D\u8D39"
-        },
         {
           name: "OpenAI\uFF08\u4ED8\u8D39\uFF09",
           value: "openai",
@@ -1013,26 +1062,36 @@ async function init() {
       ],
       theme
     });
-    const useBuiltinKey = await select4({
-      message: "API Key \u914D\u7F6E:",
-      choices: [
-        {
-          name: "\u4F7F\u7528\u5185\u7F6E Key\uFF08\u5F00\u7BB1\u5373\u7528\uFF09",
-          value: true,
-          description: "\u4F7F\u7528\u5DE5\u5177\u5185\u7F6E\u7684 API key\uFF0C\u5171\u4EAB\u9650\u989D"
-        },
-        {
-          name: "\u4F7F\u7528\u81EA\u5DF1\u7684 Key\uFF08\u63A8\u8350\uFF09",
-          value: false,
-          description: "\u914D\u7F6E\u81EA\u5DF1\u7684 API key\uFF0C\u72EC\u4EAB\u9650\u989D"
-        }
-      ],
-      theme
-    });
     let apiKey = "";
-    if (!useBuiltinKey) {
+    if (aiProvider === "github") {
+      console.log("");
+      console.log(colors.cyan("\u{1F4A1} \u5982\u4F55\u83B7\u53D6 GitHub Token:"));
+      console.log(
+        colors.dim("  1. \u8BBF\u95EE: https://github.com/settings/tokens/new")
+      );
+      console.log(colors.dim("  2. \u52FE\u9009 'repo' \u6743\u9650"));
+      console.log(colors.dim("  3. \u751F\u6210\u5E76\u590D\u5236 token"));
+      console.log("");
       apiKey = await input3({
-        message: `\u8F93\u5165\u4F60\u7684 ${aiProvider === "github" ? "GitHub Token" : "API Key"}:`,
+        message: "\u8F93\u5165\u4F60\u7684 GitHub Token:",
+        validate: (value) => {
+          if (!value.trim()) return "GitHub Token \u4E0D\u80FD\u4E3A\u7A7A";
+          return true;
+        },
+        theme
+      });
+    } else if (aiProvider !== "ollama") {
+      console.log("");
+      if (aiProvider === "openai") {
+        console.log(colors.cyan("\u{1F4A1} \u5982\u4F55\u83B7\u53D6 OpenAI API Key:"));
+        console.log(colors.dim("  \u8BBF\u95EE: https://platform.openai.com/api-keys"));
+      } else {
+        console.log(colors.cyan("\u{1F4A1} \u5982\u4F55\u83B7\u53D6 Claude API Key:"));
+        console.log(colors.dim("  \u8BBF\u95EE: https://console.anthropic.com/"));
+      }
+      console.log("");
+      apiKey = await input3({
+        message: `\u8F93\u5165\u4F60\u7684 ${aiProvider === "openai" ? "OpenAI API Key" : "Claude API Key"}:`,
         validate: (value) => {
           if (!value.trim()) return "API Key \u4E0D\u80FD\u4E3A\u7A7A";
           return true;
@@ -1056,7 +1115,6 @@ async function init() {
     };
     const defaultModels = {
       github: "gpt-4o-mini",
-      groq: "llama-3.1-8b-instant",
       openai: "gpt-4o-mini",
       claude: "claude-3-haiku-20240307",
       ollama: "qwen2.5-coder:7b"
@@ -1069,13 +1127,30 @@ async function init() {
   }
   divider();
   const content = JSON.stringify(config2, null, 2);
-  writeFileSync2(CONFIG_FILE, content + "\n");
-  console.log(colors.green(`\u2713 \u914D\u7F6E\u5DF2\u4FDD\u5B58\u5230 ${CONFIG_FILE}`));
+  writeFileSync2(configFile, content + "\n");
   console.log(
-    colors.dim(
-      "\n\u63D0\u793A: \u53EF\u4EE5\u5728\u914D\u7F6E\u6587\u4EF6\u4E2D\u4FEE\u6539 commitEmojis \u6765\u81EA\u5B9A\u4E49\u5404\u7C7B\u578B\u7684 emoji"
+    colors.green(
+      `\u2713 \u914D\u7F6E\u5DF2\u4FDD\u5B58\u5230 ${isGlobal ? "\u5168\u5C40\u914D\u7F6E\u6587\u4EF6" : "\u9879\u76EE\u914D\u7F6E\u6587\u4EF6"}: ${configFile}`
     )
   );
+  if (isGlobal) {
+    console.log("");
+    console.log(colors.cyan("\u{1F4A1} \u63D0\u793A:"));
+    console.log(
+      colors.dim("  \u2022 \u5168\u5C40\u914D\u7F6E\u5BF9\u6240\u6709\u9879\u76EE\u751F\u6548\uFF0C\u65E0\u9700\u5728\u6BCF\u4E2A\u9879\u76EE\u4E2D\u91CD\u590D\u914D\u7F6E")
+    );
+    console.log(
+      colors.dim("  \u2022 \u5982\u9700\u4E3A\u7279\u5B9A\u9879\u76EE\u81EA\u5B9A\u4E49\u914D\u7F6E\uFF0C\u53EF\u5728\u9879\u76EE\u4E2D\u8FD0\u884C gw init")
+    );
+    console.log(colors.dim("  \u2022 \u9879\u76EE\u914D\u7F6E\u4F1A\u8986\u76D6\u5168\u5C40\u914D\u7F6E"));
+  } else {
+    console.log("");
+    console.log(
+      colors.dim(
+        "\u63D0\u793A: \u53EF\u4EE5\u5728\u914D\u7F6E\u6587\u4EF6\u4E2D\u4FEE\u6539 commitEmojis \u6765\u81EA\u5B9A\u4E49\u5404\u7C7B\u578B\u7684 emoji"
+      )
+    );
+  }
   if (config2.aiCommit?.enabled) {
     console.log(
       colors.dim(
@@ -1344,13 +1419,6 @@ var AI_PROVIDERS = {
     free: true,
     needsKey: true
   },
-  groq: {
-    name: "Groq",
-    endpoint: "https://api.groq.com/openai/v1/chat/completions",
-    defaultModel: "llama-3.1-8b-instant",
-    free: true,
-    needsKey: true
-  },
   openai: {
     name: "OpenAI",
     endpoint: "https://api.openai.com/v1/chat/completions",
@@ -1393,7 +1461,8 @@ function buildPrompt(diff, language) {
 2. type \u5FC5\u987B\u662F\u4EE5\u4E0B\u4E4B\u4E00\uFF1Afeat, fix, docs, style, refactor, perf, test, build, ci, chore, revert
 3. scope \u662F\u53EF\u9009\u7684\uFF0C\u8868\u793A\u5F71\u54CD\u8303\u56F4
 4. subject \u7528\u4E2D\u6587\u63CF\u8FF0\uFF0C\u7B80\u6D01\u660E\u4E86\uFF0C\u4E0D\u8D85\u8FC7 50 \u5B57
-5. \u53EA\u8FD4\u56DE commit message\uFF0C\u4E0D\u8981\u6709\u5176\u4ED6\u89E3\u91CA
+5. \u53EA\u8FD4\u56DE\u4E00\u6761 commit message\uFF0C\u5373\u4F7F\u6709\u591A\u4E2A\u6587\u4EF6\u6539\u52A8\u4E5F\u8981\u603B\u7ED3\u6210\u4E00\u6761
+6. \u4E0D\u8981\u6709\u5176\u4ED6\u89E3\u91CA\u6216\u591A\u4F59\u5185\u5BB9
 
 \u793A\u4F8B\uFF1A
 - feat(auth): \u6DFB\u52A0\u7528\u6237\u767B\u5F55\u529F\u80FD
@@ -1405,7 +1474,8 @@ Rules:
 2. type must be one of: feat, fix, docs, style, refactor, perf, test, build, ci, chore, revert
 3. scope is optional, indicates the affected area
 4. subject should be concise, no more than 50 characters
-5. Return only the commit message, no explanations
+5. Return only ONE commit message, even if multiple files are changed, summarize into one message
+6. No explanations or extra content
 
 Examples:
 - feat(auth): add user login functionality
@@ -1441,27 +1511,6 @@ async function callGitHubAPI(prompt, apiKey, model, maxTokens) {
   const data = await response.json();
   return data.choices[0]?.message?.content?.trim() || "";
 }
-async function callGroqAPI(prompt, apiKey, model, maxTokens) {
-  const response = await fetch(AI_PROVIDERS.groq.endpoint, {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${apiKey}`,
-      "Content-Type": "application/json"
-    },
-    body: JSON.stringify({
-      model,
-      messages: [{ role: "user", content: prompt }],
-      max_tokens: maxTokens,
-      temperature: 0.3
-    })
-  });
-  if (!response.ok) {
-    const error = await response.text();
-    throw new Error(`Groq API \u9519\u8BEF: ${response.status} ${error}`);
-  }
-  const data = await response.json();
-  return data.choices[0]?.message?.content?.trim() || "";
-}
 async function callOpenAIAPI(prompt, apiKey, model, maxTokens) {
   const response = await fetch(AI_PROVIDERS.openai.endpoint, {
     method: "POST",
@@ -1536,7 +1585,7 @@ async function callOllamaAPI(prompt, model, maxTokens) {
 }
 async function generateAICommitMessage(config2) {
   const aiConfig = config2.aiCommit || {};
-  const provider = aiConfig.provider || "groq";
+  const provider = aiConfig.provider || "github";
   const language = aiConfig.language || "zh-CN";
   const maxTokens = aiConfig.maxTokens || 200;
   const diff = getGitDiff();
@@ -1560,8 +1609,6 @@ async function generateAICommitMessage(config2) {
   switch (provider) {
     case "github":
       return await callGitHubAPI(prompt, apiKey, model, maxTokens);
-    case "groq":
-      return await callGroqAPI(prompt, apiKey, model, maxTokens);
     case "openai":
       return await callOpenAIAPI(prompt, apiKey, model, maxTokens);
     case "claude":
@@ -1634,18 +1681,7 @@ function formatFileStatus(status) {
 async function commit() {
   const config2 = getConfig();
   let { staged, unstaged } = parseGitStatus();
-  if (staged.length === 0) {
-    if (unstaged.length === 0) {
-      console.log(colors.yellow("\u5DE5\u4F5C\u533A\u5E72\u51C0\uFF0C\u6CA1\u6709\u9700\u8981\u63D0\u4EA4\u7684\u66F4\u6539"));
-      return;
-    }
-    console.log(colors.yellow("\u6CA1\u6709\u6682\u5B58\u7684\u66F4\u6539"));
-    divider();
-    console.log("\u672A\u6682\u5B58\u7684\u6587\u4EF6:");
-    for (const { status, file } of unstaged) {
-      console.log(`  ${formatFileStatus(status)} ${file}`);
-    }
-    divider();
+  if (unstaged.length > 0) {
     const autoStage = config2.autoStage ?? true;
     if (autoStage) {
       execSync5("git add -A", { stdio: "pipe" });
@@ -1653,7 +1689,15 @@ async function commit() {
       divider();
       const newStatus = parseGitStatus();
       staged = newStatus.staged;
-    } else {
+      unstaged = newStatus.unstaged;
+    } else if (staged.length === 0) {
+      console.log(colors.yellow("\u6CA1\u6709\u6682\u5B58\u7684\u66F4\u6539"));
+      divider();
+      console.log("\u672A\u6682\u5B58\u7684\u6587\u4EF6:");
+      for (const { status, file } of unstaged) {
+        console.log(`  ${formatFileStatus(status)} ${file}`);
+      }
+      divider();
       const filesToStage = await checkbox({
         message: "\u9009\u62E9\u8981\u6682\u5B58\u7684\u6587\u4EF6:",
         choices: unstaged.map(({ status, file }) => ({
@@ -1675,13 +1719,16 @@ async function commit() {
       const newStatus = parseGitStatus();
       staged = newStatus.staged;
     }
-  } else {
-    console.log("\u5DF2\u6682\u5B58\u7684\u6587\u4EF6:");
-    for (const { status, file } of staged) {
-      console.log(`  ${formatFileStatus(status)} ${file}`);
-    }
-    divider();
   }
+  if (staged.length === 0) {
+    console.log(colors.yellow("\u5DE5\u4F5C\u533A\u5E72\u51C0\uFF0C\u6CA1\u6709\u9700\u8981\u63D0\u4EA4\u7684\u66F4\u6539"));
+    return;
+  }
+  console.log("\u5DF2\u6682\u5B58\u7684\u6587\u4EF6:");
+  for (const { status, file } of staged) {
+    console.log(`  ${formatFileStatus(status)} ${file}`);
+  }
+  divider();
   const aiAvailable = isAICommitAvailable(config2);
   let commitMode = "manual";
   if (aiAvailable) {
@@ -1876,7 +1923,10 @@ Tag \u547D\u4EE4:
   gw r                            \u540C\u4E0A (\u522B\u540D)
 
 \u914D\u7F6E\u547D\u4EE4:
-  gw init                         \u521D\u59CB\u5316\u914D\u7F6E\u6587\u4EF6 .gwrc.json
+  gw init                         \u521D\u59CB\u5316\u914D\u7F6E\u6587\u4EF6
+                                  \u2022 \u5168\u5C40\u914D\u7F6E: ~/.gwrc.json (\u6240\u6709\u9879\u76EE\u751F\u6548)
+                                  \u2022 \u9879\u76EE\u914D\u7F6E: .gwrc.json (\u4EC5\u5F53\u524D\u9879\u76EE)
+                                  \u8FD0\u884C\u65F6\u53EF\u9009\u62E9\u914D\u7F6E\u8303\u56F4
 
 Stash \u547D\u4EE4:
   gw stash                        \u4EA4\u4E92\u5F0F\u7BA1\u7406 stash
@@ -1911,8 +1961,8 @@ Commit \u547D\u4EE4:
 // src/update-notifier.ts
 import { execSync as execSync6 } from "child_process";
 import { readFileSync as readFileSync3, writeFileSync as writeFileSync3, existsSync as existsSync3 } from "fs";
-import { homedir } from "os";
-import { join as join2 } from "path";
+import { homedir as homedir3 } from "os";
+import { join as join3 } from "path";
 import boxen from "boxen";
 import { select as select7 } from "@inquirer/prompts";
 import ora5 from "ora";
@@ -2007,15 +2057,7 @@ async function performUpdate(packageName) {
     spinner: "dots"
   }).start();
   try {
-    try {
-      execSync6(`npm uninstall -g ${packageName}`, {
-        encoding: "utf-8",
-        stdio: ["pipe", "pipe", "pipe"]
-      });
-      spinner.text = "\u6B63\u5728\u5B89\u88C5\u65B0\u7248\u672C...";
-    } catch {
-    }
-    execSync6(`npm install -g ${packageName}`, {
+    execSync6(`npm install -g ${packageName}@latest`, {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -2026,11 +2068,7 @@ async function performUpdate(packageName) {
         [
           colors.bold("\u2728 \u66F4\u65B0\u5B8C\u6210\uFF01"),
           "",
-          colors.dim("\u8BF7\u8FD0\u884C\u4EE5\u4E0B\u547D\u4EE4\u5237\u65B0\u5E76\u4F7F\u7528\u65B0\u7248\u672C:"),
-          "",
-          colors.yellow("  hash -r && gw --version"),
-          "",
-          colors.dim("\u6216\u8005\u91CD\u65B0\u6253\u5F00\u7EC8\u7AEF")
+          colors.dim("\u8BF7\u91CD\u65B0\u6253\u5F00\u7EC8\u7AEF\u4F7F\u7528\u65B0\u7248\u672C")
         ].join("\n"),
         {
           padding: 1,
@@ -2046,13 +2084,13 @@ async function performUpdate(packageName) {
     spinner.fail(colors.red("\u66F4\u65B0\u5931\u8D25"));
     console.log("");
     console.log(colors.dim("  \u4F60\u53EF\u4EE5\u624B\u52A8\u8FD0\u884C\u4EE5\u4E0B\u547D\u4EE4\u66F4\u65B0:"));
-    console.log(colors.cyan(`  npm install -g ${packageName}`));
+    console.log(colors.cyan(`  npm install -g ${packageName}@latest`));
     console.log("");
   }
 }
 function readCache() {
   try {
-    const cacheFile = join2(homedir(), CACHE_FILE);
+    const cacheFile = join3(homedir3(), CACHE_FILE);
     if (!existsSync3(cacheFile)) {
       return null;
     }
@@ -2064,7 +2102,7 @@ function readCache() {
 }
 function writeCache(cache) {
   try {
-    const cacheFile = join2(homedir(), CACHE_FILE);
+    const cacheFile = join3(homedir3(), CACHE_FILE);
     writeFileSync3(cacheFile, JSON.stringify(cache), "utf-8");
   } catch {
   }
@@ -2095,7 +2133,7 @@ process.on("SIGTERM", () => {
   console.log("");
   process.exit(0);
 });
-var version = true ? "0.2.16" : "0.0.0-dev";
+var version = true ? "0.2.18" : "0.0.0-dev";
 async function mainMenu() {
   console.log(
     colors.green(`
@@ -2107,7 +2145,7 @@ async function mainMenu() {
  \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u255D  \u255A\u2550\u255D
 `)
   );
-  console.log(colors.dim(`  git-workflow v${version}
+  console.log(colors.dim(`  git-workflow v${colors.yellow(version)}
 `));
   const action = await select8({
     message: "\u9009\u62E9\u64CD\u4F5C:",
@@ -2275,5 +2313,10 @@ cli.help((sections) => {
     body: showHelp()
   });
 });
-cli.version(version);
+cli.option("-v, --version", "\u663E\u793A\u7248\u672C\u53F7");
+var args = process.argv.slice(2);
+if (args.includes("-v") || args.includes("--version")) {
+  console.log(colors.yellow(`v${version}`));
+  process.exit(0);
+}
 cli.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zjex/git-workflow",
-	"version": "0.2.16",
+	"version": "0.2.18",
 	"description": "🚀 极简的 Git 工作流 CLI 工具，让分支管理和版本发布变得轻松愉快",
 	"type": "module",
 	"bin": {

package/scripts/publish.js

@@ -29,12 +29,15 @@ function exec(command, silent = false) {
   }
 }
 
-function runStep(stepNum, stepName, command) {
+async function runStep(stepNum, stepName, command) {
   const spinner = ora({
     text: `${colors.blue(`[${stepNum}/${TOTAL_STEPS}]`)} ${stepName}...`,
     spinner: "dots",
   }).start();
 
+  // 给 spinner 一点时间渲染
+  await new Promise((resolve) => setTimeout(resolve, 100));
+
   try {
     execSync(command, { encoding: "utf-8", stdio: "pipe" });
     spinner.succeed(
@@ -56,7 +59,7 @@ async function main() {
   console.log("");
 
   // [1] 检查 Git 仓库
-  if (!runStep(1, "检查 Git 仓库", "git rev-parse --git-dir")) {
+  if (!(await runStep(1, "检查 Git 仓库", "git rev-parse --git-dir"))) {
     console.log(colors.red("✖ 当前目录不是 git 仓库"));
     process.exit(1);
   }
@@ -67,6 +70,8 @@ async function main() {
     spinner: "dots",
   }).start();
 
+  await new Promise((resolve) => setTimeout(resolve, 100));
+
   const status = exec("git status --porcelain", true);
   if (status && status.trim()) {
     spinner2.fail(`${colors.blue("[2/11]")} 检查工作区状态`);
@@ -86,6 +91,8 @@ async function main() {
     spinner: "dots",
   }).start();
 
+  await new Promise((resolve) => setTimeout(resolve, 100));
+
   const npmUser = exec("npm whoami", true);
   if (!npmUser) {
     spinner3.fail(`${colors.blue("[3/11]")} 检查 npm 登录状态`);
@@ -102,7 +109,7 @@ async function main() {
   const currentBranch = exec("git branch --show-current", true).trim();
 
   // [4] 拉取最新代码
-  if (!runStep(4, "拉取最新代码", `git pull origin ${currentBranch}`)) {
+  if (!(await runStep(4, "拉取最新代码", `git pull origin ${currentBranch}`))) {
     process.exit(1);
   }
 
@@ -167,12 +174,12 @@ async function main() {
   );
 
   // [6] 构建项目
-  if (!runStep(6, "构建项目", "npm run build")) {
+  if (!(await runStep(6, "构建项目", "npm run build"))) {
     process.exit(1);
   }
 
   // [7] 生成 CHANGELOG
-  if (!runStep(7, "生成 CHANGELOG", "npm run changelog")) {
+  if (!(await runStep(7, "生成 CHANGELOG", "npm run changelog"))) {
     process.exit(1);
   }
 
@@ -182,6 +189,8 @@ async function main() {
     spinner: "dots",
   }).start();
 
+  await new Promise((resolve) => setTimeout(resolve, 100));
+
   try {
     execSync("git add package.json CHANGELOG.md", { stdio: "pipe" });
     execSync(`git commit -m "🔖 chore(release): 发布 v${newVersion}"`, {
@@ -206,6 +215,8 @@ async function main() {
     spinner: "dots",
   }).start();
 
+  await new Promise((resolve) => setTimeout(resolve, 100));
+
   try {
     execSync(`git tag -a "v${newVersion}" -m "Release v${newVersion}"`, {
       stdio: "pipe",
@@ -227,6 +238,8 @@ async function main() {
     spinner: "dots",
   }).start();
 
+  await new Promise((resolve) => setTimeout(resolve, 100));
+
   try {
     execSync(`git push origin ${currentBranch}`, { stdio: "pipe" });
     execSync(`git push origin v${newVersion}`, { stdio: "pipe" });