git-stack-cli 2.5.2 → 2.5.3

package/dist/js/index.js

@@ -28098,7 +28098,7 @@ var require_last = __commonJS((exports, module) => {
 });
 
 // src/index.tsx
-var React55 = __toESM(require_react(), 1);
+var React56 = __toESM(require_react(), 1);
 import fs12 from "node:fs/promises";
 import path9 from "node:path";
 
@@ -31935,7 +31935,7 @@ var import_react20 = __toESM(require_react(), 1);
 // node_modules/.pnpm/ink-cjs@4.4.1_@types+react@18.2.33_react-devtools-core@4.19.1_react@18.2.0/node_modules/ink-cjs/build/hooks/use-focus-manager.js
 var import_react21 = __toESM(require_react(), 1);
 // src/app/App.tsx
-var React54 = __toESM(require_react(), 1);
+var React55 = __toESM(require_react(), 1);
 
 // src/app/AutoUpdate.tsx
 var React18 = __toESM(require_react(), 1);
@@ -37445,12 +37445,13 @@ function AutoUpdate(props) {
     let status2 = "done";
     let latest_version = null;
     let is_brew_bun_standalone = false;
-    const local_version = "2.5.2";
+    const local_version = "2.5.3";
+    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");
       }
-      if (props_ref.current.verbose) {
+      if (is_output) {
         handle_output(/* @__PURE__ */ React18.createElement(Text, {
           key: "init"
         }, "Checking for latest version..."));
@@ -37496,8 +37497,10 @@ function AutoUpdate(props) {
         }));
       }
       const semver_result = semver_compare(latest_version, local_version);
-      status2 = "prompt";
       if (semver_result === 0) {
+        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) {
@@ -37531,14 +37534,20 @@ function AutoUpdate(props) {
         if (state.is_brew_bun_standalone) {
           install_command = `npm install -g ${props.name}@latest`;
         } else {
-          install_command = `HOMEBREW_NO_AUTO_UPDATE=1 brew upgrade magus/git-stack/git-stack`;
+          install_command = "brew upgrade magus/git-stack/git-stack";
         }
         return /* @__PURE__ */ React18.createElement(YesNoPrompt, {
           message: /* @__PURE__ */ React18.createElement(Box_default, {
             flexDirection: "column"
           }, /* @__PURE__ */ React18.createElement(Text, {
             color: colors.yellow
-          }, "New version available, would you like to update?"), /* @__PURE__ */ React18.createElement(Text, null, " "), /* @__PURE__ */ React18.createElement(Command, null, install_command), /* @__PURE__ */ React18.createElement(Text, null, " "), /* @__PURE__ */ React18.createElement(FormatText, {
+          }, /* @__PURE__ */ React18.createElement(FormatText, {
+            wrapper: /* @__PURE__ */ React18.createElement(Text, null),
+            message: "New version available {latest_version}, would you like to update?",
+            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(FormatText, {
             wrapper: /* @__PURE__ */ React18.createElement(Text, {
               color: colors.yellow
             }),
@@ -40671,9 +40680,23 @@ async function run12(args) {
   actions.exit(0);
 }
 
-// src/components/ErrorBoundary.tsx
+// src/commands/Update.tsx
 var React52 = __toESM(require_react(), 1);
-class ErrorBoundary extends React52.Component {
+function Update() {
+  return /* @__PURE__ */ React52.createElement(Await, {
+    fallback: null,
+    function: run13
+  });
+}
+async function run13() {
+  const state = Store.getState();
+  const actions = state.actions;
+  actions.exit(0);
+}
+
+// src/components/ErrorBoundary.tsx
+var React53 = __toESM(require_react(), 1);
+class ErrorBoundary extends React53.Component {
   constructor(props) {
     super(props);
     this.state = {
@@ -40700,15 +40723,15 @@ class ErrorBoundary extends React52.Component {
       return this.props.children;
     }
     const message = this.state.error.message;
-    return /* @__PURE__ */ React52.createElement(Box_default, {
+    return /* @__PURE__ */ React53.createElement(Box_default, {
       flexDirection: "column",
       gap: 0
-    }, /* @__PURE__ */ React52.createElement(Text, {
+    }, /* @__PURE__ */ React53.createElement(Text, {
       color: colors.red
-    }, /* @__PURE__ */ React52.createElement(FormatText, {
+    }, /* @__PURE__ */ React53.createElement(FormatText, {
       message: "\uD83D\uDEA8 Unhandled error {message}",
       values: {
-        message: /* @__PURE__ */ React52.createElement(Text, {
+        message: /* @__PURE__ */ React53.createElement(Text, {
           color: colors.gray
         }, message)
       }
@@ -40717,20 +40740,20 @@ class ErrorBoundary extends React52.Component {
   _render_verbose() {
     const store_state = Store.getState();
     if (store_state.argv.verbose) {
-      return /* @__PURE__ */ React52.createElement(Text, {
+      return /* @__PURE__ */ React53.createElement(Text, {
         color: colors.gray
       }, this.state.component_stack);
     }
-    return /* @__PURE__ */ React52.createElement(Text, {
+    return /* @__PURE__ */ React53.createElement(Text, {
       color: colors.gray
-    }, /* @__PURE__ */ React52.createElement(FormatText, {
+    }, /* @__PURE__ */ React53.createElement(FormatText, {
       message: "Try again with `--verbose` to see more information."
     }));
   }
 }
 
 // src/components/ExitingGate.tsx
-var React53 = __toESM(require_react(), 1);
+var React54 = __toESM(require_react(), 1);
 function ExitingGate(props) {
   const exit_mode = Store.useState((state) => state.exit_mode);
   if (!exit_mode) {
@@ -40740,11 +40763,11 @@ function ExitingGate(props) {
     case "quiet":
       return null;
     case "normal":
-      return /* @__PURE__ */ React53.createElement(Box_default, {
+      return /* @__PURE__ */ React54.createElement(Box_default, {
         flexDirection: "column"
-      }, /* @__PURE__ */ React53.createElement(Text, {
+      }, /* @__PURE__ */ React54.createElement(Text, {
         color: colors.red
-      }, /* @__PURE__ */ React53.createElement(FormatText, {
+      }, /* @__PURE__ */ React54.createElement(FormatText, {
         message: "\uD83D\uDEA8 Exiting…"
       })));
     default:
@@ -40757,32 +40780,37 @@ function App2() {
   const actions = Store.useActions();
   const ink = Store.useState((state) => state.ink);
   const argv = Store.useState((state) => state.argv);
-  if (!ink || !argv) {
+  if (!ink || !argv || !argv.$0) {
     return null;
   }
-  return /* @__PURE__ */ React54.createElement(Providers, null, /* @__PURE__ */ React54.createElement(ErrorBoundary, null, /* @__PURE__ */ React54.createElement(Debug, null), /* @__PURE__ */ React54.createElement(Output2, null), /* @__PURE__ */ React54.createElement(ExitingGate, null, /* @__PURE__ */ React54.createElement(AutoUpdate, {
+  const positional_list = new Set(argv["_"]);
+  const is_update = positional_list.has("update") || positional_list.has("upgrade");
+  return /* @__PURE__ */ React55.createElement(Providers, null, /* @__PURE__ */ React55.createElement(ErrorBoundary, null, /* @__PURE__ */ React55.createElement(Debug, null), /* @__PURE__ */ React55.createElement(Output2, null), /* @__PURE__ */ React55.createElement(ExitingGate, null, /* @__PURE__ */ React55.createElement(AutoUpdate, {
     name: "git-stack-cli",
-    verbose: argv.verbose || argv.update,
-    timeoutMs: argv.update ? 30 * 1000 : 2 * 1000,
+    verbose: argv.verbose,
+    force: is_update,
+    timeoutMs: is_update ? 30 * 1000 : 2 * 1000,
     onOutput: actions.output,
     onDone: () => {
-      if (argv.update) {
+      if (is_update) {
         actions.exit(0);
       }
     }
-  }, /* @__PURE__ */ React54.createElement(VerboseDebugInfo, null, /* @__PURE__ */ React54.createElement(RebaseCheck, null, /* @__PURE__ */ React54.createElement(CherryPickCheck, null, /* @__PURE__ */ React54.createElement(MaybeMain, null))))), /* @__PURE__ */ React54.createElement(HandleCtrlCSigint, null))));
+  }, /* @__PURE__ */ React55.createElement(VerboseDebugInfo, null, /* @__PURE__ */ React55.createElement(RebaseCheck, null, /* @__PURE__ */ React55.createElement(CherryPickCheck, null, /* @__PURE__ */ React55.createElement(MaybeMain, null))))), /* @__PURE__ */ React55.createElement(HandleCtrlCSigint, null))));
 }
 function MaybeMain() {
   const argv = Store.useState((state) => state.argv);
   const positional_list = new Set(argv["_"]);
   if (positional_list.has("fixup")) {
-    return /* @__PURE__ */ React54.createElement(Fixup, null);
+    return /* @__PURE__ */ React55.createElement(Fixup, null);
   } else if (positional_list.has("log")) {
-    return /* @__PURE__ */ React54.createElement(Log, null);
+    return /* @__PURE__ */ React55.createElement(Log, null);
+  } else if (positional_list.has("update")) {
+    return /* @__PURE__ */ React55.createElement(Update, null);
   } else if (positional_list.has("rebase")) {
-    return /* @__PURE__ */ React54.createElement(DependencyCheck, null, /* @__PURE__ */ React54.createElement(DirtyCheck, null, /* @__PURE__ */ React54.createElement(GatherMetadata, null, /* @__PURE__ */ React54.createElement(LocalCommitStatus, null, /* @__PURE__ */ React54.createElement(Rebase, null)))));
+    return /* @__PURE__ */ React55.createElement(DependencyCheck, null, /* @__PURE__ */ React55.createElement(DirtyCheck, null, /* @__PURE__ */ React55.createElement(GatherMetadata, null, /* @__PURE__ */ React55.createElement(LocalCommitStatus, null, /* @__PURE__ */ React55.createElement(Rebase, null)))));
   }
-  return /* @__PURE__ */ React54.createElement(React54.Fragment, null, !argv.verbose ? null : /* @__PURE__ */ React54.createElement(GithubApiError, null), /* @__PURE__ */ React54.createElement(DependencyCheck, null, /* @__PURE__ */ React54.createElement(DirtyCheck, null, /* @__PURE__ */ React54.createElement(GatherMetadata, null, /* @__PURE__ */ React54.createElement(LocalCommitStatus, null, /* @__PURE__ */ React54.createElement(DetectInitialPR, null, /* @__PURE__ */ React54.createElement(Main, null)))))));
+  return /* @__PURE__ */ React55.createElement(React55.Fragment, null, !argv.verbose ? null : /* @__PURE__ */ React55.createElement(GithubApiError, null), /* @__PURE__ */ React55.createElement(DependencyCheck, null, /* @__PURE__ */ React55.createElement(DirtyCheck, null, /* @__PURE__ */ React55.createElement(GatherMetadata, null, /* @__PURE__ */ React55.createElement(LocalCommitStatus, null, /* @__PURE__ */ React55.createElement(DetectInitialPR, null, /* @__PURE__ */ React55.createElement(Main, null)))))));
 }
 
 // node_modules/.pnpm/yargs@17.7.2/node_modules/yargs/lib/platform-shims/esm.mjs
@@ -45647,7 +45675,7 @@ var yargs_default = Yargs;
 
 // src/command.ts
 async function command2() {
-  return yargs_default(hideBin(process.argv)).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).option("verbose", GlobalOptions.verbose).wrap(123).strict().version("2.5.2").showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`").help("help", "Show usage via `git stack help`").argv;
+  return yargs_default(hideBin(process.argv)).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).option("verbose", GlobalOptions.verbose).wrap(123).strict().version("2.5.3").showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`").help("help", "Show usage via `git stack help`").argv;
 }
 var GlobalOptions = {
   verbose: {
@@ -45685,12 +45713,6 @@ var DefaultOptions = {
     ].join(`
 `)
   },
-  update: {
-    type: "boolean",
-    alias: ["u", "upgrade"],
-    default: false,
-    description: "Check and install the latest version"
-  },
   branch: {
     type: "string",
     alias: ["b"],
@@ -45775,7 +45797,7 @@ var FixupOptions = {
     });
     const tmp_dir = await get_tmp_dir();
     await fs12.rm(tmp_dir, { recursive: true });
-    const ink = render_default(/* @__PURE__ */ React55.createElement(App2, null), {
+    const ink = render_default(/* @__PURE__ */ React56.createElement(App2, null), {
       exitOnCtrlC: false
     });
     Store.setState((state) => {

package/package.json

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

package/src/app/App.tsx

@@ -19,6 +19,7 @@ import { VerboseDebugInfo } from "~/app/VerboseDebugInfo";
 import { Fixup } from "~/commands/Fixup";
 import { Log } from "~/commands/Log";
 import { Rebase } from "~/commands/Rebase";
+import { Update } from "~/commands/Update";
 import { ErrorBoundary } from "~/components/ErrorBoundary";
 import { ExitingGate } from "~/components/ExitingGate";
 
@@ -28,7 +29,7 @@ export function App() {
   const ink = Store.useState((state) => state.ink);
   const argv = Store.useState((state) => state.argv);
 
-  if (!ink || !argv) {
+  if (!ink || !argv || !argv.$0) {
     return null;
   }
 
@@ -42,6 +43,9 @@ export function App() {
   //   </React.Fragment>
   // );
 
+  const positional_list = new Set(argv["_"]);
+  const is_update = positional_list.has("update") || positional_list.has("upgrade");
+
   return (
     <Providers>
       <ErrorBoundary>
@@ -51,11 +55,12 @@ export function App() {
         <ExitingGate>
           <AutoUpdate
             name="git-stack-cli"
-            verbose={argv.verbose || argv.update}
-            timeoutMs={argv.update ? 30 * 1000 : 2 * 1000}
+            verbose={argv.verbose}
+            force={is_update}
+            timeoutMs={is_update ? 30 * 1000 : 2 * 1000}
             onOutput={actions.output}
             onDone={() => {
-              if (argv.update) {
+              if (is_update) {
                 actions.exit(0);
               }
             }}
@@ -84,6 +89,8 @@ function MaybeMain() {
     return <Fixup />;
   } else if (positional_list.has("log")) {
     return <Log />;
+  } else if (positional_list.has("update")) {
+    return <Update />;
   } else if (positional_list.has("rebase")) {
     return (
       <DependencyCheck>

package/src/app/AutoUpdate.tsx

@@ -17,6 +17,7 @@ type Props = {
   name: string;
   children: React.ReactNode;
   verbose?: boolean;
+  force?: boolean;
   timeoutMs?: number;
   onError?: (error: Error) => void;
   onOutput?: (output: React.ReactNode) => void;
@@ -65,13 +66,14 @@ export function AutoUpdate(props: Props) {
     let is_brew_bun_standalone = false;
 
     const local_version = process.env.CLI_VERSION;
+    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");
       }
 
-      if (props_ref.current.verbose) {
+      if (is_output) {
         handle_output(<Ink.Text key="init">Checking for latest version...</Ink.Text>);
       }
 
@@ -125,9 +127,14 @@ export function AutoUpdate(props: Props) {
 
       const semver_result = semver_compare(latest_version, local_version);
 
-      status = "prompt";
-
       if (semver_result === 0) {
+        if (is_output) {
+          handle_output(
+            <Ink.Text>
+              ✅ Everything up to date. <Brackets>{latest_version}</Brackets>
+            </Ink.Text>,
+          );
+        }
         return;
       }
 
@@ -175,7 +182,7 @@ export function AutoUpdate(props: Props) {
         if (state.is_brew_bun_standalone) {
           install_command = `npm install -g ${props.name}@latest`;
         } else {
-          install_command = `HOMEBREW_NO_AUTO_UPDATE=1 brew upgrade magus/git-stack/git-stack`;
+          install_command = "brew upgrade magus/git-stack/git-stack";
         }
 
         return (
@@ -183,7 +190,14 @@ export function AutoUpdate(props: Props) {
             message={
               <Ink.Box flexDirection="column">
                 <Ink.Text color={colors.yellow}>
-                  New version available, would you like to update?
+                  <FormatText
+                    wrapper={<Ink.Text />}
+                    message="New version available {latest_version}, would you like to update?"
+                    values={{
+                      latest_version: <Brackets>{state.latest_version}</Brackets>,
+                    }}
+                  />
+                  ,
                 </Ink.Text>
                 <Ink.Text> </Ink.Text>
                 <Command>{install_command}</Command>

package/src/command.ts

@@ -30,6 +30,12 @@ export async function command() {
         (yargs) => yargs,
       )
 
+      .command(
+        ["update", "upgrade"],
+        "Check and install the latest version of git stack",
+        (yargs) => yargs,
+      )
+
       .option("verbose", GlobalOptions.verbose)
 
       // yargs default wraps to 80 columns
@@ -86,13 +92,6 @@ const DefaultOptions = {
     ].join("\n"),
   },
 
-  "update": {
-    type: "boolean",
-    alias: ["u", "upgrade"],
-    default: false,
-    description: "Check and install the latest version",
-  },
-
   "branch": {
     type: "string",
     alias: ["b"],

package/src/commands/Update.tsx

@@ -0,0 +1,15 @@
+import * as React from "react";
+
+import { Await } from "~/app/Await";
+import { Store } from "~/app/Store";
+
+export function Update() {
+  return <Await fallback={null} function={run} />;
+}
+
+async function run() {
+  const state = Store.getState();
+  const actions = state.actions;
+
+  actions.exit(0);
+}

package/src/core/GitReviseTodo.test.ts

@@ -67,10 +67,10 @@ test("git-revise-todo handles double quotes in commit message", () => {
     [
       //force line break
       "++ pick f143d03c723c",
-      '[new] invalid \\"by me\\" quotes',
+      '[new] invalid "by me" quotes',
       "",
       "git-stack-id: 6Ak-qn+5Z",
-      'git-stack-title: [new] invalid \\"by me\\" quotes',
+      'git-stack-title: [new] invalid "by me" quotes',
     ].join("\n"),
   );
 });

package/src/core/Metadata.test.ts

@@ -129,10 +129,10 @@ test("write handles double quotes", () => {
   expect(Metadata.write(body, metadata)).toEqual(
     [
       // force line break
-      'Revert \\"[abc / 123] subject (#1234)\\"',
+      'Revert "[abc / 123] subject (#1234)"',
       "",
       "git-stack-id: abc123",
-      'git-stack-title: Revert \\"[abc / 123] subject (#1234)\\"',
+      'git-stack-title: Revert "[abc / 123] subject (#1234)"',
     ].join("\n"),
   );
 });