neuro-commit 0.1.2 → 0.2.0

package/src/aiCommit.js

@@ -0,0 +1,311 @@
+const fs = require("fs");
+const path = require("path");
+const {
+  getStagedFiles,
+  getStagedDiff,
+  getStagedNumstat,
+  isGitRepo,
+  isLockFile,
+  statusLabel,
+  getCurrentBranch,
+  getRecentCommits,
+  gitCommit,
+  gitPush,
+} = require("./git");
+const {
+  buildFilesInfo,
+  generateCommitMessage,
+  calculateCost,
+  estimateCost,
+  countTokens,
+} = require("./ai");
+const { loadConfig } = require("./config");
+const {
+  RESET,
+  BOLD,
+  DIM,
+  GREEN,
+  YELLOW,
+  RED,
+  CYAN,
+  showSelectMenu,
+  confirm,
+  formatNumber,
+  createSpinner,
+} = require("./ui");
+
+/**
+ * Main AI Commit flow.
+ */
+async function runAiCommitMode() {
+  if (!isGitRepo()) {
+    console.log(`\n${RED}✖${RESET} Not a git repository.\n`);
+    process.exit(1);
+  }
+
+  const stagedFiles = getStagedFiles();
+  if (stagedFiles.length === 0) {
+    console.log(
+      `\n${YELLOW}⚠${RESET} No staged changes. Run ${CYAN}git add${RESET} first.\n`,
+    );
+    process.exit(0);
+  }
+
+  const config = loadConfig();
+  const diff = getStagedDiff();
+  const numstat = getStagedNumstat();
+  const branch = getCurrentBranch();
+
+  // Show file summary
+  const maxLen = Math.max(...stagedFiles.map((f) => f.file.length), 0);
+  console.log(
+    `\n${BOLD}${stagedFiles.length} files${RESET} staged on ${CYAN}${branch}${RESET}\n`,
+  );
+
+  for (const { status, file } of stagedFiles) {
+    const pad = " ".repeat(Math.max(0, maxLen - file.length));
+    if (isLockFile(file)) {
+      console.log(
+        `  ${DIM}${statusLabel(status).padEnd(10)} ${file}${pad} (lock)${RESET}`,
+      );
+    } else {
+      const color = status === "A" ? GREEN : status === "D" ? RED : YELLOW;
+      const s = numstat.find((n) => n.file === file);
+      const stat = s ? ` ${DIM}+${s.added} -${s.deleted}${RESET}` : "";
+      console.log(
+        `  ${color}${statusLabel(status).padEnd(10)}${RESET} ${file}${pad}${stat}`,
+      );
+    }
+  }
+
+  const estimatedTokens = countTokens(diff);
+  const cost = estimateCost(estimatedTokens, 150);
+  console.log(
+    `\n${DIM}~${formatNumber(estimatedTokens)} tokens | est. $${cost.toFixed(4)}${RESET}\n`,
+  );
+
+  const proceed = await confirm("Generate commit message?", true);
+  if (!proceed) {
+    console.log(`${DIM}Cancelled.${RESET}\n`);
+    return;
+  }
+
+  // Build context
+  const context = { branch };
+  if (config.commitHistory > 0) {
+    context.recentCommits = getRecentCommits(config.commitHistory);
+  }
+
+  const filesInfo = buildFilesInfo(stagedFiles, numstat);
+
+  // Generate
+  let message;
+  try {
+    const result = await generate(diff, filesInfo, context, config);
+    message = result.message;
+  } catch (err) {
+    console.log(`\n${RED}✖${RESET} ${err.message}\n`);
+    if (
+      err.message.includes("API key") ||
+      err.message.includes("OPENAI") ||
+      err.message.includes("401")
+    ) {
+      console.log(
+        `${DIM}Linux/macOS: ${CYAN}export OPENAI_API_KEY="sk-..."${RESET}`,
+      );
+      console.log(
+        `${DIM}PowerShell:  ${CYAN}$env:OPENAI_API_KEY = "sk-..."${RESET}`,
+      );
+      console.log(
+        `${DIM}CMD:         ${CYAN}set OPENAI_API_KEY=sk-...${RESET}\n`,
+      );
+    }
+    return;
+  }
+
+  // Auto-commit if configured
+  if (config.autoCommit) {
+    const result = gitCommit(message);
+    if (result.success) {
+      console.log(
+        `\n${GREEN}✓${RESET} ${result.hash} ${message.split("\n")[0]}`,
+      );
+      if (config.autoPush) {
+        const pushResult = gitPush();
+        if (pushResult.success) {
+          console.log(`${GREEN}✓${RESET} Pushed`);
+        } else {
+          console.log(`${RED}✖${RESET} Push failed: ${pushResult.error}`);
+        }
+      }
+      console.log("");
+    } else {
+      console.log(`\n${RED}✖${RESET} ${result.error}\n`);
+    }
+    return;
+  }
+
+  // Action loop
+  while (true) {
+    console.log(`\n${message}\n`);
+
+    const action = await showSelectMenu("Action:", [
+      { label: "Commit" },
+      { label: "Edit" },
+      { label: "Regenerate" },
+      { label: "Cancel" },
+    ]);
+
+    switch (action) {
+      case 0: {
+        const result = gitCommit(message);
+        if (result.success) {
+          console.log(
+            `\n${GREEN}✓${RESET} ${result.hash} ${message.split("\n")[0]}`,
+          );
+          if (config.autoPush) {
+            const pushResult = gitPush();
+            if (pushResult.success) {
+              console.log(`${GREEN}✓${RESET} Pushed`);
+            } else {
+              console.log(`${RED}✖${RESET} Push failed: ${pushResult.error}`);
+            }
+          }
+          console.log("");
+        } else {
+          console.log(`\n${RED}✖${RESET} ${result.error}\n`);
+        }
+        return;
+      }
+
+      case 1: {
+        message = await editMessage(message);
+        break;
+      }
+
+      case 2: {
+        const style = await showSelectMenu("Style:", [
+          { label: "Different approach" },
+          { label: "More concise" },
+          { label: "More detailed" },
+        ]);
+
+        let extra;
+        if (style === 0) {
+          extra =
+            "\n\nGenerate a DIFFERENT style commit message. Try a different angle.";
+        } else if (style === 1) {
+          extra = "\n\nMake it MORE CONCISE. Fewer bullet points, shorter.";
+        } else if (style === 2) {
+          extra = "\n\nMake it MORE DETAILED. Include technical details.";
+        } else {
+          break;
+        }
+
+        try {
+          const result = await generate(
+            diff,
+            filesInfo,
+            context,
+            config,
+            extra,
+          );
+          message = result.message;
+        } catch (err) {
+          console.log(`\n${RED}✖${RESET} ${err.message}`);
+        }
+        break;
+      }
+
+      case 3:
+      case -1:
+        console.log(`${DIM}Cancelled.${RESET}\n`);
+        return;
+    }
+  }
+}
+
+/**
+ * Call API with spinner, return { message, usage }.
+ */
+async function generate(diff, filesInfo, context, config, extra = "") {
+  const spinner = createSpinner("Generating...");
+  spinner.start();
+  const startTime = Date.now();
+
+  let result;
+  try {
+    result = await generateCommitMessage(diff, filesInfo, context, extra);
+  } catch (err) {
+    spinner.stop(`${RED}✖${RESET} ${err.message}`);
+    throw err;
+  }
+
+  const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
+  let statsLine = `${GREEN}✓${RESET} ${elapsed}s`;
+
+  if (result.usage) {
+    const stats = calculateCost(result.usage);
+    statsLine += ` ${DIM}| ${formatNumber(stats.inputTokens)}→${formatNumber(stats.outputTokens)} tokens | $${stats.cost.toFixed(6)}${RESET}`;
+    if (config.devMode) {
+      statsLine += ` ${DIM}[dev]${RESET}`;
+    }
+  }
+
+  spinner.stop(statsLine);
+  return result;
+}
+
+/**
+ * Open message in editor (VS Code by default).
+ */
+async function editMessage(message) {
+  const os = require("os");
+  const tmpFile = path.join(os.tmpdir(), `neuro-commit-${Date.now()}.txt`);
+
+  fs.writeFileSync(
+    tmpFile,
+    `${message}\n\n# Edit the commit message above.\n# Lines starting with '#' are ignored.\n`,
+    "utf-8",
+  );
+
+  const editorCmd = process.env.VISUAL || process.env.EDITOR || "code --wait";
+
+  try {
+    const { execSync } = require("child_process");
+    // Use quotes for the path to handle spaces safely
+    const quotedFile =
+      process.platform === "win32" ? `"${tmpFile}"` : `'${tmpFile}'`;
+    execSync(`${editorCmd} ${quotedFile}`, { stdio: "inherit" });
+  } catch {
+    console.log(`${YELLOW}⚠${RESET} Editor failed. Message unchanged.`);
+    try {
+      fs.unlinkSync(tmpFile);
+    } catch {
+      // ignore
+    }
+    return message;
+  }
+
+  try {
+    const edited = fs.readFileSync(tmpFile, "utf-8");
+    const cleaned = edited
+      .split("\n")
+      .filter((l) => !l.startsWith("#"))
+      .join("\n")
+      .trim();
+
+    fs.unlinkSync(tmpFile);
+
+    if (cleaned) {
+      console.log(`${GREEN}✓${RESET} Message updated`);
+      return cleaned;
+    }
+    console.log(`${YELLOW}⚠${RESET} Empty message, keeping original.`);
+    return message;
+  } catch {
+    return message;
+  }
+}
+
+module.exports = { runAiCommitMode };

package/src/commit.js

@@ -1,6 +1,5 @@
 const fs = require("fs");
 const path = require("path");
-const { get_encoding } = require("tiktoken");
 const {
   getStagedFiles,
   getStagedDiff,
@@ -8,198 +7,84 @@ const {
   isGitRepo,
   isLockFile,
   statusLabel,
+  getCurrentBranch,
+  getRecentCommits,
 } = require("./git");
-
-// --- ANSI helpers ---
-const RESET = "\x1b[0m";
-const BOLD = "\x1b[1m";
-const DIM = "\x1b[2m";
-const GREEN = "\x1b[32m";
-const YELLOW = "\x1b[33m";
-const RED = "\x1b[31m";
-const CYAN = "\x1b[36m";
+const {
+  buildFilesInfo,
+  buildSystemPrompt,
+  buildUserPrompt,
+  countTokens,
+} = require("./ai");
+const { loadConfig } = require("./config");
+const {
+  RESET,
+  BOLD,
+  DIM,
+  GREEN,
+  YELLOW,
+  RED,
+  CYAN,
+  formatNumber,
+} = require("./ui");
 
 const OUTPUT_FILE = "neuro-commit.md";
-const encoder = get_encoding("o200k_base");
-
-// AI Prompt that will be added at the beginning of the generated file
-const AI_PROMPT = `You are an expert in writing commit messages for repositories. Your task is to write me a commit message based on my diff file, which I will provide to you.
-
-### Rules for writing a commit message:
-
-1. Write in English, strictly considering the context.
-2. Return the answer using markdown formatting.
-3. Use the imperative mood, as if you are giving a command to the system that corresponds to messages that create changes in the code.
-4. The first line of the message (title) should be short, usually no longer than 50 characters. This makes it easier to quickly understand the changes. Do not end the title with a period.
-5. Leave one empty line after the title before starting the body of the message. This separation helps Git tools to correctly display the message text.
-6. Commits with messages like "Fix" or "Update" do not provide useful information. Always explain what exactly was fixed or updated.
-7. **Use lowercase letters to describe change types. Use** semantic tags in message titles:
-   - \`feat:\` — adding a new feature
-   - \`fix:\` — bug fixes
-   - \`docs:\` — changes in documentation
-   - \`style:\` — changes that do not affect the code (e.g., formatting fixes)
-   - \`refactor:\` — code change that doesn't add new functionality or fix bugs
-   - \`test:\` — adding or changing tests
-
-### Example of a correct commit message:
-
-\`\`\`diff
-refactor: update environment configuration and API connection
-
-- Edited \`.env\` file to support different environments (production, development) and API connection modes (docker, local, remote).
-- Updated \`config.py\` to load tokens and URLs depending on the environment and API mode.
-- Removed logic for determining the operating system.
-- Updated \`api_client.py\` to use BASE_API_URL instead of OS-specific URLs.
-- Reduced the number of retries in \`_make_request\`.
-\`\`\`
-
----
-
-`;
 
 /**
- * Build the markdown content for neuro-commit.md
- */
-function buildMarkdown(stagedFiles, diff, numstat) {
-  const lines = [];
-
-  // Start with the AI prompt
-  lines.push(AI_PROMPT);
-
-  const lockFiles = stagedFiles.filter((f) => isLockFile(f.file));
-  const regularFiles = stagedFiles.filter((f) => !isLockFile(f.file));
-
-  // Build a lookup: filename -> { added, deleted }
-  const statMap = new Map();
-  for (const entry of numstat) {
-    statMap.set(entry.file, entry);
-  }
-
-  // --- Header ---
-  lines.push("# Staged Changes Summary");
-  lines.push("");
-
-  // --- Combined file list with stats ---
-  lines.push("## Changed Files");
-  lines.push("");
-  lines.push("```");
-
-  // Compute column widths for alignment
-  const allFiles = [...regularFiles, ...lockFiles];
-  const maxLen = Math.max(...allFiles.map((f) => f.file.length), 0);
-
-  for (const { status, file } of regularFiles) {
-    const s = statMap.get(file);
-    const stat = s ? ` | +${s.added} -${s.deleted}` : "";
-    const pad = " ".repeat(Math.max(0, maxLen - file.length));
-    lines.push(`${status}  ${file}${pad}${stat}`);
-  }
-
-  for (const { status, file } of lockFiles) {
-    const pad = " ".repeat(Math.max(0, maxLen - file.length));
-    lines.push(`${status}  ${file}${pad} | lock file (diff omitted)`);
-  }
-
-  lines.push("```");
-
-  // Summary line
-  const totalAdded = numstat.reduce((sum, e) => sum + e.added, 0);
-  const totalDeleted = numstat.reduce((sum, e) => sum + e.deleted, 0);
-  lines.push("");
-  lines.push(
-    `> **${allFiles.length}** files changed, **${totalAdded}** insertions(+), **${totalDeleted}** deletions(-)`,
-  );
-  lines.push("");
-
-  // --- Diff ---
-  if (diff) {
-    lines.push("## Diff");
-    lines.push("");
-    lines.push("```diff");
-    lines.push(diff);
-    lines.push("```");
-    lines.push("");
-  }
-
-  return lines.join("\n");
-}
-
-function estimateTokens(text) {
-  return encoder.encode(text).length;
-}
-
-function formatNumber(num) {
-  return num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, " ");
-}
-
-function printSummary(files, content, outputFile) {
-  const totalFiles = files.length;
-  const totalChars = content.length;
-  const totalTokens = estimateTokens(content);
-
-  console.log("");
-  console.log(
-    `${CYAN}✓${RESET} Generated ${BOLD}${outputFile}${RESET} ${DIM}(${formatNumber(totalFiles)} files, ${formatNumber(totalTokens)} tokens, ${formatNumber(totalChars)} chars)${RESET}`,
-  );
-  console.log("");
-  console.log(`${BOLD}Next steps:${RESET}`);
-  console.log(`  1. Open ${CYAN}${outputFile}${RESET}`);
-  console.log(
-    `  2. Copy the ${BOLD}entire content${RESET} (AI prompt is already included!)`,
-  );
-  console.log(`  3. Paste into your LLM (ChatGPT, Claude, etc.)`);
-  console.log(`  4. Get your perfect commit message! 🎉`);
-  console.log("");
-}
-
-/**
- * Run the commit mode — gather staged info and write neuro-commit.md
+ * Manual mode — builds the same prompt as AI mode and saves to .md file.
  */
 function runCommitMode() {
-  // Pre-flight checks
   if (!isGitRepo()) {
-    console.log(
-      `\n${RED}✖ Error:${RESET} not a git repository. Run this inside a git project.\n`,
-    );
+    console.log(`\n${RED}✖${RESET} Not a git repository.\n`);
     process.exit(1);
   }
 
   const stagedFiles = getStagedFiles();
-
   if (stagedFiles.length === 0) {
     console.log(
-      `\n${YELLOW}⚠ No staged changes found.${RESET} Stage files with ${CYAN}git add${RESET} first.\n`,
+      `\n${YELLOW}⚠${RESET} No staged changes. Run ${CYAN}git add${RESET} first.\n`,
     );
     process.exit(0);
   }
 
-  console.log(`\n${BOLD}Commit Mode${RESET}`);
-  console.log(`${DIM}Analyzing staged changes...${RESET}\n`);
-
+  const config = loadConfig();
   const diff = getStagedDiff();
   const numstat = getStagedNumstat();
+  const branch = getCurrentBranch();
 
-  const lockFiles = stagedFiles.filter((f) => isLockFile(f.file));
-  const regularFiles = stagedFiles.filter((f) => !isLockFile(f.file));
-
-  // Print file list
-  for (const { status, file } of regularFiles) {
-    const color = status === "A" ? GREEN : status === "D" ? RED : YELLOW;
-    console.log(`  ${color}${statusLabel(status)}${RESET}  ${file}`);
+  const context = { branch };
+  if (config.commitHistory > 0) {
+    context.recentCommits = getRecentCommits(config.commitHistory);
   }
 
-  if (lockFiles.length > 0) {
-    for (const { file } of lockFiles) {
-      console.log(`  ${DIM}${statusLabel("M")}  ${file} (lock file)${RESET}`);
-    }
-  }
+  const filesInfo = buildFilesInfo(stagedFiles, numstat);
+  const systemPrompt = buildSystemPrompt(config, context);
+  const userPrompt = buildUserPrompt(filesInfo, diff);
 
-  // Generate markdown
-  const md = buildMarkdown(stagedFiles, diff, numstat);
+  const md = `${systemPrompt}\n\n---\n\n${userPrompt}`;
   const outPath = path.resolve(process.cwd(), OUTPUT_FILE);
   fs.writeFileSync(outPath, md, "utf-8");
 
-  printSummary(stagedFiles, md, OUTPUT_FILE);
+  // Print file list
+  console.log("");
+  for (const { status, file } of stagedFiles) {
+    if (isLockFile(file)) {
+      console.log(
+        `  ${DIM}${statusLabel(status).padEnd(10)} ${file} (lock)${RESET}`,
+      );
+    } else {
+      const color = status === "A" ? GREEN : status === "D" ? RED : YELLOW;
+      console.log(
+        `  ${color}${statusLabel(status).padEnd(10)}${RESET} ${file}`,
+      );
+    }
+  }
+
+  const tokens = countTokens(md);
+  console.log(
+    `\n${GREEN}✓${RESET} Saved to ${BOLD}${OUTPUT_FILE}${RESET} (~${formatNumber(tokens)} tokens)`,
+  );
+  console.log(`${DIM}Paste into ChatGPT, Claude, etc.${RESET}\n`);
 }
 
 module.exports = { runCommitMode };

package/src/config.js

@@ -0,0 +1,68 @@
+const fs = require("fs");
+const path = require("path");
+const os = require("os");
+
+const CONFIG_DIR = path.join(os.homedir(), ".neurocommit");
+const CONFIG_FILE = path.join(CONFIG_DIR, "config.json");
+
+const DEFAULT_CONFIG = {
+  model: "gpt-5-nano",
+  language: "en",
+  maxLength: 72,
+  autoCommit: false,
+  autoPush: false,
+  commitHistory: 5,
+  devMode: false,
+};
+
+function ensureConfigDir() {
+  if (!fs.existsSync(CONFIG_DIR)) {
+    fs.mkdirSync(CONFIG_DIR, { recursive: true });
+  }
+}
+
+function loadConfig() {
+  ensureConfigDir();
+  if (!fs.existsSync(CONFIG_FILE)) {
+    saveConfig(DEFAULT_CONFIG);
+    return { ...DEFAULT_CONFIG };
+  }
+  try {
+    const raw = fs.readFileSync(CONFIG_FILE, "utf-8");
+    const saved = JSON.parse(raw);
+    return { ...DEFAULT_CONFIG, ...saved };
+  } catch {
+    return { ...DEFAULT_CONFIG };
+  }
+}
+
+function saveConfig(config) {
+  ensureConfigDir();
+  fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2), "utf-8");
+}
+
+function updateConfig(key, value) {
+  const config = loadConfig();
+  config[key] = value;
+  saveConfig(config);
+  return config;
+}
+
+function getApiKey() {
+  return process.env.OPENAI_API_KEY || null;
+}
+
+function isAiAvailable() {
+  return !!getApiKey();
+}
+
+module.exports = {
+  CONFIG_DIR,
+  CONFIG_FILE,
+  DEFAULT_CONFIG,
+  loadConfig,
+  saveConfig,
+  updateConfig,
+  getApiKey,
+  isAiAvailable,
+};