@blum84/smart-commit 0.2.0 → 0.2.1

package/dist/index.js

@@ -1,443 +1,24 @@
 #!/usr/bin/env node
+import {
+  createAiClient,
+  createLogger,
+  getOfflineTemplates,
+  isAiAvailable,
+  loadConfig,
+  scanRepositories
+} from "./chunk-LYR3U55E.js";
 import {
   classifyFiles,
   groupFiles
-} from "./chunk-ZS27WQDW.js";
+} from "./chunk-MYMEBX2Q.js";
 
 // src/index.ts
 import { Command } from "commander";
 
-// src/config.ts
-import { cosmiconfig } from "cosmiconfig";
-var DEFAULT_CONFIG = {
-  ai: {
-    primary: "gemini",
-    fallback: "claude",
-    timeout: 30
-  },
-  safety: {
-    maxFileSize: "10MB",
-    blockedPatterns: [
-      "*.env",
-      ".env.*",
-      "*.pem",
-      "*.key",
-      "credentials*",
-      "*.sqlite",
-      "*.sqlite3"
-    ],
-    warnPatterns: [
-      "*.log",
-      "*.csv",
-      "package-lock.json",
-      "yarn.lock",
-      "pnpm-lock.yaml"
-    ]
-  },
-  commit: {
-    style: "conventional",
-    language: "ko",
-    maxDiffSize: 1e4
-  },
-  grouping: {
-    strategy: "smart"
-  }
-};
-async function loadConfig(cliOptions = {}) {
-  const explorer = cosmiconfig("smart-commit", {
-    searchPlaces: [
-      ".smart-commitrc",
-      ".smart-commitrc.yaml",
-      ".smart-commitrc.yml",
-      ".smart-commitrc.json",
-      "smart-commit.config.js",
-      "package.json"
-    ]
-  });
-  const result = await explorer.search();
-  const fileConfig = result?.config ?? {};
-  const config = deepMerge(
-    DEFAULT_CONFIG,
-    fileConfig
-  );
-  if (cliOptions.ai && typeof cliOptions.ai === "string") {
-    config.ai.primary = cliOptions.ai;
-  }
-  if (cliOptions.group && typeof cliOptions.group === "string") {
-    config.grouping.strategy = cliOptions.group;
-  }
-  return config;
-}
-function deepMerge(target, source) {
-  const result = { ...target };
-  for (const key of Object.keys(source)) {
-    if (source[key] && typeof source[key] === "object" && !Array.isArray(source[key]) && target[key] && typeof target[key] === "object" && !Array.isArray(target[key])) {
-      result[key] = deepMerge(
-        target[key],
-        source[key]
-      );
-    } else {
-      result[key] = source[key];
-    }
-  }
-  return result;
-}
-
-// src/scanner.ts
-import { simpleGit } from "simple-git";
-import { readdir, stat, access } from "fs/promises";
-import { join } from "path";
-async function scanRepositories(baseDir, ui, logger) {
-  const gitDirs = await findGitDirs(baseDir);
-  const repos = [];
-  ui.showProgress("Scanning repositories...", 0, gitDirs.length);
-  for (let i = 0; i < gitDirs.length; i++) {
-    const dir = gitDirs[i];
-    ui.showProgress(`Scanning: ${dir}`, i + 1, gitDirs.length);
-    try {
-      const repo = await inspectRepo(dir, logger);
-      repos.push(repo);
-    } catch (err) {
-      logger.warn({ dir, err }, "Failed to inspect repository");
-    }
-  }
-  return repos;
-}
-async function findGitDirs(baseDir) {
-  const dirs = [];
-  const entries = await readdir(baseDir, { withFileTypes: true });
-  for (const entry of entries) {
-    if (!entry.isDirectory()) continue;
-    if (entry.name === "node_modules" || entry.name.startsWith(".")) continue;
-    const fullPath = join(baseDir, entry.name);
-    const gitPath = join(fullPath, ".git");
-    try {
-      await access(gitPath);
-      dirs.push(fullPath);
-    } catch {
-      const subDirs = await findGitDirs(fullPath);
-      dirs.push(...subDirs);
-    }
-  }
-  try {
-    const selfGit = join(baseDir, ".git");
-    await access(selfGit);
-    if (!dirs.some((d) => d === baseDir)) {
-      dirs.unshift(baseDir);
-    }
-  } catch {
-  }
-  return dirs;
-}
-async function inspectRepo(dir, logger) {
-  const git = simpleGit(dir);
-  const gitStatus = await detectGitStatus(dir, git);
-  if (gitStatus === "locked") {
-    logger.warn({ dir }, "Git index locked \u2014 skipping");
-    return { path: dir, branch: "", status: "locked", files: [], unpushedCommits: 0 };
-  }
-  if (gitStatus === "detached") {
-    logger.warn({ dir }, "Detached HEAD \u2014 skipping");
-    return { path: dir, branch: "HEAD (detached)", status: "detached", files: [], unpushedCommits: 0 };
-  }
-  if (gitStatus === "rebasing") {
-    logger.warn({ dir }, "Rebase in progress \u2014 skipping");
-    return { path: dir, branch: "", status: "rebasing", files: [], unpushedCommits: 0 };
-  }
-  const statusResult = await git.status();
-  const branch = statusResult.current ?? "unknown";
-  const files = [];
-  for (const f of statusResult.files) {
-    const filePath = join(dir, f.path);
-    let size = 0;
-    try {
-      const s = await stat(filePath);
-      size = s.size;
-    } catch {
-    }
-    files.push({
-      path: f.path,
-      status: mapGitStatus(f.working_dir, f.index),
-      size,
-      isBinary: false
-      // will be checked by classifier
-    });
-  }
-  let unpushedCommits = 0;
-  try {
-    const log = await git.log(["@{u}..HEAD"]);
-    unpushedCommits = log.total;
-  } catch {
-  }
-  const repoStatus = gitStatus === "merging" ? "merging" : files.length > 0 ? "dirty" : "clean";
-  return { path: dir, branch, status: repoStatus, files, unpushedCommits };
-}
-async function detectGitStatus(dir, git) {
-  try {
-    await access(join(dir, ".git", "index.lock"));
-    return "locked";
-  } catch {
-  }
-  try {
-    await access(join(dir, ".git", "rebase-merge"));
-    return "rebasing";
-  } catch {
-  }
-  try {
-    await access(join(dir, ".git", "rebase-apply"));
-    return "rebasing";
-  } catch {
-  }
-  try {
-    await access(join(dir, ".git", "MERGE_HEAD"));
-    return "merging";
-  } catch {
-  }
-  try {
-    await git.raw(["symbolic-ref", "HEAD"]);
-  } catch {
-    return "detached";
-  }
-  return "clean";
-}
-function mapGitStatus(workingDir, index) {
-  if (index === "?" || workingDir === "?") return "untracked";
-  if (index === "A" || workingDir === "A") return "added";
-  if (index === "D" || workingDir === "D") return "deleted";
-  if (index === "R" || workingDir === "R") return "renamed";
-  return "modified";
-}
-
-// src/ai-client.ts
-import { execa } from "execa";
-var CONVENTIONAL_PREFIXES = [
-  "feat",
-  "fix",
-  "refactor",
-  "docs",
-  "style",
-  "test",
-  "chore",
-  "perf",
-  "ci",
-  "build",
-  "revert"
-];
-var CONVENTIONAL_RE = new RegExp(`^(${CONVENTIONAL_PREFIXES.join("|")})(\\(.+\\))?!?:\\s.+`);
-var OFFLINE_TEMPLATES = CONVENTIONAL_PREFIXES.map((prefix) => `${prefix}: `);
-function getOfflineTemplates() {
-  return OFFLINE_TEMPLATES;
-}
-async function isAiAvailable(tool) {
-  try {
-    const cmd = tool === "gpt" ? "openai" : tool;
-    await execa("which", [cmd], { timeout: 3e3 });
-    return true;
-  } catch {
-    return false;
-  }
-}
-function createAiClient(config, logger) {
-  async function callWithFallback(prompt) {
-    let result = await callAi(config.ai.primary, prompt, config.ai.timeout, logger, config);
-    if (!result && config.ai.fallback !== config.ai.primary) {
-      logger.warn({ fallback: config.ai.fallback }, "Primary AI failed, trying fallback");
-      result = await callAi(config.ai.fallback, prompt, config.ai.timeout, logger, config);
-    }
-    return result;
-  }
-  return {
-    async generateCommitMessage(diff, language) {
-      const summarized = await this.summarizeDiff(diff);
-      const prompt = buildCommitPrompt(summarized, language, config.commit.style);
-      logger.info({ tool: config.ai.primary, diffLength: summarized.length }, "Requesting commit message");
-      let result = await callWithFallback(prompt);
-      if (result) {
-        if (config.commit.style === "conventional" && !validateConventionalCommit(result)) {
-          logger.warn({ message: result.split("\n")[0] }, "Invalid conventional commit, retrying");
-          const retryPrompt = buildRetryPrompt(result, language);
-          const retried = await callWithFallback(retryPrompt);
-          if (retried && validateConventionalCommit(retried)) {
-            result = retried;
-          }
-        }
-        result = stripCodeBlocks(result);
-        logger.info({ messageLength: result.length }, "Commit message generated");
-      }
-      return result;
-    },
-    async resolveConflict(localContent, remoteContent) {
-      const prompt = buildConflictPrompt(localContent, remoteContent);
-      return callWithFallback(prompt);
-    },
-    async groupFiles(fileList) {
-      const { buildGroupingPrompt } = await import("./classifier-TTZQUM7N.js");
-      const prompt = buildGroupingPrompt(fileList);
-      return callWithFallback(prompt);
-    },
-    async summarizeDiff(diff) {
-      if (diff.length <= config.commit.maxDiffSize) {
-        return diff;
-      }
-      const statSection = extractDiffStat(diff);
-      const hunks = extractKeyHunks(diff, config.commit.maxDiffSize - statSection.length - 200);
-      const truncated = `${statSection}
-
-[\uC8FC\uC694 \uBCC0\uACBD \uB0B4\uC6A9 (\uC804\uCCB4 ${diff.length}\uC790 \uC911 \uD575\uC2EC\uBD80\uB9CC \uCD94\uCD9C)]
-${hunks}`;
-      if (truncated.length > config.commit.maxDiffSize * 1.5) {
-        logger.info("Diff too large, requesting AI summary");
-        const summaryPrompt = buildDiffSummaryPrompt(truncated.slice(0, config.commit.maxDiffSize));
-        const summary = await callWithFallback(summaryPrompt);
-        return summary ?? truncated.slice(0, config.commit.maxDiffSize);
-      }
-      return truncated;
-    }
-  };
-}
-function validateConventionalCommit(message) {
-  const firstLine = message.split("\n")[0].trim();
-  return CONVENTIONAL_RE.test(firstLine);
-}
-function stripCodeBlocks(text) {
-  return text.replace(/^```[\w]*\n?/gm, "").replace(/^```\s*$/gm, "").trim();
-}
-function extractDiffStat(diff) {
-  const lines = diff.split("\n");
-  const statLines = [];
-  for (const line of lines) {
-    if (line.startsWith("diff --git")) {
-      statLines.push(line);
-    } else if (line.startsWith("--- ") || line.startsWith("+++ ")) {
-      statLines.push(line);
-    }
-  }
-  return statLines.join("\n");
-}
-function extractKeyHunks(diff, maxLength) {
-  const hunks = [];
-  let currentHunk = "";
-  let totalLength = 0;
-  for (const line of diff.split("\n")) {
-    if (line.startsWith("@@")) {
-      if (currentHunk && totalLength + currentHunk.length <= maxLength) {
-        hunks.push(currentHunk);
-        totalLength += currentHunk.length;
-      }
-      currentHunk = line + "\n";
-    } else if (line.startsWith("+") || line.startsWith("-")) {
-      currentHunk += line + "\n";
-    }
-  }
-  if (currentHunk && totalLength + currentHunk.length <= maxLength) {
-    hunks.push(currentHunk);
-  }
-  return hunks.join("\n");
-}
-async function callAi(tool, prompt, timeout, logger, config) {
-  try {
-    const { command, args } = buildAiCommand(tool, prompt, config);
-    const { stdout } = await execa(command, args, {
-      timeout: timeout * 1e3,
-      stdin: "ignore"
-    });
-    const trimmed = stdout.trim();
-    return trimmed || null;
-  } catch (err) {
-    logger.error({ tool, err }, "AI call failed");
-    return null;
-  }
-}
-function buildAiCommand(tool, prompt, config) {
-  switch (tool) {
-    case "gemini":
-      return { command: "gemini", args: [prompt] };
-    case "claude":
-      return { command: "claude", args: ["-p", prompt] };
-    case "gpt":
-      return { command: "openai", args: ["api", "chat.completions.create", "-m", "gpt-4o", "-g", "user", prompt] };
-    case "ollama": {
-      const model = config?.ai?.ollama?.model ?? "llama3";
-      return { command: "ollama", args: ["run", model, prompt] };
-    }
-    default:
-      return { command: tool, args: [prompt] };
-  }
-}
-function buildCommitPrompt(diff, language, style) {
-  const langLabel = language === "ko" ? "\uD55C\uAD6D\uC5B4" : "English";
-  const styleGuide = style === "conventional" ? `Conventional Commits \uD615\uC2DD\uC744 \uBC18\uB4DC\uC2DC \uB530\uB974\uC138\uC694.
-\uC811\uB450\uC0AC\uB294 \uB2E4\uC74C \uC911 \uC120\uD0DD: ${CONVENTIONAL_PREFIXES.join(", ")}
-\uD615\uC2DD: <\uC811\uB450\uC0AC>(<\uBC94\uC704>): <\uC124\uBA85>  (\uBC94\uC704\uB294 \uC120\uD0DD\uC0AC\uD56D)` : "";
-  return `\uC544\uB798\uC758 [Git Diff] \uB0B4\uC6A9\uC744 \uBD84\uC11D\uD558\uC5EC Git Commit Message\uB97C \uC791\uC131\uD574\uC918.
-
-[CRITICAL INSTRUCTION]
-**\uACB0\uACFC\uB294 \uBB34\uC870\uAC74 '${langLabel}'\uB85C \uC791\uC131\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.**
-${styleGuide}
-
-[\uC791\uC131 \uC608\uC2DC]
-feat(auth): \uC0AC\uC6A9\uC790 \uB85C\uADF8\uC778 API \uAD6C\uD604
-
-- \uB85C\uADF8\uC778 \uC694\uCCAD \uCC98\uB9AC\uB97C \uC704\uD55C \uCEE8\uD2B8\uB864\uB7EC \uBA54\uC11C\uB4DC \uCD94\uAC00
-- JWT \uD1A0\uD070 \uBC1C\uAE09 \uB85C\uC9C1 \uAD6C\uD604
-
-[\uD544\uC218 \uADDC\uCE59]
-1. \uC5B8\uC5B4: **100% ${langLabel}**\uB85C \uC791\uC131\uD560 \uAC83.
-2. \uD615\uC2DD:
-   - \uCCAB \uC904: \uBCC0\uACBD \uC0AC\uD56D\uC744 50\uC790 \uC774\uB0B4\uB85C \uC694\uC57D (\uC81C\uBAA9)
-   - \uB450 \uBC88\uC9F8 \uC904: \uBE48 \uC904
-   - \uC138 \uBC88\uC9F8 \uC904\uBD80\uD130: \uBCC0\uACBD\uB41C \uC0C1\uC138 \uB0B4\uC6A9\uC744 \uBD88\uB9BF \uD3EC\uC778\uD2B8(-)\uB85C \uC815\uB9AC
-3. \uCD9C\uB825: \uB9C8\uD06C\uB2E4\uC6B4 \uCF54\uB4DC \uBE14\uB85D\uC774\uB098 \uBD80\uAC00 \uC124\uBA85 \uC5C6\uC774, \uC624\uC9C1 \uCEE4\uBC0B \uBA54\uC2DC\uC9C0 \uD14D\uC2A4\uD2B8\uB9CC \uCD9C\uB825\uD560 \uAC83.
-4. \uC81C\uD55C: \uC5B4\uB5A0\uD55C \uB3C4\uAD6C(Functions/Tools)\uB3C4 \uC0AC\uC6A9\uD558\uC9C0 \uB9D0 \uAC83. \uC624\uC9C1 \uD14D\uC2A4\uD2B8\uB9CC \uC0DD\uC131\uD558\uB77C.
-
-[Git Diff]
-${diff}`;
-}
-function buildRetryPrompt(invalidMessage, language) {
-  const langLabel = language === "ko" ? "\uD55C\uAD6D\uC5B4" : "English";
-  return `\uC544\uB798 \uCEE4\uBC0B \uBA54\uC2DC\uC9C0\uAC00 Conventional Commits \uD615\uC2DD\uC5D0 \uB9DE\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uC218\uC815\uD574\uC8FC\uC138\uC694.
-
-[\uD604\uC7AC \uBA54\uC2DC\uC9C0]
-${invalidMessage}
-
-[\uADDC\uCE59]
-- \uCCAB \uC904\uC740 \uBC18\uB4DC\uC2DC "${CONVENTIONAL_PREFIXES.join("|")}(<\uBC94\uC704>): <\uC124\uBA85>" \uD615\uC2DD\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- ${langLabel}\uB85C \uC791\uC131\uD558\uC138\uC694.
-- \uC218\uC815\uB41C \uCEE4\uBC0B \uBA54\uC2DC\uC9C0\uB9CC \uCD9C\uB825\uD558\uC138\uC694.`;
-}
-function buildConflictPrompt(localContent, remoteContent) {
-  return `\uC544\uB798\uC5D0 Git \uCDA9\uB3CC\uC774 \uBC1C\uC0DD\uD55C \uD30C\uC77C\uC758 [\uB85C\uCEEC \uBC84\uC804]\uACFC [\uC6D0\uACA9 \uBC84\uC804]\uC774 \uC788\uC2B5\uB2C8\uB2E4.
-\uB450 \uBC84\uC804\uC744 \uBD84\uC11D\uD558\uC5EC **\uC62C\uBC14\uB974\uAC8C \uBCD1\uD569\uB41C \uCD5C\uC885 \uD30C\uC77C \uB0B4\uC6A9**\uC744 \uC0DD\uC131\uD574\uC8FC\uC138\uC694.
-
-[\uD544\uC218 \uADDC\uCE59]
-1. \uB450 \uBC84\uC804\uC758 \uBCC0\uACBD \uC0AC\uD56D\uC744 \uBAA8\uB450 \uD3EC\uD568\uD558\uC5EC \uBCD1\uD569\uD560 \uAC83
-2. \uCDA9\uB3CC \uB9C8\uCEE4(<<<<<<, ======, >>>>>>)\uB294 \uC808\uB300 \uD3EC\uD568\uD558\uC9C0 \uB9D0 \uAC83
-3. \uCF54\uB4DC\uC758 \uB17C\uB9AC\uC801 \uC77C\uAD00\uC131\uC744 \uC720\uC9C0\uD560 \uAC83
-4. \uCD9C\uB825\uC740 **\uC624\uC9C1 \uBCD1\uD569\uB41C \uD30C\uC77C \uB0B4\uC6A9\uB9CC** \uCD9C\uB825\uD560 \uAC83
-
-[\uB85C\uCEEC \uBC84\uC804]
-${localContent}
-
-[\uC6D0\uACA9 \uBC84\uC804]
-${remoteContent}`;
-}
-function buildDiffSummaryPrompt(diff) {
-  return `\uC544\uB798 Git Diff\uAC00 \uB108\uBB34 \uD07D\uB2C8\uB2E4. \uD575\uC2EC \uBCC0\uACBD \uC0AC\uD56D\uB9CC \uC694\uC57D\uD574\uC8FC\uC138\uC694.
-
-[\uADDC\uCE59]
-1. \uC5B4\uB5A4 \uD30C\uC77C\uC5D0\uC11C \uBB34\uC5C7\uC774 \uBCC0\uACBD\uB418\uC5C8\uB294\uC9C0 \uC694\uC57D
-2. \uCD94\uAC00/\uC218\uC815/\uC0AD\uC81C\uB41C \uC8FC\uC694 \uD568\uC218/\uD074\uB798\uC2A4/\uBCC0\uC218 \uB098\uC5F4
-3. diff \uD615\uC2DD\uC73C\uB85C \uCD9C\uB825 (+ / - \uC811\uB450\uC0AC \uC0AC\uC6A9)
-4. 500\uC790 \uC774\uB0B4\uB85C \uC694\uC57D
-
-[Diff]
-${diff}`;
-}
-
 // src/committer.ts
-import { simpleGit as simpleGit2 } from "simple-git";
+import { simpleGit } from "simple-git";
 async function commitAndPush(repo, files, message, action, ui, logger) {
-  const git = simpleGit2(repo.path);
+  const git = simpleGit(repo.path);
   if (action === "cancel") {
     ui.showMessage(`${repo.path}: \uAC74\uB108\uB701\uB2C8\uB2E4.`, "info");
     return;
@@ -591,12 +172,14 @@ function createUI() {
       const items = [
         "Push (\uD478\uC2DC \uC2E4\uD589)",
         "Skip (\uB85C\uCEEC \uCEE4\uBC0B \uC720\uC9C0)",
-        "Cancel (\uCEE4\uBC0B \uCDE8\uC18C)"
+        "Cancel (\uCEE4\uBC0B \uCDE8\uC18C)",
+        "Skip repo (\uC774 \uC800\uC7A5\uC18C \uAC74\uB108\uB6F0\uAE30)",
+        "Exit (\uC885\uB8CC)"
       ];
       term("  \u25B6 Select action:\n");
       const response = await term.singleColumnMenu(items).promise;
       term("\n");
-      const map = ["push", "skip", "cancel"];
+      const map = ["push", "skip", "cancel", "skip-repo", "exit"];
       return map[response.selectedIndex] ?? "skip";
     },
     async promptOfflineTemplate(templates) {
@@ -669,26 +252,6 @@ function padEnd(str, len) {
   return str + " ".repeat(diff);
 }
 
-// src/logger.ts
-import pino from "pino";
-import { join as join2 } from "path";
-import { mkdirSync } from "fs";
-import { homedir } from "os";
-function createLogger() {
-  const logDir = join2(homedir(), ".smart-commit", "logs");
-  try {
-    mkdirSync(logDir, { recursive: true });
-  } catch {
-    return pino({ level: "info" });
-  }
-  const today = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
-  const logFile = join2(logDir, `${today}.log`);
-  return pino(
-    { level: "info" },
-    pino.destination({ dest: logFile, append: true, sync: false })
-  );
-}
-
 // src/index.ts
 var program = new Command();
 program.name("smart-commit").description("AI-powered intelligent Git auto-commit & push CLI tool").version("0.1.0").option("-d, --dry-run", "Preview without committing or pushing").option("-g, --group <strategy>", "Grouping strategy: smart | single | manual").option("-a, --ai <tool>", "AI tool: gemini | claude | gpt | ollama").option("--no-interactive", "Headless mode (no prompts)").option("--offline", "Offline mode (use templates instead of AI)").action(async (options) => {
@@ -731,7 +294,7 @@ program.name("smart-commit").description("AI-powered intelligent Git auto-commit
       }
       continue;
     }
-    const safety = classifyFiles(repo.files, config);
+    const safety = await classifyFiles(repo.files, config);
     if (safety.blocked.length > 0) {
       ui.showBlocked(repo, safety.blocked);
     }
@@ -787,6 +350,15 @@ program.name("smart-commit").description("AI-powered intelligent Git auto-commit
         continue;
       }
       const action = isHeadless ? "push" : await ui.promptAction();
+      if (action === "exit") {
+        ui.showMessage("\uC885\uB8CC\uD569\uB2C8\uB2E4.", "info");
+        ui.cleanup();
+        return;
+      }
+      if (action === "skip-repo") {
+        ui.showMessage(`${repo.path}: \uC800\uC7A5\uC18C \uAC74\uB108\uB6F0\uAE30`, "info");
+        break;
+      }
       await commitAndPush(repo, group.files, commitMsg, action, ui, logger);
     }
   }
@@ -815,8 +387,8 @@ program.command("hook").description("Install or uninstall Git hooks").option("--
   ui.cleanup();
 });
 async function getDiff(repo, filePaths) {
-  const { simpleGit: simpleGit3 } = await import("simple-git");
-  const git = simpleGit3(repo.path);
+  const { simpleGit: simpleGit2 } = await import("simple-git");
+  const git = simpleGit2(repo.path);
   await git.add(filePaths);
   const diff = await git.diff(["--cached", "--", ...filePaths]);
   return diff;