@hifullmoon/aicommit 1.5.1 → 2.0.0

package/docs/distribution.md

@@ -1,8 +1,8 @@
 # Distribution / 分发
 
-AICommit 通过 npm 与 Homebrew 发布。Homebrew formula 安装同一个 npm tarball，并用 SHA-256 固定其内容。
+AICommit 仅通过 npm 发布。
 
-AICommit is distributed through npm and Homebrew. The Homebrew formula installs the same npm tarball and pins it by SHA-256.
+AICommit is distributed exclusively through npm.
 
 ## npm
 
@@ -26,36 +26,10 @@ The release workflow uses npm Trusted Publishing without a long-lived `NPM_TOKEN
 ```bash
 workdir=$(mktemp -d)
 cd "$workdir"
-npm install --package-lock-only @hifullmoon/aicommit@1.5.1
+npm install --package-lock-only @hifullmoon/aicommit@2.0.0
 npm audit signatures
 ```
 
-## Homebrew
-
-```bash
-# install / 安装
-brew tap hi-fullmoon/aicommit https://github.com/hi-fullmoon/AICommit.git
-brew install hi-fullmoon/aicommit/aicommit
-
-# upgrade / 升级
-brew update
-brew upgrade hi-fullmoon/aicommit/aicommit
-
-# uninstall / 卸载
-brew uninstall aicommit
-brew untap hi-fullmoon/aicommit
-```
-
-Formula 依赖 Homebrew 的 Node package，使用 Homebrew 标准 npm 安装参数，并测试 `--version`、`--help` 与无凭据配置校验。每次 npm 发布完成后，release workflow 会从公开 registry 再执行一次真实安装测试。
-
-The formula depends on Homebrew's Node package, uses Homebrew's standard npm installation arguments, and tests `--version`, `--help`, and credential-free configuration validation. After every npm publish, the release workflow performs a real install from the public registry.
-
-## Integrity / 完整性
-
-`Formula/aicommit.rb` 中的 `sha256` 必须与对应 npm tarball 一致。维护者发布前通过 `scripts/release-assets.mjs` 生成 formula，工作流发布前会再次比较生成结果与已提交文件。
-
-The `sha256` in `Formula/aicommit.rb` must match the corresponding npm tarball. Maintainers generate the formula with `scripts/release-assets.mjs`, and the release workflow compares it again before publishing.
-
 ## Rollback / 回滚
 
 npm 用户可以立即固定上一可用版本：
@@ -64,13 +38,4 @@ npm 用户可以立即固定上一可用版本：
 npm install --global @hifullmoon/aicommit@<last-good-version>
 ```
 
-Homebrew 用户可从旧 tag 取出 formula 并本地安装：
-
-```bash
-git clone https://github.com/hi-fullmoon/AICommit.git /tmp/aicommit-rollback
-git -C /tmp/aicommit-rollback show v1.4.0:Formula/aicommit.rb > /tmp/aicommit.rb
-brew uninstall aicommit
-brew install --formula /tmp/aicommit.rb
-```
-
 已发布的 npm version 不应覆盖或复用。维护者应 deprecate 有问题的版本、恢复正确的 dist-tag，并发布修复 patch。完整流程见 [`RELEASING.md`](../RELEASING.md)。

package/docs/privacy.md

@@ -6,14 +6,14 @@ AICommit 是本地 CLI，不是托管中转服务。仓库数据从本地进程
 
 ## Trust boundaries / 信任边界
 
-| Boundary / 边界                                                      | Data visible there / 可见数据                                                                                                        | Default control / 默认控制                                                                                                                     |
-| -------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------- |
-| Main CLI process / CLI 主进程                                        | Selected Git metadata/diff, effective config, resolved provider credential / 选定 Git 元数据与 diff、有效配置、provider 凭据         | User config owns connection fields; project config is filtered / 连接字段归用户配置，项目配置受过滤                                            |
-| Git subprocess / Git 子进程                                          | Requested status, diff, index/tree operations / 请求的 status、diff、index/tree 操作                                                 | Explicit arguments, temporary indexes, fingerprints and recovery checkpoints / 显式参数、临时 index、指纹与恢复 checkpoint                     |
-| Provider endpoint / Provider 端点                                    | Prompt, protected selected diff/context, model options, Bearer credential / prompt、保护后的选定 diff/context、模型选项、Bearer 凭据 | Remote HTTPS except loopback; preview/protection before send; bounded context / 远端仅 HTTPS；发送前预览/保护；上下文有预算                    |
-| Extension child / 扩展子进程                                         | Only the input for its declared interface / 仅声明接口所需输入                                                                       | Sanitized environment, no resolved credential, Node permission model, timeout/output bounds / 清理环境、不传凭据、Node 权限模型、超时/输出限制 |
-| Local metrics file / 本地指标文件                                    | Duration, token totals, bounded result, edited/rewrite flags / 延迟、token 总量、结果类别、编辑/重写标记                             | Local-only, owner permissions, retention cap, disable/clear controls / 仅本地、owner 权限、保留上限、可关闭/清除                               |
-| GitHub/npm/Homebrew during installation / 安装期 GitHub/npm/Homebrew | Package/formula download metadata / 包与 formula 下载元数据                                                                          | Signed tag, Sigstore/GitHub provenance, npm provenance, SHA-256 formula pin / 签名 tag、构建证明、npm provenance、SHA-256 固定                 |
+| Boundary / 边界                                    | Data visible there / 可见数据                                                                                                        | Default control / 默认控制                                                                                                                     |
+| -------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------- |
+| Main CLI process / CLI 主进程                      | Selected Git metadata/diff, effective config, resolved provider credential / 选定 Git 元数据与 diff、有效配置、provider 凭据         | User config owns connection fields; project config is filtered / 连接字段归用户配置，项目配置受过滤                                            |
+| Git subprocess / Git 子进程                        | Requested status, diff, index/tree operations / 请求的 status、diff、index/tree 操作                                                 | Explicit arguments, temporary indexes, fingerprints and recovery checkpoints / 显式参数、临时 index、指纹与恢复 checkpoint                     |
+| Provider endpoint / Provider 端点                  | Prompt, protected selected diff/context, model options, Bearer credential / prompt、保护后的选定 diff/context、模型选项、Bearer 凭据 | Remote HTTPS except loopback; preview/protection before send; bounded context / 远端仅 HTTPS；发送前预览/保护；上下文有预算                    |
+| Extension child / 扩展子进程                       | Only the input for its declared interface / 仅声明接口所需输入                                                                       | Sanitized environment, no resolved credential, Node permission model, timeout/output bounds / 清理环境、不传凭据、Node 权限模型、超时/输出限制 |
+| Local metrics file / 本地指标文件                  | Duration, token totals, bounded result, edited/rewrite flags / 延迟、token 总量、结果类别、编辑/重写标记                             | Local-only, owner permissions, retention cap, disable/clear controls / 仅本地、owner 权限、保留上限、可关闭/清除                               |
+| GitHub/npm during installation / 安装期 GitHub/npm | Package download metadata / package 下载元数据                                                                                       | Version tag and npm Trusted Publishing provenance / 版本 tag 与 npm Trusted Publishing provenance                                              |
 
 ## Provider request contents / Provider 请求内容
 

package/docs/provider-presets.md

@@ -1,8 +1,8 @@
 # Provider presets / Provider 预设
 
-Provider presets are versioned setup data, not request code. The stable adapters in `src/providers.js` own request/response behavior; `presets/provider-presets.json` only supplies a provider ID, display label, adapter ID, secure endpoint, default model, and optional bounded `extraBody` defaults. Adding another OpenAI-compatible service with the `custom` adapter does not change Git, interaction, or request orchestration code.
+Provider presets are versioned setup data, not request code. The stable adapters in `src/providers.js` own request/response behavior; `presets/provider-presets.json` supplies a provider ID, display label, adapter ID, secure endpoint, a named model map, and the default model name. Each model supplies its API `modelId` and may include a label or bounded `extraBody` defaults. Adding another OpenAI-compatible service with the `custom` adapter does not change Git, interaction, or request orchestration code.
 
-Provider preset 是带版本的 setup 数据，不是请求代码。`src/providers.js` 中的稳定 adapter 负责请求/响应行为；`presets/provider-presets.json` 只提供 provider ID、显示名称、adapter ID、安全 endpoint、默认模型以及可选且有界的 `extraBody` 默认值。使用 `custom` adapter 新增另一个 OpenAI-compatible 服务时，不需要修改 Git、交互或请求编排代码。
+Provider preset 是带版本的 setup 数据，不是请求代码。`src/providers.js` 中的稳定 adapter 负责请求/响应行为；`presets/provider-presets.json` 提供 provider ID、显示名称、adapter ID、安全 endpoint、命名模型表和默认模型名。每个模型提供 API `modelId`，也可提供显示名称或有界的 `extraBody` 默认值。使用 `custom` adapter 新增另一个 OpenAI-compatible 服务时，不需要修改 Git、交互或请求编排代码。
 
 ## Compatibility contract / 兼容契约
 
@@ -13,11 +13,11 @@ Every manifest declares:
 ```json
 {
   "kind": "aicommit-provider-presets",
-  "schemaVersion": 1,
-  "version": "1.0.0",
+  "schemaVersion": 2,
+  "version": "2.0.0",
   "compatibility": {
-    "coreMinimum": "1.4.0",
-    "coreMaximumExclusive": "2.0.0",
+    "coreMinimum": "1.5.1",
+    "coreMaximumExclusive": "3.0.0",
     "adapterContract": 1
   }
 }
@@ -27,13 +27,15 @@ Every manifest declares:
 - The core range is inclusive at `coreMinimum` and exclusive at `coreMaximumExclusive`.
 - Core prerelease versions and build metadata follow SemVer; build metadata is ignored for precedence.
 - `adapterContract` declares the request-adapter interface expected by every entry.
-- The runtime rejects unknown fields, duplicate/reserved IDs, unsupported adapters, remote HTTP, credentials, top-level `model`/`messages` overrides, oversized data, incompatible versions, and symlinked files.
+- Every provider declares a non-empty `models` map and a `defaultModel` that references one entry. Model names are setup aliases; `modelId` is sent to the API.
+- The runtime rejects unknown fields, duplicate/reserved IDs, unsupported adapters, remote HTTP, credentials, model-level `model`/`messages` overrides, oversized data, incompatible versions, and symlinked files.
 
 - `version` 标识可独立替换的 preset 数据版本。
 - core 范围包含 `coreMinimum`，不包含 `coreMaximumExclusive`。
 - Core 的预发布版本与构建元数据遵循 SemVer；构建元数据不参与优先级比较。
 - `adapterContract` 声明每个条目所依赖的请求 adapter 接口。
-- 运行时拒绝未知字段、重复/保留 ID、不支持的 adapter、远程 HTTP、凭据、顶层 `model`/`messages` 覆盖、超限数据、不兼容版本和符号链接文件。
+- 每个 Provider 都声明非空 `models`，并通过 `defaultModel` 引用其中一项。模型名是 setup 使用的别名，`modelId` 才会发送给 API。
+- 运行时拒绝未知字段、重复/保留 ID、不支持的 adapter、远程 HTTP、凭据、模型级 `model`/`messages` 覆盖、超限数据、不兼容版本和符号链接文件。
 
 The published JSON Schema is [`schemas/aicommit-provider-presets.schema.json`](../schemas/aicommit-provider-presets.schema.json). Runtime validation is authoritative and adds semantic/security checks that JSON Schema alone cannot express.
 
@@ -91,7 +93,18 @@ Add one entry to a copied manifest, bump `version`, validate, and install it:
   "label": "Acme Compatible",
   "adapter": "custom",
   "apiUrl": "https://api.acme.example/v1/chat/completions",
-  "modelId": "acme-chat"
+  "defaultModel": "fast",
+  "models": {
+    "fast": {
+      "label": "Acme Chat",
+      "modelId": "acme-chat"
+    },
+    "quality": {
+      "label": "Acme Reasoner",
+      "modelId": "acme-reasoner",
+      "extraBody": { "reasoning": true }
+    }
+  }
 }
 ```
 

package/docs/troubleshooting.md

@@ -29,7 +29,6 @@ JSON 模式保证 stdout 只有一个机器对象，诊断进入 stderr。`error
 | Preset install/rollback fails / preset 安装或回滚失败                           | `config` / `2`                  | Schema/core range/adapter contract mismatch or no valid backup / schema、核心范围、adapter contract 不匹配或无备份                                  | `aicommit preset validate --file=...`; `aicommit preset show`; follow the compatibility guide                                                           |
 | Extension requires Node 20+ / 扩展要求 Node 20+                                 | `config` / `2`                  | Node 18 intentionally has no executable-extension fallback / Node 18 有意不降级运行扩展                                                             | Upgrade Node for extensions or remove user manifest entries; core CLI still supports Node 18                                                            |
 | Extension timeout or permission error / 扩展超时或权限错误                      | warning or `response_format`    | Extension exceeded its limit or tried denied filesystem/process access / 扩展超时或访问被拒资源                                                     | Review the extension, keep it single-file, raise `extensions.timeoutMs` cautiously; validator failures are fail-closed                                  |
-| `brew install` checksum mismatch / Homebrew checksum 不一致                     | Homebrew failure                | Formula and registry tarball differ, stale tap, or tampered download / formula 与 tarball 不同、tap 过旧或下载被篡改                                | `brew update`; compare `Formula/aicommit.rb` with the npm tarball; do not use `--force` to bypass integrity                                             |
 | npm provenance is absent or invalid / npm provenance 缺失或失败                 | npm audit failure               | Old npm CLI, non-trusted release, or wrong version / npm 过旧、非可信发布或版本错误                                                                 | Upgrade npm; run `npm audit signatures`; install only a version linked to the official workflow                                                         |
 
 If a failure remains, capture `aicommit doctor --output=json`, Node/Git versions, the error category, and redacted config sources. Never attach a diff, commit message, config file, API key, reasoning trace, extension source containing secrets, or credential-helper output to a public issue.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hifullmoon/aicommit",
-  "version": "1.5.1",
+  "version": "2.0.0",
   "description": "Safe, local-first AI commit message generator for Git workflows",
   "type": "module",
   "bin": {
@@ -29,9 +29,8 @@
     "coverage": "c8 node --test --test-concurrency=1",
     "eval": "node eval/run.mjs",
     "test:package": "node scripts/package-smoke.mjs",
-    "test:homebrew": "node scripts/homebrew-smoke.mjs",
     "docs:terminal-demo": "node scripts/readme-terminal-demo.mjs",
-    "release:assets": "node scripts/release-assets.mjs",
+    "release:version": "node scripts/update-version.mjs",
     "release:npm:check": "node scripts/verify-release.mjs && npm run ci && npm run test:package && npm pack --dry-run",
     "ci": "npm run lint && npm run format:check && npm run eval && npm run coverage"
   },

package/presets/provider-presets.json

@@ -1,10 +1,10 @@
 {
   "kind": "aicommit-provider-presets",
-  "schemaVersion": 1,
-  "version": "1.1.0",
+  "schemaVersion": 2,
+  "version": "2.0.0",
   "compatibility": {
-    "coreMinimum": "1.4.0",
-    "coreMaximumExclusive": "2.0.0",
+    "coreMinimum": "1.5.1",
+    "coreMaximumExclusive": "3.0.0",
     "adapterContract": 1
   },
   "providers": [
@@ -13,33 +13,55 @@
       "label": "OpenAI",
       "adapter": "openai",
       "apiUrl": "https://api.openai.com/v1/chat/completions",
-      "modelId": "gpt-4o"
+      "defaultModel": "gpt-4o",
+      "models": {
+        "gpt-4o": {
+          "label": "GPT-4o",
+          "modelId": "gpt-4o"
+        }
+      }
     },
     {
       "id": "deepseek",
       "label": "DeepSeek",
       "adapter": "deepseek",
       "apiUrl": "https://api.deepseek.com/v1/chat/completions",
-      "modelId": "deepseek-v4-flash"
+      "defaultModel": "chat",
+      "models": {
+        "chat": {
+          "label": "DeepSeek Chat",
+          "modelId": "deepseek-v4-flash"
+        }
+      }
     },
     {
       "id": "openrouter",
       "label": "OpenRouter",
       "adapter": "openrouter",
       "apiUrl": "https://openrouter.ai/api/v1/chat/completions",
-      "modelId": "openai/gpt-4o-mini"
+      "defaultModel": "default",
+      "models": {
+        "default": {
+          "modelId": "openai/gpt-4o-mini"
+        }
+      }
     },
     {
       "id": "minimax",
       "label": "MiniMax",
       "adapter": "minimax",
       "apiUrl": "https://api.minimaxi.com/v1/chat/completions",
-      "modelId": "MiniMax-M3",
-      "extraBody": {
-        "thinking": {
-          "type": "disabled"
-        },
-        "reasoning_split": true
+      "defaultModel": "default",
+      "models": {
+        "default": {
+          "modelId": "MiniMax-M3",
+          "extraBody": {
+            "thinking": {
+              "type": "disabled"
+            },
+            "reasoning_split": true
+          }
+        }
       }
     },
     {
@@ -47,14 +69,25 @@
       "label": "Kimi Code",
       "adapter": "custom",
       "apiUrl": "https://api.kimi.com/coding/v1/chat/completions",
-      "modelId": "kimi-for-coding"
+      "defaultModel": "default",
+      "models": {
+        "default": {
+          "modelId": "kimi-for-coding"
+        }
+      }
     },
     {
       "id": "ollama",
       "label": "Ollama (local)",
       "adapter": "ollama",
       "apiUrl": "http://127.0.0.1:11434/api/chat",
-      "modelId": "qwen3:8b"
+      "defaultModel": "qwen",
+      "models": {
+        "qwen": {
+          "label": "Qwen 3 8B",
+          "modelId": "qwen3:8b"
+        }
+      }
     }
   ]
 }

package/schemas/aicommit-provider-presets.schema.json

@@ -7,7 +7,7 @@
   "required": ["kind", "schemaVersion", "version", "compatibility", "providers"],
   "properties": {
     "kind": { "const": "aicommit-provider-presets" },
-    "schemaVersion": { "const": 1 },
+    "schemaVersion": { "const": 2 },
     "version": {
       "type": "string",
       "pattern": "^(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)$"
@@ -35,7 +35,7 @@
       "items": {
         "type": "object",
         "additionalProperties": false,
-        "required": ["id", "label", "adapter", "apiUrl", "modelId"],
+        "required": ["id", "label", "adapter", "apiUrl", "defaultModel", "models"],
         "properties": {
           "id": {
             "type": "string",
@@ -47,8 +47,28 @@
             "enum": ["openai", "openrouter", "deepseek", "minimax", "ollama", "custom"]
           },
           "apiUrl": { "type": "string", "minLength": 1, "maxLength": 2048 },
-          "modelId": { "type": "string", "minLength": 1, "maxLength": 256 },
-          "extraBody": { "type": "object" }
+          "defaultModel": {
+            "type": "string",
+            "pattern": "^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$"
+          },
+          "models": {
+            "type": "object",
+            "minProperties": 1,
+            "maxProperties": 100,
+            "propertyNames": {
+              "pattern": "^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$"
+            },
+            "additionalProperties": {
+              "type": "object",
+              "additionalProperties": false,
+              "required": ["modelId"],
+              "properties": {
+                "label": { "type": "string", "minLength": 1, "maxLength": 80 },
+                "modelId": { "type": "string", "minLength": 1, "maxLength": 256 },
+                "extraBody": { "type": "object" }
+              }
+            }
+          }
         }
       }
     }

package/src/cli.js

@@ -45,6 +45,7 @@ function showHelp() {
     -v, --version         Show version number
     -l, --lang=<zh|en>    Commit message language (default: zh)
     -p, --provider=<name> Use the named provider from config "providers"
+    -m, --model=<name>    Use a named model from the selected provider
     --split-hunks         Experimental same-file hunk planning (default: off)
     --scope=<scope>       Scope for "split|split plan": staged, all
     --file=<path>         Split-plan artifact or commit-message file
@@ -72,7 +73,7 @@ function showHelp() {
     aicommit stats        Show local acceptance, quality, latency, and token trends
     aicommit              Commit changes in current directory (Chinese)
     aicommit --lang=en    Generate English commit message
-    aicommit -p deepseek  Switch to the "deepseek" provider from config
+    aicommit -p deepseek -m chat  Select a configured provider and model
     aicommit split        Choose staged/all scope, then plan logical commits
     aicommit split --scope=staged  Split only the reviewed index snapshot
     aicommit split --scope=all --yes  Split the complete working tree non-interactively
@@ -109,6 +110,7 @@ function parsedDefaults(overrides = {}) {
     targetPath: null,
     cliLang: null,
     cliProvider: null,
+    cliModel: null,
     cliReasoning: null,
     output: 'text',
     debug: false,
@@ -228,6 +230,7 @@ export function parseArgs(args = process.argv.slice(2)) {
   let targetPath = null;
   let cliLang = null;
   let cliProvider = null;
+  let cliModel = null;
   let cliReasoning = null;
   let output = 'text';
   let debug = false;
@@ -387,6 +390,23 @@ export function parseArgs(args = process.argv.slice(2)) {
       continue;
     }
 
+    if (arg === '-m' || arg === '--model') {
+      cliModel = takeValue(args, i, arg, 'name');
+      i++;
+      continue;
+    }
+
+    if (arg.startsWith('--model=')) {
+      cliModel = arg.slice('--model='.length);
+      if (!cliModel) throw fail(ERROR_CATEGORIES.CONFIG, 'Missing value for --model.');
+      continue;
+    }
+
+    if (arg.startsWith('-m') && arg.length > 2) {
+      cliModel = arg.slice(2);
+      continue;
+    }
+
     if (!arg.startsWith('-')) {
       if (targetPath) {
         throw fail(
@@ -439,7 +459,7 @@ export function parseArgs(args = process.argv.slice(2)) {
           'split apply reads its scope from the plan; do not pass --scope or --split-hunks.',
         );
       }
-      if (cliProvider || cliLang || cliReasoning || dryRun) {
+      if (cliProvider || cliModel || cliLang || cliReasoning || dryRun) {
         throw fail(
           ERROR_CATEGORIES.CONFIG,
           'split apply accepts only --file, --yes, --output, and --debug.',
@@ -451,6 +471,7 @@ export function parseArgs(args = process.argv.slice(2)) {
         split ||
         splitHunks ||
         cliProvider ||
+        cliModel ||
         cliLang ||
         cliReasoning ||
         dryRun
@@ -484,15 +505,23 @@ export function parseArgs(args = process.argv.slice(2)) {
   ) {
     throw fail(
       ERROR_CATEGORIES.CONFIG,
-      'config accepts only an optional path, --provider, --output, and --debug.',
+      'config accepts only an optional path, --provider, --model, --output, and --debug.',
     );
   }
-  if (configAction === 'path' && cliProvider) {
-    throw fail(ERROR_CATEGORIES.CONFIG, 'config path does not accept --provider.');
+  if (configAction === 'path' && (cliProvider || cliModel)) {
+    throw fail(ERROR_CATEGORIES.CONFIG, 'config path does not accept --provider or --model.');
   }
   if (
     policyAction &&
-    (cliProvider || cliLang || cliReasoning || split || splitHunks || splitCommand || dryRun || yes)
+    (cliProvider ||
+      cliModel ||
+      cliLang ||
+      cliReasoning ||
+      split ||
+      splitHunks ||
+      splitCommand ||
+      dryRun ||
+      yes)
   ) {
     throw fail(
       ERROR_CATEGORIES.CONFIG,
@@ -509,6 +538,7 @@ export function parseArgs(args = process.argv.slice(2)) {
     presetAction &&
     (targetPath ||
       cliProvider ||
+      cliModel ||
       cliLang ||
       cliReasoning ||
       split ||
@@ -534,7 +564,7 @@ export function parseArgs(args = process.argv.slice(2)) {
   ) {
     throw fail(
       ERROR_CATEGORIES.CONFIG,
-      'doctor accepts only --provider, --output, and --debug options.',
+      'doctor accepts only --provider, --model, --output, and --debug options.',
     );
   }
 
@@ -542,6 +572,7 @@ export function parseArgs(args = process.argv.slice(2)) {
     targetPath,
     cliLang,
     cliProvider,
+    cliModel,
     cliReasoning,
     output,
     debug,

package/src/completion.js

@@ -11,6 +11,7 @@ const TOP_LEVEL = [
   '--version',
   '--lang',
   '--provider',
+  '--model',
   '--split-hunks',
   '--scope',
   '--reasoning',
@@ -30,7 +31,7 @@ _aicommit() {
   command="\${COMP_WORDS[1]}"
 
   case "$command" in
-    config) COMPREPLY=( $(compgen -W "show validate path --provider --output --debug" -- "$cur") ); return ;;
+    config) COMPREPLY=( $(compgen -W "show validate path --provider --model --output --debug" -- "$cur") ); return ;;
     policy) COMPREPLY=( $(compgen -W "template check --file --range --output --debug" -- "$cur") ); return ;;
     preset) COMPREPLY=( $(compgen -W "show validate path install rollback --file --output --debug" -- "$cur") ); return ;;
     completion) COMPREPLY=( $(compgen -W "bash zsh fish" -- "$cur") ); return ;;
@@ -66,6 +67,7 @@ _aicommit() {
     '--version[show version]'
     '--lang=[commit language]:language:(zh en)'
     '--provider=[provider name]:provider:'
+    '--model=[model name]:model:'
     '--split-hunks[experimental same-file hunk splitting]'
     '--scope=[split scope]:scope:(staged all)'
     '--file=[split plan or commit-message file]:path:_files'
@@ -115,6 +117,7 @@ complete -c aicommit -s h -l help -d 'Show help'
 complete -c aicommit -s v -l version -d 'Show version'
 complete -c aicommit -s l -l lang -x -a 'zh en' -d 'Commit language'
 complete -c aicommit -s p -l provider -x -d 'Provider name'
+complete -c aicommit -s m -l model -x -d 'Model name'
 complete -c aicommit -l split-hunks -d 'Experimental same-file hunk splitting'
 complete -c aicommit -l scope -x -a 'staged all' -d 'Split plan scope'
 complete -c aicommit -l file -r -d 'Split plan file'

package/src/config-command.js

@@ -28,7 +28,10 @@ function printPaths(paths) {
   );
 }
 
-export async function runConfigCommand(action, { provider = null, machineOutput = false } = {}) {
+export async function runConfigCommand(
+  action,
+  { provider = null, model = null, machineOutput = false } = {},
+) {
   const projectRoot = getProjectRoot();
   const paths = await inspectConfigPaths(projectRoot);
   if (action === 'path') {
@@ -36,18 +39,17 @@ export async function runConfigCommand(action, { provider = null, machineOutput
     return { exitReason: 'config_path', data: { projectRoot, paths } };
   }
 
-  const loaded = await loadConfig(provider, { resolveCredentials: false });
+  const loaded = await loadConfig(provider, { model, resolveCredentials: false });
   const data = {
     projectRoot: loaded.projectRoot,
     sources: loaded.loaded,
     provider: loaded.providerName,
+    model: loaded.modelName,
     paths,
   };
   if (action === 'validate') {
     if (!machineOutput) {
-      console.log(
-        `Configuration valid${loaded.providerName ? ` for provider "${loaded.providerName}"` : ''}.`,
-      );
+      console.log(`Configuration valid for ${loaded.providerName}/${loaded.modelName}.`);
       printPaths(paths);
     }
     return { exitReason: 'config_valid', data };