gitxelectron 1.2.7 → 1.2.9

package/out/renderer/assets/{index-CHyCU0WO.js → index-xMfzgem_.js}

@@ -12540,6 +12540,180 @@ function Loader() {
     /* @__PURE__ */ jsxRuntimeExports.jsx("circle", { cx: "680", cy: "340", r: "5", fill: "black" })
   ] }) }) });
 }
+const MassivePushLoader = ({ percentage, eta, hideHeader, compact }) => {
+  const isIndeterminate = percentage < 0;
+  const clampedPercentage = isIndeterminate ? 0 : Math.min(100, Math.max(0, percentage));
+  return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: `flex flex-col items-center justify-center w-full h-full ${compact ? "" : "space-y-8 py-8"}`, children: [
+    !hideHeader && !compact && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "text-center text-primary mb-4 relative z-10", children: [
+      /* @__PURE__ */ jsxRuntimeExports.jsx("h2", { className: "text-2xl font-bold", children: "Massive Push in Progress" }),
+      /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-sm opacity-70 mt-1", children: "Chunking thousands of files to prevent freezing" })
+    ] }),
+    /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: `loader-wrapper ${compact ? "is-compact" : ""}`, children: [
+      /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "loader", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "box", children: [
+        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "top-side" }),
+        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "bottom-side" }),
+        /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "screen", children: [
+          /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "lightray-limit", children: /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "lightray" }) }),
+          /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "loader-box-container", children: [
+            /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "loader-progress-box", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+              "div",
+              {
+                className: `progress-bar-fill transition-all duration-300 ease-out ${isIndeterminate ? "indeterminate-progress" : ""}`,
+                style: { width: isIndeterminate ? "0%" : `${clampedPercentage}%` }
+              }
+            ) }),
+            /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: `flex flex-col items-center mt-2 text-primary font-mono drop-shadow-md ${compact ? "scale-95" : ""}`, children: [
+              /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: `${compact ? "text-2xl" : "text-3xl mt-2"} font-bold`, children: isIndeterminate ? ". . ." : `${clampedPercentage.toFixed(1)}%` }),
+              /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: `${compact ? "text-xs" : "text-xs"} opacity-90 mt-1 font-semibold`, children: eta })
+            ] })
+          ] })
+        ] })
+      ] }) }),
+      /* @__PURE__ */ jsxRuntimeExports.jsx("style", { children: `
+          .loader-wrapper .loader .box {
+            background-color: var(--color-surface-hover);
+            width: var(--size, 240px);
+            height: var(--size, 240px);
+            padding: var(--pad, 20px);
+            border-radius: 50%;
+            border: var(--border-w, 5px) solid var(--color-border);
+            position: relative;
+            overflow: hidden;
+            box-shadow: 0 10px 25px rgba(0, 0, 0, 0.3), inset 0 5px 15px rgba(0,0,0,0.2);
+            transform: rotate(-45deg);
+            margin: 0 auto;
+          }
+
+          .loader-wrapper.is-compact {
+            --size: 180px;
+            --pad: 15px;
+            --border-w: 4px;
+            --top-offset: 40px;
+            --bottom-offset: 45px;
+            --screen-pad: 8px;
+            --prog-pad: 3px;
+            --prog-h: 6px;
+          }
+          
+          .loader-wrapper:not(.is-compact) {
+            --top-offset: 50px;
+            --bottom-offset: 60px;
+            --screen-pad: 10px;
+            --prog-pad: 4px;
+            --prog-h: 8px;
+          }
+
+          .loader-wrapper .loader .box .screen {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%) rotate(45deg);
+            background-color: var(--color-canvas);
+            width: calc(100% - calc(var(--pad, 20px) * 2));
+            height: calc(100% - calc(var(--pad, 20px) * 2));
+            border-radius: 50%;
+            padding: var(--screen-pad);
+            overflow: hidden;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            box-shadow: inset 0 0 15px rgba(0,0,0,0.4);
+          }
+
+          .loader-wrapper .screen .lightray-limit {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%);
+            width: calc(100% - 10px);
+            height: calc(100% - 10px);
+            overflow: hidden;
+            border-radius: 50%;
+            pointer-events: none;
+          }
+
+          .loader-wrapper .screen .lightray {
+            position: absolute;
+            left: 0;
+            top: 0;
+            transform: translate(-50%, -50%);
+            width: 250%;
+            height: 250%;
+            background-image: radial-gradient(var(--color-primary), transparent, transparent);
+            border-radius: 50% 10px 0 0;
+            animation: rotateRay 8s linear infinite;
+            opacity: 0.15;
+          }
+
+          @keyframes rotateRay {
+            0% { transform: translate(-50%, -50%) rotate(0deg); }
+            100% { transform: translate(-50%, -50%) rotate(360deg); }
+          }
+
+          .loader-wrapper .screen .loader-box-container {
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            transform: translate(-50%, -50%);
+            width: 75%;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            z-index: 10;
+          }
+
+          .loader-wrapper .screen .loader-progress-box {
+            width: 100%;
+            padding: var(--prog-pad);
+            border: 2px solid var(--color-border);
+            border-radius: 6px;
+            background: var(--color-surface);
+            box-shadow: inset 0 1px 3px rgba(0,0,0,0.2);
+          }
+
+          .loader-wrapper .screen .progress-bar-fill {
+            height: var(--prog-h);
+            background-color: var(--color-brand);
+            border-radius: 3px;
+            box-shadow: 0 0 8px var(--color-brand);
+          }
+
+          .loader-wrapper .top-side {
+            position: absolute;
+            width: 100%;
+            height: 50%;
+            top: var(--top-offset);
+            left: 50%;
+            transform: translate(-50%, -50%);
+            box-shadow: 0 10px 15px rgba(0,0,0,0.2);
+            background-color: rgba(0, 0, 0, 0.2);
+          }
+
+          .loader-wrapper .bottom-side {
+            position: absolute;
+            width: 100%;
+            height: 50%;
+            top: calc(100% + var(--bottom-offset));
+            left: 50%;
+            transform: translate(-50%, -100%);
+            box-shadow: 0 -15px 25px rgba(255,255,255,0.1);
+            background-color: rgba(255, 255, 255, 0.1);
+          }
+
+          .indeterminate-progress {
+            animation: indeterminateProgress 5s infinite;
+          }
+
+          @keyframes indeterminateProgress {
+            0% { width: 0%; }
+            50% { width: 100%; }
+            100% { width: 0%; }
+          }
+        ` })
+    ] })
+  ] });
+};
 function RepositoryWizard({ repoPath, onClose, onSuccess }) {
   const [step, setStep] = reactExports.useState(1);
   const [deviceFlowData, setDeviceFlowData] = reactExports.useState(null);
@@ -12554,8 +12728,15 @@ function RepositoryWizard({ repoPath, onClose, onSuccess }) {
   const [selectedRepoUrl, setSelectedRepoUrl] = reactExports.useState("");
   const [isLoading, setIsLoading] = reactExports.useState(false);
   const [error, setError] = reactExports.useState("");
+  const [massivePushData, setMassivePushData] = reactExports.useState(null);
+  const [localProgress, setLocalProgress] = reactExports.useState(null);
   reactExports.useEffect(() => {
     checkAuth();
+    if (window.api.onMassivePushProgress) {
+      window.api.onMassivePushProgress((data) => {
+        setMassivePushData(data);
+      });
+    }
   }, []);
   const checkAuth = async () => {
     const status = await window.api.getAuthStatus();
@@ -12596,8 +12777,10 @@ function RepositoryWizard({ repoPath, onClose, onSuccess }) {
     setError("");
     try {
       localStorage.setItem("gitquickpush-last-repo", repoPath);
+      setLocalProgress({ percentage: 5, eta: "Initializing Git locally..." });
       await window.api.initRepo(repoPath);
       if (action === "new") {
+        setLocalProgress({ percentage: 15, eta: "Creating GitHub Repository..." });
         const autoInit = addReadme || !!gitignoreTemplate || !!licenseTemplate;
         const newRepo = await window.api.createGitHubRepository(
           repoName,
@@ -12607,10 +12790,13 @@ function RepositoryWizard({ repoPath, onClose, onSuccess }) {
           gitignoreTemplate,
           licenseTemplate
         );
+        setLocalProgress({ percentage: 35, eta: "Linking Remote..." });
         await window.api.addRemote("origin", newRepo.clone_url);
         if (autoInit) {
+          setLocalProgress({ percentage: 45, eta: "Syncing with Remote..." });
           await window.api.resetToRemote("origin", "main");
         }
+        setLocalProgress({ percentage: 55, eta: "Scanning files..." });
         const status = await window.api.getStatus();
         const allFiles = [
           ...status.not_added,
@@ -12619,17 +12805,24 @@ function RepositoryWizard({ repoPath, onClose, onSuccess }) {
           ...status.conflicted
         ];
         if (allFiles.length > 0) {
+          setLocalProgress({ percentage: 70, eta: `Staging ${allFiles.length} files...` });
           await window.api.stageFiles(allFiles);
+          setLocalProgress({ percentage: 85, eta: "Committing changes..." });
           await window.api.commitChanges("Initial commit");
         }
+        setLocalProgress({ percentage: 95, eta: "Pushing to GitHub..." });
         const branches = await window.api.getBranches();
         const currentBranch = branches.current || "main";
         await window.api.pushToRemote("origin", currentBranch);
+        setLocalProgress({ percentage: 100, eta: "Complete!" });
       } else if (action === "existing") {
+        setLocalProgress({ percentage: 50, eta: "Linking existing repository..." });
         if (selectedRepoUrl) {
           await window.api.addRemote("origin", selectedRepoUrl);
+          setLocalProgress({ percentage: 80, eta: "Fetching remote data..." });
           await window.api.fetchRemote();
         }
+        setLocalProgress({ percentage: 100, eta: "Complete!" });
       } else if (action === "local") {
         localStorage.setItem(`gitquickpush-wizard-dismissed-${repoPath}`, "true");
       }
@@ -12644,10 +12837,19 @@ function RepositoryWizard({ repoPath, onClose, onSuccess }) {
     localStorage.setItem(`gitquickpush-wizard-dismissed-${repoPath}`, "true");
     if (onClose) onClose();
   };
+  const effectiveProgress = massivePushData || localProgress;
   return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "absolute inset-0 bg-black/60 backdrop-blur-sm flex items-center justify-center z-[70] p-4 sm:p-6 transition-opacity", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "bg-surface/95 backdrop-blur-xl rounded-xl shadow-2xl border border-border w-full max-w-[550px] mx-auto overflow-hidden animate-float relative flex flex-col max-h-[90vh]", children: [
-    isLoading && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "absolute inset-0 bg-surface/90 backdrop-blur-md z-10 flex flex-col items-center justify-center", children: [
-      /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-[250px] sm:w-[350px]", children: /* @__PURE__ */ jsxRuntimeExports.jsx(Loader, {}) }),
-      /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "mt-4 font-mono text-sm text-primary animate-pulse", children: "Processing..." })
+    isLoading && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "absolute inset-0 bg-surface/90 backdrop-blur-md z-10 flex flex-col items-center justify-center pt-8", children: [
+      /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-[280px] sm:w-[380px] shrink-0 -mt-8", children: /* @__PURE__ */ jsxRuntimeExports.jsx(Loader, {}) }),
+      /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-full mt-4 flex items-center justify-center", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+        MassivePushLoader,
+        {
+          percentage: effectiveProgress ? effectiveProgress.percentage : -1,
+          eta: effectiveProgress ? effectiveProgress.eta : "Processing...",
+          hideHeader: true,
+          compact: true
+        }
+      ) })
     ] }),
     /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center justify-between px-6 py-4 border-b border-border bg-surface-hover/50 shrink-0", children: [
       /* @__PURE__ */ jsxRuntimeExports.jsxs("h2", { className: "text-lg font-bold text-primary flex items-center gap-2", children: [
@@ -23662,6 +23864,247 @@ function WelcomeWizard({ onComplete }) {
     ] })
   ] });
 }
+function CloneRepoWizard({ onClose, onSuccess }) {
+  const [repoUrl, setRepoUrl] = reactExports.useState("");
+  const [destFolder, setDestFolder] = reactExports.useState("");
+  const [folderName, setFolderName] = reactExports.useState("");
+  const [isLoading, setIsLoading] = reactExports.useState(false);
+  const [error, setError] = reactExports.useState("");
+  const [cloneProgress, setCloneProgress] = reactExports.useState(null);
+  const [showOptions, setShowOptions] = reactExports.useState(false);
+  const [clonedPathState, setClonedPathState] = reactExports.useState("");
+  reactExports.useEffect(() => {
+    if (window.api.onGitProgress) {
+      window.api.onGitProgress((data) => {
+        if (data && data.progress !== void 0) {
+          setCloneProgress({
+            percentage: data.progress,
+            eta: data.stage || "Cloning..."
+          });
+        }
+      });
+    }
+  }, []);
+  reactExports.useEffect(() => {
+    if (repoUrl && !folderName) {
+      let extracted = repoUrl.split("/").pop() || "";
+      if (extracted.endsWith(".git")) {
+        extracted = extracted.substring(0, extracted.length - 4);
+      }
+      if (extracted) {
+        setFolderName(extracted);
+      }
+    }
+  }, [repoUrl]);
+  const handleSelectFolder = async () => {
+    try {
+      const result = await window.api.selectDirectory();
+      if (result) {
+        setDestFolder(result.path);
+      }
+    } catch (e) {
+      setError(e.message);
+    }
+  };
+  const handleClone = async () => {
+    if (!repoUrl) {
+      setError("Repository URL is required");
+      return;
+    }
+    if (!destFolder) {
+      setError("Destination folder is required");
+      return;
+    }
+    const finalPath = destFolder + "\\" + (folderName || "cloned-repo");
+    setIsLoading(true);
+    setError("");
+    setCloneProgress({ percentage: 0, eta: "Starting clone..." });
+    try {
+      const clonedPath = await window.api.cloneRepository(repoUrl, finalPath);
+      setCloneProgress({ percentage: 100, eta: "Clone complete!" });
+      setClonedPathState(clonedPath);
+      try {
+        const authStatus = await window.api.getAuthStatus();
+        const myUsername = authStatus?.username?.toLowerCase();
+        let repoOwner = "";
+        const urlParts = repoUrl.replace(".git", "").split("/");
+        if (repoUrl.includes("github.com")) {
+          const ghIndex = urlParts.findIndex((p) => p.includes("github.com"));
+          if (ghIndex !== -1 && urlParts.length > ghIndex + 1) {
+            repoOwner = urlParts[ghIndex + 1].toLowerCase();
+          }
+        }
+        if (myUsername && repoOwner && repoOwner === myUsername) {
+          setTimeout(() => {
+            onSuccess(clonedPath, "keep");
+          }, 1e3);
+        } else {
+          setTimeout(() => {
+            setIsLoading(false);
+            setShowOptions(true);
+          }, 1e3);
+        }
+      } catch (e) {
+        setTimeout(() => {
+          setIsLoading(false);
+          setShowOptions(true);
+        }, 1e3);
+      }
+    } catch (e) {
+      setError(e.message || "Failed to clone repository");
+      setIsLoading(false);
+      setCloneProgress(null);
+    }
+  };
+  const effectiveProgress = cloneProgress || (isLoading ? { percentage: 5, eta: "Initializing..." } : null);
+  return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "absolute inset-0 bg-black/60 backdrop-blur-sm flex items-center justify-center z-[100] p-4 animate-in fade-in duration-300", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "bg-surface/95 border border-border w-full max-w-[600px] rounded-2xl shadow-2xl flex flex-col overflow-hidden max-h-[90vh]", children: [
+    /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "p-6 border-b border-border/50 bg-canvas/30", children: [
+      /* @__PURE__ */ jsxRuntimeExports.jsxs("h2", { className: "text-2xl font-bold text-primary flex items-center gap-3", children: [
+        /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-6 h-6 text-brand", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntimeExports.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M8 7v8a2 2 0 002 2h6M8 7V5a2 2 0 012-2h4.586a1 1 0 01.707.293l4.414 4.414a1 1 0 01.293.707V15a2 2 0 01-2 2h-2M8 7H6a2 2 0 00-2 2v10a2 2 0 002 2h8a2 2 0 002-2v-2" }) }),
+        "Clone Repository"
+      ] }),
+      /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-secondary mt-2 text-sm", children: "Download an existing Git repository to your computer" })
+    ] }),
+    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "p-6 overflow-y-auto", children: isLoading ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-col items-center justify-center py-12", children: [
+      /* @__PURE__ */ jsxRuntimeExports.jsx(
+        MassivePushLoader,
+        {
+          percentage: effectiveProgress?.percentage || 0,
+          eta: effectiveProgress?.eta || "Cloning..."
+        }
+      ),
+      /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "mt-8 text-secondary text-center max-w-[300px] text-sm animate-pulse", children: "Please wait while GitElectron clones the repository. This might take a while depending on the repository size." })
+    ] }) : showOptions ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-col items-center justify-center py-8 space-y-6 text-center animate-in zoom-in-95 duration-300", children: [
+      /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-16 h-16 rounded-full bg-brand/10 text-brand flex items-center justify-center mb-2", children: /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-8 h-8", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntimeExports.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M5 13l4 4L19 7" }) }) }),
+      /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
+        /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-xl font-bold text-primary", children: "Clone Successful!" }),
+        /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-secondary text-sm mt-2 max-w-sm mx-auto", children: "This repository belongs to someone else. What would you like to do with it?" })
+      ] }),
+      /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "grid grid-cols-1 md:grid-cols-2 gap-4 w-full mt-4", children: [
+        /* @__PURE__ */ jsxRuntimeExports.jsxs(
+          "button",
+          {
+            onClick: () => onSuccess(clonedPathState, "keep"),
+            className: "flex flex-col items-center p-4 rounded-xl border border-border bg-canvas hover:bg-surface-hover transition-all text-left gap-3",
+            children: [
+              /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-10 h-10 rounded-full bg-blue-500/10 text-blue-400 flex items-center justify-center", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("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: "M15 12a3 3 0 11-6 0 3 3 0 016 0z" }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z" })
+              ] }) }),
+              /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "text-center", children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "font-semibold text-primary", children: "Keep as View-Only" }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-xs text-secondary mt-1", children: "Leave the original remote intact." })
+              ] })
+            ]
+          }
+        ),
+        /* @__PURE__ */ jsxRuntimeExports.jsxs(
+          "button",
+          {
+            onClick: () => onSuccess(clonedPathState, "new"),
+            className: "flex flex-col items-center p-4 rounded-xl border border-brand/30 bg-brand/5 hover:bg-brand/10 transition-all text-left gap-3 relative overflow-hidden",
+            children: [
+              /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "absolute top-0 right-0 px-2 py-0.5 bg-brand text-[10px] font-bold text-white rounded-bl-lg", children: "RECOMMENDED" }),
+              /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-10 h-10 rounded-full bg-brand/20 text-brand flex items-center justify-center", 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: "M12 6v6m0 0v6m0-6h6m-6 0H6" }) }) }),
+              /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "text-center", children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "font-semibold text-brand", children: "Create My Own Copy" }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-xs text-secondary mt-1", children: "Strip original data to create your own repo." })
+              ] })
+            ]
+          }
+        )
+      ] })
+    ] }) : /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "space-y-6", children: [
+      error && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "bg-danger/10 border border-danger/30 text-danger px-4 py-3 rounded-lg text-sm flex items-start gap-3", children: [
+        /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-5 h-5 flex-shrink-0 mt-0.5", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntimeExports.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" }) }),
+        /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "break-words", children: error })
+      ] }),
+      /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "space-y-4", children: [
+        /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
+          /* @__PURE__ */ jsxRuntimeExports.jsx("label", { className: "block text-sm font-medium text-secondary mb-1.5", children: "Repository URL (HTTPS / SSH)" }),
+          /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "relative", children: [
+            /* @__PURE__ */ jsxRuntimeExports.jsx(
+              "input",
+              {
+                type: "text",
+                className: "w-full bg-canvas border border-border rounded-lg px-4 py-2.5 text-primary focus:border-brand focus:ring-1 focus:ring-brand outline-none transition-all pl-10",
+                placeholder: "https://github.com/user/repo.git",
+                value: repoUrl,
+                onChange: (e) => setRepoUrl(e.target.value)
+              }
+            ),
+            /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-5 h-5 absolute left-3 top-3 text-secondary", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntimeExports.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M13.828 10.172a4 4 0 00-5.656 0l-4 4a4 4 0 105.656 5.656l1.102-1.101m-.758-4.899a4 4 0 005.656 0l4-4a4 4 0 00-5.656-5.656l-1.1 1.1" }) })
+          ] })
+        ] }),
+        /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
+          /* @__PURE__ */ jsxRuntimeExports.jsx("label", { className: "block text-sm font-medium text-secondary mb-1.5", children: "Destination Base Folder" }),
+          /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex gap-2", children: [
+            /* @__PURE__ */ jsxRuntimeExports.jsx(
+              "input",
+              {
+                type: "text",
+                className: "flex-1 bg-canvas border border-border rounded-lg px-4 py-2.5 text-primary opacity-70 cursor-not-allowed text-sm",
+                placeholder: "Select a folder...",
+                value: destFolder,
+                readOnly: true
+              }
+            ),
+            /* @__PURE__ */ jsxRuntimeExports.jsx(
+              "button",
+              {
+                onClick: handleSelectFolder,
+                className: "bg-surface-hover border border-border hover:border-brand/50 text-primary px-4 rounded-lg font-medium transition-all",
+                children: "Browse"
+              }
+            )
+          ] }),
+          /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-xs text-secondary mt-1.5", children: "The folder where the cloned repository directory will be placed." })
+        ] }),
+        /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
+          /* @__PURE__ */ jsxRuntimeExports.jsx("label", { className: "block text-sm font-medium text-secondary mb-1.5", children: "Folder Name (Optional)" }),
+          /* @__PURE__ */ jsxRuntimeExports.jsx(
+            "input",
+            {
+              type: "text",
+              className: "w-full bg-canvas border border-border rounded-lg px-4 py-2.5 text-primary focus:border-brand focus:ring-1 focus:ring-brand outline-none transition-all",
+              placeholder: "E.g. my-awesome-project",
+              value: folderName,
+              onChange: (e) => setFolderName(e.target.value)
+            }
+          ),
+          destFolder && folderName && /* @__PURE__ */ jsxRuntimeExports.jsxs("p", { className: "text-xs text-brand mt-1.5 font-mono bg-brand/10 p-2 rounded inline-block", children: [
+            "Will clone to: ",
+            destFolder,
+            "\\",
+            folderName
+          ] })
+        ] })
+      ] })
+    ] }) }),
+    !isLoading && !showOptions && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "p-6 border-t border-border bg-canvas/30 flex justify-end gap-3", children: [
+      /* @__PURE__ */ jsxRuntimeExports.jsx(
+        "button",
+        {
+          onClick: onClose,
+          className: "px-5 py-2.5 rounded-lg border border-border text-secondary hover:text-primary hover:bg-surface transition-all font-medium",
+          children: "Cancel"
+        }
+      ),
+      /* @__PURE__ */ jsxRuntimeExports.jsxs(
+        "button",
+        {
+          onClick: handleClone,
+          disabled: !repoUrl || !destFolder,
+          className: "px-6 py-2.5 rounded-lg bg-brand hover:bg-brand-hover text-white font-medium transition-all shadow-lg shadow-brand/20 flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed",
+          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: "M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4" }) }),
+            "Clone Repository"
+          ]
+        }
+      )
+    ] })
+  ] }) });
+}
 const AmongUsBackground = () => {
   const canvasRef = reactExports.useRef(null);
   reactExports.useEffect(() => {
@@ -23785,7 +24228,9 @@ const CollaborationRepoView = ({
   onRepoCardClick,
   onRefresh,
   isRefreshing,
-  onOpenExternal
+  onOpenExternal,
+  onUnlinkMapping,
+  onChangeFolder
 }) => {
   const filteredRepos = collaboratedRepos.filter((repo) => {
     if (!collabSearch.trim()) return true;
@@ -24050,21 +24495,52 @@ const CollaborationRepoView = ({
                 /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "w-1.5 h-1.5 rounded-full bg-secondary/40" }),
                 /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: "Not cloned yet" })
               ] }) }),
-              /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex items-center gap-2 flex-shrink-0 self-end sm:self-center", children: /* @__PURE__ */ jsxRuntimeExports.jsxs(
-                "button",
-                {
-                  type: "button",
-                  onClick: (e) => {
-                    e.stopPropagation();
-                    onRepoCardClick(repo);
-                  },
-                  className: `px-3.5 py-1.5 text-xs font-semibold rounded-xl transition-all shadow-xs flex items-center gap-1.5 ${savedPath ? isMissing ? "bg-danger/20 hover:bg-danger/30 text-danger border border-danger/40" : "bg-brand hover:bg-brand-hover text-white shadow-brand/20" : "bg-brand hover:bg-brand-hover text-white shadow-brand/20"}`,
-                  children: [
-                    /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: savedPath ? isMissing ? "Re-Clone" : "Open Repo" : "Clone / Connect" }),
-                    /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: isMissing ? "☁️" : savedPath ? "→" : "☁️" })
-                  ]
-                }
-              ) })
+              /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-1.5 flex-shrink-0 self-end sm:self-center", children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsxs(
+                  "button",
+                  {
+                    type: "button",
+                    onClick: (e) => {
+                      e.stopPropagation();
+                      onChangeFolder?.(repo);
+                    },
+                    className: "px-2.5 py-1.5 text-xs font-medium rounded-xl transition-all shadow-xs flex items-center gap-1 bg-surface hover:bg-surface-hover text-secondary hover:text-primary border border-border",
+                    title: savedPath ? "Change connected local folder" : "Select existing local folder on disk",
+                    children: [
+                      /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: "📁" }),
+                      /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: savedPath ? "Change Folder" : "Choose Folder" })
+                    ]
+                  }
+                ),
+                savedPath && /* @__PURE__ */ jsxRuntimeExports.jsx(
+                  "button",
+                  {
+                    type: "button",
+                    onClick: (e) => {
+                      e.stopPropagation();
+                      onUnlinkMapping?.(repo.full_name);
+                    },
+                    className: "p-1.5 text-xs rounded-xl transition-all bg-surface hover:bg-danger/10 text-secondary hover:text-danger border border-border",
+                    title: "Clear connection",
+                    children: /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-3.5 h-3.5", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntimeExports.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" }) })
+                  }
+                ),
+                /* @__PURE__ */ jsxRuntimeExports.jsxs(
+                  "button",
+                  {
+                    type: "button",
+                    onClick: (e) => {
+                      e.stopPropagation();
+                      onRepoCardClick(repo);
+                    },
+                    className: `px-3.5 py-1.5 text-xs font-semibold rounded-xl transition-all shadow-xs flex items-center gap-1.5 ${savedPath ? isMissing ? "bg-danger/20 hover:bg-danger/30 text-danger border border-danger/40" : "bg-brand hover:bg-brand-hover text-white shadow-brand/20" : "bg-brand hover:bg-brand-hover text-white shadow-brand/20"}`,
+                    children: [
+                      /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: savedPath ? isMissing ? "Re-Clone" : "Open Repo" : "Clone" }),
+                      /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: isMissing ? "☁️" : savedPath ? "→" : "☁️" })
+                    ]
+                  }
+                )
+              ] })
             ] })
           ]
         },
@@ -24165,70 +24641,6 @@ const CommitReceiptPrinter = ({ commit, onClose }) => {
     ] }) })
   ] });
 };
-const MassivePushLoader = ({ percentage, eta }) => {
-  const clampedPercentage = Math.min(100, Math.max(0, percentage));
-  const check1 = clampedPercentage >= 33;
-  const check2 = clampedPercentage >= 66;
-  const check3 = clampedPercentage >= 99;
-  return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-col items-center justify-center space-y-6 py-12", children: [
-    /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "text-center text-primary mb-2", children: [
-      /* @__PURE__ */ jsxRuntimeExports.jsx("h2", { className: "text-xl font-bold", children: "Massive Push in Progress" }),
-      /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-sm opacity-70", children: "Chunking thousands of files to prevent freezing" })
-    ] }),
-    /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "relative bg-[#3a3a3a] rounded-full h-4 w-[330px] shadow-inner", children: [
-      /* @__PURE__ */ jsxRuntimeExports.jsx(
-        "div",
-        {
-          className: "absolute left-0 top-0 h-full rounded-full transition-all duration-500 ease-out",
-          style: {
-            width: `${clampedPercentage}%`,
-            backgroundColor: "var(--color-brand, #00cd00)"
-          }
-        }
-      ),
-      /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "absolute -top-1 left-0 z-10 flex w-full justify-between px-1", children: [
-        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-6" }),
-        " ",
-        /* @__PURE__ */ jsxRuntimeExports.jsx(Checkmark, { active: check1 }),
-        /* @__PURE__ */ jsxRuntimeExports.jsx(Checkmark, { active: check2 }),
-        /* @__PURE__ */ jsxRuntimeExports.jsx(Checkmark, { active: check3 })
-      ] })
-    ] }),
-    /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "text-center text-primary mt-4", children: [
-      /* @__PURE__ */ jsxRuntimeExports.jsxs("p", { className: "font-semibold text-2xl", children: [
-        clampedPercentage.toFixed(1),
-        "%"
-      ] }),
-      /* @__PURE__ */ jsxRuntimeExports.jsxs("p", { className: "text-md opacity-80 mt-1", children: [
-        "ETA: ",
-        eta
-      ] })
-    ] })
-  ] });
-};
-const Checkmark = ({ active }) => {
-  return /* @__PURE__ */ jsxRuntimeExports.jsx(
-    "div",
-    {
-      className: `rounded-full h-6 w-6 p-[3px] transition-all duration-500 flex items-center justify-center shadow-md ${active ? "scale-110" : "scale-90"}`,
-      style: {
-        backgroundColor: active ? "var(--color-brand, #00cd00)" : "#535353",
-        opacity: active ? 1 : 0.5
-      },
-      children: /* @__PURE__ */ jsxRuntimeExports.jsx(
-        "svg",
-        {
-          stroke: "white",
-          strokeWidth: 3,
-          viewBox: "0 0 24 24",
-          fill: "none",
-          xmlns: "http://www.w3.org/2000/svg",
-          children: /* @__PURE__ */ jsxRuntimeExports.jsx("path", { d: "m4.5 12.75 6 6 9-13.5", strokeLinejoin: "round", strokeLinecap: "round" })
-        }
-      )
-    }
-  );
-};
 const translations = {
   en: {
     settings: "Settings",
@@ -24802,6 +25214,7 @@ function App() {
     return () => document.removeEventListener("click", handleClick);
   }, []);
   const [showDropModal, setShowDropModal] = reactExports.useState(false);
+  const [showCloneWizard, setShowCloneWizard] = reactExports.useState(false);
   const [droppedFiles, setDroppedFiles] = reactExports.useState([]);
   const [showConflictModal, setShowConflictModal] = reactExports.useState(false);
   const [conflictFile, setConflictFile] = reactExports.useState(null);
@@ -25004,32 +25417,8 @@ function App() {
       const exists = await window.api.checkPathExists(targetPath);
       if (!exists) {
         console.warn("Target path does not exist on disk:", targetPath);
-        const currentMappings = JSON.parse(localStorage.getItem("gitelectron_collab_mappings") || "{}");
-        const matching = Object.entries(currentMappings).find(([_, p]) => p === targetPath);
-        if (matching) {
-          const [fullName] = matching;
-          let repo = collaboratedRepos.find((r) => r.full_name === fullName);
-          if (!repo) {
-            try {
-              const allCollabs = await window.api.getCollaboratedRepos();
-              setCollaboratedRepos(allCollabs);
-              repo = allCollabs.find((r) => r.full_name === fullName);
-            } catch (e) {
-            }
-          }
-          if (repo) {
-            showToast(`The local folder for ${fullName} was deleted. You can re-clone it now.`, "warning");
-            setShowCollabActionModal({
-              repo,
-              url: repo.clone_url,
-              name: repo.name,
-              fullName: repo.full_name,
-              missingPreviousPath: targetPath
-            });
-            setChangesTab("collaboration-repo");
-            return;
-          }
-        }
+        showToast(`Folder not found on disk: ${targetPath}`, "warning");
+        return;
       }
     } catch (e) {
       console.error("Error checking target path existence:", e);
@@ -25048,24 +25437,72 @@ function App() {
       }
     }).catch((err) => console.error("Failed to load repo", err));
   };
+  const getCandidateDirs = () => {
+    const list = [];
+    if (repoPath) {
+      const p1 = repoPath.replace(/\\/g, "/").split("/").slice(0, -1).join("/");
+      if (p1 && !list.includes(p1)) list.push(p1);
+      const p2 = p1 ? p1.split("/").slice(0, -1).join("/") : "";
+      if (p2 && !list.includes(p2)) list.push(p2);
+    }
+    const standard = [
+      "D:/DRDO_ProjectX1",
+      "D:/DRDO_ProjectX1/DRDO_Project",
+      "D:/My Projects",
+      "D:/My Projects/PushGitX"
+    ];
+    standard.forEach((d) => {
+      if (!list.includes(d)) list.push(d);
+    });
+    Object.values(collabMappings).forEach((p) => {
+      if (p) {
+        const pParent = p.replace(/\\/g, "/").split("/").slice(0, -1).join("/");
+        if (pParent && !list.includes(pParent)) list.push(pParent);
+      }
+    });
+    return list;
+  };
   reactExports.useEffect(() => {
     const checkAllPaths = async () => {
       const results = {};
-      for (const [fullName, path] of Object.entries(collabMappings)) {
-        if (path) {
+      const candidateDirs = getCandidateDirs();
+      for (const repo of collaboratedRepos) {
+        const fullName = repo.full_name;
+        const currentPath = collabMappings[fullName];
+        let valid = false;
+        if (currentPath) {
           try {
-            results[fullName] = await window.api.checkPathExists(path);
+            const exists = await window.api.checkPathExists(currentPath);
+            if (exists) {
+              const gitInfo = await window.api.getDirectoryGitInfo(currentPath);
+              const detectedName = (gitInfo.repoName || "").toLowerCase();
+              const expectedName = (repo.name || fullName.split("/").pop() || "").toLowerCase();
+              if (!detectedName || detectedName === expectedName) {
+                valid = true;
+              }
+            }
           } catch {
-            results[fullName] = false;
+            valid = false;
           }
         }
+        if (!valid) {
+          try {
+            const found = await window.api.scanForRepoFolder(repo.name, candidateDirs);
+            if (found) {
+              saveMapping(fullName, found);
+              valid = true;
+            }
+          } catch {
+          }
+        }
+        results[fullName] = valid;
       }
       setPathExistenceMap(results);
     };
     if (changesTab === "collaboration-repo" || collaboratedRepos.length > 0) {
       checkAllPaths();
     }
-  }, [collabMappings, changesTab, collaboratedRepos.length]);
+  }, [changesTab, collaboratedRepos.length]);
   reactExports.useEffect(() => {
     if (authStatus.status === "Verified") {
       window.api.getCollaboratedRepos().then((repos) => {
@@ -25223,13 +25660,24 @@ function App() {
       return updated;
     });
   };
+  const removeMapping = (repoFullName) => {
+    setCollabMappings((prev) => {
+      const updated = { ...prev };
+      delete updated[repoFullName];
+      localStorage.setItem("gitelectron_collab_mappings", JSON.stringify(updated));
+      return updated;
+    });
+  };
   const openCollabRepoPath = async (targetPath) => {
     localStorage.setItem("gitelectron-last-repo", targetPath);
     setRepoPath(targetPath);
-    setIsRepo(true);
-    await window.api.setRepoPath(targetPath);
-    window.api.toggleAutoSync(targetPath, true);
-    await refreshRepoState();
+    const result = await window.api.setRepoPath(targetPath);
+    const isValidRepo = result ? result.isRepo : false;
+    setIsRepo(isValidRepo);
+    if (isValidRepo) {
+      window.api.toggleAutoSync(targetPath, true);
+      await refreshRepoState();
+    }
     setChangesTab("changes");
   };
   const handleCollabRefresh = async () => {
@@ -25245,50 +25693,114 @@ function App() {
       setIsRefreshing(false);
     }
   };
+  const handleSelectCollabFolder = async (repo) => {
+    let defaultDir = void 0;
+    if (repoPath) {
+      defaultDir = repoPath.replace(/\\/g, "/").split("/").slice(0, -1).join("/");
+    }
+    const result = await window.api.selectDirectory(defaultDir);
+    if (!result) return;
+    const targetRepoName = (repo.name || repo.full_name?.split("/").pop() || "").toLowerCase();
+    const gitInfo = await window.api.getDirectoryGitInfo(result.path);
+    const detectedRepoName = (gitInfo.repoName || "").toLowerCase();
+    if (detectedRepoName && targetRepoName && detectedRepoName !== targetRepoName) {
+      const confirmUse = window.confirm(
+        `Notice: Folder Remote Mismatch!
+
+The folder you selected appears to belong to repository "${gitInfo.repoName}", but this card is for "${repo.name}".
+
+Do you want to connect "${repo.name}" to this folder anyway?`
+      );
+      if (!confirmUse) return;
+    }
+    const pathToUse = gitInfo.rootPath || result.path;
+    saveMapping(repo.full_name, pathToUse);
+    await openCollabRepoPath(pathToUse);
+    showToast(`Connected ${repo.name} to ${pathToUse.split("\\").pop() || pathToUse}`, "success");
+  };
   const handleRepoCardClick = async (repo) => {
+    const targetRepoName = (repo.name || repo.full_name?.split("/").pop() || "").toLowerCase();
     const savedPath = collabMappings[repo.full_name];
     if (savedPath) {
       const exists = await window.api.checkPathExists(savedPath);
       if (exists) {
-        await openCollabRepoPath(savedPath);
-        return;
-      } else {
-        setShowCollabActionModal({
-          repo,
-          url: repo.clone_url,
-          name: repo.name,
-          fullName: repo.full_name,
-          missingPreviousPath: savedPath
-        });
+        const gitInfo = await window.api.getDirectoryGitInfo(savedPath);
+        const detectedRepoName = (gitInfo.repoName || "").toLowerCase();
+        const isMatch = !detectedRepoName || detectedRepoName === targetRepoName || gitInfo.remoteUrl && (gitInfo.remoteUrl.toLowerCase().includes(targetRepoName) || gitInfo.remoteUrl.toLowerCase().includes((repo.full_name || "").toLowerCase()));
+        if (isMatch) {
+          await openCollabRepoPath(gitInfo.rootPath || savedPath);
+          return;
+        }
+        console.warn(
+          `Collab mapping mismatch for ${repo.full_name}: savedPath is ${detectedRepoName}, expected ${targetRepoName}`
+        );
+      }
+    }
+    const candidateDirs = getCandidateDirs();
+    try {
+      const autoFound = await window.api.scanForRepoFolder(repo.name, candidateDirs);
+      if (autoFound) {
+        saveMapping(repo.full_name, autoFound);
+        showToast(
+          `Auto-connected to local folder: ${autoFound.split("\\").pop() || autoFound}`,
+          "success"
+        );
+        await openCollabRepoPath(autoFound);
         return;
       }
+    } catch (e) {
+      console.warn("Auto-scan error:", e);
     }
     setShowCollabActionModal({
       repo,
       url: repo.clone_url,
       name: repo.name,
-      fullName: repo.full_name
+      fullName: repo.full_name,
+      missingPreviousPath: savedPath
     });
   };
   const handleCollabMap = async () => {
     if (!showCollabActionModal) return;
-    const { fullName } = showCollabActionModal;
+    const { fullName, name, repo } = showCollabActionModal;
     setShowCollabActionModal(null);
-    const result = await window.api.selectDirectory();
+    let defaultDir = void 0;
+    if (repoPath) {
+      defaultDir = repoPath.replace(/\\/g, "/").split("/").slice(0, -1).join("/");
+    }
+    const result = await window.api.selectDirectory(defaultDir);
     if (result) {
-      if (fullName) {
-        saveMapping(fullName, result.path);
+      const repoName = name || repo?.name || (fullName ? fullName.split("/").pop() : "");
+      const selectedBasename = result.path.replace(/\\/g, "/").split("/").pop();
+      const gitInfo = await window.api.getDirectoryGitInfo(result.path);
+      const detectedRepoName = (gitInfo.repoName || "").toLowerCase();
+      const targetRepoName = (repoName || "").toLowerCase();
+      if (detectedRepoName && targetRepoName && detectedRepoName !== targetRepoName) {
+        const confirmed = window.confirm(
+          `Notice: Remote Mismatch!
+
+The folder you selected appears to be for repository "${gitInfo.repoName}", but this card is "${repoName}".
+
+Are you sure you want to connect "${repoName}" to this folder?`
+        );
+        if (!confirmed) return;
+      } else if (!detectedRepoName && repoName && selectedBasename && targetRepoName !== selectedBasename.toLowerCase()) {
+        const confirmed = window.confirm(
+          `Warning: Folder Name Mismatch!
+
+You selected the folder "${selectedBasename}", but the repository is named "${repoName}".
+
+Because the folder picker often opens in the last folder you viewed, you might have accidentally selected the wrong folder.
+
+Are you SURE you want to link "${repoName}" to this folder?`
+        );
+        if (!confirmed) return;
       }
-      localStorage.setItem("gitelectron-last-repo", result.path);
-      setRepoPath(result.path);
-      setIsRepo(result.isRepo);
-      if (result.isRepo) {
-        await window.api.setRepoPath(result.path);
-        await refreshRepoState();
-        window.api.toggleAutoSync(result.path, true);
+      const pathToUse = gitInfo.rootPath || result.path;
+      if (fullName) {
+        saveMapping(fullName, pathToUse);
       }
-      setChangesTab("changes");
-      showToast(`Linked repository to ${result.path}`, "success");
+      await openCollabRepoPath(pathToUse);
+      showToast(`Linked repository to ${pathToUse.split("\\").pop() || pathToUse}`, "success");
     }
   };
   const handleCollabClone = async () => {
@@ -25462,23 +25974,7 @@ function App() {
         try {
           const exists = await window.api.checkPathExists(repoPath);
           if (!exists) {
-            const currentMappings = JSON.parse(localStorage.getItem("gitelectron_collab_mappings") || "{}");
-            const matching = Object.entries(currentMappings).find(([_, p]) => p === repoPath);
-            if (matching) {
-              const [fullName] = matching;
-              const repo = collaboratedRepos.find((r) => r.full_name === fullName);
-              if (repo) {
-                showToast(`Repository folder was deleted on disk: ${fullName}. Prompting to re-clone.`, "warning");
-                setShowCollabActionModal({
-                  repo,
-                  url: repo.clone_url,
-                  name: repo.name,
-                  fullName: repo.full_name,
-                  missingPreviousPath: repoPath
-                });
-                setChangesTab("collaboration-repo");
-              }
-            }
+            console.warn("Repository path does not exist on disk:", repoPath);
           }
         } catch (err) {
         }
@@ -26601,7 +27097,7 @@ function App() {
                 onClick: handleCollabMap,
                 className: "w-full py-3 px-4 bg-surface-hover hover:bg-surface-hover/80 border border-border rounded-xl text-primary text-sm font-medium transition-colors text-left flex items-center justify-between",
                 children: [
-                  /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: "Already have this project folder" }),
+                  /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: "Select Existing Folder (Already on my computer)" }),
                   /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-base", children: "📁" })
                 ]
               }
@@ -26657,6 +27153,24 @@ function App() {
           }
         ),
         showUniversalWizard && /* @__PURE__ */ jsxRuntimeExports.jsx(UniversalPushWizard, { isOpen: showUniversalWizard, onClose: () => setShowUniversalWizard(false) }),
+        showCloneWizard && /* @__PURE__ */ jsxRuntimeExports.jsx(
+          CloneRepoWizard,
+          {
+            onClose: () => setShowCloneWizard(false),
+            onSuccess: async (clonedPath, action) => {
+              setShowCloneWizard(false);
+              if (action === "new") {
+                await window.api.removeGitMetadata(clonedPath);
+                localStorage.setItem("gitelectron-last-repo", clonedPath);
+                setRepoPath(clonedPath);
+                setIsRepo(false);
+                setShowSetupWizard(true);
+              } else {
+                openCollabRepoPath(clonedPath);
+              }
+            }
+          }
+        ),
         showSetupWizard && repoPath && /* @__PURE__ */ jsxRuntimeExports.jsx(
           RepositoryWizard,
           {
@@ -26895,6 +27409,26 @@ function App() {
                 ]
               }
             ),
+            /* @__PURE__ */ jsxRuntimeExports.jsxs(
+              "button",
+              {
+                onClick: () => setShowCloneWizard(true),
+                className: "w-full bg-surface-hover hover:brightness-110 text-primary font-medium py-2 px-4 rounded-md transition-all border border-border text-sm flex items-center justify-center gap-2",
+                children: [
+                  /* @__PURE__ */ jsxRuntimeExports.jsx(
+                    "svg",
+                    {
+                      className: "w-4 h-4 text-secondary",
+                      fill: "none",
+                      stroke: "currentColor",
+                      viewBox: "0 0 24 24",
+                      children: /* @__PURE__ */ jsxRuntimeExports.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M8 16H6a2 2 0 01-2-2V6a2 2 0 012-2h8a2 2 0 012 2v2m-6 12h8a2 2 0 002-2v-8a2 2 0 00-2-2h-8a2 2 0 00-2 2v8a2 2 0 002 2z" })
+                    }
+                  ),
+                  "Clone Repository"
+                ]
+              }
+            ),
             /* @__PURE__ */ jsxRuntimeExports.jsxs(
               "button",
               {
@@ -26914,19 +27448,53 @@ function App() {
               const saved = collabMappings[repo.full_name];
               const isMissing = saved && pathExistenceMap[repo.full_name] === false;
               return /* @__PURE__ */ jsxRuntimeExports.jsxs(
-                "button",
+                "div",
                 {
-                  onClick: () => handleRepoCardClick(repo),
-                  className: `w-full text-left bg-canvas hover:bg-surface-hover text-primary py-2 px-3 rounded-md transition-all border text-sm truncate flex flex-col group ${isMissing ? "border-danger/40 bg-danger/5" : "border-border"}`,
-                  title: repo.name,
+                  className: `relative w-full text-left bg-canvas hover:bg-surface-hover text-primary py-2 px-3 rounded-md transition-all border text-sm flex flex-col group ${isMissing ? "border-danger/40 bg-danger/5" : "border-border"}`,
                   children: [
-                    /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center justify-between w-full", children: [
-                      /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "font-medium truncate group-hover:text-brand transition-colors", children: repo.name }),
-                      isMissing && /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-[9px] bg-danger/20 text-danger px-1 rounded font-bold", children: "Deleted" })
-                    ] }),
-                    /* @__PURE__ */ jsxRuntimeExports.jsxs("span", { className: "text-[10px] text-secondary truncate", children: [
-                      "by @",
-                      repo.owner?.login
+                    /* @__PURE__ */ jsxRuntimeExports.jsxs(
+                      "button",
+                      {
+                        className: "w-full text-left flex flex-col truncate",
+                        onClick: () => handleRepoCardClick(repo),
+                        title: repo.name,
+                        children: [
+                          /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center justify-between w-full pr-6", children: [
+                            /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "font-medium truncate group-hover:text-brand transition-colors", children: repo.name }),
+                            isMissing && /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-[9px] bg-danger/20 text-danger px-1 rounded font-bold", children: "Deleted" })
+                          ] }),
+                          /* @__PURE__ */ jsxRuntimeExports.jsxs("span", { className: "text-[10px] text-secondary truncate", children: [
+                            "by @",
+                            repo.owner?.login
+                          ] })
+                        ]
+                      }
+                    ),
+                    /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "absolute right-1 top-1.5 flex items-center gap-0.5 opacity-0 group-hover:opacity-100 transition-all", children: [
+                      /* @__PURE__ */ jsxRuntimeExports.jsx(
+                        "button",
+                        {
+                          onClick: (e) => {
+                            e.stopPropagation();
+                            handleSelectCollabFolder(repo);
+                          },
+                          className: "p-1 rounded-md text-secondary hover:text-primary hover:bg-surface-hover transition-colors",
+                          title: saved ? "Change local folder" : "Select local folder on disk",
+                          children: /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-xs", children: "📁" })
+                        }
+                      ),
+                      saved && /* @__PURE__ */ jsxRuntimeExports.jsx(
+                        "button",
+                        {
+                          onClick: (e) => {
+                            e.stopPropagation();
+                            removeMapping(repo.full_name);
+                          },
+                          className: "p-1 rounded-md text-secondary hover:text-danger hover:bg-danger/10 transition-colors",
+                          title: "Clear saved link",
+                          children: /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-3 h-3", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntimeExports.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" }) })
+                        }
+                      )
                     ] })
                   ]
                 },
@@ -27045,7 +27613,7 @@ function App() {
             )
           ] })
         ] }),
-        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex-1 p-6 flex flex-col overflow-hidden relative z-10", children: isRepo && status && branches ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-col gap-4 mb-6 relative z-20", children: [
+        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex-1 p-6 flex flex-col overflow-y-auto custom-scrollbar min-h-0 relative z-10", children: isRepo && status && branches ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex-1 flex flex-col min-h-0 gap-4 mb-6 relative z-20", children: [
           /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-wrap justify-between items-center bg-surface/70 backdrop-blur-md border border-border p-3 rounded-xl transition-colors duration-300 gap-4 relative z-50", children: [
             /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-wrap items-center gap-4 text-sm", children: [
               /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-2 relative", children: [
@@ -27083,7 +27651,7 @@ function App() {
                       ] })
                     }
                   ),
-                  showAccountDropdown && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "absolute top-full left-0 mt-2 w-64 max-w-[90vw] bg-surface backdrop-blur-xl border border-border rounded-lg shadow-xl py-2 z-[60]", children: [
+                  showAccountDropdown && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "absolute top-full left-0 mt-2 w-64 max-w-[90vw] bg-surface backdrop-blur-xl border border-border rounded-lg shadow-2xl py-2 z-[60] account-dropdown-glass", children: [
                     /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "px-3 py-1.5 text-xs font-semibold text-secondary uppercase tracking-wider mb-1", children: "Your Accounts" }),
                     accounts.map((acc) => /* @__PURE__ */ jsxRuntimeExports.jsxs(
                       "div",
@@ -27537,12 +28105,14 @@ function App() {
                 onRepoCardClick: handleRepoCardClick,
                 onRefresh: handleCollabRefresh,
                 isRefreshing,
-                onOpenExternal: (url) => window.api.openExternal(url)
+                onOpenExternal: (url) => window.api.openExternal(url),
+                onUnlinkMapping: removeMapping,
+                onChangeFolder: handleSelectCollabFolder
               }
             )
           ] }) : /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
-            /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { id: "split-pane-container", className: "flex-1 overflow-hidden flex flex-col lg:flex-row pb-2", children: [
-              /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { style: { flex: leftPanelWidth }, className: "bg-surface/70 backdrop-blur-md rounded-xl border border-border flex flex-col transition-colors duration-300 overflow-hidden min-h-[250px]", children: [
+            /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { id: "split-pane-container", className: "flex-1 overflow-hidden min-h-0 flex flex-col lg:flex-row pb-2", children: [
+              /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { style: { flex: leftPanelWidth }, className: "bg-surface/70 backdrop-blur-md rounded-xl border border-border flex flex-col transition-colors duration-300 overflow-hidden min-h-[250px] min-w-0 min-h-0", children: [
                 /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-nowrap overflow-x-auto custom-scrollbar items-center border-b border-border px-4 pt-3 pb-1 gap-y-2 gap-x-1", children: [
                   /* @__PURE__ */ jsxRuntimeExports.jsxs(
                     "button",
@@ -27609,9 +28179,9 @@ function App() {
                   MassivePushLoader,
                   {
                     percentage: massivePushData?.percentage || 0,
-                    eta: massivePushData?.eta || "calculating..."
+                    eta: gitProgress > 0 && gitProgress < 100 ? `Uploading Chunk: ${Math.round(gitProgress)}%` : massivePushData?.eta || "calculating..."
                   }
-                ) }) : /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex-1 overflow-auto p-4 custom-scrollbar", children: [
+                ) }) : /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex-1 overflow-y-auto min-h-0 p-4 custom-scrollbar", children: [
                   changesTab === "changes" && /* @__PURE__ */ jsxRuntimeExports.jsxs("ul", { className: "space-y-1", children: [
                     status.conflicted.map((f) => /* @__PURE__ */ jsxRuntimeExports.jsxs(
                       "li",
@@ -27782,9 +28352,9 @@ function App() {
                   children: /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: `h-12 w-1 rounded-full transition-colors ${isResizing ? "bg-accent" : "bg-border group-hover:bg-accent/50"}` })
                 }
               ),
-              /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { style: { flex: 100 - leftPanelWidth }, className: "bg-surface/70 backdrop-blur-md rounded-xl p-4 border border-border flex flex-col transition-colors duration-300 min-h-[250px]", children: [
-                /* @__PURE__ */ jsxRuntimeExports.jsx("h2", { className: "font-semibold mb-4 text-primary text-sm", children: "Staged Changes" }),
-                /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex-1 overflow-auto pr-2 custom-scrollbar", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("ul", { className: "space-y-1", children: [
+              /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { style: { flex: 100 - leftPanelWidth }, className: "bg-surface/70 backdrop-blur-md rounded-xl p-4 border border-border flex flex-col transition-colors duration-300 overflow-hidden min-h-0 min-w-0", children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsx("h2", { className: "font-semibold mb-4 text-primary text-sm shrink-0", children: "Staged Changes" }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex-1 overflow-y-auto min-h-0 pr-2 custom-scrollbar", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("ul", { className: "space-y-1", children: [
                   status.staged.map((f) => /* @__PURE__ */ jsxRuntimeExports.jsxs(
                     "li",
                     {
@@ -27824,7 +28394,7 @@ function App() {
                 ] }) })
               ] })
             ] }),
-            /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "mt-4 bg-surface/70 backdrop-blur-md p-4 rounded-xl border border-border flex gap-3 items-center transition-colors duration-300", children: [
+            /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "mt-4 shrink-0 bg-surface/70 backdrop-blur-md p-4 rounded-xl border border-border flex flex-col sm:flex-row gap-3 items-center transition-colors duration-300", children: [
               /* @__PURE__ */ jsxRuntimeExports.jsx(
                 "input",
                 {
@@ -27877,7 +28447,9 @@ function App() {
               onRepoCardClick: handleRepoCardClick,
               onRefresh: handleCollabRefresh,
               isRefreshing,
-              onOpenExternal: (url) => window.api.openExternal(url)
+              onOpenExternal: (url) => window.api.openExternal(url),
+              onUnlinkMapping: removeMapping,
+              onChangeFolder: handleSelectCollabFolder
             }
           )
         ] }) : /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex-1 flex flex-col items-center justify-center text-secondary relative z-10", children: [