gitxelectron 1.3.4 → 1.3.5

package/out/main/index.js

@@ -1920,8 +1920,40 @@ ${errorMsg}
       lastError = e;
     }
   }
+  console.warn("[AI Service] Falling back to local heuristic analysis...");
+  const lowerError = errorMsg.toLowerCase();
+  if (lowerError.includes("fetch first") || lowerError.includes("non-fast-forward") || lowerError.includes("updates were rejected") || lowerError.includes("remote contains work")) {
+    return {
+      explanation: "Diverged branch detected. Pulling remote changes to reconcile...",
+      commandsToRun: ["git pull --no-edit"]
+    };
+  }
+  if (lowerError.includes("merge conflict") || lowerError.includes("conflict") || lowerError.includes("automatic merge failed")) {
+    return {
+      explanation: "Merge conflict detected. Forcing resolution by keeping local changes...",
+      commandsToRun: ["git merge --abort", "git pull -X ours --no-edit", "git add .", 'git commit -m "Auto-resolve merge conflict"']
+    };
+  }
+  if (lowerError.includes("unmerged files") || lowerError.includes("you have unmerged paths")) {
+    return {
+      explanation: "Unmerged paths detected. Committing current state to proceed...",
+      commandsToRun: ["git add .", 'git commit -m "Auto-resolve unmerged paths"']
+    };
+  }
+  if (lowerError.includes("please tell me who you are")) {
+    return {
+      explanation: "Git identity not set. Setting temporary identity...",
+      commandsToRun: ['git config user.email "gitelectron@example.com"', 'git config user.name "Git Electron"']
+    };
+  }
+  if (lowerError.includes("would be overwritten by merge") || lowerError.includes("local changes to the following files would be overwritten")) {
+    return {
+      explanation: "Local changes would be overwritten. Stashing, pulling, and popping...",
+      commandsToRun: ["git stash", "git pull --no-edit", "git stash pop", "git add .", 'git commit -m "Auto-resolved stashed changes"']
+    };
+  }
   throw new Error(
-    `AI Analysis failed after trying all provided keys. Last error: ${lastError?.message}`
+    `AI Analysis failed after trying all provided keys and no local heuristics matched. Last error: ${lastError?.message || "Unknown"}`
   );
 }
 const AUTO_SYNC_SYSTEM_PROMPT = `You are an autonomous Git Healer Agent for the "GitQuickPush" app.