@zjex/git-workflow 0.3.9 → 0.4.0

package/src/ai-service.ts

@@ -60,7 +60,12 @@ function getGitDiff(): string {
 /**
  * 构建 AI prompt
  */
-function buildPrompt(diff: string, language: string, detailedDescription: boolean = false, useEmoji: boolean = true): string {
+function buildPrompt(
+  diff: string,
+  language: string,
+  detailedDescription: boolean = false,
+  useEmoji: boolean = true
+): string {
   const isZh = language === "zh-CN";
 
   if (detailedDescription) {
@@ -69,7 +74,7 @@ function buildPrompt(diff: string, language: string, detailedDescription: boolea
       ? `你是一个专业的 Git commit message 生成助手。请根据提供的 git diff 生成符合 Conventional Commits 规范的详细 commit message。
 
 格式要求：
-1. 第一行：${useEmoji ? '<emoji> ' : ''}<type>(<scope>): <subject>
+1. 第一行：${useEmoji ? "<emoji> " : ""}<type>(<scope>): <subject>
 2. 空行
 3. 详细描述：列出主要修改点，每个修改点一行，以 "- " 开头
 
@@ -80,7 +85,9 @@ function buildPrompt(diff: string, language: string, detailedDescription: boolea
 - 详细描述要列出 3-6 个主要修改点，每个修改点简洁明了
 - 如果修改较少，可以只列出 2-3 个修改点
 - 不要有其他解释或多余内容
-${useEmoji ? `
+${
+  useEmoji
+    ? `
 Emoji 映射规则：
 - feat: ✨ (新功能)
 - fix: 🐛 (修复Bug)
@@ -92,10 +99,12 @@ Emoji 映射规则：
 - build: 📦 (构建)
 - ci: 👷 (CI/CD)
 - chore: 🔧 (其他杂项)
-- revert: ⏪ (回滚)` : ''}
+- revert: ⏪ (回滚)`
+    : ""
+}
 
 示例：
-${useEmoji ? '✨ ' : ''}feat(auth): 添加用户登录功能
+${useEmoji ? "✨ " : ""}feat(auth): 添加用户登录功能
 
 - 实现用户名密码登录接口
 - 添加登录状态验证中间件
@@ -104,7 +113,7 @@ ${useEmoji ? '✨ ' : ''}feat(auth): 添加用户登录功能
       : `You are a professional Git commit message generator. Generate a detailed commit message following Conventional Commits specification based on the provided git diff.
 
 Format requirements:
-1. First line: ${useEmoji ? '<emoji> ' : ''}<type>(<scope>): <subject>
+1. First line: ${useEmoji ? "<emoji> " : ""}<type>(<scope>): <subject>
 2. Empty line
 3. Detailed description: List main changes, one per line, starting with "- "
 
@@ -115,7 +124,9 @@ Rules:
 - Detailed description should list 3-6 main changes, each change should be concise
 - If changes are minimal, list 2-3 changes
 - No explanations or extra content
-${useEmoji ? `
+${
+  useEmoji
+    ? `
 Emoji mapping rules:
 - feat: ✨ (new feature)
 - fix: 🐛 (bug fix)
@@ -127,10 +138,12 @@ Emoji mapping rules:
 - build: 📦 (build)
 - ci: 👷 (CI/CD)
 - chore: 🔧 (chore)
-- revert: ⏪ (revert)` : ''}
+- revert: ⏪ (revert)`
+    : ""
+}
 
 Example:
-${useEmoji ? '✨ ' : ''}feat(auth): add user login functionality
+${useEmoji ? "✨ " : ""}feat(auth): add user login functionality
 
 - Implement username/password login API
 - Add login status validation middleware
@@ -148,13 +161,15 @@ ${useEmoji ? '✨ ' : ''}feat(auth): add user login functionality
       ? `你是一个专业的 Git commit message 生成助手。请根据提供的 git diff 生成符合 Conventional Commits 规范的 commit message。
 
 规则：
-1. 格式：${useEmoji ? '<emoji> ' : ''}<type>(<scope>): <subject>
+1. 格式：${useEmoji ? "<emoji> " : ""}<type>(<scope>): <subject>
 2. type 必须是以下之一：feat, fix, docs, style, refactor, perf, test, build, ci, chore, revert
 3. scope 是可选的，表示影响范围
 4. subject 用中文描述，简洁明了，不超过 50 字
 5. 只返回一条 commit message，即使有多个文件改动也要总结成一条
 6. 不要有其他解释或多余内容
-${useEmoji ? `
+${
+  useEmoji
+    ? `
 Emoji 映射规则：
 - feat: ✨ (新功能)
 - fix: 🐛 (修复Bug)
@@ -166,22 +181,26 @@ Emoji 映射规则：
 - build: 📦 (构建)
 - ci: 👷 (CI/CD)
 - chore: 🔧 (其他杂项)
-- revert: ⏪ (回滚)` : ''}
+- revert: ⏪ (回滚)`
+    : ""
+}
 
 示例：
-- ${useEmoji ? '✨ ' : ''}feat(auth): 添加用户登录功能
-- ${useEmoji ? '🐛 ' : ''}fix(api): 修复数据获取失败的问题
-- ${useEmoji ? '📝 ' : ''}docs(readme): 更新安装说明`
+- ${useEmoji ? "✨ " : ""}feat(auth): 添加用户登录功能
+- ${useEmoji ? "🐛 " : ""}fix(api): 修复数据获取失败的问题
+- ${useEmoji ? "📝 " : ""}docs(readme): 更新安装说明`
       : `You are a professional Git commit message generator. Generate a commit message following Conventional Commits specification based on the provided git diff.
 
 Rules:
-1. Format: ${useEmoji ? '<emoji> ' : ''}<type>(<scope>): <subject>
+1. Format: ${useEmoji ? "<emoji> " : ""}<type>(<scope>): <subject>
 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 ONE commit message, even if multiple files are changed, summarize into one message
 6. No explanations or extra content
-${useEmoji ? `
+${
+  useEmoji
+    ? `
 Emoji mapping rules:
 - feat: ✨ (new feature)
 - fix: 🐛 (bug fix)
@@ -193,12 +212,14 @@ Emoji mapping rules:
 - build: 📦 (build)
 - ci: 👷 (CI/CD)
 - chore: 🔧 (chore)
-- revert: ⏪ (revert)` : ''}
+- revert: ⏪ (revert)`
+    : ""
+}
 
 Examples:
-- ${useEmoji ? '✨ ' : ''}feat(auth): add user login functionality
-- ${useEmoji ? '🐛 ' : ''}fix(api): resolve data fetching failure
-- ${useEmoji ? '📝 ' : ''}docs(readme): update installation guide`;
+- ${useEmoji ? "✨ " : ""}feat(auth): add user login functionality
+- ${useEmoji ? "🐛 " : ""}fix(api): resolve data fetching failure
+- ${useEmoji ? "📝 " : ""}docs(readme): update installation guide`;
 
     const userPrompt = isZh
       ? `请根据以下 git diff 生成 commit message：\n\n${diff}`
@@ -347,25 +368,29 @@ async function callOllamaAPI(
  */
 function cleanAIResponse(response: string): string {
   // 移除开头的特殊字符（如 ...、```、等）
-  let cleaned = response.replace(/^[.\s`~-]+/, '').trim();
-  
+  let cleaned = response.replace(/^[.\s`~-]+/, "").trim();
+
   // 移除结尾的特殊字符
-  cleaned = cleaned.replace(/[.\s`~-]+$/, '').trim();
-  
-  const lines = cleaned.split('\n').map(line => line.trim()).filter(line => line);
-  
+  cleaned = cleaned.replace(/[.\s`~-]+$/, "").trim();
+
+  // 分割成行并过滤空行
+  const lines = cleaned
+    .split("\n")
+    .map((line) => line.trim())
+    .filter((line) => line);
+
   // 移除重复的行
   const uniqueLines = [];
   const seen = new Set();
-  
+
   for (const line of lines) {
     if (!seen.has(line)) {
       seen.add(line);
       uniqueLines.push(line);
     }
   }
-  
-  return uniqueLines.join('\n');
+
+  return uniqueLines.join("\n");
 }
 
 /**
@@ -379,9 +404,12 @@ export async function generateAICommitMessage(
   const language = aiConfig.language || "zh-CN";
   const detailedDescription = aiConfig.detailedDescription !== false; // 默认启用详细描述
   const maxTokens = aiConfig.maxTokens || (detailedDescription ? 400 : 200);
-  
+
   // AI emoji配置：优先使用aiCommit.useEmoji，如果未设置则使用全局useEmoji，默认true
-  const useEmoji = aiConfig.useEmoji !== undefined ? aiConfig.useEmoji : (config.useEmoji !== false);
+  const useEmoji =
+    aiConfig.useEmoji !== undefined
+      ? aiConfig.useEmoji
+      : config.useEmoji !== false;
 
   // 获取 git diff
   const diff = getGitDiff();
@@ -395,7 +423,12 @@ export async function generateAICommitMessage(
     diff.length > maxDiffLength ? diff.slice(0, maxDiffLength) + "\n..." : diff;
 
   // 构建 prompt
-  const prompt = buildPrompt(truncatedDiff, language, detailedDescription, useEmoji);
+  const prompt = buildPrompt(
+    truncatedDiff,
+    language,
+    detailedDescription,
+    useEmoji
+  );
 
   // 根据提供商调用对应的 API
   const providerInfo = AI_PROVIDERS[provider];

package/src/commands/tag.ts

@@ -624,3 +624,123 @@ export async function updateTag(): Promise<void> {
     }
   }
 }
+
+/**
+ * 清理无效标签（不包含数字的标签）
+ */
+export async function cleanInvalidTags(): Promise<void> {
+  const fetchSpinner = ora("正在获取 tags...").start();
+  exec("git fetch --tags", true);
+  fetchSpinner.stop();
+
+  divider();
+
+  // 获取所有标签
+  const allTags = execOutput("git tag -l").split("\n").filter(Boolean);
+
+  // 过滤出无效标签（不包含数字）
+  const invalidTags = allTags.filter((tag) => !/\d/.test(tag));
+
+  if (invalidTags.length === 0) {
+    console.log(colors.green("✅ 没有找到无效标签"));
+    return;
+  }
+
+  console.log(colors.yellow(`❌ 找到 ${invalidTags.length} 个无效标签：`));
+  console.log("");
+
+  // 显示每个无效标签的详细信息
+  for (const tag of invalidTags) {
+    try {
+      const commitHash = execOutput(`git rev-list -n 1 "${tag}"`).trim();
+      const commitDate = execOutput(`git log -1 --format=%ai "${tag}"`).trim();
+      const commitMsg = execOutput(`git log -1 --format=%s "${tag}"`).trim();
+
+      console.log(colors.red(`  标签: ${tag}`));
+      console.log(colors.dim(`    Commit: ${commitHash}`));
+      console.log(colors.dim(`    日期: ${commitDate}`));
+      console.log(colors.dim(`    消息: ${commitMsg}`));
+      console.log("");
+    } catch {
+      console.log(colors.red(`  标签: ${tag}`));
+      console.log(colors.dim(`    (无法获取提交信息)`));
+      console.log("");
+    }
+  }
+
+  divider();
+
+  const shouldClean = await select({
+    message: "是否删除这些无效标签？",
+    choices: [
+      { name: "是，删除所有无效标签", value: true },
+      { name: "否，取消操作", value: false },
+    ],
+    theme,
+  });
+
+  if (!shouldClean) {
+    console.log(colors.yellow("已取消"));
+    return;
+  }
+
+  divider();
+
+  // 删除本地标签
+  const localSpinner = ora("正在删除本地无效标签...").start();
+  let localSuccess = 0;
+  let localFailed = 0;
+
+  for (const tag of invalidTags) {
+    try {
+      execSync(`git tag -d "${tag}"`, { stdio: "pipe" });
+      localSuccess++;
+    } catch {
+      localFailed++;
+    }
+  }
+
+  if (localFailed === 0) {
+    localSpinner.succeed(`本地标签已删除: ${localSuccess} 个`);
+  } else {
+    localSpinner.warn(
+      `本地标签删除: 成功 ${localSuccess} 个，失败 ${localFailed} 个`
+    );
+  }
+
+  // 询问是否删除远程标签
+  const deleteRemote = await select({
+    message: "是否同时删除远程的无效标签？",
+    choices: [
+      { name: "是", value: true },
+      { name: "否", value: false },
+    ],
+    theme,
+  });
+
+  if (deleteRemote) {
+    const remoteSpinner = ora("正在删除远程无效标签...").start();
+    let remoteSuccess = 0;
+    let remoteFailed = 0;
+
+    for (const tag of invalidTags) {
+      try {
+        execSync(`git push origin --delete "${tag}"`, { stdio: "pipe" });
+        remoteSuccess++;
+      } catch {
+        remoteFailed++;
+      }
+    }
+
+    if (remoteFailed === 0) {
+      remoteSpinner.succeed(`远程标签已删除: ${remoteSuccess} 个`);
+    } else {
+      remoteSpinner.warn(
+        `远程标签删除: 成功 ${remoteSuccess} 个，失败 ${remoteFailed} 个`
+      );
+    }
+  }
+
+  console.log("");
+  console.log(colors.green("✨ 清理完成！"));
+}

package/src/index.ts

@@ -15,7 +15,13 @@ import { select } from "@inquirer/prompts";
 import { ExitPromptError } from "@inquirer/core";
 import { checkGitRepo, theme, colors } from "./utils.js";
 import { createBranch, deleteBranch } from "./commands/branch.js";
-import { listTags, createTag, deleteTag, updateTag } from "./commands/tag.js";
+import {
+  listTags,
+  createTag,
+  deleteTag,
+  updateTag,
+  cleanInvalidTags,
+} from "./commands/tag.js";
 import { release } from "./commands/release.js";
 import { init } from "./commands/init.js";
 import { stash } from "./commands/stash.js";
@@ -119,7 +125,7 @@ async function mainMenu(): Promise<void> {
         value: "hotfix",
       },
       {
-        name: `[3] 🗑️  删除分支               ${colors.dim("gw d")}`,
+        name: `[3] 🗑️  删除分支               ${colors.dim("gw brd")}`,
         value: "delete",
       },
       {
@@ -143,15 +149,15 @@ async function mainMenu(): Promise<void> {
         value: "tags",
       },
       {
-        name: `[9] 📦 发布版本               ${colors.dim("gw r")}`,
+        name: `[9] � 发布版本               ${colors.dim("gw r")}`,
         value: "release",
       },
       {
-        name: `[a] 💾 管理 stash             ${colors.dim("gw s")}`,
+        name: `[a] � 管理 stash             ${colors.dim("gw s")}`,
         value: "stash",
       },
       {
-        name: `[b] 📊 查看日志               ${colors.dim("gw log")}`,
+        name: `[b] � 查看日志               ${colors.dim("gw log")}`,
         value: "log",
       },
       {
@@ -263,9 +269,8 @@ cli
   });
 
 cli
-  .command("delete [branch]", "删除本地/远程分支")
-  .alias("del")
-  .alias("d")
+  .command("br:del [branch]", "删除本地/远程分支")
+  .alias("brd")
   .action(async (branch?: string) => {
     await checkForUpdates(version, "@zjex/git-workflow");
     checkGitRepo();
@@ -291,7 +296,7 @@ cli
   });
 
 cli
-  .command("tag:delete", "删除 tag")
+  .command("tag:del", "删除 tag")
   .alias("td")
   .action(async () => {
     await checkForUpdates(version, "@zjex/git-workflow");
@@ -308,6 +313,15 @@ cli
     return updateTag();
   });
 
+cli
+  .command("tag:clean", "清理无效 tag")
+  .alias("tc")
+  .action(async () => {
+    await checkForUpdates(version, "@zjex/git-workflow");
+    checkGitRepo();
+    return cleanInvalidTags();
+  });
+
 cli
   .command("release", "交互式选择版本号并更新 package.json")
   .alias("r")
@@ -364,13 +378,80 @@ cli
     return log(logOptions);
   });
 
-cli.command("clean", "清理缓存文件").action(async () => {
-  const { clearUpdateCache } = await import("./update-notifier.js");
-  clearUpdateCache();
-  console.log("");
-  console.log(colors.green("✔ 缓存已清理"));
-  console.log("");
-});
+cli
+  .command("clean", "清理缓存和临时文件")
+  .alias("cc")
+  .action(async () => {
+    const { clearUpdateCache } = await import("./update-notifier.js");
+    const { existsSync, unlinkSync, readdirSync } = await import("fs");
+    const { homedir, tmpdir } = await import("os");
+    const { join } = await import("path");
+    const { select } = await import("@inquirer/prompts");
+
+    let cleanedCount = 0;
+    let deletedGlobalConfig = false;
+
+    // 检查全局配置文件是否存在
+    const globalConfig = join(homedir(), ".gwrc.json");
+    const hasGlobalConfig = existsSync(globalConfig);
+
+    // 如果有全局配置文件，询问是否删除
+    if (hasGlobalConfig) {
+      const shouldDeleteConfig = await select({
+        message: "检测到全局配置文件，是否删除？",
+        choices: [
+          { name: "否，保留配置文件", value: false },
+          { name: "是，删除配置文件", value: true },
+        ],
+        theme,
+      });
+
+      if (shouldDeleteConfig) {
+        try {
+          unlinkSync(globalConfig);
+          cleanedCount++;
+          deletedGlobalConfig = true;
+        } catch {
+          // 静默失败
+        }
+      }
+    }
+
+    // 1. 清理更新缓存
+    clearUpdateCache();
+    cleanedCount++;
+
+    // 2. 清理临时 commit 消息文件
+    try {
+      const tmpDir = tmpdir();
+      const files = readdirSync(tmpDir);
+      const gwTmpFiles = files.filter((f) => f.startsWith(".gw-commit-msg-"));
+
+      for (const file of gwTmpFiles) {
+        try {
+          unlinkSync(join(tmpDir, file));
+          cleanedCount++;
+        } catch {
+          // 静默失败
+        }
+      }
+    } catch {
+      // 静默失败
+    }
+
+    console.log("");
+    console.log(colors.green(`✔ 已清理 ${cleanedCount} 个文件`));
+
+    if (deletedGlobalConfig) {
+      console.log("");
+      console.log(colors.yellow("⚠️  全局配置文件已删除"));
+      console.log(
+        colors.dim(`   如需重新配置，请运行: ${colors.cyan("gw init")}`)
+      );
+    }
+
+    console.log("");
+  });
 
 // 不使用 cac 的 version，手动处理 --version 和 --help
 cli.option("-v, --version", "显示版本号");

package/src/update-notifier.ts

@@ -181,7 +181,7 @@ async function showUpdateMessage(
   console.log(
     boxen(message, {
       padding: { top: 1, bottom: 1, left: 3, right: 3 },
-      margin: 1,
+      margin: { top: 0, bottom: 0, left: 1, right: 1 },
       borderStyle: "round",
       borderColor: "yellow",
       align: "center",