ai-cmg 0.0.7 → 0.0.9

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import { execSync, spawnSync } from 'child_process';
-import { readFileSync } from 'fs';
-import { dirname, join } from 'path';
+import { execFileSync, execSync, spawnSync } from 'child_process';
+import { readFileSync, existsSync } from 'fs';
+import { dirname, join, resolve } from 'path';
 import { fileURLToPath } from 'url';
 import prompts from 'prompts';
 import clipboardy from 'clipboardy';
@@ -103,15 +103,90 @@ function getGitEnv() {
     delete env.GIT_CEILING_DIRECTORIES;
     return env;
 }
-function resolveRepoRoot() {
+function isGitAvailable() {
     try {
-        const root = execSync('git rev-parse --show-toplevel', { env: getGitEnv() }).toString().trim();
-        return root || null;
+        execFileSync('git', ['--version'], { env: getGitEnv(), stdio: 'ignore' });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function resolveGitDir(repoRoot) {
+    const gitPath = join(repoRoot, '.git');
+    if (!existsSync(gitPath))
+        return null;
+    try {
+        const stat = execSync(`test -d "${gitPath}" && echo "dir" || echo "file"`).toString().trim();
+        if (stat === 'dir')
+            return gitPath;
+    }
+    catch {
+        // fallthrough to file parsing
+    }
+    try {
+        const content = readFileSync(gitPath, 'utf8').trim();
+        const match = content.match(/^gitdir:\s*(.+)$/i);
+        if (!match)
+            return null;
+        const gitDirPath = match[1].trim();
+        return gitDirPath.startsWith('/')
+            ? gitDirPath
+            : resolve(repoRoot, gitDirPath);
     }
     catch {
         return null;
     }
 }
+function runGit(args, repoRoot) {
+    try {
+        return execFileSync('git', ['-C', repoRoot, ...args], { env: getGitEnv() }).toString();
+    }
+    catch {
+        const gitDir = resolveGitDir(repoRoot);
+        if (!gitDir)
+            throw new Error('git failed');
+        return execFileSync('git', ['--git-dir', gitDir, '--work-tree', repoRoot, ...args], {
+            env: getGitEnv()
+        }).toString();
+    }
+}
+function spawnGit(args, repoRoot) {
+    const first = spawnSync('git', ['-C', repoRoot, ...args], { stdio: 'inherit', env: getGitEnv() });
+    if (first.status === 0)
+        return 0;
+    const gitDir = resolveGitDir(repoRoot);
+    if (!gitDir)
+        return first.status ?? 1;
+    const second = spawnSync('git', ['--git-dir', gitDir, '--work-tree', repoRoot, ...args], { stdio: 'inherit', env: getGitEnv() });
+    return second.status ?? 1;
+}
+function findRepoRootByFs(startDir) {
+    let current = resolve(startDir);
+    while (true) {
+        const gitPath = join(current, '.git');
+        if (existsSync(gitPath))
+            return current;
+        const parent = dirname(current);
+        if (parent === current)
+            return null;
+        current = parent;
+    }
+}
+function resolveRepoRoot(baseDir) {
+    try {
+        const root = execSync('git rev-parse --show-toplevel', {
+            env: getGitEnv(),
+            cwd: baseDir
+        }).toString().trim();
+        return root || null;
+    }
+    catch {
+        if (!baseDir)
+            return null;
+        return findRepoRootByFs(baseDir);
+    }
+}
 function parseMessageArgs(rawArgs) {
     const hintParts = [];
     let hint;
@@ -148,10 +223,7 @@ function parseMessageArgs(rawArgs) {
 function getNameStatus(repoRoot) {
     const map = new Map();
     try {
-        const output = execSync('git diff --cached --name-status', {
-            cwd: repoRoot,
-            env: getGitEnv()
-        }).toString();
+        const output = runGit(['diff', '--cached', '--name-status'], repoRoot);
         output.split('\n').forEach((line) => {
             if (!line.trim())
                 return;
@@ -168,10 +240,7 @@ function getNameStatus(repoRoot) {
 }
 function getChangedFiles(repoRoot) {
     try {
-        const output = execSync('git status --porcelain -z', {
-            cwd: repoRoot,
-            env: getGitEnv()
-        }).toString();
+        const output = runGit(['status', '--porcelain', '-z'], repoRoot);
         if (!output)
             return [];
         const parts = output.split('\0').filter(Boolean);
@@ -229,7 +298,7 @@ async function promptStageFiles(repoRoot) {
     if (action === 'cancel')
         return false;
     if (action === 'all') {
-        spawnSync('git', ['add', '.'], { stdio: 'inherit', cwd: repoRoot, env: getGitEnv() });
+        spawnGit(['add', '.'], repoRoot);
         return true;
     }
     const fileChoices = candidates.map((entry) => ({
@@ -246,7 +315,7 @@ async function promptStageFiles(repoRoot) {
     const files = picked.files;
     if (!files || files.length === 0)
         return false;
-    spawnSync('git', ['add', '--', ...files], { stdio: 'inherit', cwd: repoRoot, env: getGitEnv() });
+    spawnGit(['add', '--', ...files], repoRoot);
     return true;
 }
 function getExtension(filePath) {
@@ -361,7 +430,11 @@ async function main() {
         return;
     console.log('Analyzing staged changes...');
     try {
-        const repoRoot = resolveRepoRoot();
+        if (!isGitAvailable()) {
+            console.log('Error: git is not available in PATH.');
+            return;
+        }
+        const repoRoot = resolveRepoRoot(process.cwd());
         if (!repoRoot) {
             console.log('Error: not a git repository.');
             return;
@@ -369,7 +442,7 @@ async function main() {
         // 3. Git Diff 가져오기
         let diff;
         try {
-            diff = execSync('git diff --cached', { cwd: repoRoot, env: getGitEnv() }).toString();
+            diff = runGit(['diff', '--cached'], repoRoot);
         }
         catch (e) {
             console.log('Error: not a git repository or git is unavailable.');
@@ -379,7 +452,7 @@ async function main() {
             const staged = await promptStageFiles(repoRoot);
             if (!staged)
                 return;
-            diff = execSync('git diff --cached', { cwd: repoRoot, env: getGitEnv() }).toString();
+            diff = runGit(['diff', '--cached'], repoRoot);
             if (!diff.trim()) {
                 console.log('No staged changes. Nothing to commit.');
                 return;
@@ -438,11 +511,11 @@ async function main() {
         const action = actions[choice - 1].value;
         switch (action) {
             case 'commit':
-                spawnSync('git', ['commit', '-m', message], { stdio: 'inherit', cwd: repoRoot, env: getGitEnv() });
+                spawnGit(['commit', '-m', message], repoRoot);
                 console.log('Commit complete.');
                 break;
             case 'edit':
-                spawnSync('git', ['commit', '-e', '-m', message], { stdio: 'inherit', cwd: repoRoot, env: getGitEnv() });
+                spawnGit(['commit', '-e', '-m', message], repoRoot);
                 console.log('Commit complete.');
                 break;
             case 'copy':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-cmg",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "AI Commit Message Generator",
   "type": "module",
   "bin": {