jettypod 4.1.2 → 4.1.4

package/lib/smart-conflict-detection.js

@@ -0,0 +1,168 @@
+/**
+ * Smart Conflict Detection
+ *
+ * Distinguishes true git conflicts from clean merges with uncommitted changes
+ * using git status --porcelain to detect conflict markers.
+ *
+ * Key principle: UU status indicates unmerged/both modified = true conflict
+ */
+
+const { execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+
+/**
+ * Validate that repoPath is a valid git repository
+ * @param {string} repoPath - Path to validate
+ * @throws {Error} If path is invalid or not a git repository
+ */
+function validateRepoPath(repoPath) {
+  if (!repoPath || typeof repoPath !== 'string') {
+    throw new Error('repoPath is required and must be a string');
+  }
+
+  // Check if path exists
+  if (!fs.existsSync(repoPath)) {
+    throw new Error(`Repository path does not exist: ${repoPath}`);
+  }
+
+  // Check if path is a directory
+  const stats = fs.statSync(repoPath);
+  if (!stats.isDirectory()) {
+    throw new Error(`Repository path is not a directory: ${repoPath}`);
+  }
+
+  // Check if .git directory exists (handles both normal repos and worktrees)
+  const gitDir = path.join(repoPath, '.git');
+  if (!fs.existsSync(gitDir)) {
+    throw new Error(`Not a git repository (missing .git): ${repoPath}`);
+  }
+}
+
+/**
+ * Classify error types for better error handling
+ * @param {Error} err - Error from git command
+ * @returns {Object} { isFatal: boolean, category: string, message: string }
+ */
+function classifyGitError(err) {
+  const errorMsg = err.message || '';
+  const stderr = err.stderr ? err.stderr.toString() : '';
+  const fullError = `${errorMsg} ${stderr}`.toLowerCase();
+
+  // Fatal errors that should stop execution
+  if (fullError.includes('not a git repository') ||
+      fullError.includes('no such file or directory')) {
+    return {
+      isFatal: true,
+      category: 'INVALID_REPO',
+      message: 'Invalid or missing git repository'
+    };
+  }
+
+  // Detached HEAD state - recoverable but needs special handling
+  if (fullError.includes('detached head') ||
+      fullError.includes('not currently on any branch')) {
+    return {
+      isFatal: false,
+      category: 'DETACHED_HEAD',
+      message: 'Repository is in detached HEAD state'
+    };
+  }
+
+  // Permission errors - fatal
+  if (fullError.includes('permission denied') ||
+      fullError.includes('eacces')) {
+    return {
+      isFatal: true,
+      category: 'PERMISSION_DENIED',
+      message: 'Permission denied accessing repository'
+    };
+  }
+
+  // Default to recoverable
+  return {
+    isFatal: false,
+    category: 'UNKNOWN',
+    message: errorMsg || 'Unknown git error'
+  };
+}
+
+/**
+ * Check if git merge has true conflicts or just uncommitted changes
+ *
+ * Uses git status --porcelain to detect conflict markers (UU status).
+ * This allows us to distinguish between:
+ * - True conflicts: Files with UU status (both sides modified, needs manual resolution)
+ * - Clean merge: Files with M/A/D status (uncommitted changes, safe to auto-commit)
+ *
+ * @param {string} repoPath - Path to git repository
+ * @returns {Object} { hasConflicts: boolean, conflictFiles: string[], status: string, error: Object|null }
+ * @throws {Error} Only for fatal errors (invalid repo, permission denied)
+ */
+function checkForConflicts(repoPath) {
+  // Validate input
+  try {
+    validateRepoPath(repoPath);
+  } catch (validationErr) {
+    // Validation errors are always fatal
+    throw validationErr;
+  }
+
+  try {
+    // Run git status --porcelain to get machine-readable status
+    const status = execSync('git status --porcelain', {
+      cwd: repoPath,
+      encoding: 'utf8',
+      stdio: ['pipe', 'pipe', 'pipe'] // Capture stderr
+    });
+
+    // Parse for conflict markers
+    // Git status codes for conflicts (X Y filename):
+    //   DD - both deleted
+    //   AU - added by us
+    //   UD - deleted by them
+    //   UA - added by them
+    //   DU - deleted by us
+    //   AA - both added
+    //   UU - both modified
+    const conflictLines = status.split('\n').filter(line => {
+      const code = line.substring(0, 2);
+      return code === 'DD' || code === 'AU' || code === 'UD' ||
+             code === 'UA' || code === 'DU' || code === 'AA' || code === 'UU';
+    });
+
+    // Extract file paths (skip the 'UU ' prefix)
+    const conflictFiles = conflictLines.map(line => line.substring(3));
+
+    return {
+      hasConflicts: conflictLines.length > 0,
+      conflictFiles: conflictFiles,
+      status: status,
+      error: null
+    };
+
+  } catch (err) {
+    const errorInfo = classifyGitError(err);
+
+    // Fatal errors should throw
+    if (errorInfo.isFatal) {
+      throw new Error(`${errorInfo.category}: ${errorInfo.message}`);
+    }
+
+    // Recoverable errors return with error info
+    return {
+      hasConflicts: false,
+      conflictFiles: [],
+      status: '',
+      error: {
+        category: errorInfo.category,
+        message: errorInfo.message,
+        recoverable: true
+      }
+    };
+  }
+}
+
+module.exports = {
+  checkForConflicts
+};