gitxelectron 1.1.1 → 1.1.2

package/out/main/index.js

@@ -444,7 +444,7 @@ function initGit(sessionId, baseDir) {
     baseDir,
     binary: "git",
     maxConcurrentProcesses: 6,
-    unsafe: { allowUnsafeEditor: true }
+    unsafe: { allowUnsafeEditor: true, allowUnsafeAskPass: true, allowUnsafeCredentialHelper: true }
   };
   const git = simpleGit.simpleGit(options);
   gitSessions.set(sessionId, { git, repoPath: baseDir });
@@ -467,7 +467,7 @@ async function isGitRepo(dir) {
 }
 async function initializeRepo(sessionId, dir) {
   try {
-    const tempGit = simpleGit.simpleGit(dir);
+    const tempGit = simpleGit.simpleGit({ baseDir: dir, unsafe: { allowUnsafeEditor: true, allowUnsafeAskPass: true, allowUnsafeCredentialHelper: true } });
     await tempGit.init();
     const branches = await tempGit.branchLocal();
     if (branches.all.length === 0) {
@@ -560,7 +560,7 @@ async function pushToRemote(sessionId, remote, branch) {
   const { git } = getGitSession(sessionId);
   const remotes = await getRemotes(sessionId);
   const remoteObj = remotes.find((r) => r.name === remote);
-  const tempGit = git.env({
+  const tempGit = simpleGit.simpleGit({ baseDir: getGitSession(sessionId).repoPath, unsafe: { allowUnsafeEditor: true, allowUnsafeAskPass: true, allowUnsafeCredentialHelper: true } }).env({
     ...process.env,
     GCM_INTERACTIVE: "false",
     GIT_TERMINAL_PROMPT: "0",
@@ -615,7 +615,8 @@ async function getBranches(sessionId) {
     const remotes = await git.getRemotes(true);
     if (remotes.length > 0) {
       const remoteObj = remotes[0];
-      const tempGit = simpleGit.simpleGit(getGitSession(sessionId).repoPath).env({
+      const tempGit = simpleGit.simpleGit({ baseDir: getGitSession(sessionId).repoPath, unsafe: { allowUnsafeEditor: true, allowUnsafeAskPass: true, allowUnsafeCredentialHelper: true } }).env({
+        ...process.env,
         GCM_INTERACTIVE: "false",
         GIT_TERMINAL_PROMPT: "0",
         GIT_ASKPASS: "echo"
@@ -700,7 +701,7 @@ async function pushAllBranches(sessionId, remote) {
   const { git } = getGitSession(sessionId);
   const remotes = await getRemotes(sessionId);
   const remoteObj = remotes.find((r) => r.name === remote);
-  const tempGit = git.env({
+  const tempGit = simpleGit.simpleGit({ baseDir: getGitSession(sessionId).repoPath, unsafe: { allowUnsafeEditor: true, allowUnsafeAskPass: true, allowUnsafeCredentialHelper: true } }).env({
     ...process.env,
     GCM_INTERACTIVE: "false",
     GIT_TERMINAL_PROMPT: "0",
@@ -808,7 +809,7 @@ async function setupUniversalWorkspace(sessionId, remoteUrl, branch, baseBranch,
   const tempId = crypto.randomUUID();
   const workspacePath = path__namespace.join(electron.app.getPath("temp"), `gitelectron_universal_${tempId}`);
   await fs__namespace.mkdir(workspacePath, { recursive: true });
-  const git = simpleGit.simpleGit(workspacePath);
+  const git = simpleGit.simpleGit({ baseDir: workspacePath, unsafe: { allowUnsafeEditor: true, allowUnsafeAskPass: true, allowUnsafeCredentialHelper: true } });
   await git.init();
   let authUrl = remoteUrl;
   if (remoteUrl.includes("github.com")) {
@@ -868,7 +869,7 @@ async function checkUniversalCollisions(workspacePath, sourceFiles, destinationP
   };
 }
 async function getUniversalDiff(workspacePath, filePath) {
-  const git = simpleGit.simpleGit(workspacePath);
+  const git = simpleGit.simpleGit({ baseDir: workspacePath, unsafe: { allowUnsafeEditor: true, allowUnsafeAskPass: true, allowUnsafeCredentialHelper: true } });
   try {
     const diff = await git.raw(["diff", "--", filePath]);
     return diff;
@@ -877,7 +878,7 @@ async function getUniversalDiff(workspacePath, filePath) {
   }
 }
 async function commitUniversalWorkspace(workspacePath, message, branch) {
-  const git = simpleGit.simpleGit({ baseDir: workspacePath, unsafe: { allowUnsafeEditor: true } }).env({
+  const git = simpleGit.simpleGit({ baseDir: workspacePath, unsafe: { allowUnsafeEditor: true, allowUnsafeAskPass: true, allowUnsafeCredentialHelper: true } }).env({
     ...process.env,
     GCM_INTERACTIVE: "false",
     GIT_TERMINAL_PROMPT: "0",

package/out/preload/index.js

@@ -33,6 +33,7 @@ const api = {
   setGitConfig: (key, value, global = false) => electron.ipcRenderer.invoke("set-git-config", key, value, global),
   readFile: (file) => electron.ipcRenderer.invoke("read-file", file),
   writeFile: (file, content) => electron.ipcRenderer.invoke("write-file", file, content),
+  executeRawGit: (args) => electron.ipcRenderer.invoke("execute-raw-git", args),
   // NEW: Multi-Account & Window
   newWindow: () => electron.ipcRenderer.invoke("new-window"),
   getAccounts: () => electron.ipcRenderer.invoke("get-accounts"),

package/out/renderer/assets/{index-BFPlchlf.js → index-BFVPEjGX.js}

@@ -22388,7 +22388,7 @@ function FiArrowLeft(props) {
 function FiAlertTriangle(props) {
   return GenIcon({ "attr": { "viewBox": "0 0 24 24", "fill": "none", "stroke": "currentColor", "strokeWidth": "2", "strokeLinecap": "round", "strokeLinejoin": "round" }, "child": [{ "tag": "path", "attr": { "d": "M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z" }, "child": [] }, { "tag": "line", "attr": { "x1": "12", "y1": "9", "x2": "12", "y2": "13" }, "child": [] }, { "tag": "line", "attr": { "x1": "12", "y1": "17", "x2": "12.01", "y2": "17" }, "child": [] }] })(props);
 }
-function UniversalPushWizard({ isOpen, onClose }) {
+function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
   const [step, setStep] = reactExports.useState("START");
   const [errorMsg, setErrorMsg] = reactExports.useState("");
   const [files, setFiles] = reactExports.useState([]);
@@ -22528,8 +22528,8 @@ function UniversalPushWizard({ isOpen, onClose }) {
   };
   const handleCommit = async () => {
     setStep("PUSHING");
+    const targetBranch = isNewBranch ? newBranchName : selectedBranch;
     try {
-      const targetBranch = isNewBranch ? newBranchName : selectedBranch;
       await window.api.commitUniversalWorkspace(
         workspacePath,
         commitMessage || "Universal Push via GitQuickPush",
@@ -22537,8 +22537,12 @@ function UniversalPushWizard({ isOpen, onClose }) {
       );
       setStep("SUCCESS");
     } catch (e) {
-      setErrorMsg(e.message);
-      setStep("ERROR");
+      if (onAutoHealTrigger) {
+        onAutoHealTrigger(e.message, workspacePath, targetBranch);
+      } else {
+        setErrorMsg(e.message);
+        setStep("ERROR");
+      }
     }
   };
   if (!isOpen) return null;
@@ -24229,10 +24233,11 @@ function App() {
       setIsPulling(false);
     }
   };
-  const autonomousHealAndPush = async (initialError, operation) => {
+  const autonomousHealAndPush = async (initialError, operation, overrideRepoPath, overrideBranch) => {
     let currentError = initialError;
     let attempts = 0;
     const maxAttempts = 5;
+    const targetRepoPath = overrideRepoPath || repoPath;
     setShowHealerOverlay(true);
     setHealerMessage(`Analyzing initial ${operation} failure...`);
     setHealerAttempt(1);
@@ -24240,8 +24245,11 @@ function App() {
       attempts++;
       setHealerAttempt(attempts);
       try {
+        if (overrideRepoPath) {
+          await window.api.setRepoPath(overrideRepoPath);
+        }
         const currentStatus = await window.api.getStatus();
-        const result = await window.api.askAi("gemini", "", currentError, currentStatus, repoPath || "");
+        const result = await window.api.askAi("gemini", "", currentError, currentStatus, targetRepoPath || "");
         setHealerMessage(result.explanation || `Applying fix...`);
         if (result.commandsToRun && result.commandsToRun.length > 0) {
           for (const cmd of result.commandsToRun) {
@@ -24253,39 +24261,37 @@ function App() {
         const remotes = await window.api.getRemotes();
         if (remotes.length > 0) {
           if (operation === "push") {
-            if (pushAllBranches) await window.api.pushAllBranches(remotes[0].name);
-            else await window.api.pushToRemote(remotes[0].name, branches.current);
+            const targetBranch = overrideBranch || branches.current;
+            if (pushAllBranches && !overrideBranch) await window.api.pushAllBranches(remotes[0].name);
+            else await window.api.pushToRemote(remotes[0].name, targetBranch);
             setPushSuccessData({
-              repository: repoPath?.split("\\").pop() || "",
-              branch: branches.current,
+              repository: targetRepoPath?.split("\\").pop() || "",
+              branch: targetBranch,
               files: 0,
               commitMessage: commitMessage || "Auto-Healed Push"
             });
             setCommitMessage("");
             setShowHealerOverlay(false);
             await refreshRepoState();
-            return true;
-          } else if (operation === "pull") {
-            await window.api.pullFromRemote(remotes[0].name, branches.current);
-            showToast("Auto-Healer successfully pulled changes!", "success");
-            setShowHealerOverlay(false);
-            await refreshRepoState();
-            return true;
+          } else {
+            await window.api.pullFromRemote(remotes[0].name, overrideBranch || branches.current);
           }
+          setHealerMessage(`Successfully auto-healed and ${operation}ed!`);
+          setTimeout(() => {
+            setShowHealerOverlay(false);
+            if (overrideRepoPath && repoPath) {
+              window.api.setRepoPath(repoPath);
+            }
+          }, 2e3);
+          return;
+        } else {
+          throw new Error("No remote found to push/pull to.");
         }
-      } catch (loopError) {
-        currentError = loopError.message;
+      } catch (err) {
+        currentError = err.message;
         setHealerMessage(`Attempt ${attempts} failed. Analyzing new error...`);
       }
     }
-    setShowHealerOverlay(false);
-    setGitErrorData({
-      msg: `AI Auto-Healer exhausted all ${maxAttempts} attempts.
-
-Final Error: ${currentError}`,
-      status: await window.api.getStatus()
-    });
-    await refreshRepoState();
     return false;
   };
   const confirmPush = async () => {
@@ -26289,7 +26295,11 @@ Final Error: ${currentError}`,
           UniversalPushWizard,
           {
             isOpen: showUniversalWizard,
-            onClose: () => setShowUniversalWizard(false)
+            onClose: () => setShowUniversalWizard(false),
+            onAutoHealTrigger: (msg, path, branch) => {
+              setShowUniversalWizard(false);
+              autonomousHealAndPush(msg, "push", path, branch);
+            }
           }
         ),
         (isPushing || isPulling || isUnlocking) && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "absolute inset-0 bg-black/80 backdrop-blur-md flex flex-col items-center justify-center z-[100] transition-opacity", children: [

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-BFPlchlf.js"></script>
+    <script type="module" crossorigin src="./assets/index-BFVPEjGX.js"></script>
     <link rel="stylesheet" crossorigin href="./assets/index-DsltCz9R.css">
   </head>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitxelectron",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "An elegant, completely silent auto-syncing Git client. Works as a desktop app and npm CLI tool.",
   "main": "./out/main/index.js",
   "files": [
@@ -68,4 +68,4 @@
     "typescript": "^5.9.3",
     "vite": "^7.2.6"
   }
-}
+}