gitxelectron 1.3.3 → 1.3.5

package/out/main/index.js

@@ -1038,6 +1038,14 @@ async function pullFromRemote(sessionId, remote, branch) {
   if (!targetBranch) {
     const status = await git.status();
     targetBranch = status.current || "main";
+    if (targetBranch.includes("(no") || targetBranch === "HEAD") {
+      try {
+        const remoteHead = await git.raw(["rev-parse", "--abbrev-ref", `${targetRemote}/HEAD`]);
+        targetBranch = remoteHead.trim().replace(`${targetRemote}/`, "");
+      } catch {
+        targetBranch = "main";
+      }
+    }
   }
   const authUrl = remoteObj.refs?.fetch ? injectAuthToken(sessionId, remoteObj.refs.fetch) : targetRemote;
   let didStash = false;
@@ -1244,7 +1252,25 @@ async function getBranches(sessionId) {
 }
 async function checkoutBranch(sessionId, branch) {
   const { git } = getGitSession(sessionId);
-  return await git.checkout(branch);
+  let didStash = false;
+  try {
+    const status = await git.status();
+    if (!status.isClean()) {
+      await git.raw(["stash", "push", "-u", "-m", "gitquickpush-autostash-before-checkout"]);
+      didStash = true;
+    }
+  } catch (err) {
+    console.warn("Stash check before checkout warning:", err);
+  }
+  const res = await git.checkout(branch);
+  if (didStash) {
+    try {
+      await git.raw(["stash", "pop"]);
+    } catch (popErr) {
+      console.warn("Auto-stash pop after checkout had merge notice:", popErr?.message);
+    }
+  }
+  return res;
 }
 async function createBranch(sessionId, branch, baseBranch) {
   const { git } = getGitSession(sessionId);
@@ -1779,6 +1805,20 @@ async function removeGitLock(sessionId) {
     return false;
   }
 }
+async function masterPush(sessionId, remote, branch) {
+  const { git } = getGitSession(sessionId);
+  const remotes = await getRemotes(sessionId);
+  const remoteObj = (remote ? remotes.find((r) => r.name === remote) : null) || remotes[0];
+  if (!remoteObj) throw new Error("No remote repository configured.");
+  const targetRemote = remoteObj.name;
+  const authUrl = remoteObj.refs?.push ? injectAuthToken(sessionId, remoteObj.refs.push) : targetRemote;
+  await git.add(".");
+  try {
+    await git.commit("Master Override Push", ["--no-verify"]);
+  } catch (e) {
+  }
+  return await git.push(authUrl, branch, ["--force"]);
+}
 const SYSTEM_PROMPT = `You are an autonomous Git Healer Agent for the "GitElectron" app. 
 The user has encountered a Git error during a push, pull, or merge operation and you are executing as a background process to silently fix it.
 You will receive the Git Status and the Raw Error Message.
@@ -1880,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.
@@ -2482,6 +2554,9 @@ electron.app.whenReady().then(async () => {
   electron.ipcMain.handle("check-remote-updates", async (event) => {
     return await checkRemoteUpdates(event.sender.id);
   });
+  electron.ipcMain.handle("master-push", async (event, remote, branch) => {
+    return await masterPush(event.sender.id, remote, branch);
+  });
   electron.ipcMain.handle("reset-to-remote", async (event, remote, branch) => {
     return await resetToRemote(event.sender.id, remote, branch);
   });

package/out/preload/index.js

@@ -20,6 +20,7 @@ const api = {
   unstageFiles: (files) => electron.ipcRenderer.invoke("unstage-files", files),
   commitChanges: (message) => electron.ipcRenderer.invoke("commit-changes", message),
   pushToRemote: (remote, branch) => electron.ipcRenderer.invoke("push-to-remote", remote, branch),
+  masterPush: (remote, branch) => electron.ipcRenderer.invoke("master-push", remote, branch),
   pullFromRemote: (remote, branch) => electron.ipcRenderer.invoke("pull-from-remote", remote, branch),
   checkRemoteUpdates: () => electron.ipcRenderer.invoke("check-remote-updates"),
   resetToRemote: (remote, branch) => electron.ipcRenderer.invoke("reset-to-remote", remote, branch),