@zjex/git-workflow 0.3.8 → 0.3.9

package/README.md

@@ -12,7 +12,7 @@
   <a href="https://github.com/iamzjt-front-end/git-workflow"><img src="https://img.shields.io/github/stars/iamzjt-front-end/git-workflow?style=flat&colorA=18181B&colorB=F59E0B" alt="github stars"></a>
   <a href="https://github.com/iamzjt-front-end/git-workflow/blob/main/LICENSE"><img src="https://img.shields.io/npm/l/@zjex/git-workflow?style=flat&colorA=18181B&colorB=10B981" alt="license"></a>
   <a href="https://nodejs.org"><img src="https://img.shields.io/badge/node-%3E%3D18-339933?style=flat&logo=node.js&logoColor=white&colorA=18181B" alt="node version"></a>
-  <a href="https://github.com/iamzjt-front-end/git-workflow/actions"><img src="https://img.shields.io/badge/tests-267%20passed-success?style=flat&colorA=18181B" alt="tests"></a>
+  <a href="https://github.com/iamzjt-front-end/git-workflow/actions"><img src="https://img.shields.io/badge/tests-290%20passed-success?style=flat&colorA=18181B" alt="tests"></a>
   <a href="https://github.com/iamzjt-front-end/git-workflow/issues"><img src="https://img.shields.io/github/issues/iamzjt-front-end/git-workflow?style=flat&colorA=18181B&colorB=EC4899" alt="issues"></a>
 </p>
 

package/dist/index.js

@@ -179,11 +179,10 @@ function showSimpleNotification(current, latest) {
   )} \u2192 ${colors.green(latest)}    ${colors.dim("\u8FD0\u884C")} ${colors.cyan(
     "gw update"
   )} ${colors.dim("\u66F4\u65B0")}`;
-  console.log("");
   console.log(
     boxen(message, {
       padding: { top: 0, bottom: 0, left: 2, right: 2 },
-      margin: { top: 0, bottom: 1, left: 0, right: 0 },
+      margin: { top: 0, bottom: 0, left: 0, right: 0 },
       borderStyle: "round",
       borderColor: "yellow",
       align: "center"
@@ -431,12 +430,22 @@ async function getBranchName(type) {
     console.log(colors.red(`${idLabel}\u4E0D\u80FD\u4E3A\u7A7A`));
     return null;
   }
-  const description = await input({ message: "\u8BF7\u8F93\u5165\u63CF\u8FF0:", theme });
-  if (!description) {
+  const requireDescription = type === "feature" ? config2.featureRequireDescription ?? false : config2.hotfixRequireDescription ?? false;
+  const descMessage = requireDescription ? "\u8BF7\u8F93\u5165\u63CF\u8FF0:" : "\u8BF7\u8F93\u5165\u63CF\u8FF0 (\u53EF\u8DF3\u8FC7):";
+  const description = await input({ message: descMessage, theme });
+  if (requireDescription && !description) {
     console.log(colors.red("\u63CF\u8FF0\u4E0D\u80FD\u4E3A\u7A7A"));
     return null;
   }
-  return id ? `${branchPrefix}/${TODAY}-${id}-${description}` : `${branchPrefix}/${TODAY}-${description}`;
+  if (id && description) {
+    return `${branchPrefix}/${TODAY}-${id}-${description}`;
+  } else if (id) {
+    return `${branchPrefix}/${TODAY}-${id}`;
+  } else if (description) {
+    return `${branchPrefix}/${TODAY}-${description}`;
+  } else {
+    return `${branchPrefix}/${TODAY}`;
+  }
 }
 async function createBranch(type, baseBranchArg) {
   const config2 = getConfig();
@@ -1327,6 +1336,25 @@ async function init() {
   });
   config2.hotfixIdLabel = hotfixIdLabel;
   divider();
+  const featureRequireDescription = await select4({
+    message: "Feature \u5206\u652F\u662F\u5426\u8981\u6C42\u5FC5\u586B\u63CF\u8FF0?",
+    choices: [
+      { name: "\u5426", value: false },
+      { name: "\u662F", value: true }
+    ],
+    theme
+  });
+  config2.featureRequireDescription = featureRequireDescription;
+  const hotfixRequireDescription = await select4({
+    message: "Hotfix \u5206\u652F\u662F\u5426\u8981\u6C42\u5FC5\u586B\u63CF\u8FF0?",
+    choices: [
+      { name: "\u5426", value: false },
+      { name: "\u662F", value: true }
+    ],
+    theme
+  });
+  config2.hotfixRequireDescription = hotfixRequireDescription;
+  divider();
   const defaultTagPrefix = await input3({
     message: "\u9ED8\u8BA4 Tag \u524D\u7F00 (\u7559\u7A7A\u5219\u6BCF\u6B21\u9009\u62E9):",
     theme
@@ -2916,7 +2944,7 @@ process.on("SIGTERM", () => {
   console.log("");
   process.exit(0);
 });
-var version = true ? "0.3.8" : "0.0.0-dev";
+var version = true ? "0.3.9" : "0.0.0-dev";
 async function mainMenu() {
   console.log(
     colors.green(`

package/package.json

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

package/src/commands/branch.ts

@@ -32,15 +32,32 @@ export async function getBranchName(type: BranchType): Promise<string | null> {
     return null;
   }
 
-  const description = await input({ message: "请输入描述:", theme });
-  if (!description) {
+  // 描述是否必填，默认非必填
+  const requireDescription =
+    type === "feature"
+      ? config.featureRequireDescription ?? false
+      : config.hotfixRequireDescription ?? false;
+  const descMessage = requireDescription
+    ? "请输入描述:"
+    : "请输入描述 (可跳过):";
+
+  const description = await input({ message: descMessage, theme });
+
+  if (requireDescription && !description) {
     console.log(colors.red("描述不能为空"));
     return null;
   }
 
-  return id
-    ? `${branchPrefix}/${TODAY}-${id}-${description}`
-    : `${branchPrefix}/${TODAY}-${description}`;
+  // 构建分支名
+  if (id && description) {
+    return `${branchPrefix}/${TODAY}-${id}-${description}`;
+  } else if (id) {
+    return `${branchPrefix}/${TODAY}-${id}`;
+  } else if (description) {
+    return `${branchPrefix}/${TODAY}-${description}`;
+  } else {
+    return `${branchPrefix}/${TODAY}`;
+  }
 }
 
 export async function createBranch(

package/src/commands/init.ts

@@ -118,6 +118,29 @@ export async function init(): Promise<void> {
 
   divider();
 
+  // 描述必填配置
+  const featureRequireDescription = await select({
+    message: "Feature 分支是否要求必填描述?",
+    choices: [
+      { name: "否", value: false },
+      { name: "是", value: true },
+    ],
+    theme,
+  });
+  config.featureRequireDescription = featureRequireDescription;
+
+  const hotfixRequireDescription = await select({
+    message: "Hotfix 分支是否要求必填描述?",
+    choices: [
+      { name: "否", value: false },
+      { name: "是", value: true },
+    ],
+    theme,
+  });
+  config.hotfixRequireDescription = hotfixRequireDescription;
+
+  divider();
+
   // Tag 配置
   const defaultTagPrefix = await input({
     message: "默认 Tag 前缀 (留空则每次选择):",
@@ -269,15 +292,16 @@ export async function init(): Promise<void> {
     const detailedDescription = await select({
       message: "是否生成详细的修改点描述?",
       choices: [
-        { 
-          name: "是（包含修改点列表，推荐）", 
+        {
+          name: "是（包含修改点列表，推荐）",
           value: true,
-          description: "如：feat(auth): 添加用户登录功能\n\n- 实现用户名密码登录接口\n- 添加登录状态验证中间件"
+          description:
+            "如：feat(auth): 添加用户登录功能\n\n- 实现用户名密码登录接口\n- 添加登录状态验证中间件",
         },
-        { 
-          name: "否（仅生成标题）", 
+        {
+          name: "否（仅生成标题）",
           value: false,
-          description: "如：feat(auth): 添加用户登录功能"
+          description: "如：feat(auth): 添加用户登录功能",
         },
       ],
       theme,
@@ -286,20 +310,20 @@ export async function init(): Promise<void> {
     const aiUseEmoji = await select({
       message: "AI 生成的 commit message 是否包含 emoji?",
       choices: [
-        { 
-          name: "是（推荐）", 
+        {
+          name: "是（推荐）",
           value: true,
-          description: "如：✨ feat(auth): 添加用户登录功能"
+          description: "如：✨ feat(auth): 添加用户登录功能",
         },
-        { 
-          name: "否", 
+        {
+          name: "否",
           value: false,
-          description: "如：feat(auth): 添加用户登录功能"
+          description: "如：feat(auth): 添加用户登录功能",
         },
-        { 
-          name: "跟随全局设置", 
+        {
+          name: "跟随全局设置",
           value: undefined,
-          description: `当前全局设置：${useEmoji ? '启用' : '禁用'} emoji`
+          description: `当前全局设置：${useEmoji ? "启用" : "禁用"} emoji`,
         },
       ],
       theme,

package/src/config.ts

@@ -12,6 +12,10 @@ export interface GwConfig {
   hotfixPrefix: string;
   // 是否要求必填 ID，默认 false
   requireId: boolean;
+  // feature 分支是否要求必填描述，默认 false
+  featureRequireDescription?: boolean;
+  // hotfix 分支是否要求必填描述，默认 false
+  hotfixRequireDescription?: boolean;
   // ID 标签名称
   featureIdLabel: string;
   hotfixIdLabel: string;

package/src/update-notifier.ts

@@ -151,11 +151,10 @@ function showSimpleNotification(current: string, latest: string): void {
     "gw update"
   )} ${colors.dim("更新")}`;
 
-  console.log("");
   console.log(
     boxen(message, {
       padding: { top: 0, bottom: 0, left: 2, right: 2 },
-      margin: { top: 0, bottom: 1, left: 0, right: 0 },
+      margin: { top: 0, bottom: 0, left: 0, right: 0 },
       borderStyle: "round",
       borderColor: "yellow",
       align: "center",

package/tests/branch.test.ts

@@ -253,3 +253,119 @@ describe("Branch 功能测试", () => {
     });
   });
 });
+
+describe("描述必填配置", () => {
+  it("featureRequireDescription 为 true 时描述不能为空", () => {
+    const featureRequireDescription = true;
+    const description = "";
+
+    if (featureRequireDescription && !description) {
+      expect(description).toBe("");
+    }
+  });
+
+  it("featureRequireDescription 为 false 时描述可以为空", () => {
+    const featureRequireDescription = false;
+    const description = "";
+
+    if (!featureRequireDescription) {
+      expect(description).toBe("");
+    }
+  });
+
+  it("hotfixRequireDescription 为 true 时描述不能为空", () => {
+    const hotfixRequireDescription = true;
+    const description = "";
+
+    if (hotfixRequireDescription && !description) {
+      expect(description).toBe("");
+    }
+  });
+
+  it("hotfixRequireDescription 为 false 时描述可以为空", () => {
+    const hotfixRequireDescription = false;
+    const description = "";
+
+    if (!hotfixRequireDescription) {
+      expect(description).toBe("");
+    }
+  });
+
+  it("应该生成只有 ID 的 feature 分支名（描述为空）", () => {
+    const prefix = "feature";
+    const id = "PROJ-123";
+    const description = "";
+    const branchName = id ? `${prefix}/${TODAY}-${id}` : `${prefix}/${TODAY}`;
+
+    expect(branchName).toMatch(/^feature\/\d{8}-PROJ-123$/);
+  });
+
+  it("应该生成只有描述的 feature 分支名（ID 为空）", () => {
+    const prefix = "feature";
+    const id = "";
+    const description = "add-login";
+    const branchName = description
+      ? `${prefix}/${TODAY}-${description}`
+      : `${prefix}/${TODAY}`;
+
+    expect(branchName).toMatch(/^feature\/\d{8}-add-login$/);
+  });
+
+  it("应该生成只有日期的 feature 分支名（ID 和描述都为空）", () => {
+    const prefix = "feature";
+    const id = "";
+    const description = "";
+    const branchName = `${prefix}/${TODAY}`;
+
+    expect(branchName).toMatch(/^feature\/\d{8}$/);
+  });
+
+  it("应该生成只有 ID 的 hotfix 分支名（描述为空）", () => {
+    const prefix = "hotfix";
+    const id = "BUG-456";
+    const description = "";
+    const branchName = id ? `${prefix}/${TODAY}-${id}` : `${prefix}/${TODAY}`;
+
+    expect(branchName).toMatch(/^hotfix\/\d{8}-BUG-456$/);
+  });
+
+  it("应该生成只有描述的 hotfix 分支名（ID 为空）", () => {
+    const prefix = "hotfix";
+    const id = "";
+    const description = "fix-crash";
+    const branchName = description
+      ? `${prefix}/${TODAY}-${description}`
+      : `${prefix}/${TODAY}`;
+
+    expect(branchName).toMatch(/^hotfix\/\d{8}-fix-crash$/);
+  });
+
+  it("应该生成只有日期的 hotfix 分支名（ID 和描述都为空）", () => {
+    const prefix = "hotfix";
+    const id = "";
+    const description = "";
+    const branchName = `${prefix}/${TODAY}`;
+
+    expect(branchName).toMatch(/^hotfix\/\d{8}$/);
+  });
+
+  it("feature 和 hotfix 可以有不同的描述必填配置", () => {
+    const featureRequireDescription = true;
+    const hotfixRequireDescription = false;
+
+    expect(featureRequireDescription).toBe(true);
+    expect(hotfixRequireDescription).toBe(false);
+    expect(featureRequireDescription).not.toBe(hotfixRequireDescription);
+  });
+
+  it("描述必填配置默认应该为 false", () => {
+    const featureRequireDescription = undefined;
+    const hotfixRequireDescription = undefined;
+
+    const featureRequired = featureRequireDescription ?? false;
+    const hotfixRequired = hotfixRequireDescription ?? false;
+
+    expect(featureRequired).toBe(false);
+    expect(hotfixRequired).toBe(false);
+  });
+});

package/tests/commit.test.ts

@@ -1,4 +1,10 @@
-import { describe, it, expect } from "vitest";
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { execSync } from "child_process";
+
+// Mock child_process
+vi.mock("child_process", () => ({
+  execSync: vi.fn(),
+}));
 
 describe("Commit 功能测试", () => {
   describe("提交类型", () => {
@@ -82,4 +88,183 @@ describe("Commit 功能测试", () => {
       expect(extraSpace).toBe("");
     });
   });
+
+  describe("自动暂存功能", () => {
+    beforeEach(() => {
+      vi.clearAllMocks();
+    });
+
+    afterEach(() => {
+      vi.restoreAllMocks();
+    });
+
+    it("autoStage 为 true 时应该执行 git add -A", () => {
+      const autoStage = true;
+
+      if (autoStage) {
+        execSync("git add -A", { stdio: "pipe" });
+      }
+
+      expect(execSync).toHaveBeenCalledWith("git add -A", { stdio: "pipe" });
+    });
+
+    it("autoStage 为 false 时不应该自动执行 git add -A", () => {
+      const autoStage = false;
+
+      if (autoStage) {
+        execSync("git add -A", { stdio: "pipe" });
+      }
+
+      expect(execSync).not.toHaveBeenCalled();
+    });
+
+    it("提交前应该再次执行 git add -A 确保文件被暂存", () => {
+      const autoStage = true;
+
+      // 模拟提交前的暂存操作
+      if (autoStage) {
+        execSync("git add -A", { stdio: "pipe" });
+      }
+
+      // 模拟提交前再次暂存
+      if (autoStage) {
+        execSync("git add -A", { stdio: "pipe" });
+      }
+
+      // 应该被调用两次
+      expect(execSync).toHaveBeenCalledTimes(2);
+      expect(execSync).toHaveBeenCalledWith("git add -A", { stdio: "pipe" });
+    });
+
+    it("默认 autoStage 应该为 true", () => {
+      const config = {};
+      const autoStage = (config as any).autoStage ?? true;
+
+      expect(autoStage).toBe(true);
+    });
+
+    it("配置 autoStage 为 false 时应该覆盖默认值", () => {
+      const config = { autoStage: false };
+      const autoStage = config.autoStage ?? true;
+
+      expect(autoStage).toBe(false);
+    });
+  });
+
+  describe("Git 状态解析", () => {
+    it("应该正确解析已暂存的文件", () => {
+      // 模拟 git status --porcelain 输出
+      // M  = 已暂存的修改
+      // A  = 已暂存的新文件
+      const output = "M  src/index.ts\nA  src/new.ts";
+      const lines = output.split("\n");
+
+      const staged: { status: string; file: string }[] = [];
+
+      for (const line of lines) {
+        if (!line) continue;
+        const indexStatus = line[0];
+        const file = line.slice(3);
+
+        if (indexStatus !== " " && indexStatus !== "?") {
+          staged.push({ status: indexStatus, file });
+        }
+      }
+
+      expect(staged).toHaveLength(2);
+      expect(staged[0]).toEqual({ status: "M", file: "src/index.ts" });
+      expect(staged[1]).toEqual({ status: "A", file: "src/new.ts" });
+    });
+
+    it("应该正确解析未暂存的文件", () => {
+      // 模拟 git status --porcelain 输出
+      // " M" = 未暂存的修改
+      // "??" = 未跟踪的文件
+      const output = " M src/modified.ts\n?? src/untracked.ts";
+      const lines = output.split("\n");
+
+      const unstaged: { status: string; file: string }[] = [];
+
+      for (const line of lines) {
+        if (!line) continue;
+        const indexStatus = line[0];
+        const workTreeStatus = line[1];
+        const file = line.slice(3);
+
+        if (workTreeStatus !== " " || indexStatus === "?") {
+          const status = indexStatus === "?" ? "?" : workTreeStatus;
+          unstaged.push({ status, file });
+        }
+      }
+
+      expect(unstaged).toHaveLength(2);
+      expect(unstaged[0]).toEqual({ status: "M", file: "src/modified.ts" });
+      expect(unstaged[1]).toEqual({ status: "?", file: "src/untracked.ts" });
+    });
+
+    it("空输出应该返回空数组", () => {
+      const output = "";
+      const staged: any[] = [];
+      const unstaged: any[] = [];
+
+      if (!output) {
+        expect(staged).toHaveLength(0);
+        expect(unstaged).toHaveLength(0);
+      }
+    });
+
+    it("应该正确处理同时有暂存和未暂存状态的文件", () => {
+      // "MM" = 已暂存且有新的未暂存修改
+      const output = "MM src/both.ts";
+      const lines = output.split("\n");
+
+      const staged: { status: string; file: string }[] = [];
+      const unstaged: { status: string; file: string }[] = [];
+
+      for (const line of lines) {
+        if (!line) continue;
+        const indexStatus = line[0];
+        const workTreeStatus = line[1];
+        const file = line.slice(3);
+
+        if (indexStatus !== " " && indexStatus !== "?") {
+          staged.push({ status: indexStatus, file });
+        }
+
+        if (workTreeStatus !== " " || indexStatus === "?") {
+          const status = indexStatus === "?" ? "?" : workTreeStatus;
+          unstaged.push({ status, file });
+        }
+      }
+
+      expect(staged).toHaveLength(1);
+      expect(unstaged).toHaveLength(1);
+      expect(staged[0]).toEqual({ status: "M", file: "src/both.ts" });
+      expect(unstaged[0]).toEqual({ status: "M", file: "src/both.ts" });
+    });
+  });
+
+  describe("临时文件提交", () => {
+    it("应该使用临时文件传递多行 commit message", () => {
+      const message = "feat: 新功能\n\n- 详细描述1\n- 详细描述2";
+      const lines = message.split("\n");
+
+      expect(lines).toHaveLength(4);
+      expect(lines[0]).toBe("feat: 新功能");
+      expect(lines[1]).toBe("");
+      expect(lines[2]).toBe("- 详细描述1");
+      expect(lines[3]).toBe("- 详细描述2");
+    });
+
+    it("临时文件名应该包含时间戳避免冲突", () => {
+      const timestamp1 = Date.now();
+      const tmpFile1 = `.gw-commit-msg-${timestamp1}`;
+
+      // 模拟短暂延迟
+      const timestamp2 = timestamp1 + 1;
+      const tmpFile2 = `.gw-commit-msg-${timestamp2}`;
+
+      expect(tmpFile1).not.toBe(tmpFile2);
+    });
+  });
 });

package/tests/init.test.ts

@@ -43,8 +43,6 @@ describe("Init 模块测试", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     vi.spyOn(console, "log").mockImplementation(() => {});
-    
-    // Default mocks
     mockHomedir.mockReturnValue("/home/user");
     mockJoin.mockReturnValue("/home/user/.gwrc.json");
   });
@@ -56,28 +54,25 @@ describe("Init 模块测试", () => {
   describe("配置范围选择", () => {
     it("应该支持全局配置", async () => {
       mockExistsSync.mockReturnValue(false);
-      
       const { select, input } = await import("@inquirer/prompts");
       vi.mocked(select)
-        .mockResolvedValueOnce("global") // 配置范围
-        .mockResolvedValueOnce(false) // requireId
-        .mockResolvedValueOnce("ask") // autoPush
-        .mockResolvedValueOnce(true) // autoStage
-        .mockResolvedValueOnce(true) // useEmoji
-        .mockResolvedValueOnce(false); // enableAI
-      
+        .mockResolvedValueOnce("global")
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce("ask")
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(false);
       vi.mocked(input)
-        .mockResolvedValueOnce("") // baseBranch
-        .mockResolvedValueOnce("feature") // featurePrefix
-        .mockResolvedValueOnce("hotfix") // hotfixPrefix
-        .mockResolvedValueOnce("Story ID") // featureIdLabel
-        .mockResolvedValueOnce("Issue ID") // hotfixIdLabel
-        .mockResolvedValueOnce(""); // defaultTagPrefix
-      
+        .mockResolvedValueOnce("")
+        .mockResolvedValueOnce("feature")
+        .mockResolvedValueOnce("hotfix")
+        .mockResolvedValueOnce("Story ID")
+        .mockResolvedValueOnce("Issue ID")
+        .mockResolvedValueOnce("");
       const { init } = await import("../src/commands/init.js");
-      
       await init();
-      
       expect(mockJoin).toHaveBeenCalledWith("/home/user", ".gwrc.json");
       expect(mockWriteFileSync).toHaveBeenCalledWith(
         "/home/user/.gwrc.json",
@@ -87,28 +82,25 @@ describe("Init 模块测试", () => {
 
     it("应该支持项目配置", async () => {
       mockExistsSync.mockReturnValue(false);
-      
       const { select, input } = await import("@inquirer/prompts");
       vi.mocked(select)
-        .mockResolvedValueOnce("project") // 配置范围
-        .mockResolvedValueOnce(false) // requireId
-        .mockResolvedValueOnce("ask") // autoPush
-        .mockResolvedValueOnce(true) // autoStage
-        .mockResolvedValueOnce(true) // useEmoji
-        .mockResolvedValueOnce(false); // enableAI
-      
+        .mockResolvedValueOnce("project")
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce("ask")
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(false);
       vi.mocked(input)
-        .mockResolvedValueOnce("") // baseBranch
-        .mockResolvedValueOnce("feature") // featurePrefix
-        .mockResolvedValueOnce("hotfix") // hotfixPrefix
-        .mockResolvedValueOnce("Story ID") // featureIdLabel
-        .mockResolvedValueOnce("Issue ID") // hotfixIdLabel
-        .mockResolvedValueOnce(""); // defaultTagPrefix
-      
+        .mockResolvedValueOnce("")
+        .mockResolvedValueOnce("feature")
+        .mockResolvedValueOnce("hotfix")
+        .mockResolvedValueOnce("Story ID")
+        .mockResolvedValueOnce("Issue ID")
+        .mockResolvedValueOnce("");
       const { init } = await import("../src/commands/init.js");
-      
       await init();
-      
       expect(mockWriteFileSync).toHaveBeenCalledWith(
         ".gwrc.json",
         expect.stringContaining('"featurePrefix": "feature"')
@@ -119,44 +111,37 @@ describe("Init 模块测试", () => {
   describe("配置文件覆盖", () => {
     it("应该处理配置文件已存在的情况", async () => {
       mockExistsSync.mockReturnValue(true);
-      
       const { select, input } = await import("@inquirer/prompts");
       vi.mocked(select)
-        .mockResolvedValueOnce("global") // 配置范围
-        .mockResolvedValueOnce(true) // 覆盖文件
-        .mockResolvedValueOnce(false) // requireId
-        .mockResolvedValueOnce("ask") // autoPush
-        .mockResolvedValueOnce(true) // autoStage
-        .mockResolvedValueOnce(true) // useEmoji
-        .mockResolvedValueOnce(false); // enableAI
-      
+        .mockResolvedValueOnce("global")
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce("ask")
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(false);
       vi.mocked(input)
-        .mockResolvedValueOnce("") // baseBranch
-        .mockResolvedValueOnce("feature") // featurePrefix
-        .mockResolvedValueOnce("hotfix") // hotfixPrefix
-        .mockResolvedValueOnce("Story ID") // featureIdLabel
-        .mockResolvedValueOnce("Issue ID") // hotfixIdLabel
-        .mockResolvedValueOnce(""); // defaultTagPrefix
-      
+        .mockResolvedValueOnce("")
+        .mockResolvedValueOnce("feature")
+        .mockResolvedValueOnce("hotfix")
+        .mockResolvedValueOnce("Story ID")
+        .mockResolvedValueOnce("Issue ID")
+        .mockResolvedValueOnce("");
       const { init } = await import("../src/commands/init.js");
-      
       await init();
-      
       expect(mockWriteFileSync).toHaveBeenCalled();
     });
 
     it("应该处理用户取消覆盖", async () => {
       mockExistsSync.mockReturnValue(true);
-      
       const { select } = await import("@inquirer/prompts");
       vi.mocked(select)
-        .mockResolvedValueOnce("global") // 配置范围
-        .mockResolvedValueOnce(false); // 不覆盖文件
-      
+        .mockResolvedValueOnce("global")
+        .mockResolvedValueOnce(false);
       const { init } = await import("../src/commands/init.js");
-      
       await init();
-      
       expect(console.log).toHaveBeenCalledWith("已取消");
       expect(mockWriteFileSync).not.toHaveBeenCalled();
     });
@@ -165,31 +150,27 @@ describe("Init 模块测试", () => {
   describe("基础配置", () => {
     it("应该正确配置分支前缀", async () => {
       mockExistsSync.mockReturnValue(false);
-      
       const { select, input } = await import("@inquirer/prompts");
       vi.mocked(select)
-        .mockResolvedValueOnce("project") // 配置范围
-        .mockResolvedValueOnce(false) // requireId
-        .mockResolvedValueOnce("ask") // autoPush
-        .mockResolvedValueOnce(true) // autoStage
-        .mockResolvedValueOnce(true) // useEmoji
-        .mockResolvedValueOnce(false); // enableAI
-      
+        .mockResolvedValueOnce("project")
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce("ask")
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(false);
       vi.mocked(input)
-        .mockResolvedValueOnce("develop") // baseBranch
-        .mockResolvedValueOnce("feat") // featurePrefix
-        .mockResolvedValueOnce("fix") // hotfixPrefix
-        .mockResolvedValueOnce("Jira ID") // featureIdLabel
-        .mockResolvedValueOnce("Bug ID") // hotfixIdLabel
-        .mockResolvedValueOnce("v"); // defaultTagPrefix
-      
+        .mockResolvedValueOnce("develop")
+        .mockResolvedValueOnce("feat")
+        .mockResolvedValueOnce("fix")
+        .mockResolvedValueOnce("Jira ID")
+        .mockResolvedValueOnce("Bug ID")
+        .mockResolvedValueOnce("v");
       const { init } = await import("../src/commands/init.js");
-      
       await init();
-      
       const writtenConfig = mockWriteFileSync.mock.calls[0][1] as string;
       const config = JSON.parse(writtenConfig);
-      
       expect(config.baseBranch).toBe("develop");
       expect(config.featurePrefix).toBe("feat");
       expect(config.hotfixPrefix).toBe("fix");
@@ -200,61 +181,53 @@ describe("Init 模块测试", () => {
 
     it("应该正确配置 ID 要求", async () => {
       mockExistsSync.mockReturnValue(false);
-      
       const { select, input } = await import("@inquirer/prompts");
       vi.mocked(select)
-        .mockResolvedValueOnce("project") // 配置范围
-        .mockResolvedValueOnce(true) // requireId
-        .mockResolvedValueOnce("ask") // autoPush
-        .mockResolvedValueOnce(true) // autoStage
-        .mockResolvedValueOnce(true) // useEmoji
-        .mockResolvedValueOnce(false); // enableAI
-      
+        .mockResolvedValueOnce("project")
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce("ask")
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(false);
       vi.mocked(input)
-        .mockResolvedValueOnce("") // baseBranch
-        .mockResolvedValueOnce("feature") // featurePrefix
-        .mockResolvedValueOnce("hotfix") // hotfixPrefix
-        .mockResolvedValueOnce("Story ID") // featureIdLabel
-        .mockResolvedValueOnce("Issue ID") // hotfixIdLabel
-        .mockResolvedValueOnce(""); // defaultTagPrefix
-      
+        .mockResolvedValueOnce("")
+        .mockResolvedValueOnce("feature")
+        .mockResolvedValueOnce("hotfix")
+        .mockResolvedValueOnce("Story ID")
+        .mockResolvedValueOnce("Issue ID")
+        .mockResolvedValueOnce("");
       const { init } = await import("../src/commands/init.js");
-      
       await init();
-      
       const writtenConfig = mockWriteFileSync.mock.calls[0][1] as string;
       const config = JSON.parse(writtenConfig);
-      
       expect(config.requireId).toBe(true);
     });
 
     it("应该正确配置自动推送选项", async () => {
       mockExistsSync.mockReturnValue(false);
-      
       const { select, input } = await import("@inquirer/prompts");
       vi.mocked(select)
-        .mockResolvedValueOnce("project") // 配置范围
-        .mockResolvedValueOnce(false) // requireId
-        .mockResolvedValueOnce("yes") // autoPush
-        .mockResolvedValueOnce(true) // autoStage
-        .mockResolvedValueOnce(true) // useEmoji
-        .mockResolvedValueOnce(false); // enableAI
-      
+        .mockResolvedValueOnce("project")
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce("yes")
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(false);
       vi.mocked(input)
-        .mockResolvedValueOnce("") // baseBranch
-        .mockResolvedValueOnce("feature") // featurePrefix
-        .mockResolvedValueOnce("hotfix") // hotfixPrefix
-        .mockResolvedValueOnce("Story ID") // featureIdLabel
-        .mockResolvedValueOnce("Issue ID") // hotfixIdLabel
-        .mockResolvedValueOnce(""); // defaultTagPrefix
-      
+        .mockResolvedValueOnce("")
+        .mockResolvedValueOnce("feature")
+        .mockResolvedValueOnce("hotfix")
+        .mockResolvedValueOnce("Story ID")
+        .mockResolvedValueOnce("Issue ID")
+        .mockResolvedValueOnce("");
       const { init } = await import("../src/commands/init.js");
-      
       await init();
-      
       const writtenConfig = mockWriteFileSync.mock.calls[0][1] as string;
       const config = JSON.parse(writtenConfig);
-      
       expect(config.autoPush).toBe(true);
     });
   });
@@ -262,34 +235,32 @@ describe("Init 模块测试", () => {
   describe("AI 配置", () => {
     it("应该正确配置 GitHub Models", async () => {
       mockExistsSync.mockReturnValue(false);
-      
       const { select, input } = await import("@inquirer/prompts");
       vi.mocked(select)
-        .mockResolvedValueOnce("project") // 配置范围
-        .mockResolvedValueOnce(false) // requireId
-        .mockResolvedValueOnce("ask") // autoPush
-        .mockResolvedValueOnce(true) // autoStage
-        .mockResolvedValueOnce(true) // useEmoji
-        .mockResolvedValueOnce(true) // enableAI
-        .mockResolvedValueOnce("github") // AI provider
-        .mockResolvedValueOnce("zh-CN"); // language
-      
+        .mockResolvedValueOnce("project")
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce("ask")
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce("github")
+        .mockResolvedValueOnce("zh-CN")
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true);
       vi.mocked(input)
-        .mockResolvedValueOnce("") // baseBranch
-        .mockResolvedValueOnce("feature") // featurePrefix
-        .mockResolvedValueOnce("hotfix") // hotfixPrefix
-        .mockResolvedValueOnce("Story ID") // featureIdLabel
-        .mockResolvedValueOnce("Issue ID") // hotfixIdLabel
-        .mockResolvedValueOnce("") // defaultTagPrefix
-        .mockResolvedValueOnce("ghp_test_token"); // GitHub token
-      
+        .mockResolvedValueOnce("")
+        .mockResolvedValueOnce("feature")
+        .mockResolvedValueOnce("hotfix")
+        .mockResolvedValueOnce("Story ID")
+        .mockResolvedValueOnce("Issue ID")
+        .mockResolvedValueOnce("")
+        .mockResolvedValueOnce("ghp_test_token");
       const { init } = await import("../src/commands/init.js");
-      
       await init();
-      
       const writtenConfig = mockWriteFileSync.mock.calls[0][1] as string;
       const config = JSON.parse(writtenConfig);
-      
       expect(config.aiCommit.enabled).toBe(true);
       expect(config.aiCommit.provider).toBe("github");
       expect(config.aiCommit.apiKey).toBe("ghp_test_token");
@@ -299,34 +270,32 @@ describe("Init 模块测试", () => {
 
     it("应该正确配置 OpenAI", async () => {
       mockExistsSync.mockReturnValue(false);
-      
       const { select, input } = await import("@inquirer/prompts");
       vi.mocked(select)
-        .mockResolvedValueOnce("project") // 配置范围
-        .mockResolvedValueOnce(false) // requireId
-        .mockResolvedValueOnce("ask") // autoPush
-        .mockResolvedValueOnce(true) // autoStage
-        .mockResolvedValueOnce(true) // useEmoji
-        .mockResolvedValueOnce(true) // enableAI
-        .mockResolvedValueOnce("openai") // AI provider
-        .mockResolvedValueOnce("en-US"); // language
-      
+        .mockResolvedValueOnce("project")
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce("ask")
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce("openai")
+        .mockResolvedValueOnce("en-US")
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true);
       vi.mocked(input)
-        .mockResolvedValueOnce("") // baseBranch
-        .mockResolvedValueOnce("feature") // featurePrefix
-        .mockResolvedValueOnce("hotfix") // hotfixPrefix
-        .mockResolvedValueOnce("Story ID") // featureIdLabel
-        .mockResolvedValueOnce("Issue ID") // hotfixIdLabel
-        .mockResolvedValueOnce("") // defaultTagPrefix
-        .mockResolvedValueOnce("sk-test-key"); // OpenAI API key
-      
+        .mockResolvedValueOnce("")
+        .mockResolvedValueOnce("feature")
+        .mockResolvedValueOnce("hotfix")
+        .mockResolvedValueOnce("Story ID")
+        .mockResolvedValueOnce("Issue ID")
+        .mockResolvedValueOnce("")
+        .mockResolvedValueOnce("sk-test-key");
       const { init } = await import("../src/commands/init.js");
-      
       await init();
-      
       const writtenConfig = mockWriteFileSync.mock.calls[0][1] as string;
       const config = JSON.parse(writtenConfig);
-      
       expect(config.aiCommit.enabled).toBe(true);
       expect(config.aiCommit.provider).toBe("openai");
       expect(config.aiCommit.apiKey).toBe("sk-test-key");
@@ -336,33 +305,31 @@ describe("Init 模块测试", () => {
 
     it("应该正确配置 Ollama", async () => {
       mockExistsSync.mockReturnValue(false);
-      
       const { select, input } = await import("@inquirer/prompts");
       vi.mocked(select)
-        .mockResolvedValueOnce("project") // 配置范围
-        .mockResolvedValueOnce(false) // requireId
-        .mockResolvedValueOnce("ask") // autoPush
-        .mockResolvedValueOnce(true) // autoStage
-        .mockResolvedValueOnce(true) // useEmoji
-        .mockResolvedValueOnce(true) // enableAI
-        .mockResolvedValueOnce("ollama") // AI provider
-        .mockResolvedValueOnce("zh-CN"); // language
-      
+        .mockResolvedValueOnce("project")
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce("ask")
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce("ollama")
+        .mockResolvedValueOnce("zh-CN")
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true);
       vi.mocked(input)
-        .mockResolvedValueOnce("") // baseBranch
-        .mockResolvedValueOnce("feature") // featurePrefix
-        .mockResolvedValueOnce("hotfix") // hotfixPrefix
-        .mockResolvedValueOnce("Story ID") // featureIdLabel
-        .mockResolvedValueOnce("Issue ID") // hotfixIdLabel
-        .mockResolvedValueOnce(""); // defaultTagPrefix
-      
+        .mockResolvedValueOnce("")
+        .mockResolvedValueOnce("feature")
+        .mockResolvedValueOnce("hotfix")
+        .mockResolvedValueOnce("Story ID")
+        .mockResolvedValueOnce("Issue ID")
+        .mockResolvedValueOnce("");
       const { init } = await import("../src/commands/init.js");
-      
       await init();
-      
       const writtenConfig = mockWriteFileSync.mock.calls[0][1] as string;
       const config = JSON.parse(writtenConfig);
-      
       expect(config.aiCommit.enabled).toBe(true);
       expect(config.aiCommit.provider).toBe("ollama");
       expect(config.aiCommit.apiKey).toBeUndefined();
@@ -372,31 +339,27 @@ describe("Init 模块测试", () => {
 
     it("应该正确配置禁用 AI", async () => {
       mockExistsSync.mockReturnValue(false);
-      
       const { select, input } = await import("@inquirer/prompts");
       vi.mocked(select)
-        .mockResolvedValueOnce("project") // 配置范围
-        .mockResolvedValueOnce(false) // requireId
-        .mockResolvedValueOnce("ask") // autoPush
-        .mockResolvedValueOnce(true) // autoStage
-        .mockResolvedValueOnce(true) // useEmoji
-        .mockResolvedValueOnce(false); // enableAI
-      
+        .mockResolvedValueOnce("project")
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce("ask")
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(false);
       vi.mocked(input)
-        .mockResolvedValueOnce("") // baseBranch
-        .mockResolvedValueOnce("feature") // featurePrefix
-        .mockResolvedValueOnce("hotfix") // hotfixPrefix
-        .mockResolvedValueOnce("Story ID") // featureIdLabel
-        .mockResolvedValueOnce("Issue ID") // hotfixIdLabel
-        .mockResolvedValueOnce(""); // defaultTagPrefix
-      
+        .mockResolvedValueOnce("")
+        .mockResolvedValueOnce("feature")
+        .mockResolvedValueOnce("hotfix")
+        .mockResolvedValueOnce("Story ID")
+        .mockResolvedValueOnce("Issue ID")
+        .mockResolvedValueOnce("");
       const { init } = await import("../src/commands/init.js");
-      
       await init();
-      
       const writtenConfig = mockWriteFileSync.mock.calls[0][1] as string;
       const config = JSON.parse(writtenConfig);
-      
       expect(config.aiCommit.enabled).toBe(false);
     });
   });
@@ -404,41 +367,36 @@ describe("Init 模块测试", () => {
   describe("配置验证", () => {
     it("应该验证 GitHub Token 不为空", async () => {
       mockExistsSync.mockReturnValue(false);
-      
       const { select, input } = await import("@inquirer/prompts");
       vi.mocked(select)
-        .mockResolvedValueOnce("project") // 配置范围
-        .mockResolvedValueOnce(false) // requireId
-        .mockResolvedValueOnce("ask") // autoPush
-        .mockResolvedValueOnce(true) // autoStage
-        .mockResolvedValueOnce(true) // useEmoji
-        .mockResolvedValueOnce(true) // enableAI
-        .mockResolvedValueOnce("github") // AI provider
-        .mockResolvedValueOnce("zh-CN"); // language
-      
+        .mockResolvedValueOnce("project")
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce("ask")
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce("github")
+        .mockResolvedValueOnce("zh-CN")
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true);
       vi.mocked(input)
-        .mockResolvedValueOnce("") // baseBranch
-        .mockResolvedValueOnce("feature") // featurePrefix
-        .mockResolvedValueOnce("hotfix") // hotfixPrefix
-        .mockResolvedValueOnce("Story ID") // featureIdLabel
-        .mockResolvedValueOnce("Issue ID") // hotfixIdLabel
-        .mockResolvedValueOnce("") // defaultTagPrefix
-        .mockResolvedValueOnce("ghp_valid_token"); // GitHub token
-      
+        .mockResolvedValueOnce("")
+        .mockResolvedValueOnce("feature")
+        .mockResolvedValueOnce("hotfix")
+        .mockResolvedValueOnce("Story ID")
+        .mockResolvedValueOnce("Issue ID")
+        .mockResolvedValueOnce("")
+        .mockResolvedValueOnce("ghp_valid_token");
       const { init } = await import("../src/commands/init.js");
-      
       await init();
-      
-      // 验证 input 被调用时包含验证函数
       const inputCalls = vi.mocked(input).mock.calls;
-      const tokenInputCall = inputCalls.find(call => 
+      const tokenInputCall = inputCalls.find((call) =>
         call[0].message?.includes("GitHub Token")
       );
-      
       expect(tokenInputCall).toBeDefined();
       expect(tokenInputCall![0].validate).toBeDefined();
-      
-      // 测试验证函数
       const validate = tokenInputCall![0].validate!;
       expect(validate("")).toBe("GitHub Token 不能为空");
       expect(validate("valid-token")).toBe(true);
@@ -446,41 +404,36 @@ describe("Init 模块测试", () => {
 
     it("应该验证 OpenAI API Key 不为空", async () => {
       mockExistsSync.mockReturnValue(false);
-      
       const { select, input } = await import("@inquirer/prompts");
       vi.mocked(select)
-        .mockResolvedValueOnce("project") // 配置范围
-        .mockResolvedValueOnce(false) // requireId
-        .mockResolvedValueOnce("ask") // autoPush
-        .mockResolvedValueOnce(true) // autoStage
-        .mockResolvedValueOnce(true) // useEmoji
-        .mockResolvedValueOnce(true) // enableAI
-        .mockResolvedValueOnce("openai") // AI provider
-        .mockResolvedValueOnce("en-US"); // language
-      
+        .mockResolvedValueOnce("project")
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce("ask")
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce("openai")
+        .mockResolvedValueOnce("en-US")
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true);
       vi.mocked(input)
-        .mockResolvedValueOnce("") // baseBranch
-        .mockResolvedValueOnce("feature") // featurePrefix
-        .mockResolvedValueOnce("hotfix") // hotfixPrefix
-        .mockResolvedValueOnce("Story ID") // featureIdLabel
-        .mockResolvedValueOnce("Issue ID") // hotfixIdLabel
-        .mockResolvedValueOnce("") // defaultTagPrefix
-        .mockResolvedValueOnce("sk-valid-key"); // OpenAI API key
-      
+        .mockResolvedValueOnce("")
+        .mockResolvedValueOnce("feature")
+        .mockResolvedValueOnce("hotfix")
+        .mockResolvedValueOnce("Story ID")
+        .mockResolvedValueOnce("Issue ID")
+        .mockResolvedValueOnce("")
+        .mockResolvedValueOnce("sk-valid-key");
       const { init } = await import("../src/commands/init.js");
-      
       await init();
-      
-      // 验证 input 被调用时包含验证函数
       const inputCalls = vi.mocked(input).mock.calls;
-      const keyInputCall = inputCalls.find(call => 
+      const keyInputCall = inputCalls.find((call) =>
         call[0].message?.includes("OpenAI API Key")
       );
-      
       expect(keyInputCall).toBeDefined();
       expect(keyInputCall![0].validate).toBeDefined();
-      
-      // 测试验证函数
       const validate = keyInputCall![0].validate!;
       expect(validate("")).toBe("API Key 不能为空");
       expect(validate("valid-key")).toBe(true);
@@ -490,31 +443,27 @@ describe("Init 模块测试", () => {
   describe("配置输出", () => {
     it("应该包含默认的 commit emojis", async () => {
       mockExistsSync.mockReturnValue(false);
-      
       const { select, input } = await import("@inquirer/prompts");
       vi.mocked(select)
-        .mockResolvedValueOnce("project") // 配置范围
-        .mockResolvedValueOnce(false) // requireId
-        .mockResolvedValueOnce("ask") // autoPush
-        .mockResolvedValueOnce(true) // autoStage
-        .mockResolvedValueOnce(true) // useEmoji
-        .mockResolvedValueOnce(false); // enableAI
-      
+        .mockResolvedValueOnce("project")
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce("ask")
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(false);
       vi.mocked(input)
-        .mockResolvedValueOnce("") // baseBranch
-        .mockResolvedValueOnce("feature") // featurePrefix
-        .mockResolvedValueOnce("hotfix") // hotfixPrefix
-        .mockResolvedValueOnce("Story ID") // featureIdLabel
-        .mockResolvedValueOnce("Issue ID") // hotfixIdLabel
-        .mockResolvedValueOnce(""); // defaultTagPrefix
-      
+        .mockResolvedValueOnce("")
+        .mockResolvedValueOnce("feature")
+        .mockResolvedValueOnce("hotfix")
+        .mockResolvedValueOnce("Story ID")
+        .mockResolvedValueOnce("Issue ID")
+        .mockResolvedValueOnce("");
       const { init } = await import("../src/commands/init.js");
-      
       await init();
-      
       const writtenConfig = mockWriteFileSync.mock.calls[0][1] as string;
       const config = JSON.parse(writtenConfig);
-      
       expect(config.commitEmojis).toBeDefined();
       expect(config.commitEmojis.feat).toBe("✨");
       expect(config.commitEmojis.fix).toBe("🐛");
@@ -523,28 +472,25 @@ describe("Init 模块测试", () => {
 
     it("应该显示成功消息", async () => {
       mockExistsSync.mockReturnValue(false);
-      
       const { select, input } = await import("@inquirer/prompts");
       vi.mocked(select)
-        .mockResolvedValueOnce("global") // 配置范围
-        .mockResolvedValueOnce(false) // requireId
-        .mockResolvedValueOnce("ask") // autoPush
-        .mockResolvedValueOnce(true) // autoStage
-        .mockResolvedValueOnce(true) // useEmoji
-        .mockResolvedValueOnce(false); // enableAI
-      
+        .mockResolvedValueOnce("global")
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce("ask")
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(false);
       vi.mocked(input)
-        .mockResolvedValueOnce("") // baseBranch
-        .mockResolvedValueOnce("feature") // featurePrefix
-        .mockResolvedValueOnce("hotfix") // hotfixPrefix
-        .mockResolvedValueOnce("Story ID") // featureIdLabel
-        .mockResolvedValueOnce("Issue ID") // hotfixIdLabel
-        .mockResolvedValueOnce(""); // defaultTagPrefix
-      
+        .mockResolvedValueOnce("")
+        .mockResolvedValueOnce("feature")
+        .mockResolvedValueOnce("hotfix")
+        .mockResolvedValueOnce("Story ID")
+        .mockResolvedValueOnce("Issue ID")
+        .mockResolvedValueOnce("");
       const { init } = await import("../src/commands/init.js");
-      
       await init();
-      
       expect(console.log).toHaveBeenCalledWith(
         expect.stringContaining("✓ 配置已保存到 全局配置文件")
       );
@@ -552,31 +498,28 @@ describe("Init 模块测试", () => {
 
     it("应该显示全局配置的提示信息", async () => {
       mockExistsSync.mockReturnValue(false);
-      
       const { select, input } = await import("@inquirer/prompts");
       vi.mocked(select)
-        .mockResolvedValueOnce("global") // 配置范围
-        .mockResolvedValueOnce(false) // requireId
-        .mockResolvedValueOnce("ask") // autoPush
-        .mockResolvedValueOnce(true) // autoStage
-        .mockResolvedValueOnce(true) // useEmoji
-        .mockResolvedValueOnce(false); // enableAI
-      
+        .mockResolvedValueOnce("global")
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce("ask")
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(false);
       vi.mocked(input)
-        .mockResolvedValueOnce("") // baseBranch
-        .mockResolvedValueOnce("feature") // featurePrefix
-        .mockResolvedValueOnce("hotfix") // hotfixPrefix
-        .mockResolvedValueOnce("Story ID") // featureIdLabel
-        .mockResolvedValueOnce("Issue ID") // hotfixIdLabel
-        .mockResolvedValueOnce(""); // defaultTagPrefix
-      
+        .mockResolvedValueOnce("")
+        .mockResolvedValueOnce("feature")
+        .mockResolvedValueOnce("hotfix")
+        .mockResolvedValueOnce("Story ID")
+        .mockResolvedValueOnce("Issue ID")
+        .mockResolvedValueOnce("");
       const { init } = await import("../src/commands/init.js");
-      
       await init();
-      
       expect(console.log).toHaveBeenCalledWith(
         expect.stringContaining("全局配置对所有项目生效")
       );
     });
   });
-});
+});