gitxelectron 1.4.1 → 1.4.3

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

@@ -12750,37 +12750,6 @@ function RepositoryWizard({ repoPath, onClose, onSuccess }) {
   const [localProgress, setLocalProgress] = reactExports.useState(
     null
   );
-  reactExports.useEffect(() => {
-    checkAuth();
-    if (window.api.onMassivePushProgress) {
-      window.api.onMassivePushProgress((data) => {
-        setMassivePushData(data);
-      });
-    }
-  }, []);
-  async function checkAuth() {
-    const status = await window.api.getAuthStatus();
-    if (status.status !== "Verified") {
-      startAuth();
-    } else {
-      setStep(2);
-      fetchUserRepos();
-    }
-  }
-  async function startAuth() {
-    try {
-      const data = await window.api.startDeviceFlow();
-      setDeviceFlowData(data);
-      await window.api.pollDeviceFlow(data.device_code, data.interval * 1e3);
-      const newStatus = await window.api.getAuthStatus();
-      if (newStatus.status === "Verified") {
-        setStep(2);
-        fetchUserRepos();
-      }
-    } catch (e) {
-      setError(e.message);
-    }
-  }
   const fetchUserRepos = async () => {
     try {
       const repos = await window.api.getUserRepositories();
@@ -12792,6 +12761,41 @@ function RepositoryWizard({ repoPath, onClose, onSuccess }) {
       console.error(e);
     }
   };
+  reactExports.useEffect(() => {
+    let isMounted = true;
+    const verifyAndLoad = async () => {
+      try {
+        const status = await window.api.getAuthStatus();
+        if (!isMounted) return;
+        if (status.status !== "Verified") {
+          const data = await window.api.startDeviceFlow();
+          if (!isMounted) return;
+          setDeviceFlowData(data);
+          await window.api.pollDeviceFlow(data.device_code, data.interval * 1e3);
+          const newStatus = await window.api.getAuthStatus();
+          if (!isMounted) return;
+          if (newStatus.status === "Verified") {
+            setStep(2);
+            fetchUserRepos();
+          }
+        } else {
+          setStep(2);
+          fetchUserRepos();
+        }
+      } catch (e) {
+        if (isMounted) setError(e.message);
+      }
+    };
+    verifyAndLoad();
+    if (window.api.onMassivePushProgress) {
+      window.api.onMassivePushProgress((data) => {
+        setMassivePushData(data);
+      });
+    }
+    return () => {
+      isMounted = false;
+    };
+  }, []);
   const handleProceed = async () => {
     setIsLoading(true);
     setError("");
@@ -12799,6 +12803,7 @@ function RepositoryWizard({ repoPath, onClose, onSuccess }) {
       localStorage.setItem("gitquickpush-last-repo", repoPath);
       setLocalProgress({ percentage: 5, eta: "Initializing Git locally..." });
       await window.api.initRepo(repoPath);
+      await window.api.setRepoPath(repoPath);
       if (action === "new") {
         setLocalProgress({ percentage: 15, eta: "Creating GitHub Repository..." });
         const autoInit = addReadme || !!gitignoreTemplate || !!licenseTemplate;
@@ -12812,9 +12817,10 @@ function RepositoryWizard({ repoPath, onClose, onSuccess }) {
         );
         setLocalProgress({ percentage: 35, eta: "Linking Remote..." });
         await window.api.addRemote("origin", newRepo.clone_url);
+        const defaultBranch = newRepo.default_branch || "main";
         if (autoInit) {
           setLocalProgress({ percentage: 45, eta: "Syncing with Remote..." });
-          await window.api.resetToRemote("origin", "main");
+          await window.api.resetToRemote("origin", defaultBranch);
         }
         setLocalProgress({ percentage: 55, eta: "Scanning files..." });
         const status = await window.api.getStatus();
@@ -12832,7 +12838,7 @@ function RepositoryWizard({ repoPath, onClose, onSuccess }) {
         }
         setLocalProgress({ percentage: 95, eta: "Pushing to GitHub..." });
         const branches = await window.api.getBranches();
-        const currentBranch = branches.current || "main";
+        const currentBranch = branches.current || defaultBranch;
         await window.api.pushToRemote("origin", currentBranch);
         setLocalProgress({ percentage: 100, eta: "Complete!" });
       } else if (action === "existing") {
@@ -12842,8 +12848,10 @@ function RepositoryWizard({ repoPath, onClose, onSuccess }) {
           setLocalProgress({ percentage: 80, eta: "Fetching remote data..." });
           await window.api.fetchRemote();
         }
+        await window.api.setRepoPath(repoPath);
         setLocalProgress({ percentage: 100, eta: "Complete!" });
       } else if (action === "local") {
+        await window.api.setRepoPath(repoPath);
         localStorage.setItem(`gitquickpush-wizard-dismissed-${repoPath}`, "true");
       }
       onSuccess();
@@ -24826,7 +24834,7 @@ const CollaborationRepoView = ({
     collaboratedRepos.length > 0 && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-2 text-xs text-secondary flex-wrap px-1", children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-[11px] font-medium text-secondary/80", children: "Filter summary:" }),
       /* @__PURE__ */ jsxRuntimeExports.jsxs("span", { className: "inline-flex items-center gap-1 bg-surface border border-border px-2.5 py-1 rounded-lg font-mono text-[11px] text-primary", children: [
-        /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "w-2 h-2 rounded-full bg-white" }),
+        /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "w-2 h-2 rounded-full bg-emerald-400" }),
         connectedCount,
         " Connected"
       ] }),
@@ -24923,7 +24931,7 @@ const CollaborationRepoView = ({
                       children: repo.name
                     }
                   ),
-                  repo.private ? /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-[10px] bg-amber-500/10 text-amber-400 border border-amber-500/25 px-2 py-0.2 rounded-full font-medium flex-shrink-0", children: "Private" }) : /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-[10px] bg-emerald-500/10 text-white border border-emerald-500/25 px-2 py-0.2 rounded-full font-medium flex-shrink-0", children: "Public" }),
+                  repo.private ? /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-[10px] bg-amber-500/10 text-amber-400 border border-amber-500/25 px-2 py-0.2 rounded-full font-medium flex-shrink-0", children: "Private" }) : /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-[10px] bg-emerald-500/10 text-emerald-400 border border-emerald-500/25 px-2 py-0.2 rounded-full font-medium flex-shrink-0", children: "Public" }),
                   isCurrentActive && /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-[9px] bg-brand text-white px-2 py-0.5 rounded-full font-bold uppercase tracking-wider flex-shrink-0 shadow-xs", children: "Active" })
                 ] }),
                 /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-2 mt-1 text-xs text-secondary min-w-0 flex-wrap", children: [
@@ -24967,7 +24975,7 @@ const CollaborationRepoView = ({
               /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "min-w-0 flex-1", children: savedPath ? isMissing ? /* @__PURE__ */ jsxRuntimeExports.jsxs(
                 "div",
                 {
-                  className: "inline-flex items-center gap-1.5 text-xs text-danger font-mono bg-danger text-white border border-border px-2.5 py-1 rounded-lg min-w-0 max-w-full truncate",
+                  className: "inline-flex items-center gap-1.5 text-xs text-danger font-mono bg-danger/10 border border-danger/30 px-2.5 py-1 rounded-lg min-w-0 max-w-full truncate",
                   title: `Folder was deleted or moved: ${savedPath}`,
                   children: [
                     /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "w-1.5 h-1.5 rounded-full bg-danger animate-pulse flex-shrink-0" }),
@@ -24977,10 +24985,10 @@ const CollaborationRepoView = ({
               ) : /* @__PURE__ */ jsxRuntimeExports.jsxs(
                 "div",
                 {
-                  className: "inline-flex items-center gap-1.5 text-xs text-white font-mono bg-success text-white border border-border px-2.5 py-1 rounded-lg min-w-0 max-w-full truncate",
+                  className: "inline-flex items-center gap-1.5 text-xs text-emerald-400 font-mono bg-emerald-500/10 border border-emerald-500/25 px-2.5 py-1 rounded-lg min-w-0 max-w-full truncate",
                   title: savedPath,
                   children: [
-                    /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "w-1.5 h-1.5 rounded-full bg-white flex-shrink-0" }),
+                    /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "w-1.5 h-1.5 rounded-full bg-emerald-400 flex-shrink-0" }),
                     /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "truncate", children: savedPath.split("\\").pop() || savedPath })
                   ]
                 }
@@ -25059,7 +25067,7 @@ const CollaborationRepoView = ({
                       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 hover:bg-danger text-white 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"}`,
+                    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 hover:bg-danger/80 text-white 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 ? "→" : "☁️" })
@@ -25880,7 +25888,7 @@ function App() {
   });
   reactExports.useEffect(() => {
     const handleKeyDown = (e) => {
-      if (e.ctrlKey && e.key === "Delete") {
+      if ((e.ctrlKey || e.metaKey) && (e.key === "Delete" || e.key === "Backspace")) {
         setLiteMode((prev) => !prev);
       }
     };
@@ -26054,6 +26062,11 @@ function App() {
   const refreshLockRef = reactExports.useRef(false);
   reactExports.useEffect(() => {
   }, [gitProgress]);
+  reactExports.useEffect(() => {
+    const activeTheme = showSettings ? draftTheme : theme;
+    document.documentElement.setAttribute("data-theme", activeTheme);
+    document.body.setAttribute("data-theme", activeTheme);
+  }, [theme, draftTheme, showSettings]);
   const [showWelcomeWizard, setShowWelcomeWizard] = reactExports.useState(false);
   const [newPin, setNewPin] = reactExports.useState("");
   const [pinChangeSuccess, setPinChangeSuccess] = reactExports.useState(false);
@@ -26206,6 +26219,11 @@ function App() {
     window.api.getCliRepo().then((cliRepoPath) => {
       if (cliRepoPath) {
         loadRepo(cliRepoPath);
+      } else {
+        const last = localStorage.getItem("gitelectron-last-repo");
+        if (last) {
+          loadRepo(last);
+        }
       }
     });
   }, []);
@@ -26304,7 +26322,9 @@ function App() {
   };
   const handleThemeChange = (newTheme) => {
     setTheme(newTheme);
+    setDraftTheme(newTheme);
     document.documentElement.setAttribute("data-theme", newTheme);
+    document.body.setAttribute("data-theme", newTheme);
     localStorage.setItem("gitelectron-theme", newTheme);
   };
   const handleAiApprove = async () => {
@@ -26344,10 +26364,13 @@ function App() {
     localStorage.setItem("gitelectron-last-repo", targetPath);
     setRepoPath(targetPath);
     const result = await window.api.setRepoPath(targetPath);
+    const finalPath = result?.path || targetPath;
     const isValidRepo = result ? result.isRepo : false;
+    setRepoPath(finalPath);
     setIsRepo(isValidRepo);
     if (isValidRepo) {
-      window.api.toggleAutoSync(targetPath, true);
+      localStorage.setItem("gitelectron-last-repo", finalPath);
+      window.api.toggleAutoSync(finalPath, true);
       await refreshRepoState();
     }
     setChangesTab("changes");
@@ -27082,7 +27105,9 @@ Are you SURE you want to link "${repoName}" to this folder?`
     showToast("Settings saved successfully", "success");
   };
   const cancelSettings = () => {
+    setDraftTheme(theme);
     document.documentElement.setAttribute("data-theme", theme);
+    document.body.setAttribute("data-theme", theme);
     setShowSettings(false);
   };
   const handleExecuteForcePush = async () => {
@@ -27251,7 +27276,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
             ] }),
             /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
               /* @__PURE__ */ jsxRuntimeExports.jsx("h4", { className: "text-sm font-medium text-primary mb-1", children: "AI Proposed Fix" }),
-              /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "bg-brand text-white border border-brand/20 p-3 rounded text-sm text-brand", children: autoSyncErrorPayload.proposedFix })
+              /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "bg-brand/10 border border-brand/20 p-3 rounded text-sm text-brand", children: autoSyncErrorPayload.proposedFix })
             ] }),
             autoSyncErrorPayload.files && autoSyncErrorPayload.files.length > 0 && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
               /* @__PURE__ */ jsxRuntimeExports.jsx("h4", { className: "text-sm font-medium text-primary mb-1", children: "Affected Files" }),
@@ -28558,7 +28583,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
             }
           ),
           /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-3 pr-8 min-w-0", children: [
-            /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-10 h-10 rounded-xl bg-brand text-white border border-brand/20 flex items-center justify-center text-brand flex-shrink-0", children: /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-5 h-5", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+            /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-10 h-10 rounded-xl bg-brand/10 border border-brand/20 flex items-center justify-center text-brand flex-shrink-0", 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",
@@ -29355,7 +29380,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
                     }
                   ),
                   t("collaborationRepo"),
-                  collaboratedRepos.length > 0 && /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "ml-auto bg-brand text-white text-brand text-[10px] font-bold px-1.5 py-0.5 rounded-full", children: collaboratedRepos.length })
+                  collaboratedRepos.length > 0 && /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "ml-auto bg-brand/20 text-brand text-[10px] font-bold px-1.5 py-0.5 rounded-full", children: collaboratedRepos.length })
                 ]
               }
             ),
@@ -29428,7 +29453,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
             )
           ] })
         ] }),
-        /* @__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.jsx("div", { className: "flex-1 p-6 flex flex-col overflow-y-auto custom-scrollbar min-h-0 relative z-10", children: isRepo && status ? /* @__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 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: [
@@ -29603,7 +29628,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
                     "button",
                     {
                       onClick: handleToggleAutoSync,
-                      className: `px-2 py-1.5 rounded transition-colors flex items-center justify-center border font-medium ${autoSyncEnabled ? "bg-green-500/20 text-green-400 border-green-500/30" : "hover:bg-brand text-white text-brand border-brand/30"}`,
+                      className: `px-2 py-1.5 rounded transition-colors flex items-center justify-center border font-medium ${autoSyncEnabled ? "bg-green-500/20 text-green-400 border-green-500/30" : "hover:bg-brand/20 text-brand border-brand/30"}`,
                       title: autoSyncEnabled ? "Disable Auto-Push" : "Enable Auto-Push",
                       children: [
                         "⚡ ",
@@ -29797,7 +29822,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
                   "button",
                   {
                     onClick: () => window.api.openExternal(remoteUrl),
-                    className: "p-1.5 hover:bg-brand text-white text-brand rounded transition-colors flex items-center justify-center border border-brand/30",
+                    className: "p-1.5 hover:bg-brand/20 text-brand rounded transition-colors flex items-center justify-center border border-brand/30",
                     title: "View Repository on GitHub",
                     children: /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-3.5 h-3.5", viewBox: "0 0 24 24", fill: "currentColor", children: /* @__PURE__ */ jsxRuntimeExports.jsx("path", { d: "M12 0C5.374 0 0 5.373 0 12c0 5.302 3.438 9.8 8.205 11.387.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 21.795 24 17.298 24 12c0-6.627-5.373-12-12-12z" }) })
                   }
@@ -29823,7 +29848,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
                     "button",
                     {
                       onClick: () => setShowContributorsModal(true),
-                      className: "px-2 py-1.5 hover:bg-brand text-white text-brand rounded transition-colors flex items-center justify-center border border-brand/30 font-medium",
+                      className: "px-2 py-1.5 hover:bg-brand/20 text-brand rounded transition-colors flex items-center justify-center border border-brand/30 font-medium",
                       title: "Manage Collaborators",
                       children: [
                         /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -29976,7 +30001,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
                   children: "Deleted"
                 }
               ),
-              /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "ml-auto text-xs font-bold text-brand bg-brand text-white border border-brand/20 px-3 py-1 rounded-full", children: "Collaboration Repo" })
+              /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "ml-auto text-xs font-bold text-brand bg-brand/20 border border-brand/30 px-3 py-1 rounded-full", children: "Collaboration Repo" })
             ] }),
             /* @__PURE__ */ jsxRuntimeExports.jsx(
               CollaborationRepoView,
@@ -30043,7 +30068,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
                               className: `text-xs font-semibold px-3 py-1.5 rounded-t-md transition-colors border-b-2 whitespace-nowrap flex-shrink-0 ${changesTab === "collaboration-repo" ? "text-primary border-brand bg-surface border-b-2" : "text-secondary border-transparent hover:text-primary"}`,
                               children: [
                                 "Collaboration Repo",
-                                collaboratedRepos.length > 0 && /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "ml-1.5 bg-brand text-white text-brand text-[10px] font-bold px-1.5 py-0.5 rounded-full", children: collaboratedRepos.length })
+                                collaboratedRepos.length > 0 && /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "ml-1.5 bg-brand/20 text-brand text-[10px] font-bold px-1.5 py-0.5 rounded-full", children: collaboratedRepos.length })
                               ]
                             }
                           ),
@@ -30053,7 +30078,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
                               {
                                 onClick: handleUploadFiles,
                                 disabled: !repoPath || isUploading,
-                                className: "text-xs bg-brand text-white hover:bg-brand text-white text-brand border border-brand/30 px-2.5 py-1 rounded-md transition-all flex items-center gap-1.5 font-medium shadow-sm disabled:opacity-50 whitespace-nowrap flex-shrink-0",
+                                className: "text-xs bg-brand text-white hover:bg-brand/90 border border-brand/30 px-2.5 py-1 rounded-md transition-all flex items-center gap-1.5 font-medium shadow-sm disabled:opacity-50 whitespace-nowrap flex-shrink-0",
                                 title: "Upload files directly into this repository",
                                 children: [
                                   /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -30404,7 +30429,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
                 ]
               }
             ),
-            /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex items-center gap-2", children: /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-xs font-bold text-brand bg-brand text-white border border-brand/20 px-3 py-1 rounded-full", children: "Collaboration Hub" }) })
+            /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex items-center gap-2", children: /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-xs font-bold text-brand bg-brand/20 border border-brand/30 px-3 py-1 rounded-full", children: "Collaboration Hub" }) })
           ] }),
           /* @__PURE__ */ jsxRuntimeExports.jsx(
             CollaborationRepoView,
@@ -30676,42 +30701,141 @@ Are you SURE you want to link "${repoName}" to this folder?`
             repoPath ? /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
               /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-xl mb-2 text-primary font-semibold", children: "Folder Loaded" }),
               /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-xs font-mono text-accent bg-accent/10 px-3 py-1 rounded-md mb-6 border border-accent/20", children: repoPath }),
-              errorMsg ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "text-danger bg-danger/10 border border-danger/30 p-4 rounded-md text-sm text-center max-w-md", children: [
-                /* @__PURE__ */ jsxRuntimeExports.jsx("strong", { children: "Error:" }),
-                /* @__PURE__ */ jsxRuntimeExports.jsx("br", {}),
-                errorMsg
-              ] }) : !isRepo ? /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-sm", children: 'Click "Initialize Git in Folder" in the sidebar.' }) : /* @__PURE__ */ jsxRuntimeExports.jsxs("p", { className: "flex items-center gap-2 text-sm", children: [
-                /* @__PURE__ */ jsxRuntimeExports.jsxs(
-                  "svg",
-                  {
-                    className: "w-4 h-4 animate-spin text-secondary",
-                    fill: "none",
-                    viewBox: "0 0 24 24",
-                    children: [
-                      /* @__PURE__ */ jsxRuntimeExports.jsx(
-                        "circle",
-                        {
-                          className: "opacity-25",
-                          cx: "12",
-                          cy: "12",
-                          r: "10",
-                          stroke: "currentColor",
-                          strokeWidth: "4"
-                        }
-                      ),
-                      /* @__PURE__ */ jsxRuntimeExports.jsx(
-                        "path",
-                        {
-                          className: "opacity-75",
-                          fill: "currentColor",
-                          d: "M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
+              errorMsg ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "text-danger bg-danger/10 border border-danger/30 p-5 rounded-xl text-sm text-center max-w-md shadow-lg flex flex-col items-center gap-3", children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
+                  /* @__PURE__ */ jsxRuntimeExports.jsx("strong", { children: "Error:" }),
+                  /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "mt-1 text-xs opacity-90", children: errorMsg })
+                ] }),
+                /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex gap-2", children: [
+                  /* @__PURE__ */ jsxRuntimeExports.jsx(
+                    "button",
+                    {
+                      onClick: () => refreshRepoState(),
+                      className: "px-4 py-1.5 bg-brand hover:bg-brand-hover text-white text-xs font-semibold rounded-lg transition-all cursor-pointer",
+                      children: "Retry"
+                    }
+                  ),
+                  /* @__PURE__ */ jsxRuntimeExports.jsx(
+                    "button",
+                    {
+                      onClick: () => setShowSetupWizard(true),
+                      className: "px-4 py-1.5 bg-surface-hover hover:bg-surface text-secondary hover:text-primary text-xs font-semibold rounded-lg border border-border transition-all cursor-pointer",
+                      children: "Setup Repository"
+                    }
+                  )
+                ] })
+              ] }) : !isRepo ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-col items-center gap-3 max-w-md text-center p-6 bg-surface/50 rounded-2xl border border-border/40 backdrop-blur-sm", children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-sm text-secondary", children: "This folder is loaded, but Git is not initialized in it yet." }),
+                /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-2 mt-2", children: [
+                  /* @__PURE__ */ jsxRuntimeExports.jsxs(
+                    "button",
+                    {
+                      onClick: () => setShowSetupWizard(true),
+                      className: "px-5 py-2.5 bg-brand hover:bg-brand-hover text-white font-semibold rounded-xl text-xs transition-all shadow-md hover:shadow-brand/20 cursor-pointer flex items-center gap-2",
+                      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: "M12 4v16m8-8H4"
+                              }
+                            )
+                          }
+                        ),
+                        "Initialize Git Repository"
+                      ]
+                    }
+                  ),
+                  /* @__PURE__ */ jsxRuntimeExports.jsxs(
+                    "button",
+                    {
+                      onClick: async () => {
+                        if (!repoPath) return;
+                        const res = await window.api.setRepoPath(repoPath);
+                        if (res) {
+                          setRepoPath(res.path);
+                          setIsRepo(res.isRepo);
+                          if (res.isRepo) {
+                            await refreshRepoState();
+                          }
                         }
-                      )
-                    ]
+                      },
+                      className: "px-4 py-2.5 bg-surface hover:bg-surface-hover text-secondary hover:text-primary font-semibold rounded-xl text-xs border border-border transition-all cursor-pointer flex items-center gap-1.5",
+                      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: "M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"
+                              }
+                            )
+                          }
+                        ),
+                        "Check Again"
+                      ]
+                    }
+                  )
+                ] })
+              ] }) : /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-col items-center gap-2", children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsxs("p", { className: "flex items-center gap-2 text-sm text-secondary", children: [
+                  /* @__PURE__ */ jsxRuntimeExports.jsxs(
+                    "svg",
+                    {
+                      className: "w-4 h-4 animate-spin text-brand",
+                      fill: "none",
+                      viewBox: "0 0 24 24",
+                      children: [
+                        /* @__PURE__ */ jsxRuntimeExports.jsx(
+                          "circle",
+                          {
+                            className: "opacity-25",
+                            cx: "12",
+                            cy: "12",
+                            r: "10",
+                            stroke: "currentColor",
+                            strokeWidth: "4"
+                          }
+                        ),
+                        /* @__PURE__ */ jsxRuntimeExports.jsx(
+                          "path",
+                          {
+                            className: "opacity-75",
+                            fill: "currentColor",
+                            d: "M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
+                          }
+                        )
+                      ]
+                    }
+                  ),
+                  " ",
+                  "Analyzing Git Repository..."
+                ] }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx(
+                  "button",
+                  {
+                    onClick: () => refreshRepoState(),
+                    className: "text-xs text-secondary hover:text-primary underline mt-2 cursor-pointer",
+                    children: "Force Refresh"
                   }
-                ),
-                " ",
-                "Analyzing..."
+                )
               ] })
             ] }) : /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "text-center flex flex-col items-center", children: [
               /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-3xl font-bold text-primary mb-2 tracking-tight", children: "GIT ELECTRON" }),