Merge branch 'main' of github.com:misaelabanto/commita

Author: misaelabanto

src/cli/commit-handler.ts

@@ -29,6 +29,8 @@ export class CommitHandler {
   async execute(options: CommitOptions): Promise<void> {
     console.log(chalk.blue('🤖 Commita - AI-powered auto-commit\n'));
 
+    await this.gitService.init();
+
     const patternMatcher = new PatternMatcher(
       PatternMatcher.parsePatterns(options.ignore)
     );

src/config/config.loader.ts

@@ -4,6 +4,7 @@ import { existsSync } from 'fs';
 import { readFile } from 'fs/promises';
 import { join } from 'path';
 import { homedir } from 'os';
+import simpleGit from 'simple-git';
 
 export class ConfigLoader {
   async load(configPath?: string): Promise<CommitaConfig> {
@@ -24,7 +25,27 @@ export class ConfigLoader {
   }
 
   private async loadFromFile(configPath?: string): Promise<Partial<CommitaConfig>> {
-    const path = configPath || join(process.cwd(), '.commita');
+    let path = configPath;
+
+    if (!path) {
+      const cwdPath = join(process.cwd(), '.commita');
+      if (existsSync(cwdPath)) {
+        path = cwdPath;
+      } else {
+        const gitRoot = await this.findGitRoot();
+        if (gitRoot) {
+          const rootPath = join(gitRoot, '.commita');
+          if (existsSync(rootPath)) {
+            path = rootPath;
+          }
+        }
+      }
+    }
+
+    // Fallback to default check if we still haven't found it or if it was explicitly provided
+    if (!path) {
+      path = join(process.cwd(), '.commita');
+    }
 
     if (!existsSync(path)) {
       return {};
@@ -39,6 +60,16 @@ export class ConfigLoader {
     }
   }
 
+  private async findGitRoot(): Promise<string | null> {
+    try {
+      const git = simpleGit();
+      const root = await git.revparse(['--show-toplevel']);
+      return root.trim();
+    } catch {
+      return null;
+    }
+  }
+
   private parseKeyValue(content: string): Partial<CommitaConfig> {
     const config: Partial<CommitaConfig> = {};
     const lines = content.split('\n');
@@ -118,4 +149,3 @@ export class ConfigLoader {
     return config;
   }
 }
-

src/git/git.service.ts

@@ -10,9 +10,21 @@ export interface FileChange {
 
 export class GitService {
   private git: SimpleGit;
+  private rootDir: string;
 
   constructor(workingDir?: string) {
-    this.git = simpleGit(workingDir || process.cwd());
+    this.rootDir = workingDir || process.cwd();
+    this.git = simpleGit(this.rootDir);
+  }
+
+  async init(): Promise<void> {
+    try {
+      const root = await this.git.revparse(['--show-toplevel']);
+      this.rootDir = root.trim();
+      this.git = simpleGit(this.rootDir);
+    } catch (error) {
+      // Fallback to cwd if not a git repo (will likely fail later but handles init)
+    }
   }
 
   async getStagedChanges(): Promise<FileChange[]> {
@@ -72,7 +84,7 @@ export class GitService {
 
   private async getNewFileDiff(filePath: string): Promise<string> {
     try {
-      const fullPath = join(process.cwd(), filePath);
+      const fullPath = join(this.rootDir, filePath);
       if (!existsSync(fullPath)) {
         return '';
       }