gitxelectron 1.2.8 → 1.3.0

package/out/renderer/assets/{index-Cn2WMJc6.js → index-BPsK_u-e.js}

@@ -24015,9 +24015,9 @@ function CloneRepoWizard({ onClose, onSuccess }) {
         )
       ] })
     ] }) : /* @__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 })
+      error && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "bg-danger/10 border border-danger/30 text-danger px-4 py-3 rounded-lg text-xs flex items-start gap-3 max-h-36 overflow-y-auto custom-scrollbar", children: [
+        /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-5 h-5 flex-shrink-0 mt-0.5 text-danger", 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 font-mono text-[11px] leading-relaxed select-text", children: error })
       ] }),
       /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "space-y-4", children: [
         /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
@@ -24228,7 +24228,9 @@ const CollaborationRepoView = ({
   onRepoCardClick,
   onRefresh,
   isRefreshing,
-  onOpenExternal
+  onOpenExternal,
+  onUnlinkMapping,
+  onChangeFolder
 }) => {
   const filteredRepos = collaboratedRepos.filter((repo) => {
     if (!collabSearch.trim()) return true;
@@ -24493,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 ? "→" : "☁️" })
+                    ]
+                  }
+                )
+              ] })
             ] })
           ]
         },
@@ -25384,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);
@@ -25428,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) => {
@@ -25603,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 () => {
@@ -25625,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 () => {
@@ -25842,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) {
         }
@@ -26981,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: "📁" })
                 ]
               }
@@ -27332,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" }) })
+                        }
+                      )
                     ] })
                   ]
                 },
@@ -27463,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: [
@@ -27501,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",
@@ -27955,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",
@@ -28027,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",
@@ -28200,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",
                     {
@@ -28242,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",
                 {
@@ -28295,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: [