gitxelectron 1.3.3 → 1.3.4

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.
@@ -2482,6 +2522,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),

package/out/renderer/assets/{index-EakO-hPk.js → index-DBSFqXQe.js}

@@ -26710,6 +26710,41 @@ Are you SURE you want to link "${repoName}" to this folder?`
                 )
               ] })
             ] }) }),
+            /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "border-t border-border/50 pt-3 mt-1", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-col gap-2", children: [
+              /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-xs font-bold text-danger", children: "Emergency Override (Master Push)" }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-xs text-secondary/60 mt-0.5 leading-tight", children: "Bypass all protections, ignore unpushed changes or missing files, and FORCE push all current files. Warning: This overwrites remote history." })
+              ] }),
+              /* @__PURE__ */ jsxRuntimeExports.jsxs(
+                "button",
+                {
+                  type: "button",
+                  onClick: async () => {
+                    const confirmAction = window.confirm("Are you sure? This will force push all current files, overriding remote history and bypassing all safety checks.");
+                    if (!confirmAction) return;
+                    try {
+                      const remotes = await window.api.getRemotes();
+                      if (!remotes || remotes.length === 0) {
+                        showToast("No remote configured to push to.", "error");
+                        return;
+                      }
+                      showToast("Executing Master Push override...", "info");
+                      await window.api.masterPush(remotes[0].name, status?.current || "main");
+                      showToast("Master Push successful!", "success");
+                      refreshRepoState();
+                      setShowSettings(false);
+                    } catch (err) {
+                      showToast("Master Push failed: " + (err.message || "Unknown error"), "error");
+                    }
+                  },
+                  className: "w-full mt-1 px-3 py-2 bg-danger/10 text-danger border border-danger/30 text-xs font-bold rounded-lg hover:bg-danger/20 hover:border-danger/50 transition-all text-center flex items-center justify-center gap-2",
+                  children: [
+                    /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: "🚀" }),
+                    /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: "Execute Master Push (Force)" })
+                  ]
+                }
+              )
+            ] }) }),
             /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "border-t border-border/50 pt-4 mt-2", children: [
               /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center justify-between mb-3", children: [
                 /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
@@ -27991,7 +28026,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
                     ...branches?.all && branches.all.length > 0 ? branches.all.map((b) => ({ value: b, label: b })) : [{ value: "main", label: "main (new)" }]
                   ],
                   value: status?.current || "",
-                  onChange: (val) => window.api.checkoutBranch(val).then(refreshRepoState),
+                  onChange: (val) => window.api.checkoutBranch(val).then(refreshRepoState).catch((err) => showToast("Could not switch branch: " + (err.message || "Unknown error"), "error")),
                   buttonClassName: "appearance-none bg-surface border border-border rounded-md px-3 py-1.5 text-sm font-medium focus:outline-none focus:border-accent hover:border-secondary transition-colors"
                 }
               ) }),

package/out/renderer/index.html

@@ -21,7 +21,7 @@
       href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap"
       rel="stylesheet"
     />
-    <script type="module" crossorigin src="./assets/index-EakO-hPk.js"></script>
+    <script type="module" crossorigin src="./assets/index-DBSFqXQe.js"></script>
     <link rel="stylesheet" crossorigin href="./assets/index-DnYiBoot.css">
   </head>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitxelectron",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "An elegant, completely silent auto-syncing Git client. Works as a desktop app and npm CLI tool.",
   "main": "./out/main/index.js",
   "files": [