ai-cmds 0.2.0 → 0.4.0

package/README.md

@@ -7,9 +7,10 @@ AI-powered CLI tool that uses OpenAI and Google Gemini models to review code cha
 - Multiple AI models: GPT-5, GPT-5-mini, GPT-4o-mini, Gemini 2.5 Pro, Gemini 2.0 Flash
 - Configurable review setups from light to heavy
 - Custom setups with full control over reviewer and validator models
-- Four commands: `review-code-changes` for local development, `advanced-review-changes` for guided/customized local review focus, `review-pr` for CI, `create-pr` for PR creation
+- Five commands: `commit` for AI commit messages, `review-code-changes` for local development, `advanced-review-changes` for guided/customized local review focus, `review-pr` for CI, `create-pr` for PR creation
 - Parallel reviews with a single structured validation pass for higher accuracy
 - Optional provider-aware concurrency limits for reviewer fan-out
+- AI-generated commit messages with interactive editing
 - AI-generated PR titles and descriptions
 - Automatic filtering of import-only changes
 - Custom review instructions support
@@ -33,6 +34,27 @@ pnpm add ai-cmds
 
 ## Commands
 
+### `commit` - AI Commit Messages
+
+Generate commit messages from staged changes using AI (Gemini primary, GPT-5-mini fallback).
+
+```bash
+# Generate commit message and commit
+ai-cmds commit
+
+# Preview message without committing
+ai-cmds commit --dry-run
+```
+
+**Arguments:**
+- `--dry-run` - Preview the generated message without committing
+
+**Behavior:**
+- If no files are staged, automatically stages all changes before generating
+- Lockfiles are excluded from the diff sent to AI by default
+- After generation, choose to: **Commit**, **Edit**, **Regenerate**, or **Cancel**
+- If the primary model fails, automatically retries with the fallback model
+
 ### `review-code-changes` - Local Development
 
 Review local code changes (staged or all changes vs base branch). Best for local development workflow.
@@ -224,6 +246,11 @@ export default defineConfig({
     diffExcludePatterns: ['pnpm-lock.yaml'],
     descriptionInstructions: 'Always mention Jira ticket if present in branch name',
   },
+  commit: {
+    maxDiffTokens: 10000,
+    excludePatterns: ['dist/**'],
+    instructions: 'Always include the Jira ticket number from the branch name',
+  },
 });
 ```
 
@@ -255,6 +282,7 @@ By default, `.env` is loaded automatically before the config file is imported, a
 | `loadDotEnv` | Controls `.env` file loading. `true` (default): load `.env`, `false`: skip, `string`: additional file path, `string[]`: multiple files (later override earlier) |
 | `codeReview` | Configuration for the review commands (see below) |
 | `createPR` | Configuration for the create-pr command (see below) |
+| `commit` | Configuration for the commit command (see below) |
 
 #### `codeReview` Options
 
@@ -282,6 +310,16 @@ By default, `.env` is loaded automatically before the config file is imported, a
 | `diffExcludePatterns` | Glob patterns for files to exclude from diff |
 | `maxDiffTokens` | Maximum tokens from diff to include in AI prompt (default: 50000) |
 
+#### `commit` Options
+
+| Option | Description |
+|--------|-------------|
+| `primaryModel` | Custom AI model for commit message generation (default: Gemini 2.5 Flash) |
+| `fallbackModel` | Fallback AI model if primary fails (default: GPT-5-mini) |
+| `maxDiffTokens` | Maximum tokens from diff to include in AI prompt (default: 10000) |
+| `excludePatterns` | Additional glob patterns to exclude from diff (merged with default lockfile patterns) |
+| `instructions` | Custom instructions for AI commit message generation |
+
 When `codeReview.logsDir` (or `AI_CLI_LOGS_DIR`) is set, each review run stores artifacts under:
 
 - `<logsDir>/advanced-review-changes/<run-id>/...` for advanced local reviews

package/dist/{index-BN4ituqC.d.ts → index-VeIKmeup.d.ts}

@@ -171,6 +171,34 @@ type CreatePRConfig = {
    */
   maxDiffTokens?: number;
 };
+type CommitConfig = {
+  /**
+   * Custom AI model for generating commit messages.
+   * Defaults to Google Gemini 2.5 Flash.
+   */
+  primaryModel?: CustomModelConfig;
+  /**
+   * Fallback AI model if the primary model fails.
+   * Defaults to OpenAI GPT-5-mini.
+   */
+  fallbackModel?: CustomModelConfig;
+  /**
+   * Maximum number of tokens from the diff to include in the AI prompt.
+   * @default 10000
+   */
+  maxDiffTokens?: number;
+  /**
+   * Additional glob patterns to exclude from the diff sent to AI.
+   * Merged with default lockfile patterns (package-lock.json, yarn.lock, etc.).
+   * @example ['dist/**', '*.generated.ts']
+   */
+  excludePatterns?: string[];
+  /**
+   * Custom instructions to include in the AI prompt for generating commit messages.
+   * @example 'Always include the Jira ticket number from the branch name'
+   */
+  instructions?: string;
+};
 type Config = {
   /**
    * Configuration for the review-code-changes, advanced-review-changes, and
@@ -181,6 +209,10 @@ type Config = {
    * Configuration for the create-pr command.
    */
   createPR?: CreatePRConfig;
+  /**
+   * Configuration for the commit command.
+   */
+  commit?: CommitConfig;
   /**
    * Controls loading of environment variables from `.env` files.
    *
@@ -322,6 +354,33 @@ declare const advancedReviewChangesCommand: {
   }[] | undefined;
 };
 //#endregion
+//#region src/commands/commit/commit.d.ts
+declare const commitCommand: {
+  short: string | undefined;
+  description: string;
+  run: (cmdArgs: {
+    dryRun: boolean;
+    yes: boolean;
+  }) => Promise<void> | void;
+  args: {
+    dryRun: {
+      type: "flag";
+      name: string;
+      description: string;
+    };
+    yes: {
+      type: "flag";
+      name: string;
+      description: string;
+      short: string;
+    };
+  } | undefined;
+  examples: {
+    args: string[];
+    description: string;
+  }[] | undefined;
+};
+//#endregion
 //#region src/commands/create-pr/create-pr.d.ts
 declare const createPRCommand: {
   short: string | undefined;
@@ -436,4 +495,4 @@ declare const reviewPRCommand: {
   }[] | undefined;
 };
 //#endregion
-export { BUILT_IN_SCOPE_OPTIONS, BUILT_IN_SETUP_OPTIONS, type Config, type CreatePRConfig, type CustomModelConfig, DEFAULT_SCOPES, type ReviewCodeChangesConfig, type ReviewConcurrencyConfig, type ScopeConfig, type ScopeContext, type SetupConfig, advancedReviewChangesCommand, createPRCommand, defineConfig, reviewCodeChangesCommand, reviewPRCommand };
+export { BUILT_IN_SCOPE_OPTIONS, BUILT_IN_SETUP_OPTIONS, type CommitConfig, type Config, type CreatePRConfig, type CustomModelConfig, DEFAULT_SCOPES, type ReviewCodeChangesConfig, type ReviewConcurrencyConfig, type ScopeConfig, type ScopeContext, type SetupConfig, advancedReviewChangesCommand, commitCommand, createPRCommand, defineConfig, reviewCodeChangesCommand, reviewPRCommand };

package/dist/index.js

@@ -1,3 +1,3 @@
-import { a as BUILT_IN_SETUP_OPTIONS, c as defineConfig, i as reviewCodeChangesCommand, n as createPRCommand, o as BUILT_IN_SCOPE_OPTIONS, r as advancedReviewChangesCommand, s as DEFAULT_SCOPES, t as reviewPRCommand } from "./review-pr-MkD-Pu9b.js";
+import { a as reviewCodeChangesCommand, c as DEFAULT_SCOPES, i as advancedReviewChangesCommand, l as defineConfig, n as createPRCommand, o as BUILT_IN_SETUP_OPTIONS, r as commitCommand, s as BUILT_IN_SCOPE_OPTIONS, t as reviewPRCommand } from "./review-pr-abLkWpeM.js";
 
-export { BUILT_IN_SCOPE_OPTIONS, BUILT_IN_SETUP_OPTIONS, DEFAULT_SCOPES, advancedReviewChangesCommand, createPRCommand, defineConfig, reviewCodeChangesCommand, reviewPRCommand };
+export { BUILT_IN_SCOPE_OPTIONS, BUILT_IN_SETUP_OPTIONS, DEFAULT_SCOPES, advancedReviewChangesCommand, commitCommand, createPRCommand, defineConfig, reviewCodeChangesCommand, reviewPRCommand };

package/dist/main.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { i as reviewCodeChangesCommand, n as createPRCommand, r as advancedReviewChangesCommand, t as reviewPRCommand } from "./review-pr-MkD-Pu9b.js";
+import { a as reviewCodeChangesCommand, i as advancedReviewChangesCommand, n as createPRCommand, r as commitCommand, t as reviewPRCommand } from "./review-pr-abLkWpeM.js";
 import { createCLI } from "@ls-stack/cli";
 
 //#region src/main.ts
@@ -7,6 +7,7 @@ await createCLI({
 	name: "✨ ai-cmds",
 	baseCmd: "ai-cmds"
 }, {
+	commit: commitCommand,
 	"review-code-changes": reviewCodeChangesCommand,
 	"review-pr": reviewPRCommand,
 	"create-pr": createPRCommand,

package/dist/{review-pr-MkD-Pu9b.js → review-pr-abLkWpeM.js}

@@ -243,18 +243,65 @@ async function getRepoInfo() {
 		repo: match[2].replace(/\.git$/, "")
 	};
 }
+async function getUnstagedDiff(options = {}) {
+	const { includeFiles, silent = true } = options;
+	const gitArgs = ["git", "diff"];
+	if (includeFiles && includeFiles.length > 0) gitArgs.push("--", ...includeFiles);
+	return runCmdUnwrap(gitArgs, { silent });
+}
+async function getChangedFilesUnstaged() {
+	const modifiedOutput = await runCmdSilentUnwrap([
+		"git",
+		"diff",
+		"--name-only"
+	]);
+	const untrackedOutput = await runCmdSilentUnwrap([
+		"git",
+		"ls-files",
+		"--others",
+		"--exclude-standard"
+	]);
+	return [...modifiedOutput.trim().split("\n"), ...untrackedOutput.trim().split("\n")].filter(Boolean);
+}
+async function stageAll() {
+	await runCmdUnwrap([
+		"git",
+		"add",
+		"-A"
+	], { silent: true });
+}
+async function commit(message) {
+	return runCmdUnwrap([
+		"git",
+		"commit",
+		"-m",
+		message
+	], { silent: true });
+}
+async function hasChanges() {
+	return (await runCmdSilentUnwrap([
+		"git",
+		"status",
+		"--porcelain"
+	])).trim().length > 0;
+}
 const git = {
 	getCurrentBranch,
 	getGitRoot,
 	getDiffToBranch,
 	getStagedDiff,
+	getUnstagedDiff,
 	getChangedFiles: getChangedFiles$1,
+	getChangedFilesUnstaged,
 	getStagedFiles,
 	fetchBranch,
 	getCommitHash,
 	getRemoteUrl,
 	getRepoInfo,
-	getLocalBranches
+	getLocalBranches,
+	stageAll,
+	commit,
+	hasChanges
 };
 
 //#endregion
@@ -1707,7 +1754,7 @@ function getModelId(model) {
 	if (typeof model === "string") return model;
 	return model.modelId;
 }
-function getProviderId(model) {
+function getProviderId$1(model) {
 	if (typeof model === "string") return "unknown";
 	return model.provider;
 }
@@ -1744,7 +1791,7 @@ function createDebugTrace(params) {
 		durationMs: endedAt.getTime() - startedAt.getTime(),
 		model: {
 			id: getModelId(model),
-			provider: getProviderId(model)
+			provider: getProviderId$1(model)
 		},
 		config,
 		result
@@ -1766,7 +1813,7 @@ async function runSingleReview(context, prData, changedFiles, prDiff, reviewerId
 			ripgrep: createRipgrepTool(reviewerId)
 		},
 		...config?.topP !== false && { topP: config?.topP ?? .9 },
-		providerOptions: config?.providerOptions ? { [getProviderId(model)]: config.providerOptions } : void 0
+		providerOptions: config?.providerOptions ? { [getProviderId$1(model)]: config.providerOptions } : void 0
 	}));
 	const modelId = getModelId(model);
 	if (result.error) {
@@ -1820,7 +1867,7 @@ async function reviewValidator(context, reviews, prData, changedFiles, prDiff, h
 		},
 		experimental_output: Output.object({ schema: validatedReviewSchema }),
 		...config?.topP !== false && { topP: config?.topP ?? .7 },
-		providerOptions: config?.providerOptions ? { [getProviderId(model)]: config.providerOptions } : void 0
+		providerOptions: config?.providerOptions ? { [getProviderId$1(model)]: config.providerOptions } : void 0
 	}));
 	if (result.error) {
 		console.error(`❌ Validator failed with model ${getModelId(model)}`, result.error);
@@ -1884,7 +1931,7 @@ async function runPreviousReviewCheck(context, prData, changedFiles, prDiff, { m
 			ripgrep: createRipgrepTool("previous-review-checker")
 		},
 		...config?.topP !== false && { topP: config?.topP ?? .7 },
-		providerOptions: config?.providerOptions ? { [getProviderId(model)]: config.providerOptions } : void 0
+		providerOptions: config?.providerOptions ? { [getProviderId$1(model)]: config.providerOptions } : void 0
 	}));
 	const modelId = getModelId(model);
 	if (result.error) {
@@ -2497,6 +2544,252 @@ const advancedReviewChangesCommand = createCmd({
 	}
 });
 
+//#endregion
+//#region src/commands/commit/commit-message-generator.ts
+const commitMessageSchema = z.object({
+	subject: z.string().describe("Concise commit subject line (50 chars ideal, 72 max). Imperative mood. No period at end."),
+	body: z.string().optional().describe("Optional commit body explaining what and why (not how). Wrap at 72 chars.")
+});
+const systemPrompt$1 = `You are a helpful assistant that generates clear, professional git commit messages following conventional commit best practices.
+
+Guidelines for the subject line:
+- Use imperative mood ("Add feature" not "Added feature")
+- Keep it concise: 50 characters is ideal, 72 is the hard max
+- Do not end with a period
+- Capitalize the first letter
+- Focus on WHAT was done and WHY, not HOW
+- If changes span multiple areas, summarize the overall intent
+
+Guidelines for the body (optional):
+- Only include a body if the subject alone doesn't fully explain the change
+- Explain the motivation for the change
+- Contrast the new behavior with the old behavior if relevant
+- Wrap lines at 72 characters
+- Do not repeat the subject line`;
+function buildUserPrompt$1(changedFiles, diff, instructions) {
+	let prompt = `Generate a commit message for the following staged changes.
+
+<changed-files>
+${changedFiles.map((f) => `- ${f}`).join("\n")}
+</changed-files>
+
+<diff>
+${diff}
+</diff>`;
+	if (instructions) prompt += `\n\n<instructions>\n${instructions}\n</instructions>`;
+	return prompt;
+}
+function getProviderId(model) {
+	if (typeof model === "string") return "unknown";
+	return model.provider;
+}
+async function resolveModel(customModel, fallbackProvider) {
+	if (customModel) return {
+		model: customModel.model,
+		label: customModel.label ?? "custom model",
+		providerOptions: customModel.providerOptions ? { [getProviderId(customModel.model)]: customModel.providerOptions } : void 0
+	};
+	if (fallbackProvider === "google") {
+		const { google } = await import("@ai-sdk/google");
+		return {
+			model: google("gemini-2.5-flash"),
+			label: "gemini-2.5-flash",
+			providerOptions: void 0
+		};
+	}
+	const { openai } = await import("@ai-sdk/openai");
+	return {
+		model: openai("gpt-5-mini"),
+		label: "gpt-5-mini",
+		providerOptions: void 0
+	};
+}
+async function generateCommitMessage(changedFiles, diff, config) {
+	const userPrompt = buildUserPrompt$1(changedFiles, diff, config.instructions);
+	const primary = await resolveModel(config.primaryModel, "google");
+	try {
+		console.log(`🤖 Generating commit message with ${primary.label}...`);
+		const primaryStart = performance.now();
+		const result = await generateObject({
+			model: primary.model,
+			schema: commitMessageSchema,
+			system: systemPrompt$1,
+			prompt: userPrompt,
+			providerOptions: primary.providerOptions
+		});
+		const primaryDuration = performance.now() - primaryStart;
+		logTokenUsage(primary.label, result.usage, primaryDuration);
+		return formatCommitMessage(result.object);
+	} catch {
+		console.warn(`⚠️  Primary model (${primary.label}) failed, trying fallback...`);
+		const fallback = await resolveModel(config.fallbackModel, "openai");
+		console.log(`🤖 Generating commit message with ${fallback.label}...`);
+		const fallbackStart = performance.now();
+		const result = await generateObject({
+			model: fallback.model,
+			schema: commitMessageSchema,
+			system: systemPrompt$1,
+			prompt: userPrompt,
+			providerOptions: fallback.providerOptions
+		});
+		const fallbackDuration = performance.now() - fallbackStart;
+		logTokenUsage(fallback.label, result.usage, fallbackDuration);
+		return formatCommitMessage(result.object);
+	}
+}
+function logTokenUsage(label, usage, durationMs) {
+	const input = formatNum$1(usage.inputTokens ?? 0);
+	const output = formatNum$1(usage.outputTokens ?? 0);
+	const total = formatNum$1(usage.totalTokens ?? 0);
+	const seconds = (durationMs / 1e3).toFixed(1);
+	console.log(`📊 ${label} — ${seconds}s, tokens: ${input} in / ${output} out / ${total} total`);
+}
+function formatCommitMessage(message) {
+	if (message.body) return `${message.subject}\n\n${message.body}`;
+	return message.subject;
+}
+
+//#endregion
+//#region src/commands/commit/commit.ts
+const DEFAULT_MAX_DIFF_TOKENS$1 = 1e4;
+const DEFAULT_EXCLUDE_PATTERNS = [
+	"package-lock.json",
+	"yarn.lock",
+	"pnpm-lock.yaml",
+	"bun.lockb",
+	"bun.lock"
+];
+function truncateDiff$1(diff, maxTokens) {
+	const tokenCount = estimateTokenCount(diff);
+	if (tokenCount <= maxTokens) return diff;
+	return `${sliceByTokens(diff, 0, maxTokens)}\n\n... (diff truncated, ${tokenCount - maxTokens} tokens omitted)`;
+}
+const commitCommand = createCmd({
+	description: "Generate an AI-powered commit message and commit staged changes",
+	short: "c",
+	args: {
+		dryRun: {
+			type: "flag",
+			name: "dry-run",
+			description: "Preview generated message without committing"
+		},
+		yes: {
+			type: "flag",
+			name: "yes",
+			description: "Skip confirmation and commit immediately",
+			short: "y"
+		}
+	},
+	examples: [
+		{
+			args: [],
+			description: "Generate commit message and commit"
+		},
+		{
+			args: ["--dry-run"],
+			description: "Preview commit message without committing"
+		},
+		{
+			args: ["--yes"],
+			description: "Generate and commit without confirmation"
+		}
+	],
+	run: async ({ dryRun, yes }) => {
+		const config = (await loadConfig()).commit ?? {};
+		if (!await git.hasChanges()) showErrorAndExit("No changes to commit.");
+		const stagedFiles = await git.getStagedFiles();
+		const needsStaging = stagedFiles.length === 0;
+		let filesToReview;
+		let diff;
+		if (needsStaging) {
+			console.log("📂 No staged changes found. Will stage all changes on commit.");
+			const changedFiles = await git.getChangedFilesUnstaged();
+			if (changedFiles.length === 0) showErrorAndExit("No changes found to commit.");
+			filesToReview = changedFiles;
+			const excludePatterns = [...DEFAULT_EXCLUDE_PATTERNS, ...config.excludePatterns ?? []];
+			const filteredFiles = applyExcludePatterns(filesToReview, excludePatterns);
+			console.log(`\n📊 ${filesToReview.length} file(s) changed:`);
+			for (const file of filesToReview) console.log(`   ${file}`);
+			console.log();
+			diff = await git.getUnstagedDiff({
+				includeFiles: filteredFiles.length > 0 ? filteredFiles : void 0,
+				silent: true
+			});
+		} else {
+			filesToReview = stagedFiles;
+			const excludePatterns = [...DEFAULT_EXCLUDE_PATTERNS, ...config.excludePatterns ?? []];
+			const filteredFiles = applyExcludePatterns(filesToReview, excludePatterns);
+			console.log(`\n📊 ${filesToReview.length} file(s) staged for commit:`);
+			for (const file of filesToReview) console.log(`   ${file}`);
+			console.log();
+			diff = await git.getStagedDiff({
+				includeFiles: filteredFiles.length > 0 ? filteredFiles : void 0,
+				silent: true
+			});
+		}
+		if (!diff.trim()) showErrorAndExit("No diff content available. All changes may be in excluded files.");
+		const maxTokens = config.maxDiffTokens ?? DEFAULT_MAX_DIFF_TOKENS$1;
+		const diffTokens = estimateTokenCount(diff);
+		console.log(`📝 Diff: ${formatNum$1(diffTokens)} tokens`);
+		const truncatedDiff = truncateDiff$1(diff, maxTokens);
+		let message = await generateCommitMessage(filesToReview.slice(0, 30), truncatedDiff, config);
+		while (true) {
+			const separator = "─".repeat(60);
+			console.log(`\n${separator}`);
+			console.log(message);
+			console.log(separator);
+			if (dryRun) {
+				console.log("\n🔍 Dry run mode — commit not created.\n");
+				return;
+			}
+			if (yes) {
+				if (needsStaging) await git.stageAll();
+				await git.commit(message);
+				console.log("\n✅ Changes committed successfully:");
+				for (const file of filesToReview) console.log(`   ${file}`);
+				console.log();
+				return;
+			}
+			const action = await cliInput.select("What would you like to do?", { options: [
+				{
+					value: "commit",
+					label: "Commit"
+				},
+				{
+					value: "edit",
+					label: "Edit message"
+				},
+				{
+					value: "regenerate",
+					label: "Regenerate"
+				},
+				{
+					value: "cancel",
+					label: "Cancel"
+				}
+			] });
+			if (action === "cancel") {
+				console.log("\n🚫 Commit cancelled.\n");
+				return;
+			}
+			if (action === "edit") {
+				message = await cliInput.text("Edit commit message:", { initial: message });
+				continue;
+			}
+			if (action === "regenerate") {
+				message = await generateCommitMessage(filesToReview.slice(0, 30), truncatedDiff, config);
+				continue;
+			}
+			if (needsStaging) await git.stageAll();
+			await git.commit(message);
+			console.log("\n✅ Changes committed successfully:");
+			for (const file of filesToReview) console.log(`   ${file}`);
+			console.log();
+			return;
+		}
+	}
+});
+
 //#endregion
 //#region src/commands/create-pr/pr-generator.ts
 const DEFAULT_MAX_DIFF_TOKENS = 5e4;
@@ -3078,4 +3371,4 @@ const reviewPRCommand = createCmd({
 });
 
 //#endregion
-export { BUILT_IN_SETUP_OPTIONS as a, defineConfig as c, reviewCodeChangesCommand as i, createPRCommand as n, BUILT_IN_SCOPE_OPTIONS as o, advancedReviewChangesCommand as r, DEFAULT_SCOPES as s, reviewPRCommand as t };
+export { reviewCodeChangesCommand as a, DEFAULT_SCOPES as c, advancedReviewChangesCommand as i, defineConfig as l, createPRCommand as n, BUILT_IN_SETUP_OPTIONS as o, commitCommand as r, BUILT_IN_SCOPE_OPTIONS as s, reviewPRCommand as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-cmds",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "license": "MIT",
   "files": [
     "dist"