@hifullmoon/aicommit 1.4.0 → 2.0.0

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

@@ -18,7 +18,7 @@ function showHelp() {
     ${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.dim('$')} aicommit split [run|plan|apply|resume|abort] [options]
 
   ${chalk.bold('Commands:')}
     setup                 Interactive configuration wizard
@@ -30,7 +30,7 @@ function showHelp() {
     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 run             Plan and create logical commits
+    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
@@ -45,8 +45,9 @@ 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 run|plan": staged, all
+    --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)
     --reasoning=<level>   Set reasoning effort (enabled by default: medium)
@@ -72,11 +73,11 @@ 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 split run    Choose staged/all scope, then plan logical commits
-    aicommit split run --scope=staged  Split only the reviewed index snapshot
-    aicommit split run --scope=all --yes  Split the complete working tree non-interactively
-    aicommit split run --scope=staged --split-hunks  Split eligible text hunks
+    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
@@ -109,6 +110,7 @@ function parsedDefaults(overrides = {}) {
     targetPath: null,
     cliLang: null,
     cliProvider: null,
+    cliModel: null,
     cliReasoning: null,
     output: 'text',
     debug: false,
@@ -203,14 +205,23 @@ export function parseArgs(args = process.argv.slice(2)) {
 
   let splitCommand = null;
   if (args[0] === 'split') {
-    splitCommand = args[1];
-    if (!['run', 'plan', 'apply', 'resume', 'abort'].includes(splitCommand)) {
+    const requestedAction = args[1];
+    const actions = ['run', 'plan', 'apply', 'resume', 'abort'];
+    if (!requestedAction || requestedAction.startsWith('-')) {
+      // Keep the common path short: `aicommit split` is the interactive
+      // split flow, while explicit actions remain available for automation
+      // and recovery.
+      splitCommand = 'run';
+      args = args.slice(1);
+    } else if (actions.includes(requestedAction)) {
+      splitCommand = requestedAction;
+      args = args.slice(2);
+    } else {
       throw fail(
         ERROR_CATEGORIES.CONFIG,
         'split requires one action: run, plan, apply, resume, or abort.',
       );
     }
-    args = args.slice(2);
   }
 
   const doctor = args[0] === 'doctor';
@@ -219,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;
@@ -378,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(
@@ -430,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.',
@@ -442,6 +471,7 @@ export function parseArgs(args = process.argv.slice(2)) {
         split ||
         splitHunks ||
         cliProvider ||
+        cliModel ||
         cliLang ||
         cliReasoning ||
         dryRun
@@ -475,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,
@@ -500,6 +538,7 @@ export function parseArgs(args = process.argv.slice(2)) {
     presetAction &&
     (targetPath ||
       cliProvider ||
+      cliModel ||
       cliLang ||
       cliReasoning ||
       split ||
@@ -525,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.',
     );
   }
 
@@ -533,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 };