@zjex/git-workflow 0.5.2 → 0.6.0

package/src/commands/review.ts

@@ -71,6 +71,17 @@ const AI_PROVIDERS: Record<string, AIProvider> = {
 
 // ========== 辅助函数 ==========
 
+/**
+ * 解析 git log 输出的 commit 信息
+ */
+function parseCommitLine(line: string): CommitInfo | null {
+  const parts = line.split("|");
+  if (parts.length < 5) return null;
+  
+  const [hash, shortHash, subject, author, date] = parts;
+  return { hash, shortHash, subject, author, date };
+}
+
 /**
  * 获取最近的 commits 列表
  */
@@ -84,10 +95,8 @@ function getRecentCommits(limit: number = 20): CommitInfo[] {
     return output
       .split("\n")
       .filter(Boolean)
-      .map((line) => {
-        const [hash, shortHash, subject, author, date] = line.split("|");
-        return { hash, shortHash, subject, author, date };
-      });
+      .map((line) => parseCommitLine(line))
+      .filter((c): c is CommitInfo => c !== null);
   } catch {
     return [];
   }
@@ -629,19 +638,53 @@ export async function review(
 
   // 确定要审查的内容
   if (hashes && hashes.length > 0) {
-    // 指定了 commit hash
-    commits = hashes.map((hash) => {
-      const info = execOutput(
-        `git log -1 --pretty=format:"%H|%h|%s|%an|%ad" --date=short ${hash}`
-      );
-      if (!info) {
-        console.log(colors.red(`❌ 找不到 commit: ${hash}`));
+    // 检查是否是范围语法 (abc123..def456)
+    if (hashes.length === 1 && hashes[0].includes("..") && !hashes[0].includes("...")) {
+      const range = hashes[0];
+      const [startHash, endHash] = range.split("..");
+      
+      // 使用 startHash^..endHash 来包含起始 commit（闭区间 [A, B]）
+      const inclusiveRange = `${startHash}^..${endHash}`;
+      
+      // 获取范围内的所有 commits
+      try {
+        const output = execOutput(
+          `git log ${inclusiveRange} --pretty=format:"%H|%h|%s|%an|%ad" --date=short --reverse`
+        );
+        if (!output) {
+          console.log(colors.red(`❌ 无效的 commit 范围: ${range}`));
+          process.exit(1);
+        }
+        commits = output
+          .split("\n")
+          .filter(Boolean)
+          .map((line) => parseCommitLine(line))
+          .filter((c): c is CommitInfo => c !== null);
+        // 获取范围 diff
+        diff = execOutput(`git diff ${inclusiveRange}`) || "";
+      } catch {
+        console.log(colors.red(`❌ 无效的 commit 范围: ${range}`));
         process.exit(1);
       }
-      const [fullHash, shortHash, subject, author, date] = info.split("|");
-      return { hash: fullHash, shortHash, subject, author, date };
-    });
-    diff = getMultipleCommitsDiff(hashes);
+    } else {
+      // 指定了单个或多个 commit hash
+      commits = hashes.map((hash) => {
+        const info = execOutput(
+          `git log -1 --pretty=format:"%H|%h|%s|%an|%ad" --date=short ${hash}`
+        );
+        if (!info) {
+          console.log(colors.red(`❌ 找不到 commit: ${hash}`));
+          process.exit(1);
+        }
+        const commit = parseCommitLine(info);
+        if (!commit) {
+          console.log(colors.red(`❌ 无法解析 commit 信息: ${hash}`));
+          process.exit(1);
+        }
+        return commit;
+      });
+      diff = getMultipleCommitsDiff(hashes);
+    }
   } else if (options.last) {
     // 审查最近 N 个 commits
     commits = getRecentCommits(options.last);
@@ -651,7 +694,7 @@ export async function review(
     diff = getStagedDiff();
   } else {
     // 交互式选择
-    const recentCommits = getRecentCommits(20);
+    const recentCommits = getRecentCommits(10);
     const stagedDiff = getStagedDiff();
 
     const choices: any[] = [];

package/src/commands/tag.ts

@@ -10,6 +10,14 @@ import {
   divider,
 } from "../utils.js";
 import { getConfig } from "../config.js";
+import {
+  extractTagPrefix,
+  getLatestTagCommand,
+  isValidVersionTag,
+  normalizeTagLookupStrategy,
+  shouldFetchAllTagsForCreateTag,
+  type TagLookupStrategy,
+} from "../tag-utils.js";
 
 /**
  * 列出 tags（最新的显示在最下面，多个前缀分列展示）
@@ -29,7 +37,7 @@ export async function listTags(prefix?: string): Promise<void> {
 
   // 3. 过滤无效 tag（如 vnull、vundefined 等误操作产生的 tag）
   // 有效 tag 必须包含数字（版本号）
-  const tags = allTags.filter((tag) => /\d/.test(tag));
+  const tags = allTags.filter(isValidVersionTag);
 
   // 4. 如果没有 tags，提示并返回
   if (tags.length === 0) {
@@ -57,7 +65,7 @@ export async function listTags(prefix?: string): Promise<void> {
   const grouped = new Map<string, string[]>();
   tags.forEach((tag) => {
     // 提取数字之前的字母部分作为前缀（如 "v0.1.0" -> "v"）
-    const prefix = tag.replace(/\d.*/, "") || "(无前缀)";
+    const prefix = extractTagPrefix(tag) || "(无前缀)";
     if (!grouped.has(prefix)) {
       grouped.set(prefix, []);
     }
@@ -147,18 +155,21 @@ interface TagChoice {
 }
 
 // 获取指定前缀的最新有效 tag（必须包含数字）
-function getLatestTag(prefix: string): string {
-  const tags = execOutput(`git tag -l "${prefix}*" --sort=-v:refname`)
+function getLatestTag(
+  prefix: string,
+  strategy: TagLookupStrategy = "latest",
+): string {
+  const tags = execOutput(getLatestTagCommand(prefix, strategy))
     .split("\n")
-    .filter((tag) => tag && /\d/.test(tag)); // 过滤无效 tag
+    .filter((tag) => tag && isValidVersionTag(tag)); // 过滤无效 tag
   return tags[0] || "";
 }
 
 export async function createTag(inputPrefix?: string): Promise<void> {
   const config = getConfig();
-  const fetchSpinner = ora("正在获取 tags...").start();
-  exec("git fetch --tags", true);
-  fetchSpinner.stop();
+  const tagLookupStrategy = normalizeTagLookupStrategy(
+    config.tagLookupStrategy,
+  );
 
   divider();
 
@@ -170,11 +181,17 @@ export async function createTag(inputPrefix?: string): Promise<void> {
     console.log(colors.dim(`(使用配置的默认前缀: ${prefix})`));
   }
 
+  if (shouldFetchAllTagsForCreateTag(tagLookupStrategy, prefix)) {
+    const fetchSpinner = ora("正在获取 tags...").start();
+    exec("git fetch --tags", true);
+    fetchSpinner.stop();
+  }
+
   if (!prefix) {
     // 过滤无效 tag（如 vnull、vundefined 等误操作产生的 tag）
     const allTags = execOutput("git tag -l")
       .split("\n")
-      .filter((tag) => tag && /\d/.test(tag));
+      .filter((tag) => tag && isValidVersionTag(tag));
 
     // 仓库没有任何 tag 的情况
     if (allTags.length === 0) {
@@ -228,9 +245,7 @@ export async function createTag(inputPrefix?: string): Promise<void> {
     }
 
     // 从现有 tag 中提取前缀（数字之前的字母部分）
-    const prefixes = [
-      ...new Set(allTags.map((t) => t.replace(/\d.*/, "")).filter(Boolean)),
-    ];
+    const prefixes = [...new Set(allTags.map(extractTagPrefix).filter(Boolean))];
 
     if (prefixes.length === 0) {
       // 有 tag 但无法提取前缀（比如纯数字 tag）
@@ -245,7 +260,7 @@ export async function createTag(inputPrefix?: string): Promise<void> {
       }
     } else {
       const prefixWithDate: PrefixInfo[] = prefixes.map((p) => {
-        const latest = getLatestTag(p);
+        const latest = getLatestTag(p, tagLookupStrategy);
         const date = latest
           ? execOutput(`git log -1 --format=%ct "${latest}" 2>/dev/null`)
           : "0";
@@ -276,7 +291,14 @@ export async function createTag(inputPrefix?: string): Promise<void> {
     }
   }
 
-  const latestTag = getLatestTag(prefix);
+  let latestTag = getLatestTag(prefix, tagLookupStrategy);
+
+  if (!latestTag && tagLookupStrategy === "latest") {
+    const fetchSpinner = ora("本地未找到对应 tag，正在全量同步一次...").start();
+    exec("git fetch --tags", true);
+    fetchSpinner.stop();
+    latestTag = getLatestTag(prefix, tagLookupStrategy);
+  }
 
   if (!latestTag) {
     const newTag = `${prefix}1.0.0`;
@@ -297,7 +319,9 @@ export async function createTag(inputPrefix?: string): Promise<void> {
     return;
   }
 
-  console.log(colors.yellow(`当前最新 tag: ${latestTag}`));
+  const strategyText =
+    tagLookupStrategy === "latest" ? "最新创建" : "版本排序";
+  console.log(colors.yellow(`当前基准 tag (${strategyText}): ${latestTag}`));
 
   divider();
 

package/src/config.ts

@@ -21,6 +21,8 @@ export interface GwConfig {
   hotfixIdLabel: string;
   // 默认 tag 前缀
   defaultTagPrefix?: string;
+  // tag 递增基准策略，all=全量按版本排序，latest=按最新创建的 tag 递增
+  tagLookupStrategy?: "all" | "latest";
   // 创建分支后是否自动推送，默认询问
   autoPush?: boolean;
   // commit 时是否自动暂存所有更改，默认 true
@@ -60,6 +62,7 @@ const defaultConfig: GwConfig = {
   requireId: false,
   featureIdLabel: "Story ID",
   hotfixIdLabel: "Issue ID",
+  tagLookupStrategy: "latest",
   autoStage: true,
   useEmoji: true,
 };

package/src/tag-utils.ts

@@ -0,0 +1,37 @@
+export type TagLookupStrategy = "all" | "latest";
+
+export function isValidVersionTag(tag: string): boolean {
+  return /\d/.test(tag);
+}
+
+export function extractTagPrefix(tag: string): string {
+  return tag.replace(/\d.*/, "");
+}
+
+export function normalizeTagLookupStrategy(
+  value?: string,
+): TagLookupStrategy {
+  return value === "all" ? "all" : "latest";
+}
+
+export function getLatestTagCommand(
+  prefix: string,
+  strategy: TagLookupStrategy,
+): string {
+  if (strategy === "latest") {
+    return `git for-each-ref --sort=-creatordate --format="%(refname:short)" "refs/tags/${prefix}*"`;
+  }
+
+  return `git tag -l "${prefix}*" --sort=-v:refname`;
+}
+
+export function shouldFetchAllTagsForCreateTag(
+  strategy: TagLookupStrategy,
+  prefix?: string,
+): boolean {
+  if (strategy === "all") {
+    return true;
+  }
+
+  return !prefix;
+}

package/src/update-notifier.ts

@@ -1,10 +1,11 @@
-import { execSync } from "child_process";
+import { execSync, spawn } from "child_process";
 import { readFileSync, writeFileSync, existsSync, unlinkSync } from "fs";
 import { homedir } from "os";
 import { join } from "path";
 import boxen from "boxen";
 import { select } from "@inquirer/prompts";
 import ora from "ora";
+import semver from "semver";
 import { colors } from "./utils.js";
 
 const DISMISS_INTERVAL = 1000 * 60 * 60 * 24; // 24 小时后再次提示
@@ -33,10 +34,10 @@ export async function checkForUpdates(
     const cache = readCache();
     const now = Date.now();
 
-    // 1. 先用缓存的结果提示用户（如果版本不一致）
+    // 1. 先用缓存的结果提示用户（如果有更新版本）
     if (
       cache?.latestVersion &&
-      cache.latestVersion !== currentVersion
+      semver.gt(cache.latestVersion, currentVersion)
     ) {
       // 检查用户是否在 24 小时内关闭过提示
       const isDismissed =
@@ -61,8 +62,8 @@ export async function checkForUpdates(
       }
     }
 
-    // 2. 后台异步检查更新（每次都检查，不阻塞）
-    backgroundCheck(currentVersion, packageName);
+    // 2. 后台子进程检查更新（每次都检查，不阻塞）
+    spawnBackgroundCheck(packageName);
   } catch (error) {
     // 如果是用户按 Ctrl+C，重新抛出让全局处理
     if (error?.constructor?.name === "ExitPromptError") {
@@ -73,28 +74,47 @@ export async function checkForUpdates(
 }
 
 /**
- * 后台异步检查更新（不阻塞）
- * 每次运行命令时都异步检查一次
+ * 在子进程中检查更新（不阻塞主进程）
+ * 使用 unref() 确保主进程退出后子进程仍能完成
  */
-function backgroundCheck(currentVersion: string, packageName: string): void {
-  // 使用 setImmediate 确保不阻塞主流程
-  setImmediate(async () => {
-    try {
-      const latestVersion = await getLatestVersion(packageName);
-
-      if (latestVersion) {
-        const cache = readCache() || {};
-        writeCache({
-          ...cache,
-          lastCheck: Date.now(),
-          latestVersion,
-          checkedVersion: currentVersion,
-        });
-      }
-    } catch {
-      // 静默失败
-    }
-  });
+function spawnBackgroundCheck(packageName: string): void {
+  try {
+    const cacheFile = join(homedir(), CACHE_FILE);
+    
+    // 使用 node -e 执行检查脚本
+    const script = `
+      const { execSync } = require('child_process');
+      const { writeFileSync, readFileSync, existsSync } = require('fs');
+      try {
+        const version = execSync('npm view ${packageName} version', {
+          encoding: 'utf-8',
+          timeout: 10000,
+          stdio: ['pipe', 'pipe', 'ignore']
+        }).trim();
+        if (version) {
+          let cache = {};
+          try {
+            if (existsSync('${cacheFile}')) {
+              cache = JSON.parse(readFileSync('${cacheFile}', 'utf-8'));
+            }
+          } catch {}
+          cache.lastCheck = Date.now();
+          cache.latestVersion = version;
+          writeFileSync('${cacheFile}', JSON.stringify(cache), 'utf-8');
+        }
+      } catch {}
+    `;
+
+    const child = spawn("node", ["-e", script], {
+      detached: true,
+      stdio: "ignore",
+    });
+
+    // unref 让主进程可以独立退出
+    child.unref();
+  } catch {
+    // 静默失败
+  }
 }
 
 /**
@@ -109,22 +129,6 @@ function isUsingVolta(): boolean {
   }
 }
 
-/**
- * 获取 npm 上的最新版本
- */
-async function getLatestVersion(packageName: string): Promise<string | null> {
-  try {
-    const result = execSync(`npm view ${packageName} version`, {
-      encoding: "utf-8",
-      timeout: 3000,
-      stdio: ["pipe", "pipe", "ignore"], // 忽略 stderr
-    });
-    return result.trim();
-  } catch {
-    return null;
-  }
-}
-
 /**
  * 显示简单的更新通知（非交互式，不阻塞）
  */

package/tests/config.test.ts

@@ -35,6 +35,7 @@ describe("Config 模块测试", () => {
         hotfixIdLabel: "Issue ID",
         autoStage: true,
         useEmoji: true,
+        tagLookupStrategy: "latest",
       });
     });
   });
@@ -92,6 +93,23 @@ describe("Config 模块测试", () => {
 
       expect(config.autoPush).toBe(true);
     });
+
+    it("应该加载 tagLookupStrategy 配置", () => {
+      const mockConfig = {
+        tagLookupStrategy: "latest" as const,
+      };
+
+      vi.mocked(existsSync).mockImplementation((path) => {
+        return path === ".gwrc.json";
+      });
+
+      vi.mocked(readFileSync).mockReturnValue(JSON.stringify(mockConfig));
+      vi.mocked(execOutput).mockReturnValue("");
+
+      const config = loadConfig();
+
+      expect(config.tagLookupStrategy).toBe("latest");
+    });
   });
 
   describe("全局配置", () => {