@hifullmoon/aicommit 2.0.0 → 2.1.0

package/docs/troubleshooting.md

@@ -15,22 +15,19 @@ JSON mode keeps one machine object on stdout and diagnostics on stderr. The `err
 
 JSON 模式保证 stdout 只有一个机器对象，诊断进入 stderr。`error.category` 与进程退出码可稳定用于自动化。
 
-| Symptom / 症状                                                                  | Category / exit                 | Likely cause / 常见原因                                                                                                                             | Check and recovery / 检查与恢复                                                                                                                         |
-| ------------------------------------------------------------------------------- | ------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Config fails before Git/provider access / 在 Git/provider 前配置失败            | `config` / `2`                  | Malformed JSON, invalid URL, unsupported option, missing credential / JSON 损坏、URL 或选项无效、凭据缺失                                           | `aicommit config path`; `aicommit config validate`; fix only the user-owned file shown                                                                  |
-| Project settings are ignored / 项目设置被忽略                                   | warning                         | Repository config tried to set endpoint, credential, extension, reasoning, metrics, or raise a ceiling / 仓库配置尝试设置连接、凭据、扩展或提高预算 | Move trusted connection settings to `~/.aicommit.config.json`; keep team rules in `.aicommit.policy.json`                                               |
-| Not a Git repository, conflict, empty index / 非仓库、冲突或 index 为空         | `git_state` / `3`               | Wrong directory or unsafe Git state / 目录错误或 Git 状态不安全                                                                                     | `git status`; `aicommit /absolute/repo/path`; resolve conflicts before retrying                                                                         |
-| DNS, connection, or timeout / DNS、连接或超时                                   | `network` / `4`                 | Endpoint unavailable, proxy/TLS issue, budget too short / endpoint 不可达、代理/TLS、超时过短                                                       | `aicommit doctor -p NAME`; verify HTTPS URL; raise user-owned `timeoutMs` only if expected                                                              |
-| HTTP authentication/rate/parameter failure / 鉴权、限流或参数失败               | `provider` / `5`                | Wrong key/model/body; non-retryable 4xx / key、model、body 错误                                                                                     | Check `apiKeyEnv`, model and compatibility table; authentication is never retried automatically                                                         |
-| Empty or malformed model reply / 空或畸形回复                                   | `response_format` / `6`         | Unsupported response dialect, token limit, policy/extension validator failure / 响应方言、token 限制、policy/扩展校验失败                           | Raise `maxTokens`, choose the matching adapter, inspect validator issue code; one correction is already attempted                                       |
-| `split run --scope=all --yes` stops before API call / split 非交互在 API 前停止 | `sensitive_data` / `7`          | Complete untracked scan found sensitive-looking data / 完整未跟踪扫描发现疑似敏感数据                                                               | Review/stage intended files explicitly; do not bypass without checking the actual content                                                               |
-| Commit aborts after generation / 生成后提交中止                                 | `concurrent_modification` / `8` | Index/worktree changed during the protected window / 受保护窗口中 index/worktree 被修改                                                             | Review `git status`, restore the intended snapshot, and generate again                                                                                  |
-| Split stopped after one or more commits / split 部分提交后停止                  | reported Git failure            | Hook, crash, SIGINT, or concurrent pending edit / hook、崩溃、中断或待处理文件变化                                                                  | Run `aicommit split resume`; if another Git workflow already replaced the transaction, use `aicommit split abort`（只删除恢复元数据，不改提交或工作区） |
-| 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                                  |
-| 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.
-
-若问题仍未解决，请记录 `aicommit doctor --output=json`、Node/Git 版本、错误分类与脱敏后的配置来源。不要在公开 issue 中附加 diff、commit message、配置文件、API key、reasoning、含秘密的扩展源码或 credential-helper 输出。
+| Symptom / 症状                                                                  | Category / exit                 | Likely cause / 常见原因                                                                                                         | Check and recovery / 检查与恢复                                                                                                                         |
+| ------------------------------------------------------------------------------- | ------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Config fails before Git/provider access / 在 Git/provider 前配置失败            | `config` / `2`                  | Malformed JSON, invalid URL, unsupported option, missing credential / JSON 损坏、URL 或选项无效、凭据缺失                       | `aicommit config path`; `aicommit config validate`; fix only the user-owned file shown                                                                  |
+| Project settings are ignored / 项目设置被忽略                                   | warning                         | Repository config tried to set endpoint, credential, reasoning, or raise a ceiling / 仓库配置尝试设置连接、凭据、推理或提高预算 | Move trusted connection settings to `~/.aicommit/config.json`; keep team rules in `.aicommit.policy.json`                                               |
+| Not a Git repository, conflict, empty index / 非仓库、冲突或 index 为空         | `git_state` / `3`               | Wrong directory or unsafe Git state / 目录错误或 Git 状态不安全                                                                 | `git status`; `aicommit /absolute/repo/path`; resolve conflicts before retrying                                                                         |
+| DNS, connection, or timeout / DNS、连接或超时                                   | `network` / `4`                 | Endpoint unavailable, proxy/TLS issue, budget too short / endpoint 不可达、代理/TLS、超时过短                                   | `aicommit doctor -p NAME`; verify HTTPS URL; raise user-owned `timeoutMs` only if expected                                                              |
+| HTTP authentication/rate/parameter failure / 鉴权、限流或参数失败               | `provider` / `5`                | Wrong key/model/body; non-retryable 4xx / key、model、body 错误                                                                 | Check `apiKeyEnv`, model and compatibility table; authentication is never retried automatically                                                         |
+| Empty or malformed model reply / 空或畸形回复                                   | `response_format` / `6`         | Unsupported response dialect, token limit, or policy validation failure / 响应方言、token 限制或 policy 校验失败                | Raise `maxTokens`, choose the matching adapter, inspect validator issue code; one correction is already attempted                                       |
+| `split run --scope=all --yes` stops before API call / split 非交互在 API 前停止 | `sensitive_data` / `7`          | Complete untracked scan found sensitive-looking data / 完整未跟踪扫描发现疑似敏感数据                                           | Review/stage intended files explicitly; do not bypass without checking the actual content                                                               |
+| Commit aborts after generation / 生成后提交中止                                 | `concurrent_modification` / `8` | Index/worktree changed during the protected window / 受保护窗口中 index/worktree 被修改                                         | Review `git status`, restore the intended snapshot, and generate again                                                                                  |
+| Split stopped after one or more commits / split 部分提交后停止                  | reported Git failure            | Hook, crash, SIGINT, or concurrent pending edit / hook、崩溃、中断或待处理文件变化                                              | Run `aicommit split resume`; if another Git workflow already replaced the transaction, use `aicommit split abort`（只删除恢复元数据，不改提交或工作区） |
+| 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, or credential-helper output to a public issue.
+
+若问题仍未解决，请记录 `aicommit doctor --output=json`、Node/Git 版本、错误分类与脱敏后的配置来源。不要在公开 issue 中附加 diff、commit message、配置文件、API key、reasoning 或 credential-helper 输出。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hifullmoon/aicommit",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Safe, local-first AI commit message generator for Git workflows",
   "type": "module",
   "bin": {

package/src/api.js

@@ -8,7 +8,6 @@ import {
   validateCommitCandidate,
 } from './policy.js';
 import { encodeUntrustedData } from './trust.js';
-import { extensionHostFor, resolveProviderAdapter } from './extensions.js';
 
 // Default per-request timeout; overridable via the "timeoutMs" config key.
 const DEFAULT_TIMEOUT_MS = 120_000;
@@ -167,7 +166,7 @@ async function fetchWithRetry(apiUrl, init, timeout, configuredPolicy, consume)
 export async function requestGeneration(config, request) {
   secureEndpoint(config.apiUrl);
   const timeout = config.timeoutMs || DEFAULT_TIMEOUT_MS;
-  const adapter = await resolveProviderAdapter(config, getProviderAdapter);
+  const adapter = getProviderAdapter(config);
   const payload = await adapter.buildRequest({
     messages: request.messages,
     temperature: request.temperature,
@@ -370,7 +369,7 @@ function hitTokenLimit(data) {
 // happened. Disable it only for providers where we know the switch is valid;
 // unknown compatible endpoints keep their configured behavior.
 async function reasoningForFollowUp(config) {
-  const adapter = await resolveProviderAdapter(config, getProviderAdapter);
+  const adapter = getProviderAdapter(config);
   return adapter.reasoningForFollowUp(config.reasoning);
 }
 
@@ -660,23 +659,7 @@ export async function generateCommitMessage(
   // Validate against the versioned policy and give the provider exactly one
   // cheap correction attempt. The diff is never re-sent: the prior reply plus
   // concrete violations are sufficient to repair formatting and constraints.
-  const validate = async (candidate) => {
-    const builtIn = validateCommitCandidate(candidate, { policy, diff });
-    const host = extensionHostFor(config);
-    if (!host) return builtIn;
-    const extensionIssues = await host.validateMessage(candidate, policy);
-    const issues = [...builtIn.issues, ...extensionIssues];
-    const errors = issues.filter((item) => item.severity === 'error');
-    const warnings = issues.filter((item) => item.severity === 'warning');
-    return {
-      ...builtIn,
-      valid: errors.length === 0,
-      needsCorrection: errors.length > 0,
-      issues,
-      errors,
-      warnings,
-    };
-  };
+  const validate = (candidate) => validateCommitCandidate(candidate, { policy, diff });
 
   let validation = await validate(message);
   if (message.trim() && validation.needsCorrection) {

package/src/cli.js

@@ -14,28 +14,24 @@ function showHelp() {
   ${chalk.bold('Usage:')}
     ${chalk.dim('$')} aicommit [path] [options]
     ${chalk.dim('$')} aicommit setup
-    ${chalk.dim('$')} aicommit config <show|validate|path> [options]
-    ${chalk.dim('$')} aicommit policy <template|check> [options]
-    ${chalk.dim('$')} aicommit preset <show|validate|path|install|rollback> [options]
-    ${chalk.dim('$')} aicommit completion <bash|zsh|fish>
     ${chalk.dim('$')} aicommit split [run|plan|apply|resume|abort] [options]
 
-  ${chalk.bold('Commands:')}
+  ${chalk.bold('Everyday commands:')}
     setup                 Interactive configuration wizard
     doctor                Diagnose runtime, config, credentials, and connectivity
+    split                 Plan and create file-level logical commits
+
+  ${chalk.bold('Advanced commands:')}
     config show           Print the effective configuration with secrets redacted
     config validate       Parse, merge, and validate configuration without reading credentials
     config path           Print user, project, and team-policy paths
     policy template       Print a safe repository team-policy template
     policy check          Validate a message file or Git range with the effective team policy
-    preset                Inspect, validate, install, or roll back provider preset manifests
     completion            Generate Bash, Zsh, or Fish completion on stdout
-    split, split run      Plan and create logical commits
     split plan            Generate and export a fingerprinted JSON plan
     split apply           Validate and apply an exported JSON plan
     split resume          Resume the repository's unfinished transaction
     split abort           Discard recovery metadata; keep commits and changes
-    stats [action]        Show quality/cost trends; show, clear, enable, disable
 
   ${chalk.bold('Arguments:')}
     path                  Target directory (default: current directory)
@@ -46,7 +42,6 @@ function showHelp() {
     -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
     --range=<revision>    Git revision/range for "policy check" (default: HEAD)
@@ -58,35 +53,11 @@ function showHelp() {
     --debug               Print debug info (parsed args, final config, etc.)
 
   ${chalk.bold('Examples:')}
-    aicommit setup        Run the interactive configuration wizard
-    aicommit doctor       Check runtime, config, credentials, and connectivity
-    aicommit config show  Show effective redacted configuration
-    aicommit config validate --output=json  Validate configuration for CI
-    aicommit config path  Show user and project config locations
-    aicommit policy template > .aicommit.policy.json  Create a committable policy
-    aicommit policy check --file=.git/COMMIT_EDITMSG  Validate a local commit message
-    aicommit policy check --range=origin/main..HEAD --output=json  Validate a CI range
-    aicommit preset show  Show the active versioned provider preset manifest
-    aicommit preset install --file=provider-presets.json  Install a compatible manifest
-    aicommit preset rollback  Restore the previously installed manifest
-    aicommit completion zsh > _aicommit  Generate Zsh completion
-    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 -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
-    aicommit split --scope=staged --split-hunks  Split eligible text hunks
-    aicommit split plan --scope=staged --file=.aicommit-plan.json --yes
-    aicommit split apply --file=.aicommit-plan.json --yes
-    aicommit split resume --yes  Resume pending groups from the checkpoint
-    aicommit split abort --yes  Discard a stale checkpoint without changing Git state
-    aicommit --reasoning=low  Stream reasoning; Ctrl+O expands/collapses it
     aicommit --dry-run    Review a generated message without committing
     aicommit --yes        Commit already staged changes without prompts
-    aicommit --yes --output=json  Emit one machine-readable result on stdout
-    aicommit /path/to    Commit changes in the specified directory
 `);
 }
 
@@ -115,7 +86,6 @@ function parsedDefaults(overrides = {}) {
     output: 'text',
     debug: false,
     split: null,
-    splitHunks: false,
     splitCommand: null,
     splitPlanFile: null,
     dryRun: false,
@@ -126,10 +96,7 @@ function parsedDefaults(overrides = {}) {
     policyAction: null,
     policyMessageFile: null,
     policyRange: null,
-    presetAction: null,
-    presetFile: null,
     completionShell: null,
-    statsAction: null,
     help: false,
     version: false,
     ...overrides,
@@ -137,6 +104,13 @@ function parsedDefaults(overrides = {}) {
 }
 
 export function parseArgs(args = process.argv.slice(2)) {
+  if (args[0] === 'stats' || args[0] === 'preset') {
+    throw fail(
+      ERROR_CATEGORIES.CONFIG,
+      `The "${args[0]}" command was removed to keep aicommit focused on commit generation.`,
+    );
+  }
+
   // "setup" is a standalone subcommand — it doesn't combine with the
   // commit-flow options, so short-circuit before parsing them.
   if (args[0] === 'setup') {
@@ -149,15 +123,6 @@ export function parseArgs(args = process.argv.slice(2)) {
     return parsedDefaults({ setup: true });
   }
 
-  if (args[0] === 'stats') {
-    const action = args[1] || 'show';
-    const allowed = ['show', 'clear', 'enable', 'disable'];
-    if (args.length > 2 || !allowed.includes(action)) {
-      throw fail(ERROR_CATEGORIES.CONFIG, `stats accepts one action: ${allowed.join(', ')}.`);
-    }
-    return parsedDefaults({ statsAction: action });
-  }
-
   if (args[0] === 'completion') {
     const shell = args[1];
     if (args.length !== 2 || !['bash', 'zsh', 'fish'].includes(shell)) {
@@ -182,18 +147,6 @@ export function parseArgs(args = process.argv.slice(2)) {
     args = args.slice(2);
   }
 
-  let presetAction = null;
-  if (args[0] === 'preset') {
-    presetAction = args[1];
-    if (!['show', 'validate', 'path', 'install', 'rollback'].includes(presetAction)) {
-      throw fail(
-        ERROR_CATEGORIES.CONFIG,
-        'preset requires one action: show, validate, path, install, or rollback.',
-      );
-    }
-    args = args.slice(2);
-  }
-
   let configAction = null;
   if (args[0] === 'config') {
     configAction = args[1];
@@ -235,11 +188,9 @@ export function parseArgs(args = process.argv.slice(2)) {
   let output = 'text';
   let debug = false;
   let split = null;
-  let splitHunks = false;
   let splitPlanFile = null;
   let policyMessageFile = null;
   let policyRange = null;
-  let presetFile = null;
   let splitScopeOption = false;
   let dryRun = false;
   let yes = false;
@@ -275,11 +226,6 @@ export function parseArgs(args = process.argv.slice(2)) {
       continue;
     }
 
-    if (arg === '--split-hunks') {
-      splitHunks = true;
-      continue;
-    }
-
     if (arg === '--scope') {
       splitScopeOption = true;
       split = takeValue(args, i, arg, 'staged|all');
@@ -302,7 +248,6 @@ export function parseArgs(args = process.argv.slice(2)) {
     if (arg === '--file') {
       const value = takeValue(args, i, arg, 'path');
       if (policyAction) policyMessageFile = value;
-      else if (presetAction) presetFile = value;
       else splitPlanFile = value;
       i++;
       continue;
@@ -312,7 +257,6 @@ export function parseArgs(args = process.argv.slice(2)) {
       const value = arg.slice('--file='.length);
       if (!value) throw fail(ERROR_CATEGORIES.CONFIG, 'Missing value for --file.');
       if (policyAction) policyMessageFile = value;
-      else if (presetAction) presetFile = value;
       else splitPlanFile = value;
       continue;
     }
@@ -430,12 +374,6 @@ export function parseArgs(args = process.argv.slice(2)) {
   if (!['text', 'json'].includes(output)) {
     throw fail(ERROR_CATEGORIES.CONFIG, `Invalid output mode: "${output}". Use text or json.`);
   }
-  if (splitHunks && !['run', 'plan'].includes(splitCommand)) {
-    throw fail(
-      ERROR_CATEGORIES.CONFIG,
-      '--split-hunks is only valid with "aicommit split run" or "aicommit split plan".',
-    );
-  }
   if (splitCommand) {
     if (['plan', 'apply'].includes(splitCommand) && !splitPlanFile) {
       throw fail(ERROR_CATEGORIES.CONFIG, `split ${splitCommand} requires --file=<path>.`);
@@ -453,10 +391,10 @@ export function parseArgs(args = process.argv.slice(2)) {
       }
       if (splitCommand === 'plan') dryRun = true;
     } else if (splitCommand === 'apply') {
-      if (split || splitHunks) {
+      if (split) {
         throw fail(
           ERROR_CATEGORIES.CONFIG,
-          'split apply reads its scope from the plan; do not pass --scope or --split-hunks.',
+          'split apply reads its scope from the plan; do not pass --scope.',
         );
       }
       if (cliProvider || cliModel || cliLang || cliReasoning || dryRun) {
@@ -466,16 +404,7 @@ export function parseArgs(args = process.argv.slice(2)) {
         );
       }
     } else {
-      if (
-        splitPlanFile ||
-        split ||
-        splitHunks ||
-        cliProvider ||
-        cliModel ||
-        cliLang ||
-        cliReasoning ||
-        dryRun
-      ) {
+      if (splitPlanFile || split || cliProvider || cliModel || cliLang || cliReasoning || dryRun) {
         throw fail(
           ERROR_CATEGORIES.CONFIG,
           `split ${splitCommand} accepts only an optional path, --yes, --output, and --debug.`,
@@ -494,14 +423,7 @@ export function parseArgs(args = process.argv.slice(2)) {
   }
   if (
     configAction &&
-    (cliLang ||
-      cliReasoning ||
-      split ||
-      splitHunks ||
-      splitCommand ||
-      splitPlanFile ||
-      dryRun ||
-      yes)
+    (cliLang || cliReasoning || split || splitCommand || splitPlanFile || dryRun || yes)
   ) {
     throw fail(
       ERROR_CATEGORIES.CONFIG,
@@ -513,15 +435,7 @@ export function parseArgs(args = process.argv.slice(2)) {
   }
   if (
     policyAction &&
-    (cliProvider ||
-      cliModel ||
-      cliLang ||
-      cliReasoning ||
-      split ||
-      splitHunks ||
-      splitCommand ||
-      dryRun ||
-      yes)
+    (cliProvider || cliModel || cliLang || cliReasoning || split || splitCommand || dryRun || yes)
   ) {
     throw fail(
       ERROR_CATEGORIES.CONFIG,
@@ -534,30 +448,6 @@ export function parseArgs(args = process.argv.slice(2)) {
   if (policyMessageFile && policyRange) {
     throw fail(ERROR_CATEGORIES.CONFIG, 'policy check accepts either --file or --range, not both.');
   }
-  if (
-    presetAction &&
-    (targetPath ||
-      cliProvider ||
-      cliModel ||
-      cliLang ||
-      cliReasoning ||
-      split ||
-      splitHunks ||
-      splitCommand ||
-      dryRun ||
-      yes)
-  ) {
-    throw fail(
-      ERROR_CATEGORIES.CONFIG,
-      'preset accepts only --file (validate/install), --output, and --debug.',
-    );
-  }
-  if (presetAction === 'install' && !presetFile) {
-    throw fail(ERROR_CATEGORIES.CONFIG, 'preset install requires --file=<manifest>.');
-  }
-  if (presetFile && !['validate', 'install'].includes(presetAction)) {
-    throw fail(ERROR_CATEGORIES.CONFIG, '--file is only valid with preset validate or install.');
-  }
   if (
     doctor &&
     (targetPath || cliLang || cliReasoning || split || splitPlanFile || dryRun || yes)
@@ -577,7 +467,6 @@ export function parseArgs(args = process.argv.slice(2)) {
     output,
     debug,
     split,
-    splitHunks,
     splitCommand,
     splitPlanFile,
     dryRun,
@@ -588,10 +477,7 @@ export function parseArgs(args = process.argv.slice(2)) {
     policyAction,
     policyMessageFile,
     policyRange,
-    presetAction,
-    presetFile,
     completionShell: null,
-    statsAction: null,
     help: false,
     version: false,
   };

package/src/completion.js

@@ -3,16 +3,13 @@ const TOP_LEVEL = [
   'doctor',
   'config',
   'policy',
-  'preset',
   'completion',
   'split',
-  'stats',
   '--help',
   '--version',
   '--lang',
   '--provider',
   '--model',
-  '--split-hunks',
   '--scope',
   '--reasoning',
   '--no-reasoning',
@@ -33,10 +30,8 @@ _aicommit() {
   case "$command" in
     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 ;;
-    split) COMPREPLY=( $(compgen -W "run plan apply resume abort --scope --file --split-hunks --yes --output --debug" -- "$cur") ); return ;;
-    stats) COMPREPLY=( $(compgen -W "show clear enable disable" -- "$cur") ); return ;;
+    split) COMPREPLY=( $(compgen -W "run plan apply resume abort --scope --file --yes --output --debug" -- "$cur") ); return ;;
   esac
   case "$prev" in
     --lang|-l) COMPREPLY=( $(compgen -W "zh en" -- "$cur") ); return ;;
@@ -57,10 +52,8 @@ _aicommit() {
     'doctor:diagnose configuration and connectivity'
     'config:inspect or validate configuration'
     'policy:print or enforce a repository team policy'
-    'preset:manage versioned provider preset manifests'
     'completion:generate shell completion'
     'split:run, plan, apply, resume, or abort split commits'
-    'stats:show local quality trends'
   )
   options=(
     '--help[show help]'
@@ -68,7 +61,6 @@ _aicommit() {
     '--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'
     '--range=[Git range for policy check]:revision:'
@@ -85,10 +77,8 @@ _aicommit() {
       case $words[2] in
         config) _values 'config action' show validate path ;;
         policy) _values 'policy action' template check ;;
-        preset) _values 'preset action' show validate path install rollback ;;
         completion) _values 'shell' bash zsh fish ;;
         split) _values 'split action' run plan apply resume abort ;;
-        stats) _values 'action' show clear enable disable ;;
         *) _describe 'command' commands ;;
       esac
       ;;
@@ -103,22 +93,17 @@ complete -c aicommit -n '__fish_use_subcommand' -a setup -d 'Interactive configu
 complete -c aicommit -n '__fish_use_subcommand' -a doctor -d 'Diagnose configuration and connectivity'
 complete -c aicommit -n '__fish_use_subcommand' -a config -d 'Inspect or validate configuration'
 complete -c aicommit -n '__fish_use_subcommand' -a policy -d 'Print or enforce a repository team policy'
-complete -c aicommit -n '__fish_use_subcommand' -a preset -d 'Manage versioned provider preset manifests'
 complete -c aicommit -n '__fish_use_subcommand' -a completion -d 'Generate shell completion'
 complete -c aicommit -n '__fish_use_subcommand' -a split -d 'Run, plan, apply, resume, or abort split commits'
-complete -c aicommit -n '__fish_use_subcommand' -a stats -d 'Show local quality trends'
 complete -c aicommit -n '__fish_seen_subcommand_from config' -a 'show validate path'
 complete -c aicommit -n '__fish_seen_subcommand_from policy' -a 'template check'
-complete -c aicommit -n '__fish_seen_subcommand_from preset' -a 'show validate path install rollback'
 complete -c aicommit -n '__fish_seen_subcommand_from completion' -a 'bash zsh fish'
 complete -c aicommit -n '__fish_seen_subcommand_from split' -a 'run plan apply resume abort'
-complete -c aicommit -n '__fish_seen_subcommand_from stats' -a 'show clear enable disable'
 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'
 complete -c aicommit -l range -r -d 'Git range for policy check'

package/src/config-command.js

@@ -4,25 +4,43 @@ import { join } from 'node:path';
 import { getProjectRoot, loadConfig } from './config.js';
 import { fileExists, stringifyConfigRedacted } from './utils.js';
 import { TEAM_POLICY_FILENAME } from './team-policy.js';
+import { projectConfigPath, resolveConfigLocations, userConfigLocations } from './config-paths.js';
 
 function redactedObject(value) {
   return JSON.parse(stringifyConfigRedacted(value));
 }
 
 export async function inspectConfigPaths(projectRoot = getProjectRoot()) {
-  const user = join(homedir(), '.aicommit.config.json');
-  const project = join(projectRoot, '.aicommit.config.json');
+  const userLocations = await resolveConfigLocations(userConfigLocations(homedir()));
+  const project = projectConfigPath(projectRoot);
+  const projectExists = project !== userLocations.activePath && (await fileExists(project));
   const teamPolicy = join(projectRoot, TEAM_POLICY_FILENAME);
   return {
-    user: { path: user, exists: await fileExists(user) },
-    project: { path: project, exists: project !== user && (await fileExists(project)) },
+    user: {
+      path: userLocations.canonical,
+      exists: Boolean(userLocations.activePath),
+      activePath: userLocations.activePath,
+      legacyPath: userLocations.legacy,
+      legacyExists: userLocations.legacyExists,
+      usingLegacy: userLocations.usingLegacy,
+    },
+    project: {
+      path: project,
+      exists: projectExists,
+      activePath: projectExists ? project : null,
+    },
     teamPolicy: { path: teamPolicy, exists: await fileExists(teamPolicy) },
   };
 }
 
 function printPaths(paths) {
-  console.log(`User config:    ${paths.user.path}${paths.user.exists ? '' : ' (not found)'}`);
-  console.log(`Project config: ${paths.project.path}${paths.project.exists ? '' : ' (not found)'}`);
+  const displayConfigPath = (item) => {
+    if (!item.exists) return `${item.path} (not found)`;
+    if (item.usingLegacy) return `${item.activePath} (legacy; move to ${item.path})`;
+    return item.path;
+  };
+  console.log(`User config:    ${displayConfigPath(paths.user)}`);
+  console.log(`Project config: ${displayConfigPath(paths.project)}`);
   console.log(
     `Team policy:    ${paths.teamPolicy.path}${paths.teamPolicy.exists ? '' : ' (not found)'}`,
   );

package/src/config-paths.js

@@ -0,0 +1,31 @@
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+
+import { fileExists } from './utils.js';
+
+export const AICOMMIT_DIRECTORY = '.aicommit';
+export const CONFIG_FILENAME = 'config.json';
+export const PROJECT_CONFIG_FILENAME = '.aicommit.config.json';
+
+export function userConfigLocations(home = homedir()) {
+  return {
+    canonical: join(home, AICOMMIT_DIRECTORY, CONFIG_FILENAME),
+    legacy: join(home, PROJECT_CONFIG_FILENAME),
+  };
+}
+
+export function projectConfigPath(projectRoot) {
+  return join(projectRoot, PROJECT_CONFIG_FILENAME);
+}
+
+export async function resolveConfigLocations(locations) {
+  const canonicalExists = await fileExists(locations.canonical);
+  const legacyExists = await fileExists(locations.legacy);
+  return {
+    ...locations,
+    canonicalExists,
+    legacyExists,
+    activePath: canonicalExists ? locations.canonical : legacyExists ? locations.legacy : null,
+    usingLegacy: !canonicalExists && legacyExists,
+  };
+}