@jakejarvis/acai 0.2.1 → 0.3.1

package/README.md

@@ -1,6 +1,6 @@
 # acai
 
-AI-generated commit messages that match your repo's existing style. Powered by [Claude Code](https://docs.anthropic.com/en/docs/claude-code) or [Codex](https://github.com/openai/codex).
+AI-generated commit messages that match your repo's existing style. Powered by [Claude Code](https://docs.anthropic.com/en/docs/claude-code) or [Codex](https://github.com/openai/codex), with real-time streaming as the message is generated.
 
 `acai` reads your repo's recent commit history and adapts to whatever conventions your team already uses — conventional commits, gitmoji, ticket prefixes, pig latin, etc.
 
@@ -19,18 +19,21 @@ AI-generated commit messages that match your repo's existing style. Powered by [
 - [Node.js](https://nodejs.org) runtime
 - At least one of the following CLIs installed and signed in:
 
-| Provider | Install |
-|----------|---------|
+| Provider                                                          | Install                                           |
+| ----------------------------------------------------------------- | ------------------------------------------------- |
 | [Claude Code](https://code.claude.com/docs/en/overview) (default) | `curl -fsSL https://claude.ai/install.sh \| bash` |
-| [Codex](https://github.com/openai/codex) | `npm i -g @openai/codex` |
+| [Codex](https://github.com/openai/codex)                          | `npm i -g @openai/codex`                          |
 
 ## Options
 
-| Flag | Env var | Default | Description |
-|------|---------|---------|-------------|
-| `-p, --provider` | `ACAI_PROVIDER` | `claude` | AI provider (`claude`, `codex`) |
-| `-m, --model` | `ACAI_MODEL` | provider default | Model override (`sonnet`, `gpt-5.3-codex`, etc.) |
-| `-y, --yolo` | — | `false` | Stage all changes and commit without confirmation |
+| Flag                | Env var         | Default                    | Description                                          |
+| ------------------- | --------------- | -------------------------- | ---------------------------------------------------- |
+| `-p, --provider`    | `ACAI_PROVIDER` | `claude`                   | AI provider (`claude`, `codex`)                      |
+| `--claude, --codex` | `ACAI_PROVIDER` | `claude`                   | Shorthand for `--provider <name>`                    |
+| `-m, --model`       | `ACAI_MODEL`    | `sonnet` or `gpt-5.4-mini` | Model override                                       |
+| `-y, --yolo`        | —               | `false`                    | Stage all changes and commit without confirmation    |
+| `-V, --verbose`     | —               | `false`                    | Print prompts sent to the provider and raw responses |
+| `-v, --version`     | —               | —                          | Show version number                                  |
 
 ## Usage
 
@@ -45,11 +48,12 @@ npm install -g @jakejarvis/acai
 acai
 
 # Use a different provider
+acai --codex
 acai -p codex
 
 # Override the model
 acai -m haiku
-acai -p codex -m o4-mini
+acai --codex -m gpt-5.4-mini
 
 # Stage everything, generate, and commit — no prompts
 acai --yolo
@@ -62,14 +66,14 @@ acai --yolo
 │
 ◇  3 files staged
 │
-◆  Generating commit message…
+◇  Here's what Claude (sonnet) came up with:
 │
 │  feat(auth): add session expiry validation
 │
-◆  What do you want to do?
+◆  What's next?
 │  ✓ Commit          — accept and commit
 │  ✎ Edit            — open in $EDITOR before committing
-│  ↻ Revise          — give Claude feedback and regenerate
+│  ↻ Revise          — give feedback and regenerate
 │  ⎘ Copy            — copy to clipboard, don't commit
 │  ✕ Cancel
 │
@@ -78,13 +82,13 @@ acai --yolo
 
 ### Revision loop
 
-Choose **Revise** and tell Claude what to change:
+Choose **Revise** and tell the provider what to change:
 
 ```
 ◆  What should Claude change?
 │  make it shorter, drop the scope
 │
-◆  Generating commit message…
+◇  Here's what Claude (sonnet) came up with:
 │
 │  feat: add session expiry validation
 ```

package/dist/cli.mjs

@@ -7,6 +7,8 @@ import c from "readline";
 import { ReadStream } from "tty";
 import { mkdtempSync, rmSync, writeFileSync } from "fs";
 import { delimiter, dirname, join, normalize, resolve } from "path";
+import { query } from "@anthropic-ai/claude-agent-sdk";
+import { Codex } from "@openai/codex-sdk";
 import { spawn } from "child_process";
 import { PassThrough } from "stream";
 import { tmpdir } from "os";
@@ -1877,6 +1879,14 @@ function buildUserPrompt(diff, stat, files) {
 	].join("\n");
 }
 /**
+* Normalize commit message formatting: ensure a blank line between subject and body.
+*/
+function normalizeCommitMessage(message) {
+	const lines = message.split("\n");
+	if (lines.length > 1 && lines[1].trim() !== "") lines.splice(1, 0, "");
+	return lines.join("\n");
+}
+/**
 * Truncate plain text to a character limit.
 */
 function truncate(text, maxChars) {
@@ -1912,61 +1922,93 @@ const providers = {
 		bin: "claude",
 		versionArgs: ["--version"],
 		defaultModel: "sonnet",
-		buildArgs({ userPrompt, systemPrompt, model }) {
-			return [
-				"-p",
-				userPrompt,
-				"--output-format",
-				"json",
-				"--model",
-				model,
-				"--tools",
-				"",
-				"--strict-mcp-config",
-				"--no-session-persistence",
-				"--system-prompt",
-				systemPrompt
-			];
-		},
-		parseOutput(stdout) {
-			let parsed;
+		async *generate(opts) {
+			const systemPrompt = buildSystemPrompt(opts.commitLog, opts.instructions);
+			const userPrompt = buildUserPrompt(opts.diff, opts.stat, opts.files);
+			opts.log?.(`System prompt:\n${systemPrompt}`);
+			opts.log?.(`User prompt:\n${userPrompt}`);
+			const abortController = new AbortController();
+			const timeout = setTimeout(() => abortController.abort(), 12e4);
 			try {
-				parsed = JSON.parse(stdout);
-			} catch {
-				throw new Error(`Failed to parse Claude response as JSON. Raw output:\n${stdout.slice(0, 500)}`);
+				let fullText = "";
+				for await (const message of query({
+					prompt: userPrompt,
+					options: {
+						systemPrompt,
+						model: opts.model,
+						tools: [],
+						settingSources: [],
+						settings: {
+							allowedMcpServers: [],
+							enableAllProjectMcpServers: false
+						},
+						mcpServers: {},
+						permissionMode: "bypassPermissions",
+						allowDangerouslySkipPermissions: true,
+						persistSession: false,
+						includePartialMessages: true,
+						maxTurns: 1,
+						abortController
+					}
+				})) {
+					if (message.type === "stream_event") {
+						const event = message.event;
+						if (event.type === "content_block_delta" && event.delta.type === "text_delta") {
+							fullText += event.delta.text;
+							yield event.delta.text;
+						}
+					}
+					if (message.type === "assistant" && !message.error) {
+						const content = message.message?.content;
+						if (Array.isArray(content)) {
+							for (const block of content) if ("text" in block && block.text && !fullText) {
+								fullText = block.text;
+								yield block.text;
+							}
+						}
+					}
+					if (message.type === "result" && message.is_error) throw new Error(`Claude error: ${message.subtype === "success" ? message.result : message.errors?.join(", ")}`);
+					if (message.type === "assistant" && message.error) throw new Error(`Claude ${message.error} error`);
+				}
+				if (!fullText.trim()) throw new Error("Claude returned an empty commit message.");
+			} finally {
+				clearTimeout(timeout);
 			}
-			if (parsed.is_error) throw new Error(`Claude error: ${parsed.result}`);
-			const result = (parsed.result || "").trim();
-			if (!result) throw new Error("Claude returned an empty commit message.");
-			return result;
 		}
 	},
 	codex: {
 		name: "Codex",
 		bin: "codex",
 		versionArgs: ["--version"],
-		defaultModel: "gpt-5.1-codex-mini",
-		buildArgs({ userPrompt, systemPrompt, model }) {
-			return [
-				"exec",
-				userPrompt,
-				"--model",
-				model,
-				"-c",
-				`developer_instructions=${systemPrompt}`,
-				"-c",
-				"model_reasoning_effort=medium",
-				"-c",
-				"check_for_update_on_startup=false",
-				"--ephemeral",
-				"--sandbox",
-				"read-only"
-			];
-		},
-		parseOutput(stdout) {
-			const result = stdout.trim();
-			if (!result) throw new Error("Codex returned an empty commit message.");
-			return result;
+		defaultModel: "gpt-5.4-mini",
+		async *generate(opts) {
+			const systemPrompt = buildSystemPrompt(opts.commitLog, opts.instructions);
+			const userPrompt = buildUserPrompt(opts.diff, opts.stat, opts.files);
+			opts.log?.(`System prompt:\n${systemPrompt}`);
+			opts.log?.(`User prompt:\n${userPrompt}`);
+			const { events } = await new Codex({ config: {
+				developer_instructions: systemPrompt,
+				model_reasoning_effort: "medium",
+				check_for_update_on_startup: false,
+				mcp_servers: {}
+			} }).startThread({
+				model: opts.model,
+				sandboxMode: "read-only",
+				skipGitRepoCheck: true
+			}).runStreamed(userPrompt);
+			let lastText = "";
+			for await (const event of events) {
+				opts.log?.(`Event: ${JSON.stringify(event).slice(0, 300)}`);
+				if (event.type === "turn.failed") throw new Error(`Codex error: ${event.error.message}`);
+				if ((event.type === "item.updated" || event.type === "item.completed") && event.item.type === "agent_message") {
+					const newText = event.item.text;
+					if (newText.length > lastText.length) {
+						yield newText.slice(lastText.length);
+						lastText = newText;
+					}
+				}
+			}
+			if (!lastText.trim()) throw new Error("Codex returned an empty commit message.");
 		}
 	}
 };
@@ -1981,32 +2023,6 @@ async function ensureProvider(provider) {
 	] } });
 	if (exitCode !== 0) throw new Error(`${provider.name} CLI ("${provider.bin}") not found. Make sure it is installed and on your PATH.`);
 }
-/**
-* Generate a commit message using the given provider's CLI.
-*/
-async function generateCommitMessage(provider, opts) {
-	const { diff, stat, files, commitLog, model, instructions, log } = opts;
-	const systemPrompt = buildSystemPrompt(commitLog, instructions);
-	const userPrompt = buildUserPrompt(diff, stat, files);
-	log?.(`System prompt:\n${systemPrompt}`);
-	log?.(`User prompt:\n${userPrompt}`);
-	const args = provider.buildArgs({
-		userPrompt,
-		systemPrompt,
-		model
-	});
-	const { stdout, stderr, exitCode } = await z(provider.bin, args, {
-		timeout: 12e4,
-		nodeOptions: { stdio: [
-			"ignore",
-			"pipe",
-			"pipe"
-		] }
-	});
-	log?.(`Raw response:\n${stdout}${stderr ? `\nStderr:\n${stderr}` : ""}`);
-	if (exitCode !== 0) throw new Error(`${provider.name} exited with code ${exitCode}\n${stderr || stdout}`);
-	return provider.parseOutput(stdout);
-}
 //#endregion
 //#region src/args.ts
 const DEFAULT_PROVIDER = "claude";
@@ -2024,13 +2040,19 @@ const options = {
 		short: "y"
 	},
 	verbose: {
+		type: "boolean",
+		short: "V"
+	},
+	version: {
 		type: "boolean",
 		short: "v"
 	},
 	help: {
 		type: "boolean",
 		short: "h"
-	}
+	},
+	claude: { type: "boolean" },
+	codex: { type: "boolean" }
 };
 function parseConfig() {
 	const { values } = parseArgs({
@@ -2038,11 +2060,13 @@ function parseConfig() {
 		options,
 		strict: false
 	});
+	const providerAlias = values.codex ? "codex" : values.claude ? "claude" : void 0;
 	return {
-		provider: values.provider ?? process.env.ACAI_PROVIDER ?? DEFAULT_PROVIDER,
+		provider: values.provider ?? providerAlias ?? process.env.ACAI_PROVIDER ?? DEFAULT_PROVIDER,
 		model: values.model ?? process.env.ACAI_MODEL ?? "",
 		yolo: values.yolo ?? false,
 		verbose: values.verbose ?? false,
+		version: values.version ?? false,
 		help: values.help ?? false
 	};
 }
@@ -2053,11 +2077,13 @@ Usage: acai [options]
 
 Options:
   -p, --provider <name>  AI provider to use (${providerNames}) (default: ${DEFAULT_PROVIDER})
+      --claude, --codex    Shorthand for --provider <name>
                           Can also set ACAI_PROVIDER env var
   -m, --model <model>    Model to use (default: provider-specific)
                           Can also set ACAI_MODEL env var
   -y, --yolo             Stage all changes and commit without confirmation
-  -v, --verbose          Print prompts sent to the provider and raw responses
+  -V, --verbose          Print prompts sent to the provider and raw responses
+  -v, --version          Show version number
   -h, --help             Show this help message
 
 Examples:
@@ -2070,19 +2096,51 @@ Examples:
 }
 //#endregion
 //#region src/git.ts
+/**
+* Files excluded from diffs sent to the AI provider.
+* These are still listed as changed files — just their content is omitted
+* to avoid wasting tokens on generated/binary/noisy content.
+*/
+const DIFF_EXCLUDE_PATTERNS = [
+	"package-lock.json",
+	"yarn.lock",
+	"pnpm-lock.yaml",
+	"bun.lock",
+	"bun.lockb",
+	"deno.lock",
+	"Cargo.lock",
+	"Gemfile.lock",
+	"composer.lock",
+	"poetry.lock",
+	"uv.lock",
+	"go.sum",
+	"flake.lock",
+	"*.pbxproj",
+	"*.xcworkspacedata",
+	"*.map"
+];
 async function ensureGitRepo() {
 	const { stdout, exitCode } = await z("git", ["rev-parse", "--is-inside-work-tree"]);
 	if (exitCode !== 0 || stdout.trim() !== "true") throw new Error("Not inside a git repository.");
 }
 async function getStagedDiff() {
-	const { stdout, exitCode } = await z("git", ["diff", "--cached"]);
+	const { stdout, exitCode } = await z("git", [
+		"diff",
+		"--cached",
+		"--",
+		".",
+		...DIFF_EXCLUDE_PATTERNS.map((p) => `:(exclude)${p}`)
+	]);
 	return exitCode === 0 ? stdout.trim() : null;
 }
 async function getStagedStat() {
 	const { stdout, exitCode } = await z("git", [
 		"diff",
 		"--cached",
-		"--stat"
+		"--stat",
+		"--",
+		".",
+		...DIFF_EXCLUDE_PATTERNS.map((p) => `:(exclude)${p}`)
 	]);
 	return exitCode === 0 ? stdout.trim() : null;
 }
@@ -2177,6 +2235,12 @@ async function commit(message) {
 //#region bin/cli.ts
 async function main() {
 	const config = parseConfig();
+	if (config.version) {
+		const { createRequire } = await import("module");
+		const pkg = createRequire(import.meta.url)("../package.json");
+		console.log(pkg.version);
+		process.exit(0);
+	}
 	if (config.help) {
 		printUsage();
 		process.exit(0);
@@ -2189,7 +2253,6 @@ async function main() {
 	}
 	const model = config.model || provider.defaultModel;
 	Wt("acai");
-	const s = be();
 	try {
 		await ensureGitRepo();
 	} catch {
@@ -2257,10 +2320,15 @@ async function main() {
 	const commitLog = await getRecentCommitLog(10) || "";
 	let instructions;
 	while (true) {
-		s.start(`Waiting for ${provider.name}`);
 		let message;
+		let firstToken = true;
+		const BAR = import_picocolors.default.gray("│");
+		const s = be();
+		s.start(`Waiting for ${provider.name}`);
 		try {
-			message = await generateCommitMessage(provider, {
+			let fullText = "";
+			let inBody = false;
+			const generator = provider.generate({
 				diff,
 				stat,
 				files,
@@ -2269,19 +2337,40 @@ async function main() {
 				instructions,
 				log: config.verbose ? (msg) => R$1.message(import_picocolors.default.dim(msg)) : void 0
 			});
+			for await (const token of generator) {
+				if (firstToken) {
+					s.stop(`Here's what ${provider.name} ${import_picocolors.default.dim(`(${model})`)} came up with:\n`);
+					process.stderr.write(`${BAR}  `);
+					firstToken = false;
+				}
+				fullText += token;
+				const parts = token.split("\n");
+				for (let i = 0; i < parts.length; i++) {
+					if (i > 0) {
+						inBody = true;
+						process.stderr.write(`\n${BAR}  `);
+					}
+					if (parts[i]) process.stderr.write(inBody ? import_picocolors.default.dim(parts[i]) : import_picocolors.default.bold(import_picocolors.default.green(parts[i])));
+				}
+			}
+			process.stderr.write(`\n${BAR}\n`);
+			if (firstToken) s.stop("No response");
+			message = normalizeCommitMessage(fullText.trim());
 		} catch (e) {
-			s.stop("Failed");
+			if (firstToken) s.stop("Failed");
 			Nt(`Generation failed: ${e.message}`);
 			process.exit(1);
 		}
-		s.stop(`Here's what ${provider.name} ${import_picocolors.default.dim(`(${model})`)} came up with:`);
-		R$1.message(formatMessageForDisplay(message));
+		if (!message) {
+			Nt("Provider returned an empty message.");
+			process.exit(1);
+		}
 		if (config.yolo) {
 			await doCommit(message);
 			break;
 		}
 		const action = await Jt({
-			message: "What should we do?",
+			message: "What's next?",
 			options: [
 				{
 					value: "commit",
@@ -2379,14 +2468,6 @@ async function doCommit(message) {
 		process.exit(1);
 	}
 }
-function formatMessageForDisplay(message) {
-	const lines = message.split("\n");
-	const subject = lines[0];
-	const body = lines.slice(1).join("\n").trim();
-	let display = import_picocolors.default.bold(import_picocolors.default.green(subject));
-	if (body) display += `\n${import_picocolors.default.dim(body)}`;
-	return display;
-}
 async function editInEditor(message) {
 	const { spawn } = await import("child_process");
 	const { writeFileSync, readFileSync, mkdtempSync, rmSync } = await import("fs");

package/package.json

@@ -1,54 +1,63 @@
 {
   "name": "@jakejarvis/acai",
-  "version": "0.2.1",
-  "license": "MIT",
+  "version": "0.3.1",
   "description": "Yet another AI commit message generator",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/jakejarvis/acai.git"
-  },
+  "keywords": [
+    "ai",
+    "claude",
+    "codex",
+    "commit",
+    "git"
+  ],
   "bugs": {
     "url": "https://github.com/jakejarvis/acai/issues"
   },
+  "license": "MIT",
   "author": {
     "name": "Jake Jarvis",
     "email": "jake@jarv.is",
     "url": "https://jarv.is"
   },
-  "publishConfig": {
-    "access": "public"
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/jakejarvis/acai.git"
   },
-  "type": "module",
   "bin": {
-    "acai": "./dist/cli.mjs"
+    "acai": "dist/cli.mjs"
   },
   "files": [
     "dist"
   ],
+  "type": "module",
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "build": "tsdown",
-    "lint": "biome check",
-    "format": "biome format --write",
+    "lint": "oxlint",
+    "lint:fix": "oxlint --fix",
+    "fmt": "oxfmt",
+    "fmt:check": "oxfmt --check",
     "check-types": "tsc --noEmit",
-    "prepublishOnly": "npm run build"
+    "test": "vitest run",
+    "prepack": "npm run build"
+  },
+  "dependencies": {
+    "@anthropic-ai/claude-agent-sdk": "^0.2.87",
+    "@openai/codex-sdk": "^0.117.0"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.4.7",
     "@clack/prompts": "1.1.0",
     "@types/node": "^25.5.0",
+    "oxfmt": "^0.42.0",
+    "oxlint": "^1.57.0",
     "picocolors": "1.1.1",
     "tinyexec": "1.0.4",
-    "tsdown": "^0.21.2",
-    "typescript": "^5.9.3"
+    "tsdown": "0.21.4",
+    "typescript": "^5.9.3",
+    "vitest": "^4.1.2"
   },
   "engines": {
     "node": ">=18.19"
-  },
-  "keywords": [
-    "git",
-    "commit",
-    "ai",
-    "claude",
-    "codex"
-  ]
+  }
 }