gitxelectron 1.4.2 → 1.4.4

package/out/renderer/assets/{index-7yJPiur0.js → index-CmvtfcrN.js}

@@ -14346,7 +14346,7 @@ function ContributorsModal({ onClose, remoteUrl }) {
   const [suggestions, setSuggestions] = reactExports.useState([]);
   const [showSuggestions, setShowSuggestions] = reactExports.useState(false);
   const debounceTimeoutRef = reactExports.useRef(null);
-  const fetchData = async () => {
+  const fetchData = reactExports.useCallback(async () => {
     if (!remoteUrl) {
       setLoading(false);
       setErrorMsg(
@@ -14366,13 +14366,16 @@ function ContributorsModal({ onClose, remoteUrl }) {
     } finally {
       setLoading(false);
     }
-  };
+  }, [remoteUrl]);
   reactExports.useEffect(() => {
-    fetchData();
+    const timer = setTimeout(() => {
+      fetchData();
+    }, 0);
     return () => {
+      clearTimeout(timer);
       if (debounceTimeoutRef.current) clearTimeout(debounceTimeoutRef.current);
     };
-  }, []);
+  }, [fetchData]);
   const handleSelectUser = async (user) => {
     setNewUsername(user.login);
     setShowSuggestions(false);
@@ -14811,7 +14814,7 @@ function ContributorsModal({ onClose, remoteUrl }) {
                     {
                       src: user.avatar_url,
                       alt: user.login,
-                      className: "w-8 h-8 rounded-full bg-canvas"
+                      className: "w-8 h-8 rounded-full bg-canvas object-cover"
                     }
                   ),
                   /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: /* @__PURE__ */ jsxRuntimeExports.jsxs("p", { className: "text-sm font-medium text-primary flex items-center gap-2", children: [
@@ -14849,7 +14852,7 @@ function ContributorsModal({ onClose, remoteUrl }) {
                   {
                     src: user.avatar_url,
                     alt: user.login,
-                    className: "w-8 h-8 rounded-full bg-canvas mr-3"
+                    className: "w-8 h-8 rounded-full bg-canvas mr-3 object-cover"
                   }
                 ),
                 /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
@@ -14870,8 +14873,45 @@ function ContributorsModal({ onClose, remoteUrl }) {
     ] })
   ] }) });
 }
-const AIHealerOverlay = ({ message, attempt, maxAttempts, originalError }) => {
-  return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "absolute inset-0 bg-black/80 backdrop-blur-sm flex flex-col items-center justify-center z-[200] animate-fade-in", children: [
+const AIHealerOverlay = ({ message, attempt, maxAttempts, originalError, onMinimize, onClose }) => {
+  const cleanedError = originalError ? originalError.replace(/^Error invoking remote method '[^']+':\s*/i, "").replace(/^Error:\s*/i, "").replace(/^fatal:\s*/i, "") : "";
+  return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "absolute inset-0 bg-black/85 backdrop-blur-md flex flex-col items-center justify-center z-[200] p-6 animate-fade-in", children: [
+    /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "absolute top-6 right-6 flex items-center gap-2 z-20", children: [
+      onMinimize && /* @__PURE__ */ jsxRuntimeExports.jsx(
+        "button",
+        {
+          onClick: onMinimize,
+          className: "p-2 rounded-full bg-surface/60 hover:bg-surface border border-border text-secondary hover:text-primary transition-all active:scale-95 shadow-md flex items-center gap-1",
+          title: "Minimize to Bottom Dock (Runs in background)",
+          children: /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-5 h-5", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+            "path",
+            {
+              strokeLinecap: "round",
+              strokeLinejoin: "round",
+              strokeWidth: 2,
+              d: "M19 14l-7 7m0 0l-7-7m7 7V3"
+            }
+          ) })
+        }
+      ),
+      onClose && /* @__PURE__ */ jsxRuntimeExports.jsx(
+        "button",
+        {
+          onClick: onClose,
+          className: "p-2 rounded-full bg-surface/60 hover:bg-surface border border-border text-secondary hover:text-danger transition-all active:scale-95 shadow-md",
+          title: "Permanently Stop & Close Healer",
+          children: /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-5 h-5", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+            "path",
+            {
+              strokeLinecap: "round",
+              strokeLinejoin: "round",
+              strokeWidth: 2,
+              d: "M6 18L18 6M6 6l12 12"
+            }
+          ) })
+        }
+      )
+    ] }),
     /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "relative flex items-center justify-center mb-6", children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "absolute inset-0 bg-brand/20 blur-xl rounded-full scale-150 animate-pulse" }),
       /* @__PURE__ */ jsxRuntimeExports.jsxs(
@@ -14905,17 +14945,43 @@ const AIHealerOverlay = ({ message, attempt, maxAttempts, originalError }) => {
       )
     ] }),
     /* @__PURE__ */ jsxRuntimeExports.jsx("h2", { className: "text-xl font-bold text-white tracking-wide mb-2 animate-pulse", children: "AI Auto-Healer Active" }),
-    originalError && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "mb-4 max-w-lg w-full px-6", children: [
+    cleanedError && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "mb-4 max-w-lg w-full px-4", children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-xs text-secondary/80 mb-1 text-center font-semibold", children: "Resolving Error:" }),
-      /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "bg-red-900/20 border border-red-500/30 rounded-md p-3", children: /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-xs text-red-200/90 font-mono text-center break-words max-h-24 overflow-y-auto custom-scrollbar", children: originalError }) })
+      /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "bg-red-900/20 border border-red-500/30 rounded-xl p-3.5 shadow-inner", children: /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-xs text-red-200/90 font-mono text-center break-words max-h-28 overflow-y-auto custom-scrollbar", children: cleanedError }) })
     ] }),
-    /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-sm font-medium text-brand/90 mb-6 bg-brand/10 border border-brand/20 px-4 py-2 rounded-full shadow-inner", children: message }),
-    attempt > 1 && /* @__PURE__ */ jsxRuntimeExports.jsxs("p", { className: "text-xs text-secondary/70", children: [
+    /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-sm font-medium text-brand/90 mb-4 bg-brand/10 border border-brand/20 px-4 py-2 rounded-full shadow-inner max-w-md text-center", children: message }),
+    attempt > 1 && /* @__PURE__ */ jsxRuntimeExports.jsxs("p", { className: "text-xs text-secondary/70 mb-5", children: [
       "Attempt ",
       attempt,
       " of ",
       maxAttempts,
       "..."
+    ] }),
+    /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-3", children: [
+      onMinimize && /* @__PURE__ */ jsxRuntimeExports.jsxs(
+        "button",
+        {
+          onClick: onMinimize,
+          className: "px-4 py-2 bg-surface hover:bg-surface-hover border border-border text-secondary hover:text-primary rounded-xl text-xs font-semibold transition-all active:scale-95 shadow-md flex items-center gap-1.5",
+          title: "Minimize to Bottom Dock",
+          children: [
+            /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: "⤓" }),
+            " Minimize to Background"
+          ]
+        }
+      ),
+      onClose && /* @__PURE__ */ jsxRuntimeExports.jsxs(
+        "button",
+        {
+          onClick: onClose,
+          className: "px-4 py-2 bg-danger/15 hover:bg-danger/25 border border-danger/40 text-danger rounded-xl text-xs font-semibold transition-all active:scale-95 shadow-md flex items-center gap-1.5",
+          title: "Permanently cancel and stop AI healer",
+          children: [
+            /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: "✕" }),
+            " Stop & Close"
+          ]
+        }
+      )
     ] })
   ] });
 };
@@ -25821,6 +25887,28 @@ const THEMES = [
   { id: "turbo-cpp-classic", name: "Turbo C++ Classic" },
   { id: "game-rpg", name: "RPG Game UI" }
 ];
+const formatErrorMessage = (msg) => {
+  if (!msg) return "";
+  let cleaned = msg.replace(/^Error invoking remote method '[^']+':\s*/i, "").replace(/^Error:\s*/i, "").replace(/^error:\s*/i, "").replace(/^fatal:\s*/i, "");
+  cleaned = cleaned.replace(
+    /(?:Enumerating|Counting|Compressing|Writing)\s+objects:\s*\d+%(?:\s*\([^)]+\))?,?/gi,
+    ""
+  ).replace(/Delta compression using up to \d+ threads,?/gi, "").replace(/Total \d+ \(delta \d+\), reused \d+/gi, "").replace(/POST git-(?:receive|upload)-pack \([^)]+\)/gi, "").replace(/To https:\/\/github\.com[^\r\n]*/gi, "").replace(/[\r\n]{2,}/g, "\n").trim();
+  if (cleaned.includes("Protected branch update failed") || cleaned.includes("GH006") || cleaned.includes("Cannot force-push to a protected branch")) {
+    return "GitHub rejected push: Protected branch policy is enabled. Force-pushing to this branch is blocked in your GitHub repository settings.";
+  }
+  if (cleaned.includes("GH001") || cleaned.includes("exceeds GitHub's file size limit")) {
+    const match = cleaned.match(/File\s+([^\s]+)\s+is\s+([0-9.]+)\s+MB/i);
+    if (match) {
+      return `Large file rejected: "${match[1]}" is ${match[2]} MB (exceeds GitHub's 100 MB limit). Please track it with Git LFS or add it to .gitignore.`;
+    }
+    return "Large file rejected: Files exceeding GitHub's 100 MB limit must use Git LFS or be added to .gitignore.";
+  }
+  if (cleaned.includes("RPC failed") || cleaned.includes("the remote end hung up unexpectedly") || cleaned.includes("early EOF") || cleaned.includes("curl 55")) {
+    return "Push connection interrupted or payload too large. (Buffer configured to 1GB). Check network stability or use Git LFS for large assets.";
+  }
+  return cleaned || "An unexpected Git error occurred.";
+};
 function App() {
   const [repoPath, setRepoPath] = reactExports.useState(null);
   const [collaboratedRepos, setCollaboratedRepos] = reactExports.useState([]);
@@ -26031,6 +26119,8 @@ function App() {
   const [history, setHistory] = reactExports.useState(null);
   const [deletedHistory, setDeletedHistory] = reactExports.useState(null);
   const [isPulling, setIsPulling] = reactExports.useState(false);
+  const [showForcePullModal, setShowForcePullModal] = reactExports.useState(false);
+  const [showMasterPushModal, setShowMasterPushModal] = reactExports.useState(false);
   const [expandedCommits, setExpandedCommits] = reactExports.useState({});
   const toggleCommit = (hash) => {
     setExpandedCommits((prev) => ({ ...prev, [hash]: !prev[hash] }));
@@ -26059,9 +26149,49 @@ function App() {
   const [showAutoSyncLogs, setShowAutoSyncLogs] = reactExports.useState(false);
   const [isRefreshing, setIsRefreshing] = reactExports.useState(false);
   const [gitProgress, setGitProgress] = reactExports.useState(0);
+  const [gitProgressStage, setGitProgressStage] = reactExports.useState("");
+  const [syncElapsedSeconds, setSyncElapsedSeconds] = reactExports.useState(0);
   const refreshLockRef = reactExports.useRef(false);
+  const isSyncActive = isPushing || isPulling || isExecutingForcePush;
   reactExports.useEffect(() => {
-  }, [gitProgress]);
+    if (!isSyncActive) return;
+    const startTime = Date.now();
+    const timer = setInterval(() => {
+      setSyncElapsedSeconds(Math.floor((Date.now() - startTime) / 1e3));
+    }, 1e3);
+    return () => {
+      clearInterval(timer);
+      setSyncElapsedSeconds(0);
+      setGitProgress(0);
+      setGitProgressStage("");
+    };
+  }, [isSyncActive]);
+  const formatTimerDisplay = (totalSec) => {
+    const mins = Math.floor(totalSec / 60);
+    const secs = totalSec % 60;
+    return `${mins.toString().padStart(2, "0")}:${secs.toString().padStart(2, "0")}`;
+  };
+  const computeRemainingEta = (progress2, elapsed, massiveEta) => {
+    if (massiveEta && massiveEta !== "calculating..." && !massiveEta.includes("Uploading Chunk")) {
+      return massiveEta;
+    }
+    if (progress2 >= 100) return "Finalizing sync with GitHub...";
+    if (progress2 > 0 && elapsed > 0) {
+      const rate = progress2 / elapsed;
+      const remainingPercent = 100 - progress2;
+      const remainingSeconds = Math.max(1, Math.round(remainingPercent / rate));
+      if (remainingSeconds < 60) {
+        return `~${remainingSeconds}s remaining`;
+      }
+      const mins = Math.floor(remainingSeconds / 60);
+      const secs = remainingSeconds % 60;
+      return `~${mins}m ${secs}s remaining`;
+    }
+    if (elapsed > 0) {
+      return `Estimating time remaining...`;
+    }
+    return "Calculating...";
+  };
   reactExports.useEffect(() => {
     const activeTheme = showSettings ? draftTheme : theme;
     document.documentElement.setAttribute("data-theme", activeTheme);
@@ -26074,14 +26204,17 @@ function App() {
   const [healerMessage, setHealerMessage] = reactExports.useState("");
   const [healerOriginalError, setHealerOriginalError] = reactExports.useState("");
   const [healerAttempt, setHealerAttempt] = reactExports.useState(0);
+  const [isHealerMinimized, setIsHealerMinimized] = reactExports.useState(false);
+  const isHealingCancelledRef = reactExports.useRef(false);
   const [showBranchModal, setShowBranchModal] = reactExports.useState(false);
   const [toasts, setToasts] = reactExports.useState([]);
   const showToast = (msg, type = "info") => {
     const id2 = Date.now() + Math.random();
-    setToasts((prev) => [...prev, { id: id2, msg, type }]);
+    const sanitizedMsg = type === "error" ? formatErrorMessage(msg) : msg;
+    setToasts((prev) => [...prev, { id: id2, msg: sanitizedMsg, type }]);
     setTimeout(() => {
       setToasts((prev) => prev.filter((t2) => t2.id !== id2));
-    }, 4e3);
+    }, 5e3);
   };
   const loadRepo = async (targetPath) => {
     try {
@@ -26297,6 +26430,9 @@ function App() {
     window.api.onGitProgress((data) => {
       if (data && typeof data.progress === "number") {
         setGitProgress(data.progress);
+        if (data.stage) {
+          setGitProgressStage(data.stage);
+        }
       }
     });
     window.api.onAutoSyncErrorApproval((payload) => {
@@ -26773,9 +26909,50 @@ 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 handleForcePull = () => {
+    setShowForcePullModal(true);
+  };
+  const executeForcePull = async () => {
+    setShowForcePullModal(false);
+    setIsPulling(true);
+    try {
+      const remotes = await window.api.getRemotes();
+      if (remotes.length > 0) {
+        showToast("⚡ Executing Force Pull directly from GitHub...", "info");
+        const targetRemote = remotes[0].name;
+        const targetBranch = branches?.current || status?.current || "main";
+        const result = await window.api.masterPull(targetRemote, targetBranch);
+        await refreshRepoState();
+        setPushFailureData(null);
+        showToast(
+          `⚡ ${result.message || "Force Pull completed! Project is 100% synced with GitHub."}`,
+          "success"
+        );
+      } else {
+        setShowSetupWizard(true);
+      }
+    } catch (e) {
+      showToast(`Force Pull failed: ${formatErrorMessage(e.message)}`, "error");
+    } finally {
+      setIsPulling(false);
+    }
+  };
+  const executeMasterPush = async () => {
+    setShowMasterPushModal(false);
+    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();
+      cancelSettings();
+    } catch (err) {
+      showToast("Master Push failed: " + (err.message || "Unknown error"), "error");
+    }
   };
   const handleResolveConflictOurs = async () => {
     try {
@@ -26848,14 +27025,18 @@ Are you SURE you want to link "${repoName}" to this folder?`
     let attempts = 0;
     const maxAttempts = 5;
     const targetRepoPath = overrideRepoPath || repoPath;
+    isHealingCancelledRef.current = false;
+    setIsHealerMinimized(false);
     setShowHealerOverlay(true);
     setHealerOriginalError(initialError);
     setHealerMessage(`Analyzing initial ${operation} failure...`);
     setHealerAttempt(1);
     while (attempts < maxAttempts) {
+      if (isHealingCancelledRef.current) break;
       attempts++;
       setHealerAttempt(attempts);
       try {
+        if (isHealingCancelledRef.current) break;
         if (overrideRepoPath) {
           await window.api.setRepoPath(overrideRepoPath);
         }
@@ -26931,15 +27112,34 @@ Are you SURE you want to link "${repoName}" to this folder?`
         setHealerMessage(result.explanation || `Applying fix...`);
         if (result.commandsToRun && result.commandsToRun.length > 0) {
           for (const cmd of result.commandsToRun) {
-            const parts = cmd.split(" ").filter((p) => p.trim() !== "");
-            if (parts[0] === "git") parts.shift();
-            await window.api.executeRawGit(parts);
+            const regex = /[^\s"']+|"([^"]*)"|'([^']*)'/g;
+            const parts = [];
+            let match;
+            while ((match = regex.exec(cmd)) !== null) {
+              if (match[1] !== void 0) {
+                parts.push(match[1]);
+              } else if (match[2] !== void 0) {
+                parts.push(match[2]);
+              } else {
+                parts.push(match[0]);
+              }
+            }
+            if (parts.length > 0 && parts[0] === "git") {
+              parts.shift();
+            }
+            if (parts.length > 0) {
+              try {
+                await window.api.executeRawGit(parts);
+              } catch (cmdErr) {
+                console.warn(`Command "${cmd}" returned notice:`, cmdErr?.message);
+              }
+            }
           }
         }
         const remotes = await window.api.getRemotes();
         if (remotes.length > 0) {
+          const targetBranch = overrideBranch || branches?.current || status?.current || "main";
           if (operation === "push") {
-            const targetBranch = overrideBranch || branches.current;
             if (pushAllBranches && !overrideBranch)
               await window.api.pushAllBranches(remotes[0].name);
             else await window.api.pushToRemote(remotes[0].name, targetBranch);
@@ -26955,7 +27155,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
           } else {
             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);
+              await window.api.pullFromRemote(remotes[0].name, targetBranch);
             }
           }
           setHealerMessage(`Successfully auto-healed and reconciled!`);
@@ -26975,6 +27175,23 @@ Are you SURE you want to link "${repoName}" to this folder?`
         setHealerMessage(`Attempt ${attempts} failed. Analyzing new error...`);
       }
     }
+    if (overrideRepoPath && repoPath) {
+      await window.api.setRepoPath(repoPath);
+    }
+    setShowHealerOverlay(false);
+    setIsHealerMinimized(false);
+    if (!isHealingCancelledRef.current) {
+      showToast(
+        `AI Healer could not resolve error automatically: ${formatErrorMessage(currentError)}`,
+        "error"
+      );
+      setPushFailureData({
+        reason: currentError,
+        operation,
+        overrideRepoPath,
+        overrideBranch
+      });
+    }
     return false;
   };
   const confirmPush = async () => {
@@ -28183,29 +28400,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
                     "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();
-                          cancelSettings();
-                        } catch (err) {
-                          showToast(
-                            "Master Push failed: " + (err.message || "Unknown error"),
-                            "error"
-                          );
-                        }
-                      },
+                      onClick: () => setShowMasterPushModal(true),
                       className: "shrink-0 px-5 py-2.5 bg-danger hover:bg-danger/80 text-white text-xs font-bold rounded-xl transition-all shadow-sm",
                       children: "Execute Force Push"
                     }
@@ -28651,19 +28846,248 @@ Are you SURE you want to link "${repoName}" to this folder?`
             )
           ] })
         ] }) }),
+        showForcePullModal && /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "fixed inset-0 bg-black/60 backdrop-blur-sm flex items-center justify-center z-[150] transition-opacity p-4 animate-in fade-in duration-200", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "relative bg-surface/95 backdrop-blur-xl p-6 rounded-2xl shadow-2xl border border-amber-500/30 w-full max-w-[480px] mx-4 flex flex-col gap-4 animate-in zoom-in-95 duration-200", children: [
+          /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "absolute -inset-0.5 bg-gradient-to-r from-amber-500/15 via-orange-500/10 to-amber-500/15 rounded-2xl blur-xl -z-10 pointer-events-none" }),
+          /* @__PURE__ */ jsxRuntimeExports.jsx(
+            "button",
+            {
+              onClick: () => setShowForcePullModal(false),
+              className: "absolute top-4 right-4 text-secondary hover:text-primary transition-colors p-1.5 rounded-lg hover:bg-surface-hover",
+              children: /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-5 h-5", fill: "none", viewBox: "0 0 24 24", stroke: "currentColor", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+                "path",
+                {
+                  strokeLinecap: "round",
+                  strokeLinejoin: "round",
+                  strokeWidth: 2,
+                  d: "M6 18L18 6M6 6l12 12"
+                }
+              ) })
+            }
+          ),
+          /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-3.5 pr-8", children: [
+            /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-11 h-11 rounded-xl bg-amber-500/10 border border-amber-500/30 flex items-center justify-center text-amber-400 flex-shrink-0 shadow-inner", 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: "M13 10V3L4 14h7v7l9-11h-7z"
+              }
+            ) }) }),
+            /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
+              /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-base font-bold text-primary flex items-center gap-2", children: "Force Pull (Hard Sync from GitHub)" }),
+              /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-xs text-secondary mt-0.5", children: "Synchronize local repository to 100% match GitHub" })
+            ] })
+          ] }),
+          /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "bg-canvas/60 border border-border/80 rounded-xl p-3.5 flex flex-col gap-2.5 text-xs text-secondary", children: [
+            /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center justify-between text-[11px] pb-2 border-b border-border/60", children: [
+              /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-secondary/80", children: "Target Branch:" }),
+              /* @__PURE__ */ jsxRuntimeExports.jsxs("span", { className: "font-mono text-primary font-semibold bg-surface px-2 py-0.5 rounded border border-border", children: [
+                "origin / ",
+                branches?.current || status?.current || "main"
+              ] })
+            ] }),
+            /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "leading-relaxed", children: "This will pull all commits directly from GitHub. Any untracked temporary conflicts or desynchronized files will be safely aligned to match the GitHub remote." }),
+            /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-start gap-2 pt-1 text-amber-400/90 bg-amber-500/5 p-2 rounded-lg border border-amber-500/20", children: [
+              /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-sm leading-none mt-0.5", children: "⚠️" }),
+              /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-[11px] leading-tight", children: "Local uncommitted changes will be automatically aligned so your local folder is completely in sync with your team on GitHub." })
+            ] })
+          ] }),
+          /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center justify-end gap-3 pt-2", children: [
+            /* @__PURE__ */ jsxRuntimeExports.jsx(
+              "button",
+              {
+                type: "button",
+                onClick: () => setShowForcePullModal(false),
+                className: "px-4 py-2.5 rounded-xl border border-border bg-surface hover:bg-surface-hover text-secondary hover:text-primary text-xs font-medium transition-all",
+                children: "Cancel"
+              }
+            ),
+            /* @__PURE__ */ jsxRuntimeExports.jsx(
+              "button",
+              {
+                type: "button",
+                onClick: executeForcePull,
+                disabled: isPulling,
+                className: "px-5 py-2.5 rounded-xl bg-gradient-to-r from-amber-500 to-orange-600 hover:from-amber-600 hover:to-orange-700 text-white text-xs font-semibold shadow-lg shadow-amber-500/20 flex items-center gap-2 transition-all active:scale-[0.98] disabled:opacity-50",
+                children: isPulling ? /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
+                  /* @__PURE__ */ jsxRuntimeExports.jsxs(
+                    "svg",
+                    {
+                      className: "w-4 h-4 animate-spin text-white",
+                      fill: "none",
+                      viewBox: "0 0 24 24",
+                      children: [
+                        /* @__PURE__ */ jsxRuntimeExports.jsx(
+                          "circle",
+                          {
+                            className: "opacity-25",
+                            cx: "12",
+                            cy: "12",
+                            r: "10",
+                            stroke: "currentColor",
+                            strokeWidth: "4"
+                          }
+                        ),
+                        /* @__PURE__ */ jsxRuntimeExports.jsx(
+                          "path",
+                          {
+                            className: "opacity-75",
+                            fill: "currentColor",
+                            d: "M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
+                          }
+                        )
+                      ]
+                    }
+                  ),
+                  /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: "Force Pulling..." })
+                ] }) : /* @__PURE__ */ jsxRuntimeExports.jsx(jsxRuntimeExports.Fragment, { children: /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: "⚡ Confirm Force Pull" }) })
+              }
+            )
+          ] })
+        ] }) }),
+        showMasterPushModal && /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "fixed inset-0 bg-black/60 backdrop-blur-sm flex items-center justify-center z-[150] transition-opacity p-4 animate-in fade-in duration-200", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "relative bg-surface/95 backdrop-blur-xl p-6 rounded-2xl shadow-2xl border border-danger/30 w-full max-w-[480px] mx-4 flex flex-col gap-4 animate-in zoom-in-95 duration-200", children: [
+          /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "absolute -inset-0.5 bg-gradient-to-r from-red-500/15 via-rose-500/10 to-red-500/15 rounded-2xl blur-xl -z-10 pointer-events-none" }),
+          /* @__PURE__ */ jsxRuntimeExports.jsx(
+            "button",
+            {
+              onClick: () => setShowMasterPushModal(false),
+              className: "absolute top-4 right-4 text-secondary hover:text-primary transition-colors p-1.5 rounded-lg hover:bg-surface-hover",
+              children: /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-5 h-5", fill: "none", viewBox: "0 0 24 24", stroke: "currentColor", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+                "path",
+                {
+                  strokeLinecap: "round",
+                  strokeLinejoin: "round",
+                  strokeWidth: 2,
+                  d: "M6 18L18 6M6 6l12 12"
+                }
+              ) })
+            }
+          ),
+          /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-3.5 pr-8", children: [
+            /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-11 h-11 rounded-xl bg-danger/10 border border-danger/30 flex items-center justify-center text-danger flex-shrink-0 shadow-inner", 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.jsxs("div", { children: [
+              /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-base font-bold text-primary flex items-center gap-2", children: "Master Force Push Override" }),
+              /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-xs text-secondary mt-0.5", children: "Force overwrite remote branch on GitHub" })
+            ] })
+          ] }),
+          /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "bg-canvas/60 border border-border/80 rounded-xl p-3.5 flex flex-col gap-2.5 text-xs text-secondary", children: [
+            /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "leading-relaxed", children: "This will force push all current files to GitHub, bypassing standard safety checks and overriding remote commit history." }),
+            /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-start gap-2 pt-1 text-danger/90 bg-danger/5 p-2 rounded-lg border border-danger/20", children: [
+              /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-sm leading-none mt-0.5", children: "⚠️" }),
+              /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-[11px] leading-tight font-medium", children: "Use caution: Any commits on GitHub not present in your local branch will be permanently overwritten." })
+            ] })
+          ] }),
+          /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center justify-end gap-3 pt-2", children: [
+            /* @__PURE__ */ jsxRuntimeExports.jsx(
+              "button",
+              {
+                type: "button",
+                onClick: () => setShowMasterPushModal(false),
+                className: "px-4 py-2.5 rounded-xl border border-border bg-surface hover:bg-surface-hover text-secondary hover:text-primary text-xs font-medium transition-all",
+                children: "Cancel"
+              }
+            ),
+            /* @__PURE__ */ jsxRuntimeExports.jsx(
+              "button",
+              {
+                type: "button",
+                onClick: executeMasterPush,
+                className: "px-5 py-2.5 rounded-xl bg-danger hover:bg-danger/90 text-white text-xs font-semibold shadow-lg shadow-danger/20 flex items-center gap-2 transition-all active:scale-[0.98]",
+                children: /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: "Execute Force Push" })
+              }
+            )
+          ] })
+        ] }) }),
         isCloning && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "absolute inset-0 bg-black/80 backdrop-blur-sm flex flex-col items-center justify-center z-[200]", children: [
           /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-12 h-12 border-4 border-brand border-t-transparent rounded-full animate-spin mb-4 shadow-[0_0_15px_rgba(var(--brand-color),0.5)]" }),
           /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-white font-medium tracking-wide text-lg", children: "Cloning Repository..." })
         ] }),
-        showHealerOverlay && /* @__PURE__ */ jsxRuntimeExports.jsx(
+        showHealerOverlay && !isHealerMinimized && /* @__PURE__ */ jsxRuntimeExports.jsx(
           AIHealerOverlay,
           {
             message: healerMessage,
             attempt: healerAttempt,
             maxAttempts: 5,
-            originalError: healerOriginalError
+            originalError: healerOriginalError,
+            onMinimize: () => setIsHealerMinimized(true),
+            onClose: () => setIsHealerMinimized(true)
           }
         ),
+        showHealerOverlay && isHealerMinimized && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "fixed bottom-6 right-6 z-[250] bg-surface/95 border border-brand/50 backdrop-blur-2xl rounded-2xl p-3.5 shadow-2xl flex items-center gap-3.5 max-w-md animate-slideUp", children: [
+          /* @__PURE__ */ jsxRuntimeExports.jsxs(
+            "div",
+            {
+              onClick: () => setIsHealerMinimized(false),
+              className: "relative flex items-center justify-center flex-shrink-0 cursor-pointer group",
+              title: "Click to expand AI Healer window",
+              children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "absolute inset-0 bg-brand/30 blur-md rounded-full scale-125 animate-pulse" }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-8 h-8 rounded-full bg-brand/20 border border-brand/40 flex items-center justify-center text-brand font-bold text-xs relative z-10 group-hover:scale-105 transition-transform", children: "✨" })
+              ]
+            }
+          ),
+          /* @__PURE__ */ jsxRuntimeExports.jsxs(
+            "div",
+            {
+              onClick: () => setIsHealerMinimized(false),
+              className: "flex-1 min-w-0 cursor-pointer",
+              title: "Click to expand AI Healer window",
+              children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-2", children: [
+                  /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-xs font-bold text-primary flex items-center gap-1.5", children: "AI Auto-Healer Active" }),
+                  /* @__PURE__ */ jsxRuntimeExports.jsxs("span", { className: "text-[10px] bg-brand/15 text-brand px-1.5 py-0.5 rounded font-mono font-semibold", children: [
+                    "Attempt ",
+                    healerAttempt,
+                    " of 5"
+                  ] })
+                ] }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-[11px] text-secondary truncate mt-0.5 font-mono", children: healerMessage || "Analyzing repository state..." })
+              ]
+            }
+          ),
+          /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-1.5 flex-shrink-0 border-l border-border/60 pl-2.5", children: [
+            /* @__PURE__ */ jsxRuntimeExports.jsx(
+              "button",
+              {
+                onClick: () => setIsHealerMinimized(false),
+                className: "px-2 py-1 text-secondary hover:text-primary bg-surface-hover hover:bg-surface border border-border rounded-lg text-xs font-semibold transition-all active:scale-95",
+                title: "Expand full AI Healer window",
+                children: "⛶ Expand"
+              }
+            ),
+            /* @__PURE__ */ jsxRuntimeExports.jsx(
+              "button",
+              {
+                onClick: () => {
+                  isHealingCancelledRef.current = true;
+                  setShowHealerOverlay(false);
+                  setIsHealerMinimized(false);
+                  showToast("AI Auto-Healer permanently stopped.", "info");
+                },
+                className: "p-1.5 text-secondary hover:text-danger bg-surface-hover hover:bg-danger/20 border border-border hover:border-danger/40 rounded-lg transition-all active:scale-95",
+                title: "Permanently cancel and stop AI Healer",
+                children: /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+                  "path",
+                  {
+                    strokeLinecap: "round",
+                    strokeLinejoin: "round",
+                    strokeWidth: 2,
+                    d: "M6 18L18 6M6 6l12 12"
+                  }
+                ) })
+              }
+            )
+          ] })
+        ] }),
         showAutoSyncLogs && /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "absolute inset-0 bg-black/50 backdrop-blur-sm flex items-center justify-center z-[110] transition-opacity", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "bg-surface/95 backdrop-blur-xl p-8 rounded-xl shadow-2xl border border-border w-full max-w-[600px] mx-4 flex flex-col max-h-[80vh]", children: [
           /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex justify-between items-center mb-6 border-b border-border pb-4", children: [
             /* @__PURE__ */ jsxRuntimeExports.jsxs("h2", { className: "text-xl font-bold text-primary flex items-center gap-2", children: [
@@ -29021,10 +29445,11 @@ Are you SURE you want to link "${repoName}" to this folder?`
                       onClick: async () => {
                         const data = pushFailureData;
                         setPushFailureData(null);
+                        setIsExecutingForcePush(true);
                         try {
                           const remotes = await window.api.getRemotes();
                           const targetRemote = data?.overrideRepoPath || remotes[0]?.name || "origin";
-                          const targetBranch = data?.overrideBranch || "main";
+                          const targetBranch = data?.overrideBranch || branches?.current || status?.current || "main";
                           await window.api.masterPush(targetRemote, targetBranch);
                           setPushSuccessData({
                             files: "All",
@@ -29038,12 +29463,23 @@ Are you SURE you want to link "${repoName}" to this folder?`
                             overrideRepoPath: data?.overrideRepoPath,
                             overrideBranch: data?.overrideBranch
                           });
+                        } finally {
+                          setIsExecutingForcePush(false);
                         }
                       },
                       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.jsx(
+                    "button",
+                    {
+                      onClick: handleForcePull,
+                      className: "w-full mt-2 py-2.5 bg-amber-500/20 hover:bg-amber-500/30 border border-amber-500/50 text-amber-400 rounded-md font-bold transition-all text-sm flex items-center justify-center gap-2 shadow-lg shadow-amber-500/10 active:scale-[0.99]",
+                      title: "Force pull all files directly from GitHub (discards local divergence)",
+                      children: "⚡ Master Force Pull (Hard Sync from GitHub)"
+                    }
                   )
                 ] }) : /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-col gap-3", children: [
                   /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex gap-3", children: [
@@ -29090,10 +29526,11 @@ Are you SURE you want to link "${repoName}" to this folder?`
                       onClick: async () => {
                         const data = pushFailureData;
                         setPushFailureData(null);
+                        setIsExecutingForcePush(true);
                         try {
                           const remotes = await window.api.getRemotes();
                           const targetRemote = data?.overrideRepoPath || remotes[0]?.name || "origin";
-                          const targetBranch = data?.overrideBranch || "main";
+                          const targetBranch = data?.overrideBranch || branches?.current || status?.current || "main";
                           await window.api.masterPush(targetRemote, targetBranch);
                           setPushSuccessData({
                             files: "All",
@@ -29107,12 +29544,23 @@ Are you SURE you want to link "${repoName}" to this folder?`
                             overrideRepoPath: data?.overrideRepoPath,
                             overrideBranch: data?.overrideBranch
                           });
+                        } finally {
+                          setIsExecutingForcePush(false);
                         }
                       },
                       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.jsx(
+                    "button",
+                    {
+                      onClick: handleForcePull,
+                      className: "w-full py-2 bg-amber-500/20 hover:bg-amber-500/30 border border-amber-500/50 text-amber-400 rounded-md font-bold transition-all text-sm flex items-center justify-center gap-2 active:scale-[0.99]",
+                      title: "Force pull all files directly from GitHub (discards local divergence)",
+                      children: "⚡ Master Force Pull (Hard Sync from GitHub)"
+                    }
                   )
                 ] })
               ]
@@ -29234,36 +29682,48 @@ Are you SURE you want to link "${repoName}" to this folder?`
                 ]
               }
             ),
-            repoPath && /* @__PURE__ */ jsxRuntimeExports.jsxs(
-              "button",
-              {
-                onClick: handlePull,
-                disabled: isPulling,
-                className: `w-full font-medium py-2 px-4 rounded-md transition-all border text-sm flex items-center justify-center gap-2 shadow-sm ${(status?.behind ?? 0) > 0 ? "bg-blue-600/25 text-blue-300 border-blue-500/50 hover:bg-blue-600/35 ring-1 ring-blue-500/30 animate-pulse" : "bg-surface-hover hover:brightness-110 text-primary border-border hover:border-brand/40"}`,
-                title: "Download and update all new files pushed by team members on GitHub to your local folder",
-                children: [
-                  /* @__PURE__ */ jsxRuntimeExports.jsx(
-                    "svg",
-                    {
-                      className: "w-4 h-4 text-accent",
-                      fill: "none",
-                      stroke: "currentColor",
-                      viewBox: "0 0 24 24",
-                      children: /* @__PURE__ */ jsxRuntimeExports.jsx(
-                        "path",
-                        {
-                          strokeLinecap: "round",
-                          strokeLinejoin: "round",
-                          strokeWidth: 2,
-                          d: "M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4"
-                        }
-                      )
-                    }
-                  ),
-                  isPulling ? "Pulling..." : (status?.behind ?? 0) > 0 ? `Pull (${status.behind})` : "Pull"
-                ]
-              }
-            )
+            repoPath && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex gap-2 w-full", children: [
+              /* @__PURE__ */ jsxRuntimeExports.jsxs(
+                "button",
+                {
+                  onClick: handlePull,
+                  disabled: isPulling,
+                  className: `flex-1 font-medium py-2 px-3 rounded-md transition-all border text-sm flex items-center justify-center gap-1.5 shadow-sm ${(status?.behind ?? 0) > 0 ? "bg-blue-600/25 text-blue-300 border-blue-500/50 hover:bg-blue-600/35 ring-1 ring-blue-500/30 animate-pulse" : "bg-surface-hover hover:brightness-110 text-primary border-border hover:border-brand/40"}`,
+                  title: "Download and update all new files pushed by team members on GitHub to your local folder",
+                  children: [
+                    /* @__PURE__ */ jsxRuntimeExports.jsx(
+                      "svg",
+                      {
+                        className: "w-4 h-4 text-accent",
+                        fill: "none",
+                        stroke: "currentColor",
+                        viewBox: "0 0 24 24",
+                        children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+                          "path",
+                          {
+                            strokeLinecap: "round",
+                            strokeLinejoin: "round",
+                            strokeWidth: 2,
+                            d: "M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4"
+                          }
+                        )
+                      }
+                    ),
+                    isPulling ? "Pulling..." : (status?.behind ?? 0) > 0 ? `Pull (${status.behind})` : "Pull"
+                  ]
+                }
+              ),
+              /* @__PURE__ */ jsxRuntimeExports.jsx(
+                "button",
+                {
+                  onClick: handleForcePull,
+                  disabled: isPulling,
+                  className: "px-3 py-2 bg-amber-500/15 hover:bg-amber-500/25 border border-amber-500/40 text-amber-400 hover:text-amber-300 rounded-md font-bold text-xs transition-all flex items-center justify-center gap-1 shadow-sm active:scale-[0.98]",
+                  title: "⚡ Force Pull: Instantly force-sync all files 1:1 with GitHub (overrides any divergence or missing files)",
+                  children: "⚡ Force Pull"
+                }
+              )
+            ] })
           ] }),
           collaboratedRepos.length > 0 && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "mb-4", children: [
             /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-xs text-secondary font-semibold mb-2 uppercase tracking-wider px-1", children: t("collaborationRepo") }),
@@ -29977,6 +30437,16 @@ Are you SURE you want to link "${repoName}" to this folder?`
                     /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: (status?.behind ?? 0) > 0 ? `Pull (${status.behind})` : "Pull" })
                   ] })
                 }
+              ),
+              /* @__PURE__ */ jsxRuntimeExports.jsx(
+                "button",
+                {
+                  onClick: handleForcePull,
+                  disabled: isPulling,
+                  title: "⚡ Force Pull: Instantly force-sync all files 1:1 with GitHub (overrides any divergence or missing files)",
+                  className: "ml-1.5 px-2.5 py-1.5 bg-amber-500/15 hover:bg-amber-500/25 border border-amber-500/40 text-amber-400 hover:text-amber-300 rounded-lg font-bold text-xs transition-all flex items-center gap-1 shadow-sm active:scale-[0.98] disabled:opacity-50",
+                  children: "⚡ Force Pull"
+                }
               )
             ] })
           ] }),
@@ -30859,10 +31329,53 @@ Are you SURE you want to link "${repoName}" to this folder?`
             }
           }
         ),
-        (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: [
-          /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-3/4 max-w-[600px]", children: /* @__PURE__ */ jsxRuntimeExports.jsx(Loader, {}) }),
-          /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-center text-primary mt-8 font-mono text-lg animate-pulse tracking-wide drop-shadow-md", children: isPushing ? "Pushing to remote..." : isPulling ? "Pulling from remote..." : unlockingText })
-        ] }),
+        (isSyncActive || isUnlocking) && /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "absolute inset-0 bg-black/85 backdrop-blur-md flex flex-col items-center justify-center z-[100] transition-opacity p-6", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "w-full max-w-[540px] flex flex-col items-center", children: [
+          /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-full max-w-[460px] mb-4", children: /* @__PURE__ */ jsxRuntimeExports.jsx(Loader, {}) }),
+          isUnlocking ? /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-center text-primary mt-4 font-mono text-lg animate-pulse tracking-wide drop-shadow-md", children: unlockingText }) : /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "w-full bg-surface/90 border border-border/80 rounded-2xl p-6 shadow-2xl backdrop-blur-xl flex flex-col items-center text-center", children: [
+            /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex items-center gap-2 mb-2", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+              "span",
+              {
+                className: `inline-flex items-center px-2.5 py-1 rounded-full text-xs font-bold uppercase tracking-wider ${isExecutingForcePush ? "bg-danger/20 text-danger border border-danger/40 animate-pulse" : isPulling ? "bg-amber-500/20 text-amber-400 border border-amber-500/40" : "bg-brand/20 text-brand border border-brand/40"}`,
+                children: isExecutingForcePush ? "⚡ Master Force Push" : isPulling ? "📥 Pull / Force Pull" : "🚀 Live Push"
+              }
+            ) }),
+            /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-lg font-bold text-primary mb-1", children: isExecutingForcePush ? "Force Overriding Remote Repository" : isPulling ? "Syncing Team Files from GitHub" : "Uploading Changes to Remote" }),
+            /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-xs text-secondary font-mono mb-4", children: gitProgressStage ? `${gitProgressStage}...` : "Streaming files and objects securely to repository" }),
+            /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-full bg-canvas/80 border border-border rounded-full h-3 overflow-hidden p-0.5 mb-4 shadow-inner", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+              "div",
+              {
+                className: "h-full rounded-full bg-gradient-to-r from-brand via-cyan-400 to-brand transition-all duration-300 shadow-md shadow-brand/30",
+                style: {
+                  width: `${Math.min(
+                    100,
+                    Math.max(
+                      gitProgress > 0 ? gitProgress : massivePushData?.percentage || 8,
+                      8
+                    )
+                  )}%`
+                }
+              }
+            ) }),
+            /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "w-full grid grid-cols-3 gap-2 py-3 px-4 bg-canvas/60 rounded-xl border border-border/60 text-center mb-3", children: [
+              /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-col", children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-[10px] text-secondary uppercase font-semibold tracking-wider", children: "Progress" }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-base font-bold text-primary font-mono mt-0.5", children: gitProgress > 0 ? `${Math.round(gitProgress)}%` : massivePushData?.percentage ? `${Math.round(massivePushData.percentage)}%` : "Syncing..." })
+              ] }),
+              /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-col border-x border-border/60", children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-[10px] text-secondary uppercase font-semibold tracking-wider", children: "⏱️ Elapsed" }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-base font-bold text-cyan-400 font-mono mt-0.5", children: formatTimerDisplay(syncElapsedSeconds) })
+              ] }),
+              /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-col", children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-[10px] text-secondary uppercase font-semibold tracking-wider", children: "⏳ Time Left" }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-base font-bold text-amber-400 font-mono mt-0.5", children: computeRemainingEta(gitProgress, syncElapsedSeconds, massivePushData?.eta) })
+              ] })
+            ] }),
+            /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-1.5 text-[11px] text-secondary", children: [
+              /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "w-2 h-2 rounded-full bg-emerald-400 inline-block" }),
+              /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: gitProgress > 0 && syncElapsedSeconds > 0 ? `Speed: ~${(gitProgress / syncElapsedSeconds).toFixed(1)}% per second • Safe sync active` : "Live sync engine active • Safe transfer in progress" })
+            ] })
+          ] })
+        ] }) }),
         showInvitationsModal && /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "fixed 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 border border-border p-6 rounded-2xl w-full max-w-md shadow-2xl", children: [
           /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-xl font-bold text-primary mb-4", children: "Pending Invitations" }),
           invitations.length === 0 ? /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-center py-6 text-secondary", children: /* @__PURE__ */ jsxRuntimeExports.jsx("p", { children: "You have no pending invitations." }) }) : /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex flex-col gap-3 max-h-96 overflow-y-auto pr-2 custom-scrollbar", children: invitations.map((inv) => /* @__PURE__ */ jsxRuntimeExports.jsxs(
@@ -31303,7 +31816,14 @@ Are you SURE you want to link "${repoName}" to this folder?`
                   )
                 }
               ),
-              /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "font-semibold text-sm drop-shadow-md text-white/95", children: toast.msg }),
+              /* @__PURE__ */ jsxRuntimeExports.jsx(
+                "span",
+                {
+                  className: "font-semibold text-sm drop-shadow-md text-white/95 max-w-xl truncate inline-block",
+                  title: toast.msg,
+                  children: toast.msg
+                }
+              ),
               /* @__PURE__ */ jsxRuntimeExports.jsx(
                 "button",
                 {