git-stack-cli 2.7.0 → 2.7.2

package/dist/js/index.js

@@ -31938,7 +31938,7 @@ var import_react21 = __toESM(require_react(), 1);
 var React56 = __toESM(require_react(), 1);
 
 // src/app/AutoUpdate.tsx
-var React18 = __toESM(require_react(), 1);
+var React19 = __toESM(require_react(), 1);
 
 // src/app/Brackets.tsx
 var React10 = __toESM(require_react(), 1);
@@ -31993,24 +31993,34 @@ function FormatText(props) {
   });
 }
 
+// src/app/Url.tsx
+var React13 = __toESM(require_react(), 1);
+function Url(props) {
+  return /* @__PURE__ */ React13.createElement(Text, {
+    bold: true,
+    color: colors.blue,
+    ...props
+  }, props.children);
+}
+
 // src/app/YesNoPrompt.tsx
-var React14 = __toESM(require_react(), 1);
+var React15 = __toESM(require_react(), 1);
 
 // src/app/Parens.tsx
-var React13 = __toESM(require_react(), 1);
+var React14 = __toESM(require_react(), 1);
 function Parens(props) {
   const color = colors.blue;
-  return /* @__PURE__ */ React13.createElement(Text, null, /* @__PURE__ */ React13.createElement(Text, {
+  return /* @__PURE__ */ React14.createElement(Text, null, /* @__PURE__ */ React14.createElement(Text, {
     color
-  }, "("), props.children, /* @__PURE__ */ React13.createElement(Text, {
+  }, "("), props.children, /* @__PURE__ */ React14.createElement(Text, {
     color
   }, ")"));
 }
 
 // src/app/YesNoPrompt.tsx
 function YesNoPrompt(props) {
-  const [answer, set_answer] = React14.useState("");
-  const answered_ref = React14.useRef(false);
+  const [answer, set_answer] = React15.useState("");
+  const answered_ref = React15.useRef(false);
   use_input_default((input) => {
     if (answered_ref.current) {
       return;
@@ -32032,11 +32042,11 @@ function YesNoPrompt(props) {
     }
   });
   const choices = function get_choices() {
-    const y3 = /* @__PURE__ */ React14.createElement(Text, {
+    const y3 = /* @__PURE__ */ React15.createElement(Text, {
       bold: true,
       color: colors.green
     }, "Y");
-    const n3 = /* @__PURE__ */ React14.createElement(Text, {
+    const n3 = /* @__PURE__ */ React15.createElement(Text, {
       color: colors.red
     }, "n");
     switch (answer) {
@@ -32045,19 +32055,19 @@ function YesNoPrompt(props) {
       case "n":
         return n3;
       default:
-        return /* @__PURE__ */ React14.createElement(FormatText, {
+        return /* @__PURE__ */ React15.createElement(FormatText, {
           message: "{y}/{n}",
           values: { y: y3, n: n3 }
         });
     }
   }();
-  return /* @__PURE__ */ React14.createElement(Box_default, {
+  return /* @__PURE__ */ React15.createElement(Box_default, {
     flexDirection: "column"
-  }, /* @__PURE__ */ React14.createElement(Box_default, {
+  }, /* @__PURE__ */ React15.createElement(Box_default, {
     alignItems: "flex-end"
-  }, typeof props.message === "object" ? props.message : /* @__PURE__ */ React14.createElement(Text, {
+  }, typeof props.message === "object" ? props.message : /* @__PURE__ */ React15.createElement(Text, {
     color: colors.yellow
-  }, props.message), /* @__PURE__ */ React14.createElement(Text, null, " "), /* @__PURE__ */ React14.createElement(Parens, null, /* @__PURE__ */ React14.createElement(Text, {
+  }, props.message), /* @__PURE__ */ React15.createElement(Text, null, " "), /* @__PURE__ */ React15.createElement(Parens, null, /* @__PURE__ */ React15.createElement(Text, {
     color: colors.gray
   }, choices))));
 }
@@ -32071,7 +32081,7 @@ function assertNever(value) {
 import * as child from "node:child_process";
 
 // src/app/Store.tsx
-var React17 = __toESM(require_react(), 1);
+var React18 = __toESM(require_react(), 1);
 
 // node_modules/.pnpm/zustand@4.4.4_@types+react@18.2.33_immer@10.0.3_react@18.2.0/node_modules/zustand/esm/vanilla.mjs
 var createStoreImpl = (createState) => {
@@ -32702,7 +32712,7 @@ var immerImpl = (initializer) => (set2, get, store) => {
 var immer2 = immerImpl;
 
 // src/app/Exit.tsx
-var React15 = __toESM(require_react(), 1);
+var React16 = __toESM(require_react(), 1);
 
 // src/core/sleep.ts
 async function sleep(time) {
@@ -32711,7 +32721,7 @@ async function sleep(time) {
 
 // src/app/Exit.tsx
 function Exit(props) {
-  React15.useEffect(() => {
+  React16.useEffect(() => {
     Exit.handle_exit(props).catch((err) => {
       console.error(err);
     });
@@ -32728,7 +32738,7 @@ Exit.handle_exit = async function handle_exit(props) {
   }
   if (state.is_dirty_check_stash) {
     await cli("git stash pop");
-    actions.output(/* @__PURE__ */ React15.createElement(Text, {
+    actions.output(/* @__PURE__ */ React16.createElement(Text, {
       color: colors.green
     }, "✅ Changes restored from stash"));
   }
@@ -32742,7 +32752,7 @@ Exit.handle_exit = async function handle_exit(props) {
 };
 
 // src/app/LogTimestamp.tsx
-var React16 = __toESM(require_react(), 1);
+var React17 = __toESM(require_react(), 1);
 
 // node_modules/.pnpm/luxon@3.4.4/node_modules/luxon/src/errors.js
 class LuxonError extends Error {
@@ -37037,7 +37047,7 @@ function friendlyDateTime(dateTimeish) {
 
 // src/app/LogTimestamp.tsx
 function LogTimestamp() {
-  return /* @__PURE__ */ React16.createElement(Text, {
+  return /* @__PURE__ */ React17.createElement(Text, {
     dimColor: true
   }, DateTime.now().toFormat("[yyyy-MM-dd HH:mm:ss.SSS] "));
 }
@@ -37081,7 +37091,7 @@ var BaseStore = createStore()(immer2((set2, get) => ({
           state.exit_mode = "normal";
         }
         let clear = args?.clear ?? true;
-        const node = /* @__PURE__ */ React17.createElement(Exit, {
+        const node = /* @__PURE__ */ React18.createElement(Exit, {
           clear,
           code
         });
@@ -37109,17 +37119,17 @@ var BaseStore = createStore()(immer2((set2, get) => ({
     error(error) {
       let node;
       if (typeof error === "string") {
-        node = /* @__PURE__ */ React17.createElement(Text, {
+        node = /* @__PURE__ */ React18.createElement(Text, {
           color: colors.red
         }, error);
       } else if (error instanceof Error) {
-        node = /* @__PURE__ */ React17.createElement(Box_default, {
+        node = /* @__PURE__ */ React18.createElement(Box_default, {
           flexDirection: "column"
-        }, /* @__PURE__ */ React17.createElement(Text, {
+        }, /* @__PURE__ */ React18.createElement(Text, {
           color: colors.red
         }, error.stack));
       } else {
-        node = /* @__PURE__ */ React17.createElement(Text, {
+        node = /* @__PURE__ */ React18.createElement(Text, {
           color: colors.red
         }, `Unhandled error: ${JSON.stringify(error)}`);
       }
@@ -37203,12 +37213,12 @@ function renderOutputArgs(args) {
     case "boolean":
     case "number":
     case "string":
-      output = /* @__PURE__ */ React17.createElement(Text, {
+      output = /* @__PURE__ */ React18.createElement(Text, {
         dimColor: args.debug
       }, String(args.node));
   }
   if (args.debug) {
-    return /* @__PURE__ */ React17.createElement(React17.Fragment, null, args.withoutTimestamp ? null : /* @__PURE__ */ React17.createElement(LogTimestamp, null), output);
+    return /* @__PURE__ */ React18.createElement(React18.Fragment, null, args.withoutTimestamp ? null : /* @__PURE__ */ React18.createElement(LogTimestamp, null), output);
   }
   return output;
 }
@@ -37404,6 +37414,17 @@ async function fetch_json(url) {
   });
 }
 
+// src/core/get_timeout_fn.ts
+function get_timeout_fn(ms, message) {
+  return function timeout(promise) {
+    let id;
+    const timeout = new Promise((_resolve, reject) => {
+      id = setTimeout(() => reject(new Error(message)), ms);
+    });
+    return Promise.race([promise, timeout]).finally(() => clearTimeout(id));
+  };
+}
+
 // src/core/is_finite_value.ts
 function is_finite_value(value) {
   return typeof value === "number" && Number.isFinite(value);
@@ -37430,127 +37451,28 @@ function reducer(state, patch) {
   return { ...state, ...patch };
 }
 function AutoUpdate(props) {
-  const props_ref = React18.useRef(props);
+  const props_ref = React19.useRef(props);
   props_ref.current = props;
-  const [output, set_output] = React18.useState([]);
-  const [state, patch] = React18.useReducer(reducer, {
-    error: null,
+  const [output, set_output] = React19.useState([]);
+  const [state, patch] = React19.useReducer(reducer, {
+    status: "init",
     local_version: null,
     latest_version: null,
-    status: "init",
     is_brew_bun_standalone: false
   });
-  function handle_output(node) {
-    if (typeof props.onOutput === "function") {
-      props.onOutput(node);
-    } else {
-      set_output((current2) => {
-        return [...current2, node];
-      });
-    }
-  }
-  React18.useEffect(() => {
+  React19.useEffect(handle_init_state, []);
+  React19.useEffect(handle_status, [state.latest_version]);
+  React19.useEffect(handle_on_done, [state.status]);
+  const status = render_status();
+  return /* @__PURE__ */ React19.createElement(React19.Fragment, null, output, status);
+  function render_status() {
     switch (state.status) {
       case "init":
-      case "prompt":
+        return null;
       case "install":
-        break;
-      case "done": {
-        props.onDone?.();
-        break;
-      }
-      default:
-        assertNever(state.status);
-    }
-  }, [state.status]);
-  React18.useEffect(() => {
-    let status2 = "init";
-    let latest_version = null;
-    let is_brew_bun_standalone = false;
-    const local_version = "2.7.0";
-    const is_output = props_ref.current.verbose || props_ref.current.force;
-    async function auto_update() {
-      if (!local_version) {
-        throw new Error("Auto update requires process.env.CLI_VERSION to be set");
-      }
-      const timeout_ms = is_finite_value(props.timeoutMs) ? props.timeoutMs : 2 * 1000;
-      const npm_json = await Promise.race([
-        fetch_json(`https://registry.npmjs.org/${props.name}`),
-        sleep(timeout_ms).then(() => {
-          throw new Error("AutoUpdate timeout");
-        })
-      ]);
-      latest_version = npm_json?.["dist-tags"]?.latest;
-      if (!latest_version) {
-        throw new Error("Unable to retrieve latest version from npm");
-      }
-      const binary_path = process.argv[1];
-      if (props_ref.current.verbose) {
-        handle_output(/* @__PURE__ */ React18.createElement(Text, {
-          dimColor: true
-        }, JSON.stringify({ binary_path })));
-      }
-      is_brew_bun_standalone = binary_path.startsWith("/$bunfs");
-      if (props_ref.current.verbose) {
-        if (is_brew_bun_standalone) {
-          handle_output(/* @__PURE__ */ React18.createElement(Text, {
-            dimColor: true
-          }, "brew install detected (compiled bun standalone)"));
-        } else {
-          handle_output(/* @__PURE__ */ React18.createElement(Text, {
-            dimColor: true
-          }, "npm install detected"));
-        }
-      }
-      if (props_ref.current.verbose) {
-        handle_output(/* @__PURE__ */ React18.createElement(FormatText, {
-          key: "versions",
-          wrapper: /* @__PURE__ */ React18.createElement(Text, null),
-          message: "Auto update found latest version {latest_version} and current local version {local_version}",
-          values: {
-            latest_version: /* @__PURE__ */ React18.createElement(Brackets, null, latest_version),
-            local_version: /* @__PURE__ */ React18.createElement(Brackets, null, local_version)
-          }
-        }));
-      }
-      const semver_result = semver_compare(latest_version, local_version);
-      if (props_ref.current.verbose) {
-        handle_output(/* @__PURE__ */ React18.createElement(Text, {
-          dimColor: true
-        }, JSON.stringify({ semver_result })));
-      }
-      if (semver_result === 0) {
-        status2 = "done";
-        if (is_output) {
-          handle_output(/* @__PURE__ */ React18.createElement(Text, null, "✅ Everything up to date. ", /* @__PURE__ */ React18.createElement(Brackets, null, latest_version)));
-        }
-        return;
-      }
-      if (semver_result === 1) {
-        status2 = "prompt";
-      }
-      throw new Error("AutoUpdate failed");
-    }
-    const onError = props_ref.current.onError || (() => {
-    });
-    auto_update().then(() => {
-      patch({ status: status2, local_version, latest_version, is_brew_bun_standalone });
-    }).catch((error) => {
-      if (props_ref.current.verbose) {
-        handle_output(/* @__PURE__ */ React18.createElement(Text, {
-          key: "error",
-          color: colors.red
-        }, error?.message));
-      }
-      status2 = "done";
-      patch({ status: status2, error, local_version, latest_version, is_brew_bun_standalone });
-      onError(error);
-    });
-  }, []);
-  const status = function render_status() {
-    switch (state.status) {
-      case "init":
         return null;
+      case "done":
+        return props.children;
       case "prompt": {
         let install_command = "";
         if (state.is_brew_bun_standalone) {
@@ -37558,27 +37480,21 @@ function AutoUpdate(props) {
         } else {
           install_command = `npm install -g ${props.name}@latest`;
         }
-        return /* @__PURE__ */ React18.createElement(YesNoPrompt, {
-          message: /* @__PURE__ */ React18.createElement(Box_default, {
-            flexDirection: "column"
-          }, /* @__PURE__ */ React18.createElement(Box_default, {
-            flexDirection: "column"
-          }, /* @__PURE__ */ React18.createElement(Text, {
-            color: colors.yellow
-          }, /* @__PURE__ */ React18.createElement(FormatText, {
-            wrapper: /* @__PURE__ */ React18.createElement(Text, null),
-            message: "New version available {latest_version}",
-            values: {
-              latest_version: /* @__PURE__ */ React18.createElement(Brackets, null, state.latest_version)
-            }
-          }), ","), /* @__PURE__ */ React18.createElement(Text, null, " "), /* @__PURE__ */ React18.createElement(Command, null, install_command), /* @__PURE__ */ React18.createElement(Text, null, " ")), /* @__PURE__ */ React18.createElement(Box_default, null, /* @__PURE__ */ React18.createElement(FormatText, {
-            wrapper: /* @__PURE__ */ React18.createElement(Text, {
+        return /* @__PURE__ */ React19.createElement(YesNoPrompt, {
+          message: /* @__PURE__ */ React19.createElement(Box_default, {
+            flexDirection: "column",
+            gap: 1
+          }, /* @__PURE__ */ React19.createElement(Command, null, install_command), /* @__PURE__ */ React19.createElement(FormatText, {
+            wrapper: /* @__PURE__ */ React19.createElement(Text, {
               color: colors.yellow
             }),
             message: "Would you like to run the above command to update?"
-          }))),
+          })),
+          onNo: () => {
+            patch({ status: "done" });
+          },
           onYes: async () => {
-            handle_output(/* @__PURE__ */ React18.createElement(Command, null, install_command));
+            info(/* @__PURE__ */ React19.createElement(Command, null, install_command));
             patch({ status: "install" });
             await cli(install_command, {
               env: {
@@ -37586,34 +37502,160 @@ function AutoUpdate(props) {
                 HOMEBREW_COLOR: "1"
               },
               onOutput: (data) => {
-                handle_output(/* @__PURE__ */ React18.createElement(Text, null, data));
+                info(/* @__PURE__ */ React19.createElement(Text, null, data));
               }
             });
-            handle_output(/* @__PURE__ */ React18.createElement(Text, {
+            info(/* @__PURE__ */ React19.createElement(Text, {
               key: "done"
-            }, "✅ Installed ", /* @__PURE__ */ React18.createElement(Brackets, null, state.latest_version)));
-            patch({ status: "done" });
-          },
-          onNo: () => {
+            }, "✅ Installed ", /* @__PURE__ */ React19.createElement(Brackets, null, state.latest_version)));
             patch({ status: "done" });
           }
         });
       }
+    }
+  }
+  function handle_on_done() {
+    switch (state.status) {
+      case "init":
+      case "prompt":
       case "install":
-        return null;
-      case "done":
-        return props.children;
+        break;
+      case "done": {
+        props.onDone?.();
+        break;
+      }
+      default:
+        assertNever(state.status);
     }
-  }();
-  return /* @__PURE__ */ React18.createElement(React18.Fragment, null, output, status);
+  }
+  function handle_init_state() {
+    init_state().catch(abort);
+    async function init_state() {
+      if (state.latest_version !== null)
+        return;
+      const local_version = "2.7.2";
+      const latest_version = await get_latest_version();
+      const is_brew_bun_standalone = get_is_brew_bun_standalone();
+      patch({ local_version, latest_version, is_brew_bun_standalone });
+    }
+    async function get_latest_version() {
+      const timeout_ms = is_finite_value(props.timeoutMs) ? props.timeoutMs : 2 * 1000;
+      const timeout = get_timeout_fn(timeout_ms, "AutoUpdate timeout");
+      const npm_json = await timeout(fetch_json(`https://registry.npmjs.org/${props.name}`));
+      const maybe_version = npm_json?.["dist-tags"]?.latest;
+      if (typeof maybe_version === "string") {
+        return maybe_version;
+      }
+      throw new Error("Unable to retrieve latest version from npm");
+    }
+    function get_is_brew_bun_standalone() {
+      const binary_path = process.argv[1];
+      debug(/* @__PURE__ */ React19.createElement(Text, {
+        dimColor: true
+      }, JSON.stringify({ binary_path })));
+      const is_bunfs_path = binary_path.startsWith("/$bunfs");
+      debug(/* @__PURE__ */ React19.createElement(Text, {
+        dimColor: true
+      }, is_bunfs_path ? "brew install detected (compiled bun standalone)" : "npm install detected"));
+      return is_bunfs_path;
+    }
+  }
+  function handle_status() {
+    const latest_version = state.latest_version;
+    if (latest_version === null) {
+      return;
+    }
+    const local_version = state.local_version;
+    if (!local_version) {
+      throw new Error("Auto update requires process.env.CLI_VERSION to be set");
+    }
+    debug(/* @__PURE__ */ React19.createElement(FormatText, {
+      key: "versions",
+      wrapper: /* @__PURE__ */ React19.createElement(Text, {
+        dimColor: true
+      }),
+      message: "Auto update found latest version {latest_version} and current local version {local_version}",
+      values: {
+        latest_version: /* @__PURE__ */ React19.createElement(Brackets, null, latest_version),
+        local_version: /* @__PURE__ */ React19.createElement(Brackets, null, local_version)
+      }
+    }));
+    const semver_result = semver_compare(latest_version, local_version);
+    debug(/* @__PURE__ */ React19.createElement(Text, {
+      dimColor: true
+    }, JSON.stringify({ semver_result })));
+    switch (semver_result) {
+      case 0: {
+        info(/* @__PURE__ */ React19.createElement(Text, null, "✅ Everything up to date. ", /* @__PURE__ */ React19.createElement(Brackets, null, latest_version)));
+        return patch({ status: "done" });
+      }
+      case 1: {
+        const old_tag = local_version;
+        const new_tag = state.latest_version;
+        const url = `https://github.com/magus/git-stack-cli/compare/${old_tag}...${new_tag}`;
+        info(/* @__PURE__ */ React19.createElement(Box_default, {
+          flexDirection: "column",
+          gap: 1,
+          paddingTop: 1,
+          paddingBottom: 1
+        }, /* @__PURE__ */ React19.createElement(Text, null, "\uD83C\uDD95 New version available! ", /* @__PURE__ */ React19.createElement(Brackets, null, latest_version)), /* @__PURE__ */ React19.createElement(Box_default, {
+          flexDirection: "column"
+        }, /* @__PURE__ */ React19.createElement(Text, {
+          dimColor: true
+        }, "Changelog"), /* @__PURE__ */ React19.createElement(Url, null, url))));
+        return patch({ status: "prompt" });
+      }
+      case -1: {
+        info(/* @__PURE__ */ React19.createElement(FormatText, {
+          message: "⚠️ Local version {local_version} is newer than latest version {latest_version}",
+          values: {
+            local_version: /* @__PURE__ */ React19.createElement(Brackets, null, local_version),
+            latest_version: /* @__PURE__ */ React19.createElement(Brackets, null, latest_version)
+          }
+        }));
+        return patch({ status: "done" });
+      }
+      default: {
+        assertNever(semver_result);
+        abort(new Error("AutoUpdate failed"));
+      }
+    }
+  }
+  function info(node) {
+    if (props_ref.current.verbose || props_ref.current.force) {
+      handle_output(node);
+    }
+  }
+  function debug(node) {
+    if (props_ref.current.verbose) {
+      handle_output(node);
+    }
+  }
+  function abort(error) {
+    info(/* @__PURE__ */ React19.createElement(Text, {
+      key: "error",
+      color: colors.red
+    }, error.message));
+    patch({ status: "done" });
+    props_ref.current.onError?.(error);
+  }
+  function handle_output(node) {
+    if (typeof props.onOutput === "function") {
+      props.onOutput(node);
+    } else {
+      set_output((current2) => {
+        return [...current2, node];
+      });
+    }
+  }
 }
 
 // src/app/CherryPickCheck.tsx
-var React20 = __toESM(require_react(), 1);
+var React21 = __toESM(require_react(), 1);
 import path from "node:path";
 
 // src/app/Await.tsx
-var React19 = __toESM(require_react(), 1);
+var React20 = __toESM(require_react(), 1);
 
 // src/core/cache.ts
 function cache3(cacheable) {
@@ -37661,8 +37703,8 @@ function invariant(condition, message) {
 
 // src/app/Await.tsx
 function Await(props) {
-  const [display_fallback, set_display_fallback] = React19.useState(false);
-  const cacheRef = React19.useRef(null);
+  const [display_fallback, set_display_fallback] = React20.useState(false);
+  const cacheRef = React20.useRef(null);
   if (!cacheRef.current) {
     cacheRef.current = cache3(props.function);
   }
@@ -37672,7 +37714,7 @@ function Await(props) {
   } else {
     delayFallbackMs = 1000;
   }
-  React19.useEffect(() => {
+  React20.useEffect(() => {
     const cache4 = cacheRef.current;
     if (!cache4) {
       return;
@@ -37689,13 +37731,13 @@ function Await(props) {
   }, [delayFallbackMs]);
   invariant(cacheRef.current, "cache must exist");
   if ("fallback" in props) {
-    return /* @__PURE__ */ React19.createElement(React19.Suspense, {
+    return /* @__PURE__ */ React20.createElement(React20.Suspense, {
       fallback: !display_fallback ? null : props.fallback
-    }, /* @__PURE__ */ React19.createElement(ReadCache, {
+    }, /* @__PURE__ */ React20.createElement(ReadCache, {
       cache: cacheRef.current
     }, props.children));
   }
-  return /* @__PURE__ */ React19.createElement(ReadCache, {
+  return /* @__PURE__ */ React20.createElement(ReadCache, {
     cache: cacheRef.current
   });
 }
@@ -37721,17 +37763,17 @@ function reducer2(state, patch) {
 }
 function CherryPickCheck(props) {
   const actions = Store.useActions();
-  const [state, patch] = React20.useReducer(reducer2, {
+  const [state, patch] = React21.useReducer(reducer2, {
     status: "init"
   });
   switch (state.status) {
     case "done":
       return props.children;
     case "prompt":
-      return /* @__PURE__ */ React20.createElement(YesNoPrompt, {
-        message: /* @__PURE__ */ React20.createElement(Text, {
+      return /* @__PURE__ */ React21.createElement(YesNoPrompt, {
+        message: /* @__PURE__ */ React21.createElement(Text, {
           color: colors.yellow
-        }, /* @__PURE__ */ React20.createElement(Command, null, "git cherry-pick"), " detected, would you like to abort it?"),
+        }, /* @__PURE__ */ React21.createElement(Command, null, "git cherry-pick"), " detected, would you like to abort it?"),
         onYes: async () => {
           await cli(`git cherry-pick --abort`);
           patch({ status: "done" });
@@ -37741,11 +37783,11 @@ function CherryPickCheck(props) {
         }
       });
     default:
-      return /* @__PURE__ */ React20.createElement(Await, {
+      return /* @__PURE__ */ React21.createElement(Await, {
         function: run,
-        fallback: /* @__PURE__ */ React20.createElement(Text, {
+        fallback: /* @__PURE__ */ React21.createElement(Text, {
           color: colors.yellow
-        }, "Checking for ", /* @__PURE__ */ React20.createElement(Command, null, "git cherry-pick"), "…")
+        }, "Checking for ", /* @__PURE__ */ React21.createElement(Command, null, "git cherry-pick"), "…")
       });
   }
   async function run() {
@@ -37771,7 +37813,7 @@ function CherryPickCheck(props) {
 }
 
 // src/app/Debug.tsx
-var React21 = __toESM(require_react(), 1);
+var React22 = __toESM(require_react(), 1);
 import fs4 from "node:fs/promises";
 import path2 from "node:path";
 
@@ -37824,14 +37866,14 @@ function Debug() {
   const state = Store.useState((state2) => state2);
   const argv = Store.useState((state2) => state2.argv);
   const debug = Store.useState((state2) => state2.select.debug(state2));
-  React21.useEffect(function debugMessageOnce() {
+  React22.useEffect(function debugMessageOnce() {
     if (debug) {
-      actions.output(/* @__PURE__ */ React21.createElement(Text, {
+      actions.output(/* @__PURE__ */ React22.createElement(Text, {
         color: colors.yellow
       }, "Debug mode enabled"));
     }
   }, [argv]);
-  React21.useEffect(function sync_state_json() {
+  React22.useEffect(function sync_state_json() {
     if (!argv?.["write-state-json"]) {
       return;
     }
@@ -37850,16 +37892,6 @@ function Debug() {
 // src/app/DependencyCheck.tsx
 var React23 = __toESM(require_react(), 1);
 
-// src/app/Url.tsx
-var React22 = __toESM(require_react(), 1);
-function Url(props) {
-  return /* @__PURE__ */ React22.createElement(Text, {
-    bold: true,
-    color: colors.blue,
-    ...props
-  }, props.children);
-}
-
 // src/core/is_command_available.ts
 import fs5 from "node:fs";
 import path3 from "node:path";
@@ -38053,7 +38085,12 @@ function write(message, values) {
   return new_message;
 }
 function read(message) {
-  const values = { id: null, title: null };
+  const values = { subject: null, id: null, title: null };
+  const match_subject = message.match(RE2.subject_line);
+  if (match_subject?.groups) {
+    values.subject = match_subject.groups["subject"];
+    invariant(values.subject, "subject must exist");
+  }
   const match_id = message.match(RE2.stack_id);
   if (match_id?.groups) {
     values.id = match_id.groups["id"];
@@ -38081,10 +38118,46 @@ var TEMPLATE = {
   }
 };
 var RE2 = {
+  subject_line: /^(?<subject>[^\n]*)/,
   stack_id: new RegExp(`${TEMPLATE.stack_id("(?<id>[^\\s]+)")}`, "i"),
   group_title: new RegExp(TEMPLATE.group_title("(?<title>[^\\n^\\r]+)"), "i")
 };
 
+// src/core/git.ts
+async function get_commits(dot_range) {
+  const log_result = await cli(`git log ${dot_range} --format=${FORMAT} --color=never`);
+  if (!log_result.stdout) {
+    return [];
+  }
+  const commit_list = [];
+  for (let record of log_result.stdout.split(SEP2.record)) {
+    record = record.replace(/^\n/, "");
+    record = record.replace(/\n$/, "");
+    if (!record)
+      continue;
+    const [sha, full_message] = record.split(SEP2.field);
+    const metadata = read(full_message);
+    const branch_id = metadata.id;
+    const subject_line = metadata.subject || "";
+    const title = metadata.title;
+    const commit = {
+      sha,
+      full_message,
+      subject_line,
+      branch_id,
+      title
+    };
+    commit_list.push(commit);
+  }
+  commit_list.reverse();
+  return commit_list;
+}
+var SEP2 = {
+  record: "\x1E",
+  field: "\x1F"
+};
+var FORMAT = `%H${SEP2.field}%B${SEP2.record}`;
+
 // src/core/github.tsx
 var React24 = __toESM(require_react(), 1);
 import crypto from "node:crypto";
@@ -38119,6 +38192,8 @@ var RE3 = {
 async function pr_list() {
   const state = Store.getState();
   const actions = state.actions;
+  const timer = Timer();
+  actions.debug("start github.pr_list");
   const username = state.username;
   const repo_path = state.repo_path;
   invariant(username, "username must exist");
@@ -38140,6 +38215,8 @@ async function pr_list() {
       state2.pr[pr.headRefName] = pr;
     }
   });
+  const duration = timer.duration();
+  actions.debug(`end github.pr_list (duration=${duration})`);
   return result_pr_list;
 }
 async function pr_status(branch) {
@@ -38262,11 +38339,12 @@ var RE4 = {
 
 // src/core/CommitMetadata.ts
 async function range(commit_group_map) {
-  const master_branch = Store.getState().master_branch;
   await pr_list();
-  const commit_list = await get_commit_list();
+  const master_branch = Store.getState().master_branch;
+  const commit_list = await get_commits(`${master_branch}..HEAD`);
   const pr_lookup = {};
   let invalid = false;
+  let last_group_id = null;
   const group_map = new Map;
   for (const commit of commit_list) {
     let id = commit.branch_id;
@@ -38282,9 +38360,7 @@ async function range(commit_group_map) {
       invalid = true;
     }
     if (id) {
-      const group_key_list = Array.from(group_map.keys());
-      const last_key = group_key_list[group_key_list.length - 1];
-      if (group_map.has(id) && last_key !== id) {
+      if (group_map.has(id) && last_group_id !== id) {
         invalid = true;
       }
     } else {
@@ -38304,6 +38380,7 @@ async function range(commit_group_map) {
     };
     group.commits.push(commit);
     group_map.set(id, group);
+    last_group_id = id;
   }
   const group_value_list = Array.from(group_map.values());
   const group_list = [];
@@ -38369,44 +38446,6 @@ async function range(commit_group_map) {
   }
   return { invalid, group_list, commit_list, pr_lookup, UNASSIGNED };
 }
-async function get_commit_list() {
-  const master_branch = Store.getState().master_branch;
-  const log_result = await cli(`git log ${master_branch}..HEAD --oneline --format=%H --color=never`);
-  if (!log_result.stdout) {
-    return [];
-  }
-  const sha_list = lines(log_result.stdout).reverse();
-  const commit_metadata_list = [];
-  for (let i2 = 0;i2 < sha_list.length; i2++) {
-    const sha = sha_list[i2];
-    const commit_metadata = await commit(sha);
-    commit_metadata_list.push(commit_metadata);
-  }
-  return commit_metadata_list;
-}
-async function commit(sha) {
-  const full_message = (await cli(`git show -s --format=%B ${sha}`)).stdout;
-  const metadata = await read(full_message);
-  const branch_id = metadata?.id;
-  const subject_line = get_subject_line(full_message);
-  const title = metadata?.title;
-  return {
-    sha,
-    full_message,
-    subject_line,
-    branch_id,
-    title
-  };
-}
-function get_subject_line(message) {
-  const line_list = lines(message);
-  const first_line = line_list[0];
-  return remove(first_line);
-}
-function lines(value) {
-  return value.split(`
-`);
-}
 var UNASSIGNED = "unassigned";
 
 // src/core/GitReviseTodo.ts
@@ -38417,8 +38456,8 @@ function GitReviseTodo(args) {
   const group_list = args.commit_range.group_list;
   for (let i2 = args.rebase_group_index;i2 < group_list.length; i2++) {
     const group = group_list[i2];
-    for (const commit2 of group.commits) {
-      commit_list.push(commit2);
+    for (const commit of group.commits) {
+      commit_list.push(commit);
     }
   }
   const todo = GitReviseTodo.todo({ commit_list });
@@ -38426,17 +38465,17 @@ function GitReviseTodo(args) {
 }
 GitReviseTodo.todo = function todo(args) {
   const entry_list = [];
-  for (const commit2 of args.commit_list) {
-    const sha = commit2.sha.slice(0, 12);
+  for (const commit of args.commit_list) {
+    const sha = commit.sha.slice(0, 12);
     const entry_lines = [`++ pick ${sha}`];
-    const id = commit2.branch_id;
+    const id = commit.branch_id;
     if (id == null || id === UNASSIGNED) {
-      entry_lines.push(commit2.full_message);
+      entry_lines.push(commit.full_message);
     } else {
-      const title = commit2.title;
+      const title = commit.title;
       invariant(title, "commit.title must exist");
       const metadata = { id, title };
-      const unsafe_message_with_id = write(commit2.full_message, metadata);
+      const unsafe_message_with_id = write(commit.full_message, metadata);
       const message_with_id = unsafe_message_with_id;
       entry_lines.push(message_with_id);
     }
@@ -38604,8 +38643,8 @@ function DetectInitialPR(props) {
     invariant(commit_range, "commit_range must exist");
     try {
       let has_existing_metadata = false;
-      for (const commit2 of commit_range.commit_list) {
-        if (commit2.branch_id) {
+      for (const commit of commit_range.commit_list) {
+        if (commit.branch_id) {
           has_existing_metadata = true;
           break;
         }
@@ -38634,9 +38673,9 @@ function DetectInitialPR(props) {
     for (const group of commit_range.group_list) {
       group.id = branch_name2;
       group.title = state.pr?.title || "-";
-      for (const commit2 of commit_range.commit_list) {
-        commit2.branch_id = group.id;
-        commit2.title = group.title;
+      for (const commit of commit_range.commit_list) {
+        commit.branch_id = group.id;
+        commit.title = group.title;
       }
     }
     const rebase_group_index = 0;
@@ -39265,7 +39304,9 @@ Rebase.run = async function run5(props) {
     }
     actions.exit(20);
   }
+  actions.debug("start CommitMetadata.range");
   const next_commit_range = await range();
+  actions.debug("end CommitMetadata.range");
   actions.output(/* @__PURE__ */ React34.createElement(FormatText, {
     wrapper: /* @__PURE__ */ React34.createElement(Text, {
       color: colors.green
@@ -39295,12 +39336,12 @@ Rebase.run = async function run5(props) {
     await cli(`git checkout -b ${temp_branch_name} ${rebase_merge_base}`);
     const picked_commit_list = [];
     for (let i2 = 0;i2 < commit_range.commit_list.length; i2++) {
-      const commit2 = commit_range.commit_list[i2];
-      const commit_pr = commit_range.pr_lookup[commit2.branch_id || ""];
+      const commit = commit_range.commit_list[i2];
+      const commit_pr = commit_range.pr_lookup[commit.branch_id || ""];
       const merged_pr = commit_pr?.state === "MERGED";
       const commit_message = /* @__PURE__ */ React34.createElement(Text, {
         color: colors.blue
-      }, commit2.subject_line);
+      }, commit.subject_line);
       if (merged_pr) {
         actions.output(/* @__PURE__ */ React34.createElement(FormatText, {
           wrapper: /* @__PURE__ */ React34.createElement(Text, {
@@ -39327,15 +39368,17 @@ Rebase.run = async function run5(props) {
           commit_message
         }
       }));
-      picked_commit_list.push(commit2);
+      picked_commit_list.push(commit);
     }
     if (picked_commit_list.length > 0) {
       await cli(`git clean -fd`);
-      const sha_list = picked_commit_list.map((commit2) => commit2.sha).join(" ");
+      const sha_list = picked_commit_list.map((commit) => commit.sha).join(" ");
       await cli(`git cherry-pick --keep-redundant-commits ${sha_list}`);
     }
     await cli(`git branch -f ${branch_name} ${temp_branch_name}`);
+    actions.debug("start restore_git()");
     restore_git();
+    actions.debug("end restore_git()");
   }
   function restore_git() {
     const spawn_options = { ignoreExitCode: true };
@@ -39406,10 +39449,10 @@ async function run6() {
     const merge_base = (await cli(`git merge-base HEAD ${master_branch}`)).stdout;
     let commit_range = await range(commit_map);
     commit_range.group_list.reverse();
-    for (const commit2 of commit_range.commit_list) {
-      const group_from_map = commit_map[commit2.sha];
-      commit2.branch_id = group_from_map.id;
-      commit2.title = group_from_map.title;
+    for (const commit of commit_range.commit_list) {
+      const group_from_map = commit_map[commit.sha];
+      commit.branch_id = group_from_map.id;
+      commit.title = group_from_map.title;
     }
     await GitReviseTodo.execute({
       rebase_group_index: 0,
@@ -39873,8 +39916,8 @@ function SelectCommitRangesInternal(props) {
     map.set(args.key, args.value);
     return new Map(map);
   }, new Map, (map) => {
-    for (const commit2 of props.commit_range.commit_list) {
-      map.set(commit2.sha, commit2.branch_id);
+    for (const commit of props.commit_range.commit_list) {
+      map.set(commit.sha, commit.branch_id);
     }
     return new Map(map);
   });
@@ -39964,8 +40007,8 @@ function SelectCommitRangesInternal(props) {
   const max_width = 80;
   const [focused, set_focused] = React42.useState("");
   const has_groups = group.id !== props.commit_range.UNASSIGNED;
-  const items = props.commit_range.commit_list.map((commit2) => {
-    const commit_metadata_id = commit_map.get(commit2.sha);
+  const items = props.commit_range.commit_list.map((commit) => {
+    const commit_metadata_id = commit_map.get(commit.sha);
     const selected = commit_metadata_id !== null;
     let disabled;
     if (group_input) {
@@ -39976,8 +40019,8 @@ function SelectCommitRangesInternal(props) {
       disabled = Boolean(selected && commit_metadata_id !== group.id);
     }
     return {
-      label: commit2.subject_line,
-      value: commit2,
+      label: commit.subject_line,
+      value: commit,
       selected,
       disabled
     };
@@ -40108,7 +40151,7 @@ function SelectCommitRangesInternal(props) {
     wrapper: /* @__PURE__ */ React42.createElement(Text, {
       color: colors.gray
     }),
-    message: "Press {s} to {sync} the {count} assigned commits to Github",
+    message: argv.sync ? "Press {s} to {sync} the {count} assigned commits to Github" : "Press {s} to {sync} the {count} assigned commits locally",
     values: {
       ...S_TO_SYNC_VALUES,
       count: /* @__PURE__ */ React42.createElement(Text, {
@@ -40116,15 +40159,11 @@ function SelectCommitRangesInternal(props) {
         bold: true
       }, assigned_count)
     }
-  })) : /* @__PURE__ */ React42.createElement(React42.Fragment, null, argv.sync ? /* @__PURE__ */ React42.createElement(FormatText, {
+  })) : /* @__PURE__ */ React42.createElement(FormatText, {
     wrapper: /* @__PURE__ */ React42.createElement(Text, null),
-    message: "\uD83C\uDF89 Done! Press {s} to {sync} the commits to Github",
+    message: argv.sync ? "\uD83C\uDF89 Done! Press {s} to {sync} the PRs to Github" : "\uD83C\uDF89 Done! Press {s} to {sync} the PRs locally",
     values: S_TO_SYNC_VALUES
-  }) : /* @__PURE__ */ React42.createElement(FormatText, {
-    wrapper: /* @__PURE__ */ React42.createElement(Text, null),
-    message: "\uD83C\uDF89 Done! Press {s} to {save} the commits locally",
-    values: S_TO_SYNC_VALUES
-  })), /* @__PURE__ */ React42.createElement(Box_default, null, /* @__PURE__ */ React42.createElement(FormatText, {
+  }), /* @__PURE__ */ React42.createElement(Box_default, null, /* @__PURE__ */ React42.createElement(FormatText, {
     wrapper: /* @__PURE__ */ React42.createElement(Text, {
       color: colors.gray
     }),
@@ -40179,8 +40218,8 @@ function SelectCommitRangesInternal(props) {
     }
     let allow_unassigned_sync = null;
     for (let i2 = 0;i2 < props.commit_range.commit_list.length; i2++) {
-      const commit2 = props.commit_range.commit_list[i2];
-      const group_id = commit_map.get(commit2.sha);
+      const commit = props.commit_range.commit_list[i2];
+      const group_id = commit_map.get(commit.sha);
       if (allow_unassigned_sync === null) {
         if (group_id === null) {
           allow_unassigned_sync = true;
@@ -40745,14 +40784,14 @@ class UI {
     return [0, noAnsi.match(/\s*$/)[0].length, 0, noAnsi.match(/^\s*/)[0].length];
   }
   toString() {
-    const lines2 = [];
+    const lines = [];
     this.rows.forEach((row) => {
-      this.rowToString(row, lines2);
+      this.rowToString(row, lines);
     });
-    return lines2.filter((line) => !line.hidden).map((line) => line.text).join(`
+    return lines.filter((line) => !line.hidden).map((line) => line.text).join(`
 `);
   }
-  rowToString(row, lines2) {
+  rowToString(row, lines) {
     this.rasterize(row).forEach((rrow, r3) => {
       let str = "";
       rrow.forEach((col, c2) => {
@@ -40779,16 +40818,16 @@ class UI {
         if (padding[right]) {
           str += " ".repeat(padding[right]);
         }
-        if (r3 === 0 && lines2.length > 0) {
-          str = this.renderInline(str, lines2[lines2.length - 1]);
+        if (r3 === 0 && lines.length > 0) {
+          str = this.renderInline(str, lines[lines.length - 1]);
         }
       });
-      lines2.push({
+      lines.push({
         text: str.replace(/ +$/, ""),
         span: row.span
       });
     });
-    return lines2;
+    return lines;
   }
   renderInline(source, previousLine) {
     const match2 = source.match(/^ */);
@@ -45537,7 +45576,7 @@ async function command2(argv, options = {}) {
   if (options.env_config) {
     builder = builder.config(options.env_config);
   }
-  const parsed = await builder.scriptName("git stack").usage("Usage: git stack [command] [options]").command("$0", "Sync commit ranges to Github", (yargs) => yargs.options(DefaultOptions)).command("fixup [commit]", "Amend staged changes to a specific commit in history", (yargs) => yargs.positional("commit", FixupOptions.commit)).command("log [args...]", "Print an abbreviated log with numbered commits, useful for git stack fixup", (yargs) => yargs.strict(false)).command("rebase", "Update local branch via rebase with latest changes from origin master branch", (yargs) => yargs).command(["update", "upgrade"], "Check and install the latest version of git stack", (yargs) => yargs).command("config", "Generate a one-time configuration json based on the passed arguments", (yargs) => yargs.options(DefaultOptions)).option("verbose", GlobalOptions.verbose).wrap(123).strict().version("2.7.0").showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`").help("help", "Show usage via `git stack help`");
+  const parsed = await builder.scriptName("git stack").usage("Usage: git stack [command] [options]").command("$0", "Sync commit ranges to Github", (yargs) => yargs.options(DefaultOptions)).command("fixup [commit]", "Amend staged changes to a specific commit in history", (yargs) => yargs.positional("commit", FixupOptions.commit)).command("log [args...]", "Print an abbreviated log with numbered commits, useful for git stack fixup", (yargs) => yargs.strict(false)).command("rebase", "Update local branch via rebase with latest changes from origin master branch", (yargs) => yargs).command(["update", "upgrade"], "Check and install the latest version of git stack", (yargs) => yargs).command("config", "Generate a one-time configuration json based on the passed arguments", (yargs) => yargs.options(DefaultOptions)).option("verbose", GlobalOptions.verbose).wrap(123).strict().version("2.7.2").showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`").help("help", "Show usage via `git stack help`");
   const result = parsed.argv;
   return result;
 }