gh-manager-cli 1.10.3 → 1.10.5

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.10.5](https://github.com/wiiiimm/gh-manager-cli/compare/v1.10.4...v1.10.5) (2025-09-01)
+
+
+### Bug Fixes
+
+* prevent duplicate modal handlers and improve modal UI ([79281d3](https://github.com/wiiiimm/gh-manager-cli/commit/79281d34fe42d3345885cad257e6800e94eb2bb3))
+
+## [1.10.4](https://github.com/wiiiimm/gh-manager-cli/compare/v1.10.3...v1.10.4) (2025-09-01)
+
+
+### Bug Fixes
+
+* eliminate duplicate sync handler to prevent double execution ([bf838b6](https://github.com/wiiiimm/gh-manager-cli/commit/bf838b66f5c8b7def294d3835278cd32254bce1f))
+
 ## [1.10.3](https://github.com/wiiiimm/gh-manager-cli/compare/v1.10.2...v1.10.3) (2025-09-01)
 
 

package/dist/{chunk-KOZ6QCTU.js → chunk-XCFI3TG5.js}

@@ -668,19 +668,6 @@ async function syncForkWithUpstream(token, owner, repo, branch = "main") {
     const body = await res.json();
     return body;
   }
-  if (res.status === 422) {
-    try {
-      const body = await res.json();
-      if (body && body.message && body.message.includes("There was a problem updating the branch")) {
-        return {
-          message: "Sync completed (with warnings)",
-          merge_type: "merge",
-          base_branch: branch
-        };
-      }
-    } catch {
-    }
-  }
   let msg = `Fork sync failed (status ${res.status})`;
   try {
     const body = await res.json();
@@ -689,6 +676,9 @@ async function syncForkWithUpstream(token, owner, repo, branch = "main") {
       if (res.status === 409) {
         msg += " (conflicts detected - manual merge required)";
       }
+      if (res.status === 422) {
+        msg += " (branch could not be synced)";
+      }
     }
   } catch {
   }

package/dist/{github-HC6GZCKR.js → github-6IFMCQKW.js}

@@ -17,7 +17,7 @@ import {
   updateCacheAfterArchive,
   updateCacheAfterDelete,
   updateCacheWithRepository
-} from "./chunk-KOZ6QCTU.js";
+} from "./chunk-XCFI3TG5.js";
 export {
   archiveRepositoryById,
   deleteRepositoryRest,

package/dist/index.js

@@ -16,14 +16,14 @@ import {
   updateCacheAfterArchive,
   updateCacheAfterDelete,
   updateCacheWithRepository
-} from "./chunk-KOZ6QCTU.js";
+} from "./chunk-XCFI3TG5.js";
 
 // package.json
 var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "gh-manager-cli",
-      version: "1.10.3",
+      version: "1.10.5",
       private: false,
       description: "Interactive CLI to manage your GitHub repos (personal) with Ink",
       license: "MIT",
@@ -279,7 +279,7 @@ function OrgSwitcher({ token, currentContext, onSelect, onClose }) {
     const loadOrgs = async () => {
       try {
         setLoading(true);
-        const client = await import("./github-HC6GZCKR.js").then((m) => m.makeClient(token));
+        const client = await import("./github-6IFMCQKW.js").then((m) => m.makeClient(token));
         const orgs = await fetchViewerOrganizations(client);
         setOrganizations(orgs);
         if (!isPersonalContext) {
@@ -486,6 +486,7 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin, onOrgContextCh
   const [syncing, setSyncing] = useState3(false);
   const [syncError, setSyncError] = useState3(null);
   const [syncFocus, setSyncFocus] = useState3("confirm");
+  const [syncTrigger, setSyncTrigger] = useState3(false);
   const [infoMode, setInfoMode] = useState3(false);
   const [infoRepo, setInfoRepo] = useState3(null);
   const [logoutMode, setLogoutMode] = useState3(false);
@@ -504,6 +505,67 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin, onOrgContextCh
     setSyncing(false);
     setSyncError(null);
     setSyncFocus("confirm");
+    setSyncTrigger(false);
+  }
+  async function executeSync() {
+    if (!syncTarget || syncing) return;
+    try {
+      setSyncing(true);
+      const [owner, repo] = syncTarget.nameWithOwner.split("/");
+      const branchName = syncTarget.defaultBranchRef?.name || "main";
+      const result = await syncForkWithUpstream(token, owner, repo, branchName);
+      const updatedRepo = {
+        ...syncTarget,
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        // If we're tracking fork commits and this is a fork with parent data, set commits to be in sync
+        ...forkTracking && syncTarget.isFork && syncTarget.parent && syncTarget.defaultBranchRef?.target?.history && syncTarget.parent.defaultBranchRef?.target?.history ? {
+          defaultBranchRef: {
+            ...syncTarget.defaultBranchRef,
+            target: {
+              ...syncTarget.defaultBranchRef.target,
+              history: {
+                // Set fork's commit count equal to parent's (0 commits behind)
+                totalCount: syncTarget.parent.defaultBranchRef.target.history.totalCount
+              }
+            }
+          }
+        } : {}
+      };
+      await updateCacheWithRepository(token, updatedRepo);
+      const updateSyncedRepo = (r) => {
+        if (r.id === syncTarget.id) {
+          return updatedRepo;
+        }
+        return r;
+      };
+      setItems((prev) => prev.map(updateSyncedRepo));
+      setSearchItems((prev) => prev.map(updateSyncedRepo));
+      closeSyncModal();
+    } catch (e) {
+      setSyncing(false);
+      setSyncError(e.message || "Failed to sync fork. Check permissions and network.");
+    }
+  }
+  async function executeArchive() {
+    if (!archiveTarget || archiving) return;
+    try {
+      setArchiving(true);
+      const isArchived = archiveTarget.isArchived;
+      const id = archiveTarget.id;
+      if (isArchived) {
+        await unarchiveRepositoryById(client, id);
+      } else {
+        await archiveRepositoryById(client, id);
+      }
+      await updateCacheAfterArchive(token, id, !isArchived);
+      const updateRepo = (r) => r.id === id ? { ...r, isArchived: !isArchived } : r;
+      setItems((prev) => prev.map(updateRepo));
+      setSearchItems((prev) => prev.map(updateRepo));
+      closeArchiveModal();
+    } catch (e) {
+      setArchiving(false);
+      setArchiveError("Failed to update archive state. Check permissions.");
+    }
   }
   function handleOrgContextChange(newContext) {
     setOwnerContext(newContext);
@@ -795,13 +857,12 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin, onOrgContextCh
           setConfirmFocus("cancel");
           return;
         }
-        if (key.return) {
-          if (confirmFocus === "delete") confirmDeleteNow();
-          else cancelDeleteModal();
-          return;
-        }
         if (input && input.toUpperCase() === "Y") {
-          confirmDeleteNow();
+          if (confirmFocus === "delete") {
+            confirmDeleteNow();
+          } else {
+            cancelDeleteModal();
+          }
           return;
         }
       }
@@ -820,29 +881,12 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin, onOrgContextCh
         setArchiveFocus("cancel");
         return;
       }
-      if (key.return || input && input.toUpperCase() === "Y") {
+      if (input && input.toUpperCase() === "Y") {
         if (archiveFocus === "cancel") {
           closeArchiveModal();
           return;
         }
-        if (!archiveTarget) return;
-        (async () => {
-          try {
-            setArchiving(true);
-            const isArchived = archiveTarget.isArchived;
-            const id = archiveTarget.id;
-            if (isArchived) await unarchiveRepositoryById(client, id);
-            else await archiveRepositoryById(client, id);
-            await updateCacheAfterArchive(token, id, !isArchived);
-            const updateRepo = (r) => r.id === id ? { ...r, isArchived: !isArchived } : r;
-            setItems((prev) => prev.map(updateRepo));
-            setSearchItems((prev) => prev.map(updateRepo));
-            closeArchiveModal();
-          } catch (e) {
-            setArchiving(false);
-            setArchiveError("Failed to update archive state. Check permissions.");
-          }
-        })();
+        executeArchive();
         return;
       }
       return;
@@ -860,50 +904,12 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin, onOrgContextCh
         setSyncFocus("cancel");
         return;
       }
-      if (key.return || input && input.toUpperCase() === "Y") {
+      if (input && input.toUpperCase() === "Y") {
         if (syncFocus === "cancel") {
           closeSyncModal();
-          return;
+        } else {
+          executeSync();
         }
-        if (!syncTarget) return;
-        (async () => {
-          try {
-            setSyncing(true);
-            const [owner, repo] = syncTarget.nameWithOwner.split("/");
-            const branchName = syncTarget.defaultBranchRef?.name || "main";
-            const result = await syncForkWithUpstream(token, owner, repo, branchName);
-            const updatedRepo = {
-              ...syncTarget,
-              updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
-              // If we're tracking fork commits and this is a fork with parent data, set commits to be in sync
-              ...forkTracking && syncTarget.isFork && syncTarget.parent && syncTarget.defaultBranchRef?.target?.history && syncTarget.parent.defaultBranchRef?.target?.history ? {
-                defaultBranchRef: {
-                  ...syncTarget.defaultBranchRef,
-                  target: {
-                    ...syncTarget.defaultBranchRef.target,
-                    history: {
-                      // Set fork's commit count equal to parent's (0 commits behind)
-                      totalCount: syncTarget.parent.defaultBranchRef.target.history.totalCount
-                    }
-                  }
-                }
-              } : {}
-            };
-            await updateCacheWithRepository(token, updatedRepo);
-            const updateSyncedRepo = (r) => {
-              if (r.id === syncTarget.id) {
-                return updatedRepo;
-              }
-              return r;
-            };
-            setItems((prev) => prev.map(updateSyncedRepo));
-            setSearchItems((prev) => prev.map(updateSyncedRepo));
-            closeSyncModal();
-          } catch (e) {
-            setSyncing(false);
-            setSyncError(e.message || "Failed to sync fork. Check permissions and network.");
-          }
-        })();
         return;
       }
       return;
@@ -1361,7 +1367,7 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin, onOrgContextCh
           /* @__PURE__ */ jsx6(Box5, { marginTop: 1, flexDirection: "row", justifyContent: "center", children: /* @__PURE__ */ jsxs5(Text6, { color: "gray", children: [
             "Press Enter to ",
             confirmFocus === "delete" ? "Delete" : "Cancel",
-            " \u2022 Y to confirm \u2022 C to cancel"
+            " | Y to Delete | C to Cancel"
           ] }) }),
           /* @__PURE__ */ jsx6(Box5, { marginTop: 1, children: /* @__PURE__ */ jsx6(
             TextInput2,
@@ -1417,7 +1423,9 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin, onOrgContextCh
       /* @__PURE__ */ jsx6(Box5, { marginTop: 1, flexDirection: "row", justifyContent: "center", children: /* @__PURE__ */ jsxs5(Text6, { color: "gray", children: [
         "Press Enter to ",
         archiveFocus === "confirm" ? archiveTarget.isArchived ? "Unarchive" : "Archive" : "Cancel",
-        " \u2022 Y to confirm \u2022 C to cancel"
+        " | Y to ",
+        archiveTarget.isArchived ? "Unarchive" : "Archive",
+        " | C to Cancel"
       ] }) }),
       /* @__PURE__ */ jsx6(Box5, { marginTop: 1, children: /* @__PURE__ */ jsx6(
         TextInput2,
@@ -1427,23 +1435,7 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin, onOrgContextCh
           },
           onSubmit: () => {
             if (archiveFocus === "confirm") {
-              (async () => {
-                try {
-                  setArchiving(true);
-                  const isArchived = archiveTarget.isArchived;
-                  const id = archiveTarget.id;
-                  if (isArchived) await unarchiveRepositoryById(client, id);
-                  else await archiveRepositoryById(client, id);
-                  await updateCacheAfterArchive(token, id, !isArchived);
-                  const updateRepo = (r) => r.id === id ? { ...r, isArchived: !isArchived } : r;
-                  setItems((prev) => prev.map(updateRepo));
-                  setSearchItems((prev) => prev.map(updateRepo));
-                  closeArchiveModal();
-                } catch (e) {
-                  setArchiving(false);
-                  setArchiveError("Failed to update archive state. Check permissions.");
-                }
-              })();
+              executeArchive();
             } else {
               closeArchiveModal();
             }
@@ -1493,7 +1485,7 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin, onOrgContextCh
       /* @__PURE__ */ jsx6(Box5, { marginTop: 1, flexDirection: "row", justifyContent: "center", children: /* @__PURE__ */ jsxs5(Text6, { color: "gray", children: [
         "Press Enter to ",
         syncFocus === "confirm" ? "Sync" : "Cancel",
-        " \u2022 y to confirm \u2022 c to cancel"
+        " | Y to Sync | C to Cancel"
       ] }) }),
       /* @__PURE__ */ jsx6(Box5, { marginTop: 1, children: /* @__PURE__ */ jsx6(
         TextInput2,
@@ -1503,44 +1495,7 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin, onOrgContextCh
           },
           onSubmit: () => {
             if (syncFocus === "confirm") {
-              (async () => {
-                try {
-                  setSyncing(true);
-                  const [owner, repo] = syncTarget.nameWithOwner.split("/");
-                  const branchName = syncTarget.defaultBranchRef?.name || "main";
-                  const result = await syncForkWithUpstream(token, owner, repo, branchName);
-                  const updatedRepo = {
-                    ...syncTarget,
-                    updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
-                    // If we're tracking fork commits and this is a fork with parent data, set commits to be in sync
-                    ...forkTracking && syncTarget.isFork && syncTarget.parent && syncTarget.defaultBranchRef?.target?.history && syncTarget.parent.defaultBranchRef?.target?.history ? {
-                      defaultBranchRef: {
-                        ...syncTarget.defaultBranchRef,
-                        target: {
-                          ...syncTarget.defaultBranchRef.target,
-                          history: {
-                            // Set fork's commit count equal to parent's (0 commits behind)
-                            totalCount: syncTarget.parent.defaultBranchRef.target.history.totalCount
-                          }
-                        }
-                      }
-                    } : {}
-                  };
-                  await updateCacheWithRepository(token, updatedRepo);
-                  const updateSyncedRepo = (r) => {
-                    if (r.id === syncTarget.id) {
-                      return updatedRepo;
-                    }
-                    return r;
-                  };
-                  setItems((prev) => prev.map(updateSyncedRepo));
-                  setSearchItems((prev) => prev.map(updateSyncedRepo));
-                  closeSyncModal();
-                } catch (e) {
-                  setSyncing(false);
-                  setSyncError(e.message || "Failed to sync fork. Check permissions and network.");
-                }
-              })();
+              executeSync();
             } else {
               closeSyncModal();
             }
@@ -1583,7 +1538,7 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin, onOrgContextCh
       /* @__PURE__ */ jsx6(Box5, { marginTop: 1, flexDirection: "row", justifyContent: "center", children: /* @__PURE__ */ jsxs5(Text6, { color: "gray", children: [
         "Press Enter to ",
         logoutFocus === "confirm" ? "Logout" : "Cancel",
-        " \u2022 Y to confirm \u2022 C to cancel"
+        " | Y to Logout | C to Cancel"
       ] }) })
     ] }) }) : orgSwitcherOpen ? /* @__PURE__ */ jsx6(Box5, { height: contentHeight, alignItems: "center", justifyContent: "center", children: /* @__PURE__ */ jsx6(
       OrgSwitcher,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gh-manager-cli",
-  "version": "1.10.3",
+  "version": "1.10.5",
   "private": false,
   "description": "Interactive CLI to manage your GitHub repos (personal) with Ink",
   "license": "MIT",