gh-manager-cli 1.10.0 → 1.10.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.10.2](https://github.com/wiiiimm/gh-manager-cli/compare/v1.10.1...v1.10.2) (2025-09-01)
+
+
+### Bug Fixes
+
+* handle GitHub API 422 status for sync-upstream as potential success ([9a13e8a](https://github.com/wiiiimm/gh-manager-cli/commit/9a13e8a76d4ed09eb7af18b5b8de9e0f2d4c978f))
+
+## [1.10.1](https://github.com/wiiiimm/gh-manager-cli/compare/v1.10.0...v1.10.1) (2025-09-01)
+
+
+### Bug Fixes
+
+* keep sync and delete modals open on error for better UX ([1823076](https://github.com/wiiiimm/gh-manager-cli/commit/1823076bdd74c2cb50591d9133eabe4a96927cea))
+
 # [1.10.0](https://github.com/wiiiimm/gh-manager-cli/compare/v1.9.0...v1.10.0) (2025-09-01)
 
 

package/README.md

@@ -45,7 +45,7 @@ On first run, you'll be prompted for a GitHub Personal Access Token.
   - Open in browser (Enter/`O`)
   - Delete repository (`Del` or `Ctrl+Backspace`) with secure two-step confirmation
   - Archive/unarchive repositories (`Ctrl+A`) with confirmation prompts
-  - Sync forks with upstream (`Ctrl+U`) with automatic conflict detection
+  - Sync forks with upstream (`Ctrl+S`) with automatic conflict detection
 
 ### User Interface & Experience
 - **Keyboard Navigation**: Full keyboard control (arrow keys, PageUp/Down, `Ctrl+G`/`G`)
@@ -151,7 +151,7 @@ Launch the app, then use the keys below:
   - Confirm: press `Y` or Enter
   - Cancel: press `C` or Esc
 - Archive/Unarchive: `Ctrl+A`
-- Sync fork with upstream: `Ctrl+U` (for forks only, shows commit status and handles conflicts)
+- Sync fork with upstream: `Ctrl+S` (for forks only, shows commit status and handles conflicts)
 - Logout: `Ctrl+L`
 - Toggle fork metrics: `F`
 - Quit: `Q`

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

@@ -668,6 +668,19 @@ 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();

package/dist/{github-OM6QOCRV.js → github-HC6GZCKR.js}

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

package/dist/index.js

@@ -17,14 +17,14 @@ import {
   updateCacheAfterArchive,
   updateCacheAfterDelete,
   updateCacheWithRepository
-} from "./chunk-X5PZ5T27.js";
+} from "./chunk-KOZ6QCTU.js";
 
 // package.json
 var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "gh-manager-cli",
-      version: "1.10.0",
+      version: "1.10.2",
       private: false,
       description: "Interactive CLI to manage your GitHub repos (personal) with Ink",
       license: "MIT",
@@ -280,7 +280,7 @@ function OrgSwitcher({ token, currentContext, onSelect, onClose }) {
     const loadOrgs = async () => {
       try {
         setLoading(true);
-        const client = await import("./github-OM6QOCRV.js").then((m) => m.makeClient(token));
+        const client = await import("./github-HC6GZCKR.js").then((m) => m.makeClient(token));
         const orgs = await fetchViewerOrganizations(client);
         setOrganizations(orgs);
         if (!isPersonalContext) {
@@ -1051,7 +1051,7 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin, onOrgContextCh
       }
       return;
     }
-    if (key.ctrl && (input === "u" || input === "U")) {
+    if (key.ctrl && (input === "s" || input === "S")) {
       const repo = visibleItems[cursor];
       if (repo && repo.isFork && repo.parent) {
         const hasCommitData = repo.defaultBranchRef && repo.parent.defaultBranchRef && repo.parent.defaultBranchRef.target?.history && repo.defaultBranchRef.target?.history;
@@ -1741,7 +1741,7 @@ function RepoList({ token, maxVisibleRows, onLogout, viewerLogin, onOrgContextCh
     ] }) }),
     /* @__PURE__ */ jsxs5(Box5, { marginTop: 1, paddingX: 1, flexDirection: "column", children: [
       /* @__PURE__ */ jsx6(Box5, { width: terminalWidth, justifyContent: "center", children: /* @__PURE__ */ jsx6(Text6, { color: "gray", dimColor: modalOpen ? true : void 0, children: "\u2191\u2193 Navigate \u2022 Ctrl+G Top \u2022 G Bottom \u2022 / Filter \u2022 W Org Switcher \u2022 S Sort \u2022 D Direction \u2022 T Density \u2022 F Forks \u2022 \u23CE/O Open" }) }),
-      /* @__PURE__ */ jsx6(Box5, { width: terminalWidth, justifyContent: "center", children: /* @__PURE__ */ jsx6(Text6, { color: "gray", dimColor: modalOpen ? true : void 0, children: "Del/Ctrl+Backspace Delete \u2022 Ctrl+A Un/Archive \u2022 Ctrl+U Sync Fork \u2022 I Info \u2022 Ctrl+I Cache \u2022 Ctrl+L Logout \u2022 R Refresh \u2022 Q Quit" }) })
+      /* @__PURE__ */ jsx6(Box5, { width: terminalWidth, justifyContent: "center", children: /* @__PURE__ */ jsx6(Text6, { color: "gray", dimColor: modalOpen ? true : void 0, children: "Del/Ctrl+Backspace Delete \u2022 Ctrl+A Un/Archive \u2022 Ctrl+S Sync Fork \u2022 I Info \u2022 Ctrl+I Cache \u2022 Ctrl+L Logout \u2022 R Refresh \u2022 Q Quit" }) })
     ] }),
     process.env.GH_MANAGER_DEBUG === "1" && /* @__PURE__ */ jsxs5(Box5, { marginTop: 1, borderStyle: "single", borderColor: "yellow", paddingX: 1, flexDirection: "column", children: [
       /* @__PURE__ */ jsx6(Text6, { bold: true, color: "yellow", children: "Debug Messages:" }),

package/package.json

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