@hifullmoon/aicommit 2.0.0 → 2.1.0

package/src/config.js

@@ -1,14 +1,11 @@
 import { readFile, chmod } from 'node:fs/promises';
 import { execSync } from 'node:child_process';
-import { homedir } from 'node:os';
-import { isAbsolute, join } from 'node:path';
 
 import chalk from 'chalk';
 
-import { fileExists, deepMerge } from './utils.js';
+import { deepMerge, fileExists } from './utils.js';
 import { ERROR_CATEGORIES, fail } from './errors.js';
 import { resolveCredential } from './credentials.js';
-import { DEFAULT_METRICS } from './metrics.js';
 import { DEFAULT_COMMIT_POLICY, mergeCommitPolicy, validateCommitPolicyConfig } from './policy.js';
 import {
   DEFAULT_REPOSITORY_CONTEXT,
@@ -18,7 +15,7 @@ import {
 } from './context.js';
 import { readTeamPolicy } from './team-policy.js';
 import { isProviderType, PROVIDER_TYPES } from './providers.js';
-import { isExtensionProviderType, validateExtensionsConfig } from './extensions.js';
+import { projectConfigPath, resolveConfigLocations, userConfigLocations } from './config-paths.js';
 
 // Repository-owned config is untrusted input: a cloned repository must never
 // be able to redirect requests while inheriting the API key from the user's
@@ -38,9 +35,7 @@ export const PROJECT_CONNECTION_KEYS = new Set([
   'extraBody',
   'retry',
   'credentialHelper',
-  'metrics',
   'allowProjectPrompt',
-  'extensions',
 ]);
 
 const PROJECT_SAFE_KEYS = new Set([
@@ -144,16 +139,6 @@ export const DEFAULT_CONFIG = {
     enabled: false,
     username: 'aicommit',
   },
-  // Minimal local-only run metrics. There is deliberately no upload target.
-  metrics: { ...DEFAULT_METRICS },
-  // Executable extensions are selected only from the user-owned config.
-  // Their v1 manifests must explicitly deny credential access and run in a
-  // permissioned child process instead of sharing this process.
-  extensions: {
-    manifests: [],
-    timeoutMs: 3000,
-    maxContextChars: 2000,
-  },
   // Cap on diff characters sent to the model per call. Oversized diffs are
   // condensed to a `git diff --stat` summary plus truncated hunks, so a huge
   // change set doesn't burn tokens on lines the model doesn't need.
@@ -370,7 +355,7 @@ export function validateUserConfig(value) {
 }
 
 // Select a Provider and one of its named Model profiles, then flatten both
-// layers so request, split, and extension code keep consuming one runtime
+// layers so request and split code keep consuming one runtime
 // config with a concrete modelId.
 function resolveSelection(config, catalog, cliProvider, cliModel) {
   const providers = catalog.providers;
@@ -462,26 +447,9 @@ export function validateConfig(config) {
   }
   if (
     typeof config.providerType !== 'string' ||
-    (config.providerType !== '' &&
-      !isProviderType(config.providerType) &&
-      !isExtensionProviderType(config.providerType))
+    (config.providerType !== '' && !isProviderType(config.providerType))
   ) {
-    throw new Error(
-      `Invalid config "providerType": expected ${PROVIDER_TYPES.join(', ')}, extension:<id>, or "".`,
-    );
-  }
-  validateExtensionsConfig(config.extensions);
-  if (!config.metrics || typeof config.metrics !== 'object' || Array.isArray(config.metrics)) {
-    throw new Error('Invalid config "metrics": expected an object.');
-  }
-  if (typeof config.metrics.enabled !== 'boolean') {
-    throw new Error('Invalid config "metrics.enabled": expected a boolean.');
-  }
-  if (
-    typeof config.metrics.path !== 'string' ||
-    (config.metrics.path && !isAbsolute(config.metrics.path))
-  ) {
-    throw new Error('Invalid config "metrics.path": expected an absolute path or "".');
+    throw new Error(`Invalid config "providerType": expected ${PROVIDER_TYPES.join(', ')}, or "".`);
   }
   if (
     typeof config.apiKeyEnv !== 'string' ||
@@ -558,7 +526,6 @@ export function validateConfig(config) {
   assertNumber(config.retry, 'maxAttempts', { integer: true, min: 1, max: 10 });
   assertNumber(config.retry, 'baseDelayMs', { integer: true, min: 0, max: 60000 });
   assertNumber(config.retry, 'maxDelayMs', { integer: true, min: 0, max: 300000 });
-  assertNumber(config.metrics, 'maxEntries', { integer: true, min: 1, max: 10000 });
   if (config.retry.maxDelayMs < config.retry.baseDelayMs) {
     throw new Error('Invalid config "retry.maxDelayMs": must be >= retry.baseDelayMs.');
   }
@@ -596,6 +563,11 @@ export function getProjectRoot() {
   }
 }
 
+function warnLegacyConfig(kind, locations) {
+  console.error(chalk.yellow(`  ⚠ Using legacy ${kind} config: ${locations.legacy}`));
+  console.error(chalk.dim(`    Move it to ${locations.canonical}.`));
+}
+
 export async function loadConfig(
   cliProvider = null,
   { model: cliModel = null, resolveCredentials = true } = {},
@@ -605,8 +577,10 @@ export async function loadConfig(
   let catalog = DEFAULT_PROVIDER_CATALOG;
   const loaded = [];
 
-  const userPath = join(homedir(), '.aicommit.config.json');
-  if (await fileExists(userPath)) {
+  const userLocations = await resolveConfigLocations(userConfigLocations());
+  const userPath = userLocations.activePath;
+  if (userPath) {
+    if (userLocations.usingLegacy) warnLegacyConfig('user', userLocations);
     let parsed;
     try {
       parsed = JSON.parse(await readFile(userPath, 'utf-8'));
@@ -635,7 +609,7 @@ export async function loadConfig(
     modelName,
   } = resolveSelection(config, catalog, cliProvider, cliModel);
 
-  const projectPath = join(projectRoot, '.aicommit.config.json');
+  const projectPath = projectConfigPath(projectRoot);
   if (projectPath !== userPath && (await fileExists(projectPath))) {
     let parsed;
     try {
@@ -653,7 +627,7 @@ export async function loadConfig(
         ),
       );
       console.error(
-        chalk.dim('    Put provider credentials and endpoints in ~/.aicommit.config.json.'),
+        chalk.dim('    Put provider credentials and endpoints in ~/.aicommit/config.json.'),
       );
     }
   }
@@ -671,6 +645,12 @@ export async function loadConfig(
     loaded.push('team policy');
   }
 
+  // These v2.0-era settings are intentionally ignored after the related
+  // features were removed. Keeping old config files loadable makes the
+  // product simplification a non-disruptive upgrade for normal users.
+  delete resolvedConfig.metrics;
+  delete resolvedConfig.extensions;
+
   validateConfig(resolvedConfig);
   const credential = resolveCredentials
     ? resolveCredential(resolvedConfig)

package/src/doctor.js

@@ -6,7 +6,6 @@ import { checkConnection } from './api.js';
 import { loadConfig, isSecureApiUrl } from './config.js';
 import { classifyError, ERROR_CATEGORIES, fail } from './errors.js';
 import { getProviderAdapter } from './providers.js';
-import { configureExtensionHost, resolveProviderAdapter } from './extensions.js';
 import { formatMs, formatUsage, redactSensitiveUrl, sanitizeTerminalText } from './utils.js';
 
 function nodeSupported(version = process.versions.node) {
@@ -70,8 +69,7 @@ export async function runDoctor(cliProvider = null, cliModel = null) {
 
   const { config, loaded, providerName, modelName, credentialSourceLabel, credentialWarning } =
     loadedConfig;
-  const extensionHost = await configureExtensionHost(config);
-  const adapter = await resolveProviderAdapter(config, getProviderAdapter);
+  const adapter = getProviderAdapter(config);
   const provider = providerName || adapter.id;
   addCheck(checks, 'Config', 'pass', loaded.length ? loaded.join(' + ') : 'built-in defaults');
   addCheck(checks, 'Model', 'pass', `${providerName}/${modelName} (${config.modelId})`);
@@ -93,15 +91,6 @@ export async function runDoctor(cliProvider = null, cliModel = null) {
   );
   addCheck(checks, 'Credentials', credentialWarning ? 'warn' : 'pass', credentialSourceLabel);
   if (credentialWarning) warnings.push(credentialWarning);
-  if (extensionHost.extensions.length) {
-    addCheck(
-      checks,
-      'Extensions',
-      'pass',
-      extensionHost.extensions.map((item) => `${item.id}@${item.version}`).join(', '),
-    );
-  }
-
   let report;
   try {
     report = await checkConnection(config);

package/src/git.js

@@ -332,7 +332,7 @@ export function gitCommit(message, projectRoot, diagnosticsOnly = false) {
 }
 
 const SENSITIVE_FILE_RE =
-  /(?:^|\/)(?:\.env(?:\..+)?|\.aicommit\.config\.json|\.npmrc|\.pypirc|\.netrc|id_(?:rsa|dsa|ecdsa|ed25519)(?:\.pub)?|credentials?(?:\.[^/]*)?|service[-_]?account(?:\.[^/]*)?|[^/]+\.(?:pem|p12|pfx|key|keystore))$/i;
+  /(?:^|\/)(?:\.env(?:\..+)?|\.aicommit\.config\.json|\.aicommit\/config\.json|\.npmrc|\.pypirc|\.netrc|id_(?:rsa|dsa|ecdsa|ed25519)(?:\.pub)?|credentials?(?:\.[^/]*)?|service[-_]?account(?:\.[^/]*)?|[^/]+\.(?:pem|p12|pfx|key|keystore))$/i;
 const PRIVATE_KEY_RE = /-----BEGIN (?:[A-Z0-9 ]+ )?PRIVATE KEY-----/i;
 const AWS_KEY_RE = /\b(?:AKIA|ASIA)[A-Z0-9]{16}\b/g;
 const ASSIGNED_SECRET_RE =

package/src/main.js

@@ -45,14 +45,11 @@ import { abortSplit, applySplitPlan, resumeSplit, splitFlow } from './split.js';
 import { runModelTask } from './generation-ui.js';
 import { runSetup } from './setup.js';
 import { detectProviderType } from './providers.js';
-import { configureExtensionHost } from './extensions.js';
 import { ERROR_CATEGORIES, fail } from './errors.js';
 import { runDoctor } from './doctor.js';
-import { configureMetrics, runStatsCommand } from './metrics.js';
 import { runConfigCommand } from './config-command.js';
 import { generateCompletion } from './completion.js';
 import { runPolicyCommand } from './policy-command.js';
-import { runPresetCommand } from './preset-command.js';
 import {
   applyCommitlintPolicy,
   collectRepositoryContext,
@@ -95,7 +92,6 @@ async function runMain() {
     output,
     debug,
     split,
-    splitHunks,
     splitCommand,
     splitPlanFile,
     dryRun,
@@ -106,10 +102,7 @@ async function runMain() {
     policyAction,
     policyMessageFile,
     policyRange,
-    presetAction,
-    presetFile,
     completionShell,
-    statsAction,
     help,
     version,
   } = parseArgs();
@@ -119,13 +112,8 @@ async function runMain() {
     process.stdout.write(generateCompletion(completionShell));
     return { exitReason: 'completion' };
   }
-  if (statsAction) {
-    await runStatsCommand(statsAction);
-    return { exitReason: `stats_${statsAction}` };
-  }
-
   const machineOutput = output === 'json';
-  if (machineOutput && !yes && !doctor && !configAction && !policyAction && !presetAction) {
+  if (machineOutput && !yes && !doctor && !configAction && !policyAction) {
     throw fail(ERROR_CATEGORIES.CONFIG, '--output=json requires --yes for commit and split flows.');
   }
 
@@ -162,10 +150,6 @@ async function runMain() {
     });
   }
 
-  if (presetAction) {
-    return runPresetCommand(presetAction, { file: presetFile, machineOutput });
-  }
-
   // ── Banner ──────────────────────────────────────────────────────────
 
   console.log('');
@@ -193,7 +177,6 @@ async function runMain() {
     cliProvider,
     { model: cliModel },
   );
-  const extensionHost = await configureExtensionHost(config);
   const selectedProvider = providerName || detectProviderType(config.apiUrl, config.providerType);
   const warnings = [];
 
@@ -263,8 +246,6 @@ async function runMain() {
     console.log('  ' + chalk.green('✓') + chalk.dim(' Reasoning: off (via CLI)'));
   }
 
-  configureMetrics(config.metrics);
-
   // An empty apiKey is valid for local, keyless endpoints (Ollama, LM Studio,
   // LiteLLM); the request layer omits the Authorization header for them, so a
   // missing key must not abort the run here.
@@ -326,7 +307,6 @@ async function runMain() {
       machineOutput,
       provider: selectedProvider,
       exportPlanPath: splitCommand === 'plan' ? splitPlanFile : null,
-      splitHunks,
     });
     if (handled) return handled === true ? { exitReason: 'success' } : handled;
     // Only one changed file — continue with the normal single-commit flow.
@@ -506,12 +486,8 @@ async function runMain() {
     contextReport.constraints,
     config.language,
   );
-  const extensionContext = await extensionHost.collectContext({ files: changedFiles, branch });
-  config.repositoryContextText = [contextReport.text, extensionContext.text]
-    .filter(Boolean)
-    .join('\n\n');
+  config.repositoryContextText = contextReport.text;
   warnings.push(...contextReport.warnings);
-  warnings.push(...extensionContext.warnings);
   console.log(
     '  ' + chalk.dim(`Context: ${sanitizeTerminalText(repositoryContextSummary(contextReport))}`),
   );

package/src/provider-presets.js

@@ -1,11 +1,9 @@
 import { createRequire } from 'node:module';
-import { lstat, mkdir, readFile, rename, unlink, writeFile } from 'node:fs/promises';
-import { homedir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { lstat, readFile } from 'node:fs/promises';
+import { dirname, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 import { isProviderType } from './providers.js';
-import { fileExists } from './utils.js';
 
 const require = createRequire(import.meta.url);
 const { version: CORE_VERSION } = require('../package.json');
@@ -13,8 +11,6 @@ const { version: CORE_VERSION } = require('../package.json');
 export const PROVIDER_PRESET_KIND = 'aicommit-provider-presets';
 export const PROVIDER_PRESET_SCHEMA_VERSION = 2;
 export const PROVIDER_ADAPTER_CONTRACT_VERSION = 1;
-export const PROVIDER_PRESET_FILENAME = 'provider-presets.json';
-export const PROVIDER_PRESET_BACKUP_FILENAME = 'provider-presets.previous.json';
 export const BUNDLED_PROVIDER_PRESET_PATH = resolve(
   dirname(fileURLToPath(import.meta.url)),
   '../presets/provider-presets.json',
@@ -275,15 +271,6 @@ export function assertProviderPresetCompatibility(value, coreVersion = CORE_VERS
   return value;
 }
 
-export function providerPresetPaths(home = homedir()) {
-  const directory = join(home, '.aicommit');
-  return {
-    bundled: BUNDLED_PROVIDER_PRESET_PATH,
-    user: join(directory, PROVIDER_PRESET_FILENAME),
-    backup: join(directory, PROVIDER_PRESET_BACKUP_FILENAME),
-  };
-}
-
 async function readManifest(path, coreVersion) {
   const info = await lstat(path);
   if (!info.isFile() || info.isSymbolicLink()) {
@@ -302,88 +289,11 @@ async function readManifest(path, coreVersion) {
   return value;
 }
 
-export async function loadProviderPresetManifest({
-  path = null,
-  home = homedir(),
-  coreVersion,
-} = {}) {
-  const paths = providerPresetPaths(home);
-  const selected = path
-    ? resolve(path)
-    : (await fileExists(paths.user))
-      ? paths.user
-      : paths.bundled;
+export async function loadProviderPresetManifest({ path = null, coreVersion } = {}) {
+  const selected = path ? resolve(path) : BUNDLED_PROVIDER_PRESET_PATH;
   return {
     manifest: await readManifest(selected, coreVersion),
     path: selected,
-    source: path ? 'file' : selected === paths.user ? 'user' : 'bundled',
+    source: path ? 'file' : 'bundled',
   };
 }
-
-async function assertWritableTarget(path) {
-  if (!(await fileExists(path))) return;
-  const info = await lstat(path);
-  if (!info.isFile() || info.isSymbolicLink()) {
-    throw new Error(`Refusing to replace non-regular provider preset path: ${path}`);
-  }
-}
-
-async function writeTextAtomic(path, text) {
-  const temp = `${path}.${process.pid}.${Date.now()}.tmp`;
-  try {
-    await writeFile(temp, text, { encoding: 'utf8', mode: 0o600, flag: 'wx' });
-    await rename(temp, path);
-  } catch (err) {
-    await unlink(temp).catch(() => {});
-    throw err;
-  }
-}
-
-async function writeAtomic(path, value) {
-  await writeTextAtomic(path, `${JSON.stringify(value, null, 2)}\n`);
-}
-
-export async function installProviderPresetManifest(
-  sourcePath,
-  { home = homedir(), coreVersion } = {},
-) {
-  if (!sourcePath) throw new Error('preset install requires --file=<manifest>.');
-  const source = await loadProviderPresetManifest({ path: sourcePath, home, coreVersion });
-  const paths = providerPresetPaths(home);
-  const directory = dirname(paths.user);
-  if (await fileExists(directory)) {
-    const info = await lstat(directory);
-    if (!info.isDirectory() || info.isSymbolicLink()) {
-      throw new Error(`Refusing to use non-regular provider preset directory: ${directory}`);
-    }
-  } else {
-    await mkdir(directory, { recursive: true, mode: 0o700 });
-  }
-  await assertWritableTarget(paths.user);
-  await assertWritableTarget(paths.backup);
-  let invalidBackupPath = null;
-  if (await fileExists(paths.user)) {
-    try {
-      const current = await readManifest(paths.user, coreVersion);
-      await writeAtomic(paths.backup, current);
-    } catch {
-      invalidBackupPath = join(dirname(paths.user), `provider-presets.invalid-${Date.now()}.json`);
-      await writeTextAtomic(invalidBackupPath, await readFile(paths.user, 'utf8'));
-    }
-  }
-  await writeAtomic(paths.user, source.manifest);
-  return {
-    manifest: source.manifest,
-    path: paths.user,
-    backupPath: paths.backup,
-    invalidBackupPath,
-  };
-}
-
-export async function rollbackProviderPresetManifest({ home = homedir(), coreVersion } = {}) {
-  const paths = providerPresetPaths(home);
-  if (!(await fileExists(paths.backup))) {
-    throw new Error(`No previous provider preset is available at ${paths.backup}.`);
-  }
-  return installProviderPresetManifest(paths.backup, { home, coreVersion });
-}

package/src/providers.js

@@ -23,7 +23,6 @@ function endpoint(apiUrl) {
 export function detectProviderType(apiUrl, explicitType = '') {
   if (explicitType) {
     const normalized = explicitType.toLowerCase();
-    if (/^extension:[a-z][a-z0-9]*(?:-[a-z0-9]+)*$/.test(normalized)) return normalized;
     if (!PROVIDER_TYPE_SET.has(normalized)) {
       throw new Error(
         `Unknown providerType "${explicitType}". Use one of: ${PROVIDER_TYPES.join(', ')}.`,
@@ -75,9 +74,9 @@ function openAIReasoningEffort(modelId, enabled, effort) {
   );
 }
 
-function mergeRequestExtensions(payload, extensions) {
-  if (!extensions || typeof extensions !== 'object' || Array.isArray(extensions)) return;
-  const { model: _model, messages: _messages, ...safe } = extensions;
+function mergeRequestExtras(payload, extras) {
+  if (!extras || typeof extras !== 'object' || Array.isArray(extras)) return;
+  const { model: _model, messages: _messages, ...safe } = extras;
   Object.assign(payload, safe);
 }
 
@@ -223,7 +222,7 @@ function applyReasoning(payload, provider, modelId, reasoning, nativeOllama) {
   }
 
   const customBody = enabled ? reasoning?.enabledBody : reasoning?.disabledBody;
-  if (customBody !== undefined) mergeRequestExtensions(payload, customBody);
+  if (customBody !== undefined) mergeRequestExtras(payload, customBody);
 }
 
 function reasoningForFollowUp(provider, modelId, reasoning) {
@@ -282,7 +281,7 @@ export function getProviderAdapter({ apiUrl, providerType = '', modelId = '' })
         payload.max_tokens = maxTokens;
       }
 
-      mergeRequestExtensions(payload, extraBody);
+      mergeRequestExtras(payload, extraBody);
       applyReasoning(payload, provider, modelId, reasoning, nativeOllama);
       if (streaming && !nativeOllama) {
         payload.stream = true;

package/src/setup.js

@@ -1,6 +1,6 @@
-import { readFile, writeFile, chmod, copyFile, rename, unlink } from 'node:fs/promises';
+import { readFile, writeFile, chmod, copyFile, mkdir, rename, unlink } from 'node:fs/promises';
 import { homedir } from 'node:os';
-import { join } from 'node:path';
+import { dirname } from 'node:path';
 
 import chalk from 'chalk';
 import ora from 'ora';
@@ -13,6 +13,7 @@ import { CONFIG_SCHEMA_VERSION, isSecureApiUrl, validateUserConfig } from './con
 import { vimSelect } from './ui.js';
 import { fileExists, formatMs, indentError, maskApiKey } from './utils.js';
 import { loadProviderPresetManifest } from './provider-presets.js';
+import { resolveConfigLocations, userConfigLocations } from './config-paths.js';
 
 // Merge the wizard's answers into the one supported Provider/Model schema.
 // Existing providers and unrelated global settings are preserved; the
@@ -41,6 +42,9 @@ async function readExistingConfig(path) {
 }
 
 async function writeConfigAtomic(path, value) {
+  const directory = dirname(path);
+  await mkdir(directory, { recursive: true, mode: 0o700 });
+  await chmod(directory, 0o700).catch(() => {});
   const tempPath = `${path}.${process.pid}.${Date.now()}.tmp`;
   try {
     await writeFile(tempPath, JSON.stringify(value, null, 2) + '\n', {
@@ -58,7 +62,8 @@ async function writeConfigAtomic(path, value) {
 
 export async function runSetup(dependencies = {}) {
   const {
-    targetPath = join(homedir(), '.aicommit.config.json'),
+    targetPath: requestedTargetPath,
+    home = homedir(),
     selectPrompt = vimSelect,
     inputPrompt = input,
     passwordPrompt = password,
@@ -67,6 +72,12 @@ export async function runSetup(dependencies = {}) {
     spinnerFactory = ora,
     presetLoader = loadProviderPresetManifest,
   } = dependencies;
+  const defaultLocations = await resolveConfigLocations(userConfigLocations(home));
+  const targetPath = requestedTargetPath ?? defaultLocations.canonical;
+  const sourcePath =
+    requestedTargetPath !== undefined
+      ? targetPath
+      : defaultLocations.activePath || defaultLocations.canonical;
 
   console.log('');
   console.log(
@@ -78,8 +89,11 @@ export async function runSetup(dependencies = {}) {
   // project config for harmless generation preferences, but it must never be
   // able to redirect a globally authenticated request.
   console.log(chalk.dim(`  Credentials will be stored in the user config: ${targetPath}`));
+  if (sourcePath !== targetPath) {
+    console.log(chalk.dim(`  Existing legacy config will be migrated from: ${sourcePath}`));
+  }
 
-  const existing = await readExistingConfig(targetPath);
+  const existing = await readExistingConfig(sourcePath);
   const { manifest: presetManifest } = await presetLoader();
   const providerPresets = presetManifest.providers;