git-aic 1.1.0 → 1.2.1

package/README.md

@@ -21,13 +21,16 @@ Your workflow. Your control.
 - **Full Control Over Rules**  
   Modify the system prompt to enforce your own commit conventions and formatting style.
 
+- **Flexible Prompt Management**  
+  Edit prompts globally or per repository, and set them from your editor, direct text, or a file.
+
 - **Conventional Commits Compliance**  
   Strictly follows formats like `feat:`, `fix:`, `refactor:`, `chore:`.
 
 - **Commit Confirmation & Editing**  
   Before committing, you can:
   - Accept the suggested commit message
-  - Edit the message
+  - Edit the full message in your editor
   - Reject it
   - Retry generation
 
@@ -122,9 +125,9 @@ To view your current config:
 git aic config
 ```
 
-> "\*Note:\*\* it's masked by default for security reasons
+> **Note:** It is masked by default for security reasons.
 
-To view the whole current config api key
+To view the full saved API key:
 
 ```bash
 git aic config --show
@@ -160,6 +163,7 @@ git aic
 
 - Prompts you with a generated commit message.
 - You can **accept, edit, reject, or retry** the message.
+- Editing opens your editor and supports multiline commit messages.
 
 ### Commit and Link to Issue
 
@@ -191,26 +195,73 @@ git aic config
 
 - Displays your saved config.
 
-That’s it.
+### Manage Prompts
 
-No need to manually write commit messages anymore.
+Edit the global prompt:
 
-## How It Works
+```bash
+git aic prompt edit
+```
 
-1. Captures your staged Git diff
-2. Builds a strict system prompt
-3. Sends the diff to Gemini
-4. Enforces Conventional Commit formatting
-5. Prompts for commit confirmation (accept, edit, retry, reject)
-6. Executes `git commit` automatically
-7. Optionally pushes if `-p` flag is used
+Set the global prompt directly from text:
 
-You can modify commit behavior by editing:
+```bash
+git aic prompt edit --text "Write concise conventional commits with a short body when needed."
+```
 
+Load the global prompt from a file:
+
+```bash
+git aic prompt edit --file ./prompt.txt
 ```
-src/prompt.ts
+
+Reset the global prompt:
+
+```bash
+git aic prompt reset
+```
+
+Edit a repository-local prompt:
+
+```bash
+git aic prompt edit --local
 ```
 
+Set a repository-local prompt from text:
+
+```bash
+git aic prompt edit --local --text "Use a short subject and a clear explanatory body."
+```
+
+Load a repository-local prompt from a file:
+
+```bash
+git aic prompt edit --local --file ./commit-prompt.txt
+```
+
+Reset the local prompt:
+
+```bash
+git aic prompt reset --local
+```
+
+Prompt resolution order:
+
+1. local prompt from Git config
+2. global prompt from Git-AIC config
+3. built-in default prompt
+
+## How It Works
+
+1. Captures your staged Git diff
+2. Builds a strict system prompt
+3. Resolves the active prompt from local, global, or default settings
+4. Sends the prompt and diff to Gemini
+5. Prompts for commit confirmation (accept, edit, retry, reject)
+6. Opens your editor when you choose to edit the generated message
+7. Executes `git commit` automatically
+8. Optionally pushes if `-p` flag is used
+
 ---
 
 ## Technologies Used
@@ -247,7 +298,7 @@ You are **building them to fit your process.**
 
 ## License
 
-[**ISC License**](https://github.com/Spectra010s/git-aic/main/#license)
+[**ISC License**](https://github.com/Spectra010s/git-aic/blob/main/LICENSE)
 
 ## Author
 
@@ -261,9 +312,3 @@ Spectra010s
 This project is a fork and standalone version of:
 
 [https://github.com/samueltuoyo15/Commit-Message-Tool](https://github.com/samueltuoyo15/Commit-Message-Tool)
-
----
-
-![License](https://img.shields.io/badge/License-ISC-blue.svg)
-![TypeScript](https://img.shields.io/badge/Language-TypeScript-blue?style=flat&logo=typescript&logoColor=white)
-![Node.js](https://img.shields.io/badge/Runtime-Node.js-green?style=flat&logo=nodedotjs&logoColor=white)

package/dist/cli.js

@@ -1,20 +1,31 @@
 #!/usr/bin/env node
+import fs from "fs/promises";
+import { readFileSync } from "fs";
+import { join, dirname } from "path";
+import { fileURLToPath } from "url";
 import { Command } from "commander";
 import { simpleGit } from "simple-git";
 import chalk from "chalk";
-import { getGitDiff } from "./git.js";
+import { ensureInsideGitRepo, getGitDiff, getLocalPrompt, resetLocalPrompt, setLocalPrompt, } from "./git.js";
 import { generateCommitMessage } from "./llm.js";
 import { getUserConfirmation } from "./confirm.js";
-import { getConfig, setApiKey } from "./config.js";
+import { editPromptInEditor } from "./editor.js";
+import { getConfig, resetCustomPrompt, setApiKey, setCustomPrompt, } from "./config.js";
+import { DEFAULT_SYSTEM_PROMPT } from "./prompt.js";
 process.on("SIGINT", () => {
     process.exit(0);
 });
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const pkg = JSON.parse(readFileSync(join(__dirname, "../package.json"), "utf-8"));
 const git = simpleGit();
 const program = new Command();
+function getErrorMessage(error) {
+    return error instanceof Error ? error.message : String(error);
+}
 program
-    .name("git aic")
-    .description("AI-powered Git commit generator using Google Gemini")
-    .version("1.0.0")
+    .name(pkg.name)
+    .description(pkg.description)
+    .version(pkg.version)
     .option("-p, --push", "push after committing")
     .option("-i, --issue <number>", "Link commit to GitHub issue");
 program
@@ -44,8 +55,89 @@ program
         console.log(chalk.yellow("No API key set"));
     }
 });
+const promptCommand = program
+    .command("prompt")
+    .description("Manage the system prompt used for commit generation");
+promptCommand
+    .command("edit")
+    .description("Edit and save a custom system prompt in your editor")
+    .option("--local", "Save the custom prompt in the current repository")
+    .option("--global", "Save the custom prompt in the global git-aic config")
+    .option("-t, --text <prompt>", "Set the custom prompt from a string")
+    .option("-f, --file <path>", "Set the custom prompt from a file")
+    .action(async (options) => {
+    try {
+        const cfg = await getConfig();
+        if (options.local && options.global) {
+            console.log(chalk.red("Use either --local or --global, not both at the same time."));
+            process.exit(1);
+        }
+        if (options.text && options.file) {
+            console.log(chalk.red("Use either --text or --file, not both at the same time."));
+            process.exit(1);
+        }
+        if (options.local) {
+            await ensureInsideGitRepo();
+        }
+        let editedPrompt = "";
+        if (options.text) {
+            editedPrompt = options.text.trim();
+        }
+        else if (options.file) {
+            editedPrompt = (await fs.readFile(options.file, "utf-8")).trim();
+        }
+        else {
+            const startingPrompt = options.local
+                ? ((await getLocalPrompt()) ?? cfg.customPrompt ?? DEFAULT_SYSTEM_PROMPT)
+                : (cfg.customPrompt ?? DEFAULT_SYSTEM_PROMPT);
+            editedPrompt = await editPromptInEditor(startingPrompt);
+        }
+        if (!editedPrompt) {
+            console.log(chalk.red("Prompt was empty. Nothing saved."));
+            process.exit(1);
+        }
+        if (options.local) {
+            await setLocalPrompt(editedPrompt);
+            console.log(chalk.green("Local system prompt saved successfully!"));
+        }
+        else {
+            await setCustomPrompt(editedPrompt);
+            console.log(chalk.green("Global system prompt saved successfully!"));
+        }
+    }
+    catch (error) {
+        console.error(chalk.red("Prompt edit failed:"), getErrorMessage(error));
+        process.exit(1);
+    }
+});
+promptCommand
+    .command("reset")
+    .description("Reset the system prompt back to the default")
+    .option("--local", "Reset the prompt in the current repository")
+    .option("--global", "Reset the prompt in the global git-aic config")
+    .action(async (options) => {
+    try {
+        if (options.local && options.global) {
+            console.log(chalk.red("Use either --local or --global, not both at the same time."));
+            process.exit(1);
+        }
+        if (options.local) {
+            await ensureInsideGitRepo();
+            await resetLocalPrompt();
+            console.log(chalk.green("Local system prompt reset to default."));
+            return;
+        }
+        await resetCustomPrompt();
+        console.log(chalk.green("Global system prompt reset to default."));
+    }
+    catch (error) {
+        console.error(chalk.red("Prompt reset failed:"), getErrorMessage(error));
+        process.exit(1);
+    }
+});
 program.action(async (options) => {
     try {
+        await ensureInsideGitRepo();
         const diff = await getGitDiff();
         if (!diff) {
             console.log(chalk.yellow("No changes to commit!"));
@@ -92,8 +184,8 @@ program.action(async (options) => {
             const e = error;
             isAbort = e.code === "ABORT_ERR";
         }
-        const msg = isAbort ? "Operation cancelled" : error;
-        console.error(chalk.red("\n\nCommit failed:"), msg);
+        const msg = isAbort ? "Operation cancelled" : getErrorMessage(error);
+        console.error(chalk.red("\nCommit failed:"), msg);
         process.exit(isAbort ? 0 : 1);
     }
 });

package/dist/config.js

@@ -2,6 +2,7 @@ import fs from "fs/promises";
 import path from "path";
 import os from "os";
 import chalk from "chalk";
+import { getLocalPrompt } from "./git.js";
 function getConfigPath() {
     const toolName = "git-aic";
     if (process.platform === "win32") {
@@ -39,3 +40,22 @@ export async function saveConfig(data) {
 export async function setApiKey(key) {
     await saveConfig({ apiKey: key });
 }
+export async function setCustomPrompt(prompt) {
+    await saveConfig({ customPrompt: prompt });
+}
+export async function resetCustomPrompt() {
+    const { customPrompt, ...rest } = await getConfig();
+    void customPrompt;
+    const configPath = getConfigPath();
+    const dir = path.dirname(configPath);
+    await fs.mkdir(dir, { recursive: true });
+    await fs.writeFile(configPath, JSON.stringify(rest, null, 2), "utf-8");
+}
+export async function getResolvedPrompt() {
+    const localPrompt = await getLocalPrompt();
+    if (localPrompt) {
+        return localPrompt;
+    }
+    const config = await getConfig();
+    return config.customPrompt;
+}

package/dist/confirm.js

@@ -1,5 +1,6 @@
 import readline from "node:readline/promises";
 import chalk from "chalk";
+import { editTextInEditor } from "./editor.js";
 export const getUserConfirmation = async (message) => {
     const rl = readline.createInterface({
         input: process.stdin,
@@ -10,22 +11,16 @@ export const getUserConfirmation = async (message) => {
     rl.close();
     const choice = (answer.toLowerCase() || "y").trim();
     if (choice === "e") {
-        const editRl = readline.createInterface({
-            input: process.stdin,
-            output: process.stdout,
-            terminal: true,
-        });
-        console.log(chalk.cyan("\nEdit the message:"));
-        editRl.write(message);
-        let editedMessage = "";
-        while (!editedMessage.trim()) {
-            editedMessage = await editRl.question("> ");
+        let editedMessage = message;
+        while (true) {
+            editedMessage = await editTextInEditor(editedMessage, "git-aic-commit-", "COMMIT_EDITMSG");
+            if (editedMessage.trim()) {
+                return { choice: "y", message: editedMessage };
+            }
             if (!editedMessage.trim()) {
-                console.log(chalk.red("Commit message cannot be empty. Please type something."));
+                console.log(chalk.red("Commit message cannot be empty. Please edit it again."));
             }
         }
-        editRl.close();
-        return { choice: "y", message: editedMessage };
     }
     return { choice, message };
 };

package/dist/editor.js

@@ -0,0 +1,83 @@
+import { spawnSync } from "child_process";
+import fs from "fs/promises";
+import os from "os";
+import path from "path";
+function splitCommand(command) {
+    const parts = [];
+    let current = "";
+    let quote = null;
+    let escaping = false;
+    for (const char of command.trim()) {
+        if (escaping) {
+            current += char;
+            escaping = false;
+            continue;
+        }
+        if (char === "\\") {
+            escaping = true;
+            continue;
+        }
+        if (quote) {
+            if (char === quote) {
+                quote = null;
+            }
+            else {
+                current += char;
+            }
+            continue;
+        }
+        if (char === '"' || char === "'") {
+            quote = char;
+            continue;
+        }
+        if (/\s/.test(char)) {
+            if (current) {
+                parts.push(current);
+                current = "";
+            }
+            continue;
+        }
+        current += char;
+    }
+    if (escaping || quote) {
+        throw new Error("Editor command has invalid quoting.");
+    }
+    if (current) {
+        parts.push(current);
+    }
+    return parts;
+}
+export function openInEditor(filePath) {
+    const editor = process.env.VISUAL || process.env.EDITOR || "editor";
+    const [editorCommand, ...editorArgs] = splitCommand(editor);
+    if (!editorCommand) {
+        throw new Error("No editor found. Set VISUAL or EDITOR, or install an `editor` command.");
+    }
+    const result = spawnSync(editorCommand, [...editorArgs, filePath], {
+        stdio: "inherit",
+    });
+    if (result.error) {
+        if ("code" in result.error && result.error.code === "ENOENT") {
+            throw new Error("No editor found. Set VISUAL or EDITOR, or install an `editor` command.");
+        }
+        throw result.error;
+    }
+    if (result.status !== 0) {
+        throw new Error(`Editor exited with status ${result.status}`);
+    }
+}
+export async function editTextInEditor(initialText, prefix = "git-aic-", fileName = "message.txt") {
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), prefix));
+    const tempFile = path.join(tempDir, fileName);
+    try {
+        await fs.writeFile(tempFile, `${initialText}\n`, "utf-8");
+        openInEditor(tempFile);
+        return (await fs.readFile(tempFile, "utf-8")).trim();
+    }
+    finally {
+        await fs.rm(tempDir, { recursive: true, force: true });
+    }
+}
+export async function editPromptInEditor(initialPrompt) {
+    return editTextInEditor(initialPrompt, "git-aic-prompt-", "prompt.txt");
+}

package/dist/git.js

@@ -1,5 +1,20 @@
 import { simpleGit } from "simple-git";
 const git = simpleGit();
+const LOCAL_PROMPT_KEY = "aic.prompt";
+export async function isInsideGitRepo() {
+    try {
+        const result = await git.raw(["rev-parse", "--is-inside-work-tree"]);
+        return result.trim() === "true";
+    }
+    catch {
+        return false;
+    }
+}
+export async function ensureInsideGitRepo() {
+    if (!(await isInsideGitRepo())) {
+        throw new Error("Not inside a Git repository.");
+    }
+}
 export const getGitDiff = async () => {
     try {
         await git.raw(["config", "core.autocrlf", "true"]);
@@ -18,3 +33,24 @@ export const getGitDiff = async () => {
         return "";
     }
 };
+export async function getLocalPrompt() {
+    try {
+        const prompt = await git.raw(["config", "--local", "--get", LOCAL_PROMPT_KEY]);
+        const trimmed = prompt.trim();
+        return trimmed || undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+export async function setLocalPrompt(prompt) {
+    await git.raw(["config", "--local", LOCAL_PROMPT_KEY, prompt]);
+}
+export async function resetLocalPrompt() {
+    try {
+        await git.raw(["config", "--local", "--unset", LOCAL_PROMPT_KEY]);
+    }
+    catch {
+        return;
+    }
+}

package/dist/llm.js

@@ -1,7 +1,7 @@
 import axios from "axios";
 import chalk from "chalk";
 import { buildPrompt } from "./prompt.js";
-import { getConfig } from "./config.js";
+import { getConfig, getResolvedPrompt } from "./config.js";
 export const generateCommitMessage = async (rawDiff) => {
     const API_URL = "https://generativelanguage.googleapis.com/v1/models/gemini-2.5-flash:generateContent";
     const config = await getConfig();
@@ -18,7 +18,7 @@ export const generateCommitMessage = async (rawDiff) => {
         console.log(chalk.gray("After setting the key, restart your terminal.\n"));
         process.exit(1);
     }
-    const prompt = buildPrompt(rawDiff);
+    const prompt = buildPrompt(rawDiff, await getResolvedPrompt());
     try {
         const response = await axios.post(API_URL, {
             contents: [{ parts: [{ text: prompt }] }],

package/dist/prompt.js

@@ -1,44 +1,50 @@
-export const buildPrompt = (diff) => `
-CRITICAL INSTRUCTIONS - READ CAREFULLY:
-You are an expert Git commit message writer. You MUST follow ALL these rules:
-
-1. FORMAT: Use Conventional Commits format: <type>(<scope>): <description>
-   - type: MUST be one of: feat, fix, refactor, chore, docs, style, test, perf
-   - scope: Should be the module/file affected (e.g., "auth", "api", "ui", "config")
-   - description: Clear, imperative description in present tense
-
-2. DESCRIPTION REQUIREMENTS:
-   - Start with an imperative verb (add, fix, remove, update, refactor, etc.)
-   - Be specific about what changed
-   - Keep it under 72 characters total (including type and scope)
-   - NO trailing punctuation
-   - NO emojis ever
-   - MUST be a complete sentence
-
-3. MESSAGE STRUCTURE:
-   - The entire commit message must be exactly one line
-   - Format: type(scope): description
-   - Example: "feat(auth): add password reset functionality"
-   - Example: "fix(api): handle null response in user endpoint"
-   - Example: "refactor(ui): simplify component state management"
-
-4. QUALITY CHECKS - YOUR OUTPUT MUST PASS:
-   - Contains opening and closing parentheses
-   - Has a colon after the parentheses
-   - Description exists and is not empty
-   - Total length ≤ 72 characters
-   - No markdown formatting
-   - No code blocks
-   - No explanations or notes
-
-5. FAILURE MODE:
-   - If you cannot generate a proper message, return exactly: "chore: update code"
-
-YOUR TASK:
-Analyze this git diff and generate exactly ONE proper commit message following all rules above.
-
-Git diff:
-${diff}
-
-Commit message:
+export const DEFAULT_SYSTEM_PROMPT = `
+CRITICAL INSTRUCTIONS - READ CAREFULLY:
+You are an expert Git commit message writer. You MUST follow ALL these rules:
+
+1. FORMAT: Use Conventional Commits format: <type>(<scope>): <description>
+   - type: MUST be one of: feat, fix, refactor, chore, docs, style, test, perf
+   - scope: Should be the module/file affected (e.g., "auth", "api", "ui", "config")
+   - description: Clear, imperative description in present tense
+
+2. DESCRIPTION REQUIREMENTS:
+   - Start with an imperative verb (add, fix, remove, update, refactor, etc.)
+   - Be specific about what changed
+   - Keep it under 72 characters total (including type and scope)
+   - NO trailing punctuation
+   - NO emojis ever
+   - MUST be a complete sentence
+
+3. MESSAGE STRUCTURE:
+   - The entire commit message must be exactly one line
+   - Format: type(scope): description
+   - Example: "feat(auth): add password reset functionality"
+   - Example: "fix(api): handle null response in user endpoint"
+   - Example: "refactor(ui): simplify component state management"
+
+4. QUALITY CHECKS - YOUR OUTPUT MUST PASS:
+   - Contains opening and closing parentheses
+   - Has a colon after the parentheses
+   - Description exists and is not empty
+   - Total length ≤ 72 characters
+   - No markdown formatting
+   - No code blocks
+   - No explanations or notes
+
+5. FAILURE MODE:
+   - If you cannot generate a proper message, return exactly: "chore: update code"
+
+YOUR TASK:
+Analyze this git diff and generate exactly ONE proper commit message following all rules above.
+
+Git diff:
+{{diff}}
+
+Commit message:
 `.trim();
+export const buildPrompt = (diff, systemPrompt = DEFAULT_SYSTEM_PROMPT) => {
+    if (systemPrompt.includes("{{diff}}")) {
+        return systemPrompt.split("{{diff}}").join(diff);
+    }
+    return `${systemPrompt.trim()}\n\nGit diff:\n${diff}\n\nCommit message:`.trim();
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-aic",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "AI-powered Git commit generator using Google Gemini",
   "homepage": "https://github.com/Spectra010s/git-aic",
   "bugs": {
@@ -15,7 +15,7 @@
   "type": "module",
   "main": "./dist/cli.js",
   "bin": {
-    "git-aic": "./dist/cli.js"
+    "git-aic": "dist/cli.js"
   },
   "scripts": {
     "build": "tsc",

package/t.txt

@@ -1,32 +0,0 @@
-# Git Aic v1.1.0
-
-## Highlights
-- Fully standalone CLI — removed dependency on the original form network.
-- AI-powered commit message generation with Google Gemini.
-- Commit confirmation now gracefully exits if canceled.
-- Empty commit messages are prevented during editing in confirmation prompt.
-- `--issue` option added to link commits to GitHub issues.
-- Flattened project structure for cleaner code organization.
-- Axios errors for LLM requests are now handled properly to avoid crashes.
-- CLI config system for managing your API key.
-- Environment variable fallback supported.
-- README updated with full usage, installation, and features.
-
-## Improvements
-- TypeScript & type-safe implementation.
-- Improved user experience — prompts only run when called.
-- Conventional commit compliance enforced.
-- Clear separation between developer install (contributors) and user install (global npm).
-
-## Notes
-- Editable prompt system is not yet included — planned for v1.2.0.
-- Users can now run `git aic` globally via npm.
-
-## What's Changed
-• refactor(project): flatten project structure and update config by @Spectra010s in https://github.com/Spectra010s/git-aic/pull/1  
-• feat(cli): add --issue option to link commit to an issue, closes #3 by @Spectra010s in https://github.com/Spectra010s/git-aic/pull/4  
-• prevent empty commit message when editing in confirmation prompt by @Spectra010s in https://github.com/Spectra010s/git-aic/pull/6  
-• fix(cli): handle graceful process exit on cancellation, closes #7 by @Spectra010s in https://github.com/Spectra010s/git-aic/pull/8  
-• fix(llm): handle Axios errors for LLM requests by @Spectra010s in https://github.com/Spectra010s/git-aic/pull/10  
-
-Full Changelog: https://github.com/Spectra010s/git-aic/commits/v1.1.0