@git-ai/cli 1.0.2 → 1.0.4

package/src/actions/TokenAction.mjs

@@ -1,25 +1,25 @@
-import { config } from "../utils/Storage.mjs";
-import Logger from "../utils/Logger.mjs";
-import { formatToken } from "../utils/Utils.mjs";
-import BaseAction from "./BaseAction.mjs";
-
-class SetTokenAction extends BaseAction {
-  constructor(key) {
-    super(key);
-    this.key = key || "";
-  }
-
-  async execute() {
-    config.set("key", this.key);
-    if (this.key) {
-      Logger.success(`OpenAI Api Key 已设置: ${formatToken(this.key)}`);
-    } else {
-      Logger.warn(`OpenAI Api Key 已设置为空`);
-    }
-  }
-}
-
-export default async function (key) {
-  const action = new SetTokenAction(key);
-  await action.run();
-}
+import { config } from '../utils/Storage.mjs';
+import Logger from '../utils/Logger.mjs';
+import { formatToken } from '../utils/Utils.mjs';
+import BaseAction from './BaseAction.mjs';
+
+class SetTokenAction extends BaseAction {
+  constructor(key) {
+    super(key);
+    this.key = key || '';
+  }
+
+  async execute() {
+    config.set('key', this.key);
+    if (this.key) {
+      Logger.success(`OpenAI Api Key 已设置: ${formatToken(this.key)}`);
+    } else {
+      Logger.warn(`OpenAI Api Key 已设置为空`);
+    }
+  }
+}
+
+export default async function (key) {
+  const action = new SetTokenAction(key);
+  await action.run();
+}

package/src/const.mjs

@@ -1,41 +1,43 @@
-import { resolve } from 'path';
-import { readFileSync } from 'fs';
-// 读取 package.json 文件
-const pkgPath = resolve(process.argv[1], '../../package.json');
-const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
-export const BIN = Object.keys(pkg.bin)[0].split('-').join(' ')
-export const NAME = pkg.name
-export const DESCRIPTION = pkg.description
-export const VERSION = pkg.version
-export const AUTHOR = pkg.author
-export const LOWEST_NODE_VERSION = pkg.engines.node
-export const OPENAI_BASE_URL = "" //"https://api.siliconflow.cn/v1"
-export const OPENAI_API_KEYS_URL = "" //"https://cloud.siliconflow.cn/me/account/ak"
-export const OPENAI_MODELS_URL = "" //"https://cloud.siliconflow.cn/me/models"
-export const OPENAI_MODEL_DEFAULT = "" // "Qwen/Qwen2.5-Coder-7B-Instruct"
-export const OPENAI_TIMEOUT = 60 * 1000 * 3
-export const OPENAI_MAX_TOKEN_DEFAULT = 128000
-export const OPENAI_MODEL_LIST_URL = process.env.OPENAI_MODEL_LIST_URL
-export const OPENAI_FREE_BASE_URL = "https://open.bigmodel.cn/api/paas/v4"
-export const OPENAI_FREE_MODEL_ID = "glm-4-flash-250414,glm-4.5-flash"
-export const OPENAI_COMMIT_MESSAGE_TYPES = [
-    'feat',
-    'fix',
-    'docs',
-    'style',
-    'refactor',
-    'perf',
-    'test',
-    'build',
-    'ci',
-    'chore',
-    'revert',
-]
-export const asciiArt = `
- ██████╗ ██╗████████╗     █████╗ ██╗
-██╔════╝ ██║╚══██╔══╝    ██╔══██╗██║
-██║  ███╗██║   ██║       ███████║██║
-██║   ██║██║   ██║       ██╔══██║██║
-╚██████╔╝██║   ██║       ██║  ██║██║
- ╚═════╝ ╚═╝   ╚═╝       ╚═╝  ╚═╝╚═╝
-`
+import { resolve } from 'path';
+import { fileURLToPath } from 'url';
+import { readFileSync } from 'fs';
+// 读取 package.json 文件
+const __dirname = fileURLToPath(new URL('.', import.meta.url));
+const pkgPath = resolve(__dirname, '../package.json');
+const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
+export const BIN = Object.keys(pkg.bin)[0].split('-').join(' ');
+export const NAME = pkg.name;
+export const DESCRIPTION = pkg.description;
+export const VERSION = pkg.version;
+export const AUTHOR = pkg.author;
+export const LOWEST_NODE_VERSION = pkg.engines.node;
+export const OPENAI_BASE_URL = ''; //"https://api.siliconflow.cn/v1"
+export const OPENAI_API_KEYS_URL = ''; //"https://cloud.siliconflow.cn/me/account/ak"
+export const OPENAI_MODELS_URL = ''; //"https://cloud.siliconflow.cn/me/models"
+export const OPENAI_MODEL_DEFAULT = ''; // "Qwen/Qwen2.5-Coder-7B-Instruct"
+export const OPENAI_TIMEOUT = 60 * 1000 * 3;
+export const OPENAI_MAX_TOKEN_DEFAULT = 128000;
+export const OPENAI_MODEL_LIST_URL = process.env.OPENAI_MODEL_LIST_URL;
+export const OPENAI_FREE_BASE_URL = 'https://open.bigmodel.cn/api/paas/v4';
+export const OPENAI_FREE_MODEL_ID = 'glm-4-flash-250414,glm-4.5-flash';
+export const OPENAI_COMMIT_MESSAGE_TYPES = [
+  'feat',
+  'fix',
+  'docs',
+  'style',
+  'refactor',
+  'perf',
+  'test',
+  'build',
+  'ci',
+  'chore',
+  'revert',
+];
+export const asciiArt = `
+ ██████╗ ██╗████████╗     █████╗ ██╗
+██╔════╝ ██║╚══██╔══╝    ██╔══██╗██║
+██║  ███╗██║   ██║       ███████║██║
+██║   ██║██║   ██║       ██╔══██║██║
+╚██████╔╝██║   ██║       ██║  ██║██║
+ ╚═════╝ ╚═╝   ╚═╝       ╚═╝  ╚═╝╚═╝
+`;

package/src/index.mjs

@@ -1,69 +1,95 @@
-import { Command } from 'commander';
-import CommitAction from './actions/CommitAction.mjs';
-import ModelAction from './actions/ModelAction.mjs';
-import TokenAction from './actions/TokenAction.mjs';
-import BaseUrlAction from './actions/BaseUrlAction.mjs';
-import MaxTokenAction from './actions/MaxTokenAction.mjs';
-import { exitProcess } from './utils/Utils.mjs';
-import SelectModelAction from './actions/SelectModelAction.mjs';
-import { BIN, VERSION, DESCRIPTION, NAME, OPENAI_MAX_TOKEN_DEFAULT, asciiArt } from './const.mjs';
-import Logger from './utils/Logger.mjs';
-import chalk from "chalk";
-
-let startTimestamp;
-function registerCommand() {
-    const program = new Command();
-    program
-        .name(BIN)
-        // .description(`${asciiArt}`)
-        // .description(`${asciiArt}\n${DESCRIPTION}`)
-        .version(VERSION)
-        .helpOption('-h', chalk.cyan(`显示帮助信息 （baseURL、model、token 分别支持多个，英文逗号隔开）`));
-    program
-        .command('set-baseURL [baseURL]')
-        .description(`设置 OpenAI compatible Base URL，请执行 ${chalk.cyan('`' + BIN + ' set-baseURL [baseURL]`')}\n如：https://api.siliconflow.cn/v1`)
-        .action(BaseUrlAction);
-    program
-        .command('set-key [key]')
-        .description(`设置 OpenAI compatible Api Key，请执行 ${chalk.cyan('`' + BIN + ' set-key [key]`')}`)
-        .action(TokenAction);
-    program
-        .command('set-model [model]')
-        .description(`设置您的模型，请执行 ${chalk.cyan('`' + BIN + ' set-model [model]`')}`)
-        .action(ModelAction);
-    program
-        .command('set-max-token <maxToken>')
-        .description(`设置您的最大 token 数，默认：${OPENAI_MAX_TOKEN_DEFAULT}(${Math.round(OPENAI_MAX_TOKEN_DEFAULT / 1000)}k)`)
-        .action(MaxTokenAction);
-    program
-        .command('select-model')
-        .description(`从模型列表选择，请执行 ${chalk.cyan('`' + BIN + ' select-model`')}`)
-        .action(SelectModelAction);
-    program
-        .option('-d, --dry-run', `等同于 ${chalk.cyan('`git commit --dry-run -m <message>`')}`)
-        .option('-e, --allow-empty', `等同于 ${chalk.cyan('`git commit --allow-empty -m <message>`')}`)
-        .option('-n, --no-verify', `等同于 ${chalk.cyan('`git commit --no-verify -m <message>`')}`)
-        .option('-s, --skip', `跳过 ${chalk.cyan('`git add`')} 命令, 只提交已暂存的更改，如：${chalk.cyan('`' + BIN + ' --skip\`')}`)
-        .description(`${DESCRIPTION}\n${asciiArt}\n使用 AI 自动生成提交信息并推送
-   → ${chalk.cyan('检查环境')} → ${chalk.cyan('检查目录')} → ${chalk.cyan('检查冲突')} → ${chalk.cyan('处理合并')}\n   → ${chalk.cyan('git add')} → ${chalk.cyan('获取diff')} → ${chalk.cyan('AI 生成 commit message')}\n   → ${chalk.cyan('git fetch')} → ${chalk.cyan('git merge')} → ${chalk.cyan('检查冲突')} → ${chalk.cyan('git push')}`)
-        .action(CommitAction);
-    program.parse();
-}
-async function prepare() {
-    // 第一步检查版本号
-    checkPkgVersion();
-}
-function checkPkgVersion() {
-    Logger.verbose(`${NAME}@${VERSION}`);
-}
-export default async function core() {
-    startTimestamp = Date.now()
-    try {
-        await prepare();
-        // 命令注册
-        registerCommand()
-    } catch (e) {
-        Logger.error(e.message);
-        exitProcess(1, startTimestamp);
-    }
-}
+import { Command } from 'commander';
+import CommitAction from './actions/CommitAction.mjs';
+import ModelAction from './actions/ModelAction.mjs';
+import TokenAction from './actions/TokenAction.mjs';
+import BaseUrlAction from './actions/BaseUrlAction.mjs';
+import MaxTokenAction from './actions/MaxTokenAction.mjs';
+import { exitProcess } from './utils/Utils.mjs';
+import SelectModelAction from './actions/SelectModelAction.mjs';
+import { BIN, VERSION, DESCRIPTION, NAME, OPENAI_MAX_TOKEN_DEFAULT, asciiArt } from './const.mjs';
+import Logger from './utils/Logger.mjs';
+import chalk from 'chalk';
+
+let startTimestamp;
+function registerCommand() {
+  const program = new Command();
+  program
+    .name(BIN)
+    // .description(`${asciiArt}`)
+    // .description(`${asciiArt}\n${DESCRIPTION}`)
+    .version(VERSION)
+    .helpOption(
+      '-h',
+      chalk.cyan(`显示帮助信息 （baseURL、model、token 分别支持多个，英文逗号隔开）`)
+    );
+  program
+    .command('set-baseURL [baseURL]')
+    .description(
+      `设置 OpenAI compatible Base URL，请执行 ${chalk.cyan(
+        '`' + BIN + ' set-baseURL [baseURL]`'
+      )}\n如：https://api.siliconflow.cn/v1`
+    )
+    .action(BaseUrlAction);
+  program
+    .command('set-key [key]')
+    .description(
+      `设置 OpenAI compatible Api Key，请执行 ${chalk.cyan('`' + BIN + ' set-key [key]`')}`
+    )
+    .action(TokenAction);
+  program
+    .command('set-model [model]')
+    .description(`设置您的模型，请执行 ${chalk.cyan('`' + BIN + ' set-model [model]`')}`)
+    .action(ModelAction);
+  program
+    .command('set-max-token <maxToken>')
+    .description(
+      `设置您的最大 token 数，默认：${OPENAI_MAX_TOKEN_DEFAULT}(${Math.round(
+        OPENAI_MAX_TOKEN_DEFAULT / 1000
+      )}k)`
+    )
+    .action(MaxTokenAction);
+  program
+    .command('select-model')
+    .description(`从模型列表选择，请执行 ${chalk.cyan('`' + BIN + ' select-model`')}`)
+    .action(SelectModelAction);
+  program
+    .option('-d, --dry-run', `等同于 ${chalk.cyan('`git commit --dry-run -m <message>`')}`)
+    .option('-e, --allow-empty', `等同于 ${chalk.cyan('`git commit --allow-empty -m <message>`')}`)
+    .option('-n, --no-verify', `等同于 ${chalk.cyan('`git commit --no-verify -m <message>`')}`)
+    .option(
+      '-s, --skip',
+      `跳过 ${chalk.cyan('`git add`')} 命令, 只提交已暂存的更改，如：${chalk.cyan(
+        '`' + BIN + ' --skip`'
+      )}`
+    )
+    .description(
+      `${DESCRIPTION}\n${asciiArt}\n使用 AI 自动生成提交信息并推送
+   → ${chalk.cyan('检查环境')} → ${chalk.cyan('检查目录')} → ${chalk.cyan(
+        '检查冲突'
+      )} → ${chalk.cyan('处理合并')}\n   → ${chalk.cyan('git add')} → ${chalk.cyan(
+        '获取diff'
+      )} → ${chalk.cyan('AI 生成 commit message')}\n   → ${chalk.cyan('git fetch')} → ${chalk.cyan(
+        'git merge'
+      )} → ${chalk.cyan('检查冲突')} → ${chalk.cyan('git push')}`
+    )
+    .action(CommitAction);
+  program.parse();
+}
+async function prepare() {
+  // 第一步检查版本号
+  checkPkgVersion();
+}
+function checkPkgVersion() {
+  Logger.verbose(`${NAME}@${VERSION}`);
+}
+export default async function core() {
+  startTimestamp = Date.now();
+  try {
+    await prepare();
+    // 命令注册
+    registerCommand();
+  } catch (e) {
+    Logger.error(e.message);
+    exitProcess(1, startTimestamp);
+  }
+}

package/src/services/AIService.mjs

@@ -1,113 +1,106 @@
-import { chat, freeChat } from "../utils/OpenAI.mjs";
-import {
-  generateSystemMessage,
-  formatCompletions,
-} from "../utils/MessageUtils.mjs";
-import { config } from "../utils/Storage.mjs";
-import chalk from "chalk";
-/**
- * AI 服务类
- * 封装所有 AI 相关操作
- */
-export class AIService {
-  constructor(userName) {
-    this.userName = userName;
-    this.usageMessage = "";
-  }
-  // 检查是否配置 baseUrl model
-  checkConfig() {
-    const baseURL = config.get("baseURL");
-    const key = config.get("key");
-    return baseURL && key;
-  }
-
-  /**
-   * 生成提交消息
-   */
-  async generateCommitMessage(diffString) {
-    const request = this.checkConfig() ? chat : freeChat;
-    const result = await request({
-      messages: [
-        {
-          role: "system",
-          content: generateSystemMessage(this.userName),
-        },
-        { role: "user", content: diffString },
-      ],
-    });
-    if (result.data && result.data.error && !result.data.choices) {
-      throw result.data.error;
-    }
-
-    if (result.data.usage) {
-      this.usageMessage = chalk.underline(
-        `本次模型消耗统计：总数 ${result.data.usage.total_tokens} tokens、输入 ${result.data.usage.prompt_tokens} tokens、输出 ${result.data.usage.completion_tokens} tokens`
-      );
-    }
-
-    return formatCompletions(result);
-  }
-
-  /**
-   * 让 AI 帮忙分析 git commit 失败原因
-   * @param {Object} payload
-   * @param {string} payload.errorMessage git commit 抛出的错误
-   * @param {string} payload.gitStatus 当前 git status 输出
-   * @param {string} payload.hookLogs 如果有 hook 输出，可传入
-   */
-  async analyzeCommitFailure({
-    errorMessage = "",
-    gitStatus = "",
-    hookLogs = "",
-  } = {}) {
-    this.usageMessage = "";
-    const request = this.checkConfig() ? chat : freeChat;
-    const contextParts = [];
-    if (errorMessage) {
-      contextParts.push(`Git 命令报错：\n${errorMessage}`);
-    }
-    if (gitStatus) {
-      contextParts.push(`git status 输出：\n${gitStatus}`);
-    }
-    if (hookLogs) {
-      contextParts.push(`Hook 输出：\n${hookLogs}`);
-    }
-    const userPrompt = contextParts.length
-      ? contextParts.join("\n\n")
-      : "未提供额外日志，只知道 git commit 失败。";
-
-    const result = await request({
-      messages: [
-        {
-          role: "system",
-          content:
-            "你是一个资深的 Git 专家，请分析用户提供的 git commit 失败日志，输出造成失败的最可能原因，并给出简洁的排查或修复步骤。请使用中文回答，结构可以是：原因 + 处理建议。",
-        },
-        {
-          role: "user",
-          content: userPrompt,
-        },
-      ],
-      temperature: 0.2,
-    });
-
-    if (result.data && result.data.usage) {
-      this.usageMessage = chalk.underline(
-        `本次模型消耗统计：总数 ${result.data.usage.total_tokens} tokens、输入 ${result.data.usage.prompt_tokens} tokens、输出 ${result.data.usage.completion_tokens} tokens`
-      );
-    }
-
-    if (result.data && result.data.error && !result.data.choices) {
-      throw result.data.error;
-    }
-
-    return formatCompletions(result);
-  }
-
-  /**
-   * 获取使用统计信息
-   */
-  getUsageMessage() {
-    return this.usageMessage;
-  }
-}
+import { chat, freeChat } from '../utils/OpenAI.mjs';
+import { generateSystemMessage, formatCompletions } from '../utils/MessageUtils.mjs';
+import { config } from '../utils/Storage.mjs';
+import chalk from 'chalk';
+/**
+ * AI 服务类
+ * 封装所有 AI 相关操作
+ */
+export class AIService {
+  constructor(userName) {
+    this.userName = userName;
+    this.usageMessage = '';
+  }
+  // 检查是否配置 baseUrl model
+  checkConfig() {
+    const baseURL = config.get('baseURL');
+    const key = config.get('key');
+    return baseURL && key;
+  }
+
+  /**
+   * 生成提交消息
+   */
+  async generateCommitMessage(diffString) {
+    const request = this.checkConfig() ? chat : freeChat;
+    const result = await request({
+      messages: [
+        {
+          role: 'system',
+          content: generateSystemMessage(this.userName),
+        },
+        { role: 'user', content: diffString },
+      ],
+    });
+    if (result.data && result.data.error && !result.data.choices) {
+      throw result.data.error;
+    }
+
+    if (result.data.usage) {
+      this.usageMessage = chalk.underline(
+        `本次模型消耗统计：总数 ${result.data.usage.total_tokens} tokens、输入 ${result.data.usage.prompt_tokens} tokens、输出 ${result.data.usage.completion_tokens} tokens`
+      );
+    }
+
+    return formatCompletions(result);
+  }
+
+  /**
+   * 让 AI 帮忙分析 git commit 失败原因
+   * @param {Object} payload
+   * @param {string} payload.errorMessage git commit 抛出的错误
+   * @param {string} payload.gitStatus 当前 git status 输出
+   * @param {string} payload.hookLogs 如果有 hook 输出，可传入
+   */
+  async analyzeCommitFailure({ errorMessage = '', gitStatus = '', hookLogs = '' } = {}) {
+    this.usageMessage = '';
+    const request = this.checkConfig() ? chat : freeChat;
+    const contextParts = [];
+    if (errorMessage) {
+      contextParts.push(`Git 命令报错：\n${errorMessage}`);
+    }
+    if (gitStatus) {
+      contextParts.push(`git status 输出：\n${gitStatus}`);
+    }
+    if (hookLogs) {
+      contextParts.push(`Hook 输出：\n${hookLogs}`);
+    }
+    const userPrompt = contextParts.length
+      ? contextParts.join('\n\n')
+      : '未提供额外日志，只知道 git commit 失败。';
+
+    const result = await request({
+      messages: [
+        {
+          role: 'system',
+          content:
+            '你是一个资深的 Git 专家，请分析用户提供的 git commit 失败日志，输出造成失败的最可能原因，并给出简洁的排查或修复步骤。请使用中文回答，结构可以是：原因 + 处理建议。',
+        },
+        {
+          role: 'user',
+          content: userPrompt,
+        },
+      ],
+      temperature: 0.2,
+    });
+
+    if (result.data && result.data.usage) {
+      this.usageMessage = chalk.underline(
+        `本次模型消耗统计：总数 ${result.data.usage.total_tokens} tokens、输入 ${result.data.usage.prompt_tokens} tokens、输出 ${result.data.usage.completion_tokens} tokens`
+      );
+    }
+
+    if (result.data && result.data.error && !result.data.choices) {
+      throw result.data.error;
+    }
+
+    return formatCompletions(result);
+  }
+
+  /**
+   * 获取使用统计信息
+   */
+  getUsageMessage() {
+    return this.usageMessage;
+  }
+}