code-agent-auto-commit 1.3.3 → 1.5.0

package/.code-agent-auto-commit.example.json

@@ -10,8 +10,8 @@
   "ai": {
     "enabled": true,
     "timeoutMs": 15000,
-    "model": "openai/gpt-4.1-mini",
-    "defaultProvider": "openai",
+    "model": "minimax/MiniMax-M2.5-highspeed",
+    "defaultProvider": "minimax",
     "providers": {
       "openai": {
         "api": "openai-completions",
@@ -41,7 +41,7 @@
     }
   },
   "push": {
-    "enabled": false,
+    "enabled": true,
     "provider": "github",
     "remote": "origin",
     "branch": "main"

package/README.md

@@ -44,23 +44,20 @@ cac --help
 # 1. Initialize config
 cac init
 
-# 2. Configure AI API key for commit messages
-#    Edit .cac/.code-agent-auto-commit.json — set your model and defaultProvider.
-#    Fill keys in .cac/.env and load them:
-source .cac/.env
-#    OR:
-cac ai set-key <provider|ENV_VAR> <api-key> [--config <path>]
+# 2. Configure AI API key (pick one method):
+#    Global (recommended — works across all projects):
+cac ai set-key <provider|ENV_VAR> <api-key>
+#    Or project-level (edit .cac/.env):
+echo 'MINIMAX_API_KEY=sk-xxx' >> .cac/.env
 
 # 3. Install hooks
 cac install --tool all --scope project
 
 # 4. Verify
 cac status --scope project
+cac ai "hello"
 
-# 5. Git config
-git init
-
-# 6. Agentic coding
+# 5. Agentic coding
 opencode / claude / codex
 ```
 
@@ -69,7 +66,7 @@ opencode / claude / codex
 > generic `chore(auto): ...` prefixed messages.
 >
 > **Model tip:** Choose a fast, lightweight model (e.g. `gpt-4.1-mini`,
-> `MiniMax-M2.1-highspeed`). Commit messages are short — speed matters more
+> `MiniMax-M2.5-highspeed`). Commit messages are short — speed matters more
 > than intelligence here.
 
 ## Commands
@@ -113,14 +110,20 @@ You can copy from:
 
 Full schema and options:
 
-- `docs/CONFIG.md`
-- `docs/zh-CN.md`
+- `doc/CONFIG.md`
+- `doc/zh-CN.md`
+
+### AI Key Resolution
+
+`cac` resolves API keys automatically in this order (first match wins):
 
-### AI Key Fields
+1. **`process.env`** — environment variable already set in the current shell
+2. **`~/.config/code-agent-auto-commit/keys.env`** — global keys file (written by `cac ai set-key`)
+3. **`.cac/.env`** — project-level env file (created by `cac init`)
+4. **`ai.providers.<name>.apiKey`** — key stored directly in config (not recommended)
 
-- `ai.providers.<name>.apiKeyEnv` expects an environment variable name (for example, `MINIMAX_API_KEY`), not the raw key value.
-- If you prefer storing a key directly in config, use `ai.providers.<name>.apiKey`.
-- If AI request fails (missing key, invalid provider/model, or non-2xx response), `cac` falls back to `commit.fallbackPrefix`-style messages.
+This means **hooks work out of the box** — no need to manually `source .cac/.env` before running.
+If AI request fails (missing key, invalid provider/model, or non-2xx response), `cac` falls back to `commit.fallbackPrefix`-style messages.
 
 ## AI Models (Multi-Provider)
 

package/dist/cli.js

@@ -369,6 +369,7 @@ async function commandAI(flags, positionals) {
     const worktree = node_path_1.default.resolve(getStringFlag(flags, "worktree") ?? process.cwd());
     const explicitConfig = getStringFlag(flags, "config");
     const loaded = (0, config_1.loadConfig)({ explicitPath: explicitConfig, worktree });
+    (0, fs_1.loadProjectAndGlobalEnv)(worktree);
     const subcommand = positionals[0];
     if (subcommand === "set-key") {
         const target = positionals[1];

package/dist/core/config.js

@@ -20,10 +20,10 @@ const DEFAULT_CONFIG = (worktree) => ({
         maxMessageLength: 72,
     },
     ai: {
-        enabled: false,
+        enabled: true,
         timeoutMs: 15000,
-        model: "openai/gpt-4.1-mini",
-        defaultProvider: "openai",
+        model: "minimax/MiniMax-M2.5-highspeed",
+        defaultProvider: "minimax",
         providers: {
             openai: {
                 api: "openai-completions",
@@ -35,11 +35,6 @@ const DEFAULT_CONFIG = (worktree) => ({
                 baseUrl: "https://api.anthropic.com/v1",
                 apiKeyEnv: "ANTHROPIC_API_KEY",
             },
-            openrouter: {
-                api: "openai-completions",
-                baseUrl: "https://openrouter.ai/api/v1",
-                apiKeyEnv: "OPENROUTER_API_KEY",
-            },
             moonshot: {
                 api: "openai-completions",
                 baseUrl: "https://api.moonshot.ai/v1",
@@ -50,11 +45,6 @@ const DEFAULT_CONFIG = (worktree) => ({
                 baseUrl: "https://api.minimaxi.chat/v1",
                 apiKeyEnv: "MINIMAX_API_KEY",
             },
-            "kimi-coding": {
-                api: "anthropic-messages",
-                baseUrl: "https://api.moonshot.ai/anthropic",
-                apiKeyEnv: "KIMI_API_KEY",
-            },
             ollama: {
                 api: "openai-completions",
                 baseUrl: "http://127.0.0.1:11434/v1",
@@ -63,10 +53,10 @@ const DEFAULT_CONFIG = (worktree) => ({
         },
     },
     push: {
-        enabled: false,
+        enabled: true,
         provider: "github",
         remote: "origin",
-        branch: "",
+        branch: "main",
     },
     filters: {
         include: [],
@@ -122,10 +112,10 @@ function normalizeConfig(config) {
         config.ai.timeoutMs = 1000;
     }
     if (!config.ai.model.trim()) {
-        config.ai.model = "openai/gpt-4.1-mini";
+        config.ai.model = "minimax/MiniMax-M2.5-highspeed";
     }
     if (!config.ai.defaultProvider.trim()) {
-        config.ai.defaultProvider = "openai";
+        config.ai.defaultProvider = "minimax";
     }
     const allowedApis = new Set(["openai-completions", "anthropic-messages"]);
     for (const [provider, providerConfig] of Object.entries(config.ai.providers)) {

package/dist/core/exec.js

@@ -8,6 +8,7 @@ function runCommand(command, args, cwd) {
         cwd,
         encoding: "utf8",
         stdio: ["ignore", "pipe", "pipe"],
+        maxBuffer: 10 * 1024 * 1024,
     });
     return {
         exitCode: result.status ?? 1,

package/dist/core/fs.d.ts

@@ -10,3 +10,5 @@ export declare function ensureDirForFile(filePath: string): void;
 export declare function readJsonFile<T>(filePath: string): T | undefined;
 export declare function writeJsonFile(filePath: string, value: unknown): void;
 export declare function writeTextFile(filePath: string, content: string): void;
+export declare function loadEnvFileIntoProcess(filePath: string): void;
+export declare function loadProjectAndGlobalEnv(worktree: string): void;

package/dist/core/fs.js

@@ -15,6 +15,8 @@ exports.ensureDirForFile = ensureDirForFile;
 exports.readJsonFile = readJsonFile;
 exports.writeJsonFile = writeJsonFile;
 exports.writeTextFile = writeTextFile;
+exports.loadEnvFileIntoProcess = loadEnvFileIntoProcess;
+exports.loadProjectAndGlobalEnv = loadProjectAndGlobalEnv;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_os_1 = __importDefault(require("node:os"));
 const node_path_1 = __importDefault(require("node:path"));
@@ -78,3 +80,31 @@ function writeTextFile(filePath, content) {
     ensureDirForFile(filePath);
     node_fs_1.default.writeFileSync(filePath, content, "utf8");
 }
+function parseEnvValue(raw) {
+    const trimmed = raw.trim();
+    if ((trimmed.startsWith("'") && trimmed.endsWith("'")) ||
+        (trimmed.startsWith("\"") && trimmed.endsWith("\""))) {
+        return trimmed.slice(1, -1);
+    }
+    return trimmed;
+}
+function loadEnvFileIntoProcess(filePath) {
+    if (!node_fs_1.default.existsSync(filePath)) {
+        return;
+    }
+    const lines = node_fs_1.default.readFileSync(filePath, "utf8").split(/\r?\n/);
+    for (const line of lines) {
+        const match = line.match(/^\s*(?:export\s+)?([A-Za-z_][A-Za-z0-9_]*)=(.*)$/);
+        if (!match) {
+            continue;
+        }
+        const [, key, rawValue] = match;
+        if (process.env[key] === undefined || process.env[key] === "") {
+            process.env[key] = parseEnvValue(rawValue);
+        }
+    }
+}
+function loadProjectAndGlobalEnv(worktree) {
+    loadEnvFileIntoProcess(getGlobalKeysEnvPath());
+    loadEnvFileIntoProcess(getProjectEnvPath(worktree));
+}

package/dist/core/git.js

@@ -44,11 +44,11 @@ function listChangedFiles(worktree) {
             if (secondNull === -1) {
                 break;
             }
-            const secondPath = output.slice(offset, secondNull);
+            const renamedFrom = output.slice(offset, secondNull);
             offset = secondNull + 1;
             files.push({
-                path: secondPath,
-                originalPath: firstPath,
+                path: firstPath,
+                originalPath: renamedFrom,
                 indexStatus,
                 worktreeStatus,
             });

package/dist/core/run.js

@@ -8,6 +8,7 @@ const node_path_1 = __importDefault(require("node:path"));
 const ai_1 = require("./ai");
 const config_1 = require("./config");
 const filter_1 = require("./filter");
+const fs_1 = require("./fs");
 const git_1 = require("./git");
 function normalizeFallbackType(prefix) {
     const value = prefix.toLowerCase();
@@ -72,6 +73,7 @@ async function buildMessage(prefix, maxLength, aiConfig, stagedPath, fallback, w
 async function runAutoCommit(context, configOptions) {
     const { config } = (0, config_1.loadConfig)(configOptions);
     const worktree = node_path_1.default.resolve(context.worktree ?? config.worktree);
+    (0, fs_1.loadProjectAndGlobalEnv)(worktree);
     if (!config.enabled) {
         return {
             skipped: true,

package/{docs → doc}/CONFIG.md

@@ -20,28 +20,28 @@
     "maxMessageLength": 72
   },
   "ai": {
-    "enabled": false,
+    "enabled": true,
     "timeoutMs": 15000,
-    "model": "openai/gpt-4.1-mini",
-    "defaultProvider": "openai",
+    "model": "minimax/MiniMax-M2.5-highspeed",
+    "defaultProvider": "minimax",
     "providers": {
       "openai": {
         "api": "openai-completions",
         "baseUrl": "https://api.openai.com/v1",
         "apiKeyEnv": "OPENAI_API_KEY"
       },
-      "anthropic": {
-        "api": "anthropic-messages",
-        "baseUrl": "https://api.anthropic.com/v1",
-        "apiKeyEnv": "ANTHROPIC_API_KEY"
+      "minimax": {
+        "api": "openai-completions",
+        "baseUrl": "https://api.minimaxi.chat/v1",
+        "apiKeyEnv": "MINIMAX_API_KEY"
       }
     }
   },
   "push": {
-    "enabled": false,
+    "enabled": true,
     "provider": "github",
     "remote": "origin",
-    "branch": ""
+    "branch": "main"
   },
   "filters": {
     "include": [],
@@ -61,6 +61,22 @@
 - `ai.providers.<name>.apiKey` or `apiKeyEnv`: API key source (env preferred).
 - `ai.providers.<name>.headers`: optional custom headers.
 
+## API Key Resolution
+
+`cac` resolves API keys automatically in this order (first match wins, no override):
+
+| Priority | Source | Description |
+|----------|--------|-------------|
+| 1 | `process.env` | Environment variable in current shell |
+| 2 | `~/.config/code-agent-auto-commit/keys.env` | Global keys file (`cac ai set-key` writes here) |
+| 3 | `.cac/.env` | Project-level env file (`cac init` generates this) |
+| 4 | `ai.providers.<name>.apiKey` | Direct key in config JSON (not recommended) |
+
+Both `export KEY='value'` and `KEY=value` formats are supported in env files.
+
+This auto-loading ensures **hooks work without manual `source`** — the subprocess
+reads keys from files even when shell env vars are not inherited.
+
 ## Notes
 
 - `commit.mode`
@@ -70,6 +86,5 @@
   - `github`: remote URL must contain `github`
   - `gitlab`: remote URL must contain `gitlab`
   - `generic`: no provider URL validation
-- Keep API keys in environment variables when possible.
-- `cac init` also creates `.cac/.env.example` and `.cac/.env` with provider key variables.
+- `cac init` creates `.cac/.env.example` and `.cac/.env` with provider key variables.
 - Hook-triggered `cac run` writes output logs to `.cac/run-<timestamp>.log`.

package/{docs → doc}/zh-CN.md

@@ -14,26 +14,30 @@ It runs commits automatically when a chat/agent turn ends.
 # 1. 初始化配置
 cac init
 
-# 2. 配置 AI API Key（必须，否则无法生成 AI commit message）
-#    编辑 .cac/.code-agent-auto-commit.json，设置 model 和 defaultProvider。
-#    在 .cac/.env 中填入 API Key 后加载：
-source .cac/.env
-#    或者:
-cac ai set-key <provider|ENV_VAR> <api-key> [--config <path>]
+# 2. 配置 AI API Key（必须，二选一）
+#    全局设置（推荐，所有项目通用）：
+cac ai set-key <provider|ENV_VAR> <api-key>
+#    或项目级（编辑 .cac/.env）：
+echo 'MINIMAX_API_KEY=sk-xxx' >> .cac/.env
 
 # 3. 安装钩子
 cac install --tool all --scope project
 
-# 4. 验证状态
+# 4. 验证
 cac status --scope project
+cac ai "hello"
 ```
 
 > **重要：** `cac init` 之后**必须**配置 AI provider 的 API Key。
 > 没有有效的 Key，AI 生成 commit message 会失败，`cac` 会退回到
 > `chore(auto): ...` 格式的通用消息。
 >
+> **Key 自动加载：** 无需手动 `source .cac/.env`。`cac run` 和 `cac ai` 启动时
+> 会自动从 `~/.config/.../keys.env`（全局）和 `.cac/.env`（项目级）加载 API Key。
+> Hook 触发的子进程也能正常工作。
+>
 > **模型选择建议：** 推荐选择速度快、轻量的模型（如 `gpt-4.1-mini`、
-> `MiniMax-M2.1-highspeed`）。Commit message 内容很短，速度比智能更重要。
+> `MiniMax-M2.5-highspeed`）。Commit message 内容很短，速度比智能更重要。
 
 ## Command Reference
 
@@ -83,12 +87,24 @@ cac status --scope project
 
 Default location in repository root: `.cac/.code-agent-auto-commit.json`
 
-For full field details, see `docs/CONFIG.md`.
+For full field details, see `doc/CONFIG.md`.
+
+## API Key 解析顺序
+
+`cac` 按以下优先级自动查找 API Key（先到先得，不覆盖）：
+
+| 优先级 | 来源 | 说明 |
+|--------|------|------|
+| 1 | `process.env` | 当前 shell 已有的环境变量 |
+| 2 | `~/.config/code-agent-auto-commit/keys.env` | 全局 key 文件（`cac ai set-key` 写入） |
+| 3 | `.cac/.env` | 项目级 env 文件（`cac init` 生成） |
+| 4 | `ai.providers.<name>.apiKey` | 配置文件中直接写的 key（不推荐） |
+
+env 文件支持 `export KEY='value'` 和 `KEY=value` 两种格式。
 
 ## Important Notes
 
 - `.env` and key-like files are excluded by default.
 - `per-file` mode requires a clean staging area.
 - Push is disabled by default; verify remote and branch settings before enabling.
-- `ai.providers.<name>.apiKeyEnv` must be an environment variable name (for example, `MINIMAX_API_KEY`), not the raw key.
-- If you want to store the key directly in config, use `ai.providers.<name>.apiKey`.
+- Hook 触发的 `cac run` 会自动加载 env 文件，无需手动 `source`。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-agent-auto-commit",
-  "version": "1.3.3",
+  "version": "1.5.0",
   "description": "CAC provides configurable AI auto-commit(using your git account) for OpenCode, Claude Code, Codex, and other AI code agents",
   "license": "MIT",
   "type": "commonjs",
@@ -17,19 +17,12 @@
     "CONTRIBUTING.md",
     "CODE_OF_CONDUCT.md",
     "SECURITY.md",
-    "docs",
+    "doc",
     ".code-agent-auto-commit.example.json"
   ],
   "publishConfig": {
     "access": "public"
   },
-  "scripts": {
-    "clean": "rm -rf dist",
-    "build": "tsc -p tsconfig.json",
-    "typecheck": "tsc -p tsconfig.json --noEmit",
-    "test": "node --test dist/test/*.test.js",
-    "prepare": "pnpm run build"
-  },
   "keywords": [
     "git",
     "commit",
@@ -41,7 +34,6 @@
   "engines": {
     "node": ">=20"
   },
-  "packageManager": "pnpm@10.28.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/0xtresser/code-agent-auto-commit.git"
@@ -53,5 +45,11 @@
   "devDependencies": {
     "@types/node": "^22.10.0",
     "typescript": "^5.7.2"
+  },
+  "scripts": {
+    "clean": "rm -rf dist",
+    "build": "tsc -p tsconfig.json",
+    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "test": "tsc -p tsconfig.test.json && node --test dist-test/tests/*.test.js"
   }
-}
+}