gitxelectron 1.3.8 → 1.3.9

package/out/renderer/assets/{index-FVTFdxtU.js → index-Dtxyy2BB.js}

@@ -26703,6 +26703,55 @@ Are you SURE you want to link "${repoName}" to this folder?`
       setIsPulling(false);
     }
   };
+  const formatErrorMessage = (msg) => {
+    if (!msg) return "";
+    return msg.replace(/^Error invoking remote method '[^']+':\s*/i, "").replace(/^Error:\s*/i, "").replace(/^error:\s*/i, "").trim();
+  };
+  const handleResolveConflictOurs = async () => {
+    try {
+      showToast("Resolving conflicts: keeping local changes...", "info");
+      await window.api.executeRawGit(["checkout", "--ours", "."]);
+      await window.api.executeRawGit(["add", "."]);
+      await window.api.executeRawGit(["commit", "-m", "Resolved conflicts (kept local changes)"]);
+      setPushFailureData(null);
+      await refreshRepoState();
+      showToast("✅ Conflicts resolved (kept local changes)", "success");
+    } catch (err) {
+      showToast(`Failed to resolve conflicts: ${err.message}`, "error");
+    }
+  };
+  const handleResolveConflictTheirs = async () => {
+    try {
+      showToast("Resolving conflicts: accepting remote changes...", "info");
+      await window.api.executeRawGit(["checkout", "--theirs", "."]);
+      await window.api.executeRawGit(["add", "."]);
+      await window.api.executeRawGit(["commit", "-m", "Resolved conflicts (accepted remote changes)"]);
+      setPushFailureData(null);
+      await refreshRepoState();
+      showToast("✅ Conflicts resolved (accepted remote changes)", "success");
+    } catch (err) {
+      showToast(`Failed to resolve conflicts: ${err.message}`, "error");
+    }
+  };
+  const handleAbortMerge = async () => {
+    try {
+      showToast("Aborting merge...", "info");
+      try {
+        await window.api.executeRawGit(["merge", "--abort"]);
+      } catch {
+        try {
+          await window.api.executeRawGit(["rebase", "--abort"]);
+        } catch {
+          await window.api.executeRawGit(["reset", "--merge"]);
+        }
+      }
+      setPushFailureData(null);
+      await refreshRepoState();
+      showToast("✅ Merge aborted. Repository restored to clean state.", "success");
+    } catch (err) {
+      showToast(`Failed to abort merge: ${err.message}`, "error");
+    }
+  };
   const handleSyncCollabRepo = async (repo, savedPath) => {
     try {
       showToast(`Syncing ${repo.name} with GitHub...`, "info");
@@ -26768,6 +26817,29 @@ Are you SURE you want to link "${repoName}" to this folder?`
           }, 1500);
           break;
         }
+        const isConflictErr = currentError.includes("unmerged files") || currentError.includes("unresolved conflict") || currentError.includes("automatic merge failed") || currentError.includes("you have unmerged paths");
+        if (isConflictErr) {
+          setHealerMessage("Unmerged conflict detected. Automatically resolving conflicted files...");
+          try {
+            await window.api.executeRawGit(["checkout", "--ours", "."]);
+            await window.api.executeRawGit(["add", "."]);
+            await window.api.executeRawGit(["commit", "-m", "Auto-resolved conflicts: kept local changes"]);
+          } catch {
+            try {
+              await window.api.executeRawGit(["merge", "--abort"]);
+            } catch {
+            }
+          }
+          await refreshRepoState();
+          showToast("Merge conflicts resolved successfully!", "success");
+          setTimeout(() => {
+            setShowHealerOverlay(false);
+            if (overrideRepoPath && repoPath) {
+              window.api.setRepoPath(repoPath);
+            }
+          }, 1500);
+          return true;
+        }
         const currentStatus = await window.api.getStatus();
         const result = await window.api.askAi(
           "gemini",
@@ -26801,14 +26873,18 @@ Are you SURE you want to link "${repoName}" to this folder?`
             setShowHealerOverlay(false);
             await refreshRepoState();
           } else {
-            await window.api.pullFromRemote(remotes[0].name, overrideBranch || branches.current);
+            const wasConflict = currentError.includes("unmerged files") || currentError.includes("unresolved conflict") || currentError.includes("automatic merge failed") || currentError.includes("you have unmerged paths");
+            if (!wasConflict) {
+              await window.api.pullFromRemote(remotes[0].name, overrideBranch || branches.current);
+            }
           }
-          setHealerMessage(`Successfully auto-healed and ${operation}ed!`);
+          setHealerMessage(`Successfully auto-healed and reconciled!`);
           setTimeout(() => {
             setShowHealerOverlay(false);
             if (overrideRepoPath && repoPath) {
               window.api.setRepoPath(repoPath);
             }
+            refreshRepoState();
           }, 2e3);
           return;
         } else {
@@ -28176,60 +28252,199 @@ Are you SURE you want to link "${repoName}" to this folder?`
             }
           )
         ] }) }),
-        pushFailureData && /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "absolute inset-0 bg-black/60 backdrop-blur-sm flex items-center justify-center z-50", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "bg-surface/95 backdrop-blur-xl p-8 rounded-xl shadow-2xl border border-danger/50 w-full max-w-[500px] mx-4 animate-float", children: [
-          /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-3 mb-4 text-danger", children: [
-            /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-6 h-6", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
-              "path",
-              {
-                strokeLinecap: "round",
-                strokeLinejoin: "round",
-                strokeWidth: 2,
-                d: "M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"
-              }
-            ) }),
-            /* @__PURE__ */ jsxRuntimeExports.jsx("h2", { className: "text-xl font-bold", children: "Push Rejected" })
-          ] }),
-          /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "mb-5 bg-canvas border border-border p-4 rounded-md", children: /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-primary text-sm", children: pushFailureData.reason }) }),
-          /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-secondary mb-6 text-sm", children: "Recommendation: You can pull the latest changes from the remote to reconcile your local branch, or you can use the AI Auto-Healer to analyze and fix the issue automatically." }),
-          /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex gap-3", children: [
-            /* @__PURE__ */ jsxRuntimeExports.jsx(
-              "button",
-              {
-                onClick: () => {
-                  const data = pushFailureData;
-                  setPushFailureData(null);
-                  autonomousHealAndPush(
-                    data.reason,
-                    data.operation || "push",
-                    data.overrideRepoPath,
-                    data.overrideBranch
-                  );
-                },
-                className: "flex-1 py-2 bg-brand hover:bg-brand-hover border border-white/10 text-white rounded-md font-semibold transition-all text-sm flex items-center justify-center gap-2",
-                children: "✨ Fix with AI"
-              }
-            ),
-            /* @__PURE__ */ jsxRuntimeExports.jsx(
-              "button",
-              {
-                onClick: () => {
-                  setPushFailureData(null);
-                  handlePull();
-                },
-                className: "flex-1 py-2 bg-surface hover:bg-surface-hover border border-border text-primary rounded-md font-semibold transition-all text-sm",
-                children: "Pull Changes"
-              }
-            ),
-            /* @__PURE__ */ jsxRuntimeExports.jsx(
-              "button",
-              {
-                onClick: () => setPushFailureData(null),
-                className: "flex-1 py-2 bg-surface hover:bg-surface-hover border border-border text-primary rounded-md font-semibold transition-colors text-sm",
-                children: "Cancel"
-              }
-            )
-          ] })
-        ] }) }),
+        pushFailureData && (() => {
+          const isConflict = Boolean(
+            pushFailureData.reason && (pushFailureData.reason.includes("unmerged files") || pushFailureData.reason.includes("unresolved conflict") || pushFailureData.reason.includes("merge conflict") || pushFailureData.reason.includes("Automatic merge failed") || pushFailureData.reason.includes("you have unmerged paths") || pushFailureData.reason.includes("CONFLICT ("))
+          );
+          const isPull = pushFailureData.operation === "pull" || pushFailureData.reason?.includes("pull-from-remote");
+          const cleanedReason = formatErrorMessage(pushFailureData.reason);
+          return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "absolute inset-0 bg-black/60 backdrop-blur-sm flex items-center justify-center z-50 p-4", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: `bg-surface/95 backdrop-blur-xl p-6 sm:p-8 rounded-xl shadow-2xl border ${isConflict ? "border-amber-500/50" : "border-danger/50"} w-full max-w-[520px] animate-float`, children: [
+            /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: `flex items-center gap-3 mb-4 ${isConflict ? "text-amber-500" : "text-danger"}`, children: [
+              isConflict ? /* @__PURE__ */ jsxRuntimeExports.jsxs("svg", { className: "w-6 h-6 flex-shrink-0", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round", children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsx("circle", { cx: "18", cy: "18", r: "3" }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx("circle", { cx: "6", cy: "6", r: "3" }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx("path", { d: "M6 9v12" }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx("path", { d: "M18 9a9 9 0 0 0-9 9" })
+              ] }) : /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-6 h-6 flex-shrink-0", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+                "path",
+                {
+                  strokeLinecap: "round",
+                  strokeLinejoin: "round",
+                  strokeWidth: 2,
+                  d: "M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"
+                }
+              ) }),
+              /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsx("h2", { className: "text-xl font-bold tracking-tight", children: isConflict ? "Merge Conflict Detected" : isPull ? "Pull Failed" : "Push Rejected" }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-xs text-secondary mt-0.5", children: isConflict ? "Unmerged files prevent Git from syncing automatically." : isPull ? "Unable to pull incoming commits from the remote repository." : "Remote repository rejected your push request." })
+              ] })
+            ] }),
+            /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "mb-4 bg-canvas/80 border border-border p-3.5 rounded-lg max-h-36 overflow-y-auto custom-scrollbar", children: /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-primary font-mono text-xs leading-relaxed whitespace-pre-wrap select-text", children: cleanedReason }) }),
+            /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-secondary mb-5 text-sm leading-relaxed", children: isConflict ? /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
+              "Choose a resolution below: let ",
+              /* @__PURE__ */ jsxRuntimeExports.jsx("strong", { className: "text-primary font-semibold", children: "AI Auto-Healer" }),
+              " intelligently reconcile conflicts, keep your local changes, accept remote incoming changes, or abort the merge to revert to the previous state."
+            ] }) : isPull ? /* @__PURE__ */ jsxRuntimeExports.jsx(jsxRuntimeExports.Fragment, { children: "Failed to pull latest changes from the remote repository. Check your connection or use the AI Auto-Healer to analyze and fix the issue." }) : /* @__PURE__ */ jsxRuntimeExports.jsx(jsxRuntimeExports.Fragment, { children: "Recommendation: You can pull the latest changes from the remote to reconcile your local branch, or you can use the AI Auto-Healer to analyze and fix the issue automatically." }) }),
+            isConflict ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-col gap-2.5", children: [
+              /* @__PURE__ */ jsxRuntimeExports.jsx(
+                "button",
+                {
+                  onClick: () => {
+                    const data = pushFailureData;
+                    setPushFailureData(null);
+                    autonomousHealAndPush(
+                      data.reason,
+                      data.operation || "pull",
+                      data.overrideRepoPath,
+                      data.overrideBranch
+                    );
+                  },
+                  className: "w-full py-2.5 bg-brand hover:bg-brand-hover border border-white/10 text-white rounded-md font-semibold transition-all text-sm flex items-center justify-center gap-2 shadow-lg shadow-brand/20 active:scale-[0.99]",
+                  children: "✨ Auto-Resolve with AI"
+                }
+              ),
+              /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "grid grid-cols-3 gap-2", children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsx(
+                  "button",
+                  {
+                    onClick: handleResolveConflictOurs,
+                    className: "py-2 px-2 bg-surface hover:bg-surface-hover border border-border text-primary rounded-md font-semibold transition-all text-xs text-center hover:border-brand/40",
+                    title: "Keep local changes and discard remote changes",
+                    children: "Keep Local (Ours)"
+                  }
+                ),
+                /* @__PURE__ */ jsxRuntimeExports.jsx(
+                  "button",
+                  {
+                    onClick: handleResolveConflictTheirs,
+                    className: "py-2 px-2 bg-surface hover:bg-surface-hover border border-border text-primary rounded-md font-semibold transition-all text-xs text-center hover:border-brand/40",
+                    title: "Accept remote incoming changes and discard local changes",
+                    children: "Accept Remote (Theirs)"
+                  }
+                ),
+                /* @__PURE__ */ jsxRuntimeExports.jsx(
+                  "button",
+                  {
+                    onClick: handleAbortMerge,
+                    className: "py-2 px-2 bg-danger/10 hover:bg-danger/20 border border-danger/30 text-danger rounded-md font-semibold transition-all text-xs text-center",
+                    title: "Abort the merge and revert repository to previous state",
+                    children: "Abort Merge"
+                  }
+                )
+              ] }),
+              /* @__PURE__ */ jsxRuntimeExports.jsx(
+                "button",
+                {
+                  onClick: () => {
+                    setPushFailureData(null);
+                    setChangesTab("changes");
+                  },
+                  className: "w-full py-2 bg-surface hover:bg-surface-hover border border-border text-secondary hover:text-primary rounded-md font-medium transition-colors text-xs text-center",
+                  children: "Review Conflicted Files Manually in Changes Tab"
+                }
+              ),
+              /* @__PURE__ */ jsxRuntimeExports.jsx(
+                "button",
+                {
+                  onClick: async () => {
+                    const data = pushFailureData;
+                    setPushFailureData(null);
+                    try {
+                      const remotes = await window.api.getRemotes();
+                      const targetRemote = data?.overrideRepoPath || remotes[0]?.name || "origin";
+                      const targetBranch = data?.overrideBranch || "main";
+                      await window.api.masterPush(targetRemote, targetBranch);
+                      setPushSuccessData({
+                        files: "All",
+                        branch: targetBranch,
+                        repository: targetRemote
+                      });
+                    } catch (err) {
+                      setPushFailureData({
+                        reason: err.message || "Master Force Push Failed",
+                        operation: "push",
+                        overrideRepoPath: data?.overrideRepoPath,
+                        overrideBranch: data?.overrideBranch
+                      });
+                    }
+                  },
+                  className: "w-full mt-2 py-2.5 bg-danger/20 hover:bg-danger/30 border border-danger/50 text-danger rounded-md font-bold transition-all text-sm flex items-center justify-center gap-2 shadow-lg shadow-danger/10 active:scale-[0.99]",
+                  title: "Force push everything (including ignored files) bypassing all rules",
+                  children: "⚡ Master Force Push (Override All)"
+                }
+              )
+            ] }) : /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-col gap-3", children: [
+              /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex gap-3", children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsx(
+                  "button",
+                  {
+                    onClick: () => {
+                      const data = pushFailureData;
+                      setPushFailureData(null);
+                      autonomousHealAndPush(
+                        data.reason,
+                        data.operation || (isPull ? "pull" : "push"),
+                        data.overrideRepoPath,
+                        data.overrideBranch
+                      );
+                    },
+                    className: "flex-1 py-2 bg-brand hover:bg-brand-hover border border-white/10 text-white rounded-md font-semibold transition-all text-sm flex items-center justify-center gap-2 active:scale-[0.99]",
+                    children: "✨ Fix with AI"
+                  }
+                ),
+                /* @__PURE__ */ jsxRuntimeExports.jsx(
+                  "button",
+                  {
+                    onClick: () => {
+                      setPushFailureData(null);
+                      handlePull();
+                    },
+                    className: "flex-1 py-2 bg-surface hover:bg-surface-hover border border-border text-primary rounded-md font-semibold transition-all text-sm active:scale-[0.99]",
+                    children: isPull ? "Retry Pull" : "Pull Changes"
+                  }
+                ),
+                /* @__PURE__ */ jsxRuntimeExports.jsx(
+                  "button",
+                  {
+                    onClick: () => setPushFailureData(null),
+                    className: "flex-1 py-2 bg-surface hover:bg-surface-hover border border-border text-primary rounded-md font-semibold transition-colors text-sm active:scale-[0.99]",
+                    children: "Cancel"
+                  }
+                )
+              ] }),
+              /* @__PURE__ */ jsxRuntimeExports.jsx(
+                "button",
+                {
+                  onClick: async () => {
+                    const data = pushFailureData;
+                    setPushFailureData(null);
+                    try {
+                      const remotes = await window.api.getRemotes();
+                      const targetRemote = data?.overrideRepoPath || remotes[0]?.name || "origin";
+                      const targetBranch = data?.overrideBranch || "main";
+                      await window.api.masterPush(targetRemote, targetBranch);
+                      setPushSuccessData({
+                        files: "All",
+                        branch: targetBranch,
+                        repository: targetRemote
+                      });
+                    } catch (err) {
+                      setPushFailureData({
+                        reason: err.message || "Master Force Push Failed",
+                        operation: "push",
+                        overrideRepoPath: data?.overrideRepoPath,
+                        overrideBranch: data?.overrideBranch
+                      });
+                    }
+                  },
+                  className: "w-full py-2 bg-danger/20 hover:bg-danger/30 border border-danger/50 text-danger rounded-md font-bold transition-all text-sm flex items-center justify-center gap-2 active:scale-[0.99]",
+                  title: "Force push everything (including ignored files) bypassing all rules",
+                  children: "⚡ Master Force Push (Override All)"
+                }
+              )
+            ] })
+          ] }) });
+        })(),
         /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "w-64 lg:w-72 flex-shrink-0 bg-surface/80 backdrop-blur-md p-5 border-r border-border flex flex-col relative z-10 shadow-lg transition-colors duration-300", children: [
           /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-3 mb-6 p-1", children: [
             /* @__PURE__ */ jsxRuntimeExports.jsx(

package/out/renderer/index.html

@@ -21,8 +21,8 @@
       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-FVTFdxtU.js"></script>
-    <link rel="stylesheet" crossorigin href="./assets/index-D_wJ7hR7.css">
+    <script type="module" crossorigin src="./assets/index-Dtxyy2BB.js"></script>
+    <link rel="stylesheet" crossorigin href="./assets/index-Bhk4vMRr.css">
   </head>
 
   <body class="bg-gray-900 text-white font-sans antialiased overflow-hidden">

package/package.json

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