git-stack-cli 2.7.0 → 2.7.1

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;
 }
@@ -37430,127 +37440,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 +37469,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 +37491,164 @@ 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.1";
+      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 npm_json = await Promise.race([
+        fetch_json(`https://registry.npmjs.org/${props.name}`),
+        sleep(timeout_ms).then(() => {
+          abort(new Error("AutoUpdate timeout"));
+        })
+      ]);
+      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 +37696,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 +37707,7 @@ function Await(props) {
   } else {
     delayFallbackMs = 1000;
   }
-  React19.useEffect(() => {
+  React20.useEffect(() => {
     const cache4 = cacheRef.current;
     if (!cache4) {
       return;
@@ -37689,13 +37724,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 +37756,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 +37776,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 +37806,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 +37859,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 +37885,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";
@@ -45537,7 +45562,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.1").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;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/src/app/AutoUpdate.tsx

@@ -5,6 +5,7 @@ import * as Ink from "ink-cjs";
 import { Brackets } from "~/app/Brackets";
 import { Command } from "~/app/Command";
 import { FormatText } from "~/app/FormatText";
+import { Url } from "~/app/Url";
 import { YesNoPrompt } from "~/app/YesNoPrompt";
 import { assertNever } from "~/core/assertNever";
 import { cli } from "~/core/cli";
@@ -26,10 +27,9 @@ type Props = {
 };
 
 type State = {
-  error: null | Error;
+  status: "init" | "prompt" | "install" | "done";
   local_version: null | string;
   latest_version: null | string;
-  status: "init" | "prompt" | "install" | "done";
   is_brew_bun_standalone: boolean;
 };
 
@@ -44,24 +44,94 @@ export function AutoUpdate(props: Props) {
   const [output, set_output] = React.useState<Array<React.ReactNode>>([]);
 
   const [state, patch] = React.useReducer(reducer, {
-    error: null,
+    status: "init",
     local_version: null,
     latest_version: null,
-    status: "init",
     is_brew_bun_standalone: false,
+
+    // // debugging
+    // status: "prompt",
+    // local_version: "2.5.3",
+    // latest_version: "2.7.0",
+    // is_brew_bun_standalone: true,
   });
 
-  function handle_output(node: React.ReactNode) {
-    if (typeof props.onOutput === "function") {
-      props.onOutput(node);
-    } else {
-      set_output((current) => {
-        return [...current, node];
-      });
+  React.useEffect(handle_init_state, []);
+  React.useEffect(handle_status, [state.latest_version]);
+  React.useEffect(handle_on_done, [state.status]);
+
+  const status = render_status();
+
+  return (
+    <React.Fragment>
+      {output}
+      {status}
+    </React.Fragment>
+  );
+
+  function render_status() {
+    switch (state.status) {
+      case "init":
+        return null;
+
+      case "install":
+        return null;
+
+      case "done":
+        return props.children;
+
+      case "prompt": {
+        let install_command = "";
+        if (state.is_brew_bun_standalone) {
+          install_command = "brew install magus/git-stack/git-stack";
+        } else {
+          install_command = `npm install -g ${props.name}@latest`;
+        }
+
+        return (
+          <YesNoPrompt
+            message={
+              <Ink.Box flexDirection="column" gap={1}>
+                <Command>{install_command}</Command>
+                <FormatText
+                  wrapper={<Ink.Text color={colors.yellow} />}
+                  message="Would you like to run the above command to update?"
+                />
+              </Ink.Box>
+            }
+            onNo={() => {
+              patch({ status: "done" });
+            }}
+            onYes={async () => {
+              info(<Command>{install_command}</Command>);
+
+              patch({ status: "install" });
+
+              await cli(install_command, {
+                env: {
+                  ...process.env,
+                  HOMEBREW_COLOR: "1",
+                },
+                onOutput: (data: string) => {
+                  info(<Ink.Text>{data}</Ink.Text>);
+                },
+              });
+
+              info(
+                <Ink.Text key="done">
+                  ✅ Installed <Brackets>{state.latest_version}</Brackets>
+                </Ink.Text>,
+              );
+
+              patch({ status: "done" });
+            }}
+          />
+        );
+      }
     }
   }
 
-  React.useEffect(() => {
+  function handle_on_done() {
     switch (state.status) {
       case "init":
       case "prompt":
@@ -76,199 +146,165 @@ export function AutoUpdate(props: Props) {
       default:
         assertNever(state.status);
     }
-  }, [state.status]);
+  }
 
-  React.useEffect(() => {
-    let status: State["status"] = "init";
-    let latest_version: string | null = null;
-    let is_brew_bun_standalone = false;
+  function handle_init_state() {
+    init_state().catch(abort);
 
-    const local_version = process.env.CLI_VERSION;
-    const is_output = props_ref.current.verbose || props_ref.current.force;
+    async function init_state() {
+      if (state.latest_version !== null) return;
 
-    async function auto_update() {
-      if (!local_version) {
-        throw new Error("Auto update requires process.env.CLI_VERSION to be set");
-      }
+      const local_version = process.env.CLI_VERSION;
+      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 npm_json = await Promise.race([
         fetch_json(`https://registry.npmjs.org/${props.name}`),
 
         sleep(timeout_ms).then(() => {
-          throw new Error("AutoUpdate timeout");
+          abort(new Error("AutoUpdate timeout"));
         }),
       ]);
 
-      latest_version = npm_json?.["dist-tags"]?.latest;
+      const maybe_version = npm_json?.["dist-tags"]?.latest;
 
-      if (!latest_version) {
-        throw new Error("Unable to retrieve latest version from npm");
+      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(<Ink.Text dimColor>{JSON.stringify({ binary_path })}</Ink.Text>);
+
+      const is_bunfs_path = binary_path.startsWith("/$bunfs");
+      debug(
+        <Ink.Text dimColor>
+          {is_bunfs_path
+            ? "brew install detected (compiled bun standalone)"
+            : "npm install detected"}
+        </Ink.Text>,
+      );
+
+      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(
+      <FormatText
+        key="versions"
+        wrapper={<Ink.Text dimColor />}
+        message="Auto update found latest version {latest_version} and current local version {local_version}"
+        values={{
+          latest_version: <Brackets>{latest_version}</Brackets>,
+          local_version: <Brackets>{local_version}</Brackets>,
+        }}
+      />,
+    );
+
+    const semver_result = semver_compare(latest_version, local_version);
+    debug(<Ink.Text dimColor>{JSON.stringify({ semver_result })}</Ink.Text>);
+
+    switch (semver_result) {
+      case 0: {
+        info(
+          <Ink.Text>
+            ✅ Everything up to date. <Brackets>{latest_version}</Brackets>
+          </Ink.Text>,
+        );
 
-      if (props_ref.current.verbose) {
-        handle_output(<Ink.Text dimColor>{JSON.stringify({ binary_path })}</Ink.Text>);
+        return patch({ status: "done" });
       }
 
-      is_brew_bun_standalone = binary_path.startsWith("/$bunfs");
+      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}`;
 
-      if (props_ref.current.verbose) {
-        if (is_brew_bun_standalone) {
-          handle_output(
-            <Ink.Text dimColor>brew install detected (compiled bun standalone)</Ink.Text>,
-          );
-        } else {
-          handle_output(<Ink.Text dimColor>npm install detected</Ink.Text>);
-        }
+        info(
+          <Ink.Box flexDirection="column" gap={1} paddingTop={1} paddingBottom={1}>
+            <Ink.Text>
+              🆕 New version available! <Brackets>{latest_version}</Brackets>
+            </Ink.Text>
+            <Ink.Box flexDirection="column">
+              <Ink.Text dimColor>Changelog</Ink.Text>
+              <Url>{url}</Url>
+            </Ink.Box>
+          </Ink.Box>,
+        );
+
+        return patch({ status: "prompt" });
       }
 
-      if (props_ref.current.verbose) {
-        handle_output(
+      case -1: {
+        info(
           <FormatText
-            key="versions"
-            wrapper={<Ink.Text />}
-            message="Auto update found latest version {latest_version} and current local version {local_version}"
+            message="⚠️ Local version {local_version} is newer than latest version {latest_version}"
             values={{
-              latest_version: <Brackets>{latest_version}</Brackets>,
               local_version: <Brackets>{local_version}</Brackets>,
+              latest_version: <Brackets>{latest_version}</Brackets>,
             }}
           />,
         );
-      }
 
-      const semver_result = semver_compare(latest_version, local_version);
-      if (props_ref.current.verbose) {
-        handle_output(<Ink.Text dimColor>{JSON.stringify({ semver_result })}</Ink.Text>);
+        return patch({ status: "done" });
       }
 
-      if (semver_result === 0) {
-        status = "done";
-
-        if (is_output) {
-          handle_output(
-            <Ink.Text>
-              ✅ Everything up to date. <Brackets>{latest_version}</Brackets>
-            </Ink.Text>,
-          );
-        }
-        return;
-      }
-
-      if (semver_result === 1) {
-        // trigger yes no prompt
-        status = "prompt";
+      default: {
+        assertNever(semver_result);
+        abort(new Error("AutoUpdate failed"));
       }
+    }
+  }
 
-      throw new Error("AutoUpdate failed");
+  function info(node: React.ReactNode) {
+    if (props_ref.current.verbose || props_ref.current.force) {
+      handle_output(node);
     }
+  }
 
-    const onError = props_ref.current.onError || (() => {});
-
-    auto_update()
-      .then(() => {
-        patch({ status, local_version, latest_version, is_brew_bun_standalone });
-      })
-      .catch((error) => {
-        if (props_ref.current.verbose) {
-          handle_output(
-            <Ink.Text key="error" color={colors.red}>
-              {error?.message}
-            </Ink.Text>,
-          );
-        }
+  function debug(node: React.ReactNode) {
+    if (props_ref.current.verbose) {
+      handle_output(node);
+    }
+  }
+  function abort(error: Error) {
+    info(
+      <Ink.Text key="error" color={colors.red}>
+        {error.message}
+      </Ink.Text>,
+    );
+    patch({ status: "done" });
+    props_ref.current.onError?.(error);
+  }
 
-        // ensure we always exit
-        status = "done";
-        patch({ status, error, local_version, latest_version, is_brew_bun_standalone });
-        onError(error);
+  function handle_output(node: React.ReactNode) {
+    if (typeof props.onOutput === "function") {
+      props.onOutput(node);
+    } else {
+      set_output((current) => {
+        return [...current, node];
       });
-  }, []);
-
-  const status = (function render_status() {
-    switch (state.status) {
-      case "init":
-        return null;
-
-      case "prompt": {
-        let install_command = "";
-        if (state.is_brew_bun_standalone) {
-          install_command = "brew install magus/git-stack/git-stack";
-        } else {
-          install_command = `npm install -g ${props.name}@latest`;
-        }
-
-        return (
-          <YesNoPrompt
-            message={
-              <Ink.Box flexDirection="column">
-                <Ink.Box flexDirection="column">
-                  <Ink.Text color={colors.yellow}>
-                    <FormatText
-                      wrapper={<Ink.Text />}
-                      message="New version available {latest_version}"
-                      values={{
-                        latest_version: <Brackets>{state.latest_version}</Brackets>,
-                      }}
-                    />
-                    ,
-                  </Ink.Text>
-                  <Ink.Text> </Ink.Text>
-                  <Command>{install_command}</Command>
-                  <Ink.Text> </Ink.Text>
-                </Ink.Box>
-                <Ink.Box>
-                  <FormatText
-                    wrapper={<Ink.Text color={colors.yellow} />}
-                    message="Would you like to run the above command to update?"
-                  />
-                </Ink.Box>
-              </Ink.Box>
-            }
-            onYes={async () => {
-              handle_output(<Command>{install_command}</Command>);
-
-              patch({ status: "install" });
-
-              await cli(install_command, {
-                env: {
-                  ...process.env,
-                  HOMEBREW_COLOR: "1",
-                },
-                onOutput: (data: string) => {
-                  handle_output(<Ink.Text>{data}</Ink.Text>);
-                },
-              });
-
-              handle_output(
-                <Ink.Text key="done">
-                  ✅ Installed <Brackets>{state.latest_version}</Brackets>
-                </Ink.Text>,
-              );
-
-              patch({ status: "done" });
-            }}
-            onNo={() => {
-              patch({ status: "done" });
-            }}
-          />
-        );
-      }
-
-      case "install":
-        return null;
-
-      case "done":
-        return props.children;
     }
-  })();
-
-  return (
-    <React.Fragment>
-      {output}
-      {status}
-    </React.Fragment>
-  );
+  }
 }