@zjex/git-workflow 0.2.5 → 0.2.7

package/src/commands/init.ts

@@ -1,5 +1,5 @@
 import { existsSync, writeFileSync } from "fs";
-import { select, input, confirm } from "@inquirer/prompts";
+import { select, input } from "@inquirer/prompts";
 import { colors, theme, divider } from "../utils.js";
 import type { GwConfig } from "../config.js";
 
@@ -22,9 +22,12 @@ const DEFAULT_COMMIT_EMOJIS = {
 
 export async function init(): Promise<void> {
   if (existsSync(CONFIG_FILE)) {
-    const overwrite = await confirm({
+    const overwrite = await select({
       message: `${CONFIG_FILE} 已存在，是否覆盖?`,
-      default: false,
+      choices: [
+        { name: "否，取消", value: false },
+        { name: "是，覆盖", value: true },
+      ],
       theme,
     });
     if (!overwrite) {
@@ -64,9 +67,12 @@ export async function init(): Promise<void> {
   divider();
 
   // ID 配置
-  const requireId = await confirm({
+  const requireId = await select({
     message: "是否要求必填 ID (Story ID / Issue ID)?",
-    default: false,
+    choices: [
+      { name: "否", value: false },
+      { name: "是", value: true },
+    ],
     theme,
   });
   if (requireId) config.requireId = true;
@@ -110,16 +116,22 @@ export async function init(): Promise<void> {
   divider();
 
   // Commit 配置
-  const autoStage = await confirm({
+  const autoStage = await select({
     message: "Commit 时是否自动暂存所有更改?",
-    default: true,
+    choices: [
+      { name: "是", value: true },
+      { name: "否", value: false },
+    ],
     theme,
   });
   if (!autoStage) config.autoStage = false;
 
-  const useEmoji = await confirm({
+  const useEmoji = await select({
     message: "Commit 时是否使用 emoji?",
-    default: true,
+    choices: [
+      { name: "是", value: true },
+      { name: "否", value: false },
+    ],
     theme,
   });
   if (!useEmoji) config.useEmoji = false;
@@ -129,6 +141,122 @@ export async function init(): Promise<void> {
 
   divider();
 
+  // AI Commit 配置
+  console.log(
+    colors.dim("\nAI Commit 配置 (使用 AI 自动生成 commit message)\n")
+  );
+
+  const enableAI = await select({
+    message: "是否启用 AI Commit 功能?",
+    choices: [
+      { name: "是（推荐）", value: true },
+      { name: "否", value: false },
+    ],
+    theme,
+  });
+
+  if (enableAI) {
+    const aiProvider = await select({
+      message: "选择 AI 提供商:",
+      choices: [
+        {
+          name: "GitHub Models（免费，推荐）",
+          value: "github",
+          description: "使用 GitHub 账号，每天 150 次免费",
+        },
+        {
+          name: "Groq（免费）",
+          value: "groq",
+          description: "需要注册，每天 14,400 次免费",
+        },
+        {
+          name: "OpenAI（付费）",
+          value: "openai",
+          description: "需要付费 API key",
+        },
+        {
+          name: "Claude（付费）",
+          value: "claude",
+          description: "需要付费 API key",
+        },
+        {
+          name: "Ollama（本地）",
+          value: "ollama",
+          description: "需要安装 Ollama",
+        },
+      ],
+      theme,
+    });
+
+    const useBuiltinKey = await select({
+      message: "API Key 配置:",
+      choices: [
+        {
+          name: "使用内置 Key（开箱即用）",
+          value: true,
+          description: "使用工具内置的 API key，共享限额",
+        },
+        {
+          name: "使用自己的 Key（推荐）",
+          value: false,
+          description: "配置自己的 API key，独享限额",
+        },
+      ],
+      theme,
+    });
+
+    let apiKey = "";
+    if (!useBuiltinKey) {
+      apiKey = await input({
+        message: `输入你的 ${
+          aiProvider === "github" ? "GitHub Token" : "API Key"
+        }:`,
+        validate: (value) => {
+          if (!value.trim()) return "API Key 不能为空";
+          return true;
+        },
+        theme,
+      });
+    }
+
+    const language = await select({
+      message: "生成的 commit message 语言:",
+      choices: [
+        { name: "中文", value: "zh-CN" },
+        { name: "English", value: "en-US" },
+      ],
+      theme,
+    });
+
+    config.aiCommit = {
+      enabled: true,
+      provider: aiProvider as
+        | "github"
+        | "groq"
+        | "openai"
+        | "claude"
+        | "ollama",
+      apiKey: apiKey || undefined,
+      language: language as "zh-CN" | "en-US",
+    };
+
+    // 根据提供商设置默认模型
+    const defaultModels: Record<string, string> = {
+      github: "gpt-4o-mini",
+      groq: "llama-3.1-8b-instant",
+      openai: "gpt-4o-mini",
+      claude: "claude-3-haiku-20240307",
+      ollama: "qwen2.5-coder:7b",
+    };
+    config.aiCommit.model = defaultModels[aiProvider];
+  } else {
+    config.aiCommit = {
+      enabled: false,
+    };
+  }
+
+  divider();
+
   // 写入配置
   const content = JSON.stringify(config, null, 2);
   writeFileSync(CONFIG_FILE, content + "\n");
@@ -139,5 +267,24 @@ export async function init(): Promise<void> {
       "\n提示: 可以在配置文件中修改 commitEmojis 来自定义各类型的 emoji"
     )
   );
+
+  if (config.aiCommit?.enabled) {
+    console.log(
+      colors.dim(
+        "提示: AI Commit 已启用，运行 'gw c' 时可以选择 AI 自动生成 commit message"
+      )
+    );
+    if (!config.aiCommit.apiKey) {
+      console.log(
+        colors.yellow(
+          "\n⚠️  当前使用内置 API key，建议配置自己的 key 以获得更好的体验"
+        )
+      );
+      console.log(
+        colors.dim("   获取方法: https://github.com/settings/tokens/new")
+      );
+    }
+  }
+
   console.log(colors.dim("\n" + content));
 }

package/src/config.ts

@@ -36,6 +36,15 @@ export interface GwConfig {
     chore?: string;
     revert?: string;
   };
+  // AI commit 配置
+  aiCommit?: {
+    enabled?: boolean; // 是否启用 AI commit，默认 true
+    provider?: "github" | "groq" | "openai" | "claude" | "ollama"; // AI 提供商，默认 github
+    apiKey?: string; // API key，空则使用内置 key
+    model?: string; // 模型名称
+    language?: "zh-CN" | "en-US"; // 生成语言，默认 zh-CN
+    maxTokens?: number; // 最大 token 数，默认 200
+  };
 }
 
 const defaultConfig: GwConfig = {

package/src/index.ts

@@ -12,17 +12,39 @@ import { stash } from "./commands/stash.js";
 import { commit } from "./commands/commit.js";
 import { showHelp } from "./commands/help.js";
 import { checkForUpdates } from "./update-notifier.js";
-import { checkForUpdates } from "./update-notifier.js";
 
 // 捕获 Ctrl+C 退出，静默处理
 process.on("uncaughtException", (err) => {
   if (err instanceof ExitPromptError) {
+    console.log(""); // 输出空行，让界面更整洁
     process.exit(0);
   }
   console.error(err);
   process.exit(1);
 });
 
+// 捕获未处理的 Promise 拒绝
+process.on("unhandledRejection", (reason) => {
+  if (reason instanceof ExitPromptError) {
+    console.log("");
+    process.exit(0);
+  }
+  console.error("未处理的 Promise 拒绝:", reason);
+  process.exit(1);
+});
+
+// 捕获 SIGINT 信号 (Ctrl+C)
+process.on("SIGINT", () => {
+  console.log("");
+  process.exit(0);
+});
+
+// 捕获 SIGTERM 信号
+process.on("SIGTERM", () => {
+  console.log("");
+  process.exit(0);
+});
+
 declare const __VERSION__: string | undefined;
 
 // 开发环境下从 package.json 读取版本号

package/src/update-notifier.ts

@@ -145,18 +145,18 @@ async function performUpdate(packageName: string): Promise<void> {
   }).start();
 
   try {
-    // 先尝试卸载旧版本（无 scope 的版本）
+    // 先卸载当前版本，确保干净安装
     try {
-      execSync("npm uninstall -g git-workflow", {
+      execSync(`npm uninstall -g ${packageName}`, {
         encoding: "utf-8",
         stdio: ["pipe", "pipe", "pipe"],
       });
-      spinner.text = "已卸载旧版本，正在安装新版本...";
+      spinner.text = "正在安装新版本...";
     } catch {
-      // 旧版本不存在，忽略错误
+      // 当前版本不存在，忽略错误
     }
 
-    // 执行更新命令
+    // 执行安装命令
     execSync(`npm install -g ${packageName}`, {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"],
@@ -164,8 +164,26 @@ async function performUpdate(packageName: string): Promise<void> {
 
     spinner.succeed(colors.green("更新成功！"));
     console.log("");
-    console.log(colors.cyan("  提示: 请重新运行命令以使用新版本"));
-    console.log("");
+    console.log(
+      boxen(
+        [
+          colors.bold("✨ 更新完成！"),
+          "",
+          colors.dim("请运行以下命令刷新并使用新版本:"),
+          "",
+          colors.yellow("  hash -r && gw --version"),
+          "",
+          colors.dim("或者重新打开终端"),
+        ].join("\n"),
+        {
+          padding: 1,
+          margin: { top: 0, bottom: 1, left: 2, right: 2 },
+          borderStyle: "round",
+          borderColor: "green",
+          align: "left",
+        }
+      )
+    );
 
     // 更新成功后退出，让用户重新运行
     process.exit(0);
@@ -173,10 +191,6 @@ async function performUpdate(packageName: string): Promise<void> {
     spinner.fail(colors.red("更新失败"));
     console.log("");
     console.log(colors.dim("  你可以手动运行以下命令更新:"));
-    console.log(colors.yellow("  # 如果之前安装过旧版本，先卸载:"));
-    console.log(colors.cyan("  npm uninstall -g git-workflow"));
-    console.log("");
-    console.log(colors.yellow("  # 然后安装新版本:"));
     console.log(colors.cyan(`  npm install -g ${packageName}`));
     console.log("");
   }

package/test-ctrl-c.mjs

@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-
-import { select } from "@inquirer/prompts";
-import { ExitPromptError } from "@inquirer/core";
-
-// 捕获 Ctrl+C 退出，静默处理
-process.on("uncaughtException", (err) => {
-  if (err instanceof ExitPromptError) {
-    console.log("\n✓ Ctrl+C 被正确捕获，程序退出");
-    process.exit(0);
-  }
-  console.error("其他错误:", err);
-  process.exit(1);
-});
-
-async function test() {
-  try {
-    const choice = await select({
-      message: "测试 Ctrl+C (按 Ctrl+C 退出):",
-      choices: [
-        { name: "选项 1", value: "1" },
-        { name: "选项 2", value: "2" },
-      ],
-    });
-    console.log(`你选择了: ${choice}`);
-  } catch (error) {
-    console.log("\n在 catch 中捕获到错误，重新抛出...");
-    throw error;
-  }
-}
-
-test();

package/test-full-flow.mjs

@@ -1,108 +0,0 @@
-#!/usr/bin/env node
-
-import boxen from "boxen";
-import { select } from "@inquirer/prompts";
-import { ExitPromptError } from "@inquirer/core";
-
-// 捕获 Ctrl+C 退出，静默处理
-process.on("uncaughtException", (err) => {
-  if (err instanceof ExitPromptError) {
-    process.exit(0);
-  }
-  console.error(err);
-  process.exit(1);
-});
-
-const colors = {
-  green: (s) => `\x1b[32m${s}\x1b[0m`,
-  dim: (s) => `\x1b[2m${s}\x1b[0m`,
-  bold: (s) => `\x1b[1m${s}\x1b[0m`,
-};
-
-async function checkForUpdates() {
-  const current = "0.2.3";
-  const latest = "0.2.4";
-  const packageName = "@zjex/git-workflow";
-
-  const message = [
-    colors.bold("🎉 发现新版本可用！"),
-    "",
-    `${colors.dim(current)}  →  ${colors.green(colors.bold(latest))}`,
-  ].join("\n");
-
-  console.log("");
-  console.log(
-    boxen(message, {
-      padding: 1,
-      margin: 1,
-      borderStyle: "round",
-      borderColor: "yellow",
-      align: "left",
-    })
-  );
-
-  try {
-    const action = await select({
-      message: "你想做什么？",
-      choices: [
-        {
-          name: "🚀 立即更新",
-          value: "update",
-          description: `运行 npm install -g ${packageName}`,
-        },
-        {
-          name: "⏭️  稍后更新，继续使用",
-          value: "continue",
-          description: "下次启动时会再次提示",
-        },
-        {
-          name: "🙈 跳过此版本 (24h 内不再提示)",
-          value: "dismiss",
-          description: "24 小时内不会再提示此版本",
-        },
-      ],
-    });
-
-    if (action === "update") {
-      console.log("\n模拟更新中...\n");
-      process.exit(0);
-    } else if (action === "dismiss") {
-      console.log(colors.dim("\n已跳过此版本，24 小时内不再提示\n"));
-    }
-  } catch (error) {
-    // 用户按了 Ctrl+C，重新抛出让全局处理
-    console.log("");
-    throw error;
-  }
-}
-
-async function mainMenu() {
-  // 先检查更新，等待完成
-  await checkForUpdates();
-
-  // 然后显示主菜单
-  console.log(
-    colors.green(`
- ███████╗     ██╗███████╗██╗  ██╗
- ╚══███╔╝     ██║██╔════╝╚██╗██╔╝
-   ███╔╝      ██║█████╗   ╚███╔╝ 
-  ███╔╝  ██   ██║██╔══╝   ██╔██╗ 
- ███████╗╚█████╔╝███████╗██╔╝ ██╗
- ╚══════╝ ╚════╝ ╚══════╝╚═╝  ╚═╝
-`)
-  );
-  console.log(colors.dim(`  git-workflow v0.2.4\n`));
-
-  const choice = await select({
-    message: "选择操作:",
-    choices: [
-      { name: "[1] ✨ 创建 feature 分支      gw f", value: "1" },
-      { name: "[2] 🐛 创建 hotfix 分支       gw h", value: "2" },
-      { name: "[3] 🗑️  删除分支               gw d", value: "3" },
-    ],
-  });
-
-  console.log(`\n你选择了: ${choice}\n`);
-}
-
-mainMenu();

package/test-update-flow.mjs

@@ -1,98 +0,0 @@
-#!/usr/bin/env node
-
-import boxen from "boxen";
-import { select } from "@inquirer/prompts";
-import ora from "ora";
-
-const colors = {
-  red: (s) => `\x1b[31m${s}\x1b[0m`,
-  green: (s) => `\x1b[32m${s}\x1b[0m`,
-  yellow: (s) => `\x1b[33m${s}\x1b[0m`,
-  cyan: (s) => `\x1b[36m${s}\x1b[0m`,
-  dim: (s) => `\x1b[2m${s}\x1b[0m`,
-  bold: (s) => `\x1b[1m${s}\x1b[0m`,
-  reset: "\x1b[0m",
-};
-
-async function testUpdateFlow() {
-  const current = "0.1.0";
-  const latest = "0.2.0";
-  const packageName = "@zjex/git-workflow";
-
-  // 1. 显示更新提示框
-  const message = [
-    colors.bold("🎉 发现新版本可用！"),
-    "",
-    `${colors.dim(current)}  →  ${colors.green(colors.bold(latest))}`,
-  ].join("\n");
-
-  console.log("");
-  console.log(
-    boxen(message, {
-      padding: 1,
-      margin: 1,
-      borderStyle: "round",
-      borderColor: "yellow",
-      align: "left",
-    })
-  );
-
-  // 2. 交互式选择
-  try {
-    const action = await select({
-      message: "你想做什么？",
-      choices: [
-        {
-          name: "🚀 立即更新",
-          value: "update",
-          description: `运行 npm install -g ${packageName}`,
-        },
-        {
-          name: "⏭️  稍后更新，继续使用",
-          value: "continue",
-          description: "下次启动时会再次提示",
-        },
-        {
-          name: "🙈 跳过此版本 (24h 内不再提示)",
-          value: "dismiss",
-          description: "24 小时内不会再提示此版本",
-        },
-      ],
-    });
-
-    console.log("");
-
-    // 3. 根据选择执行操作
-    if (action === "update") {
-      // 模拟更新过程
-      const spinner = ora({
-        text: "正在更新...",
-        spinner: "dots",
-      }).start();
-
-      // 模拟卸载旧版本
-      await new Promise((resolve) => setTimeout(resolve, 1000));
-      spinner.text = "已卸载旧版本，正在安装新版本...";
-
-      // 模拟安装新版本
-      await new Promise((resolve) => setTimeout(resolve, 2000));
-
-      spinner.succeed(colors.green("更新成功！"));
-      console.log("");
-      console.log(colors.cyan("  提示: 请重新运行命令以使用新版本"));
-      console.log("");
-    } else if (action === "continue") {
-      console.log(colors.cyan("继续使用当前版本..."));
-      console.log("");
-    } else if (action === "dismiss") {
-      console.log(colors.dim("已跳过此版本，24 小时内不再提示"));
-      console.log("");
-    }
-  } catch (error) {
-    console.log("");
-    console.log(colors.dim("已取消"));
-    console.log("");
-  }
-}
-
-testUpdateFlow();