git-stack-cli 2.5.0 → 2.5.2

package/package.json

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

package/src/app/App.tsx

@@ -61,13 +61,11 @@ export function App() {
             }}
           >
             <VerboseDebugInfo>
-              <DependencyCheck>
-                <RebaseCheck>
-                  <CherryPickCheck>
-                    <MaybeMain />
-                  </CherryPickCheck>
-                </RebaseCheck>
-              </DependencyCheck>
+              <RebaseCheck>
+                <CherryPickCheck>
+                  <MaybeMain />
+                </CherryPickCheck>
+              </RebaseCheck>
             </VerboseDebugInfo>
           </AutoUpdate>
 
@@ -88,11 +86,15 @@ function MaybeMain() {
     return <Log />;
   } else if (positional_list.has("rebase")) {
     return (
-      <GatherMetadata>
-        <LocalCommitStatus>
-          <Rebase />
-        </LocalCommitStatus>
-      </GatherMetadata>
+      <DependencyCheck>
+        <DirtyCheck>
+          <GatherMetadata>
+            <LocalCommitStatus>
+              <Rebase />
+            </LocalCommitStatus>
+          </GatherMetadata>
+        </DirtyCheck>
+      </DependencyCheck>
     );
   }
 
@@ -100,15 +102,17 @@ function MaybeMain() {
     <React.Fragment>
       {!argv.verbose ? null : <GithubApiError />}
 
-      <GatherMetadata>
+      <DependencyCheck>
         <DirtyCheck>
-          <LocalCommitStatus>
-            <DetectInitialPR>
-              <Main />
-            </DetectInitialPR>
-          </LocalCommitStatus>
+          <GatherMetadata>
+            <LocalCommitStatus>
+              <DetectInitialPR>
+                <Main />
+              </DetectInitialPR>
+            </LocalCommitStatus>
+          </GatherMetadata>
         </DirtyCheck>
-      </GatherMetadata>
+      </DependencyCheck>
     </React.Fragment>
   );
 }

package/src/app/AutoUpdate.tsx

@@ -1,18 +1,15 @@
 import * as React from "react";
 
-import fs from "node:fs/promises";
-import path from "node:path";
-
 import * as Ink from "ink-cjs";
 
 import { Brackets } from "~/app/Brackets";
+import { Command } from "~/app/Command";
 import { FormatText } from "~/app/FormatText";
 import { YesNoPrompt } from "~/app/YesNoPrompt";
 import { cli } from "~/core/cli";
 import { colors } from "~/core/colors";
 import { fetch_json } from "~/core/fetch_json";
 import { is_finite_value } from "~/core/is_finite_value";
-import { read_json } from "~/core/read_json";
 import { semver_compare } from "~/core/semver_compare";
 import { sleep } from "~/core/sleep";
 
@@ -31,6 +28,7 @@ type State = {
   local_version: null | string;
   latest_version: null | string;
   status: "init" | "prompt" | "install" | "done" | "exit";
+  is_brew_bun_standalone: boolean;
 };
 
 function reducer(state: State, patch: Partial<State>) {
@@ -48,6 +46,7 @@ export function AutoUpdate(props: Props) {
     local_version: null,
     latest_version: null,
     status: "init",
+    is_brew_bun_standalone: false,
   });
 
   function handle_output(node: React.ReactNode) {
@@ -62,10 +61,16 @@ export function AutoUpdate(props: Props) {
 
   React.useEffect(() => {
     let status: State["status"] = "done";
-    let local_version: string | null = null;
     let latest_version: string | null = null;
+    let is_brew_bun_standalone = false;
+
+    const local_version = process.env.CLI_VERSION;
 
     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) {
         handle_output(<Ink.Text key="init">Checking for latest version...</Ink.Text>);
       }
@@ -86,22 +91,24 @@ export function AutoUpdate(props: Props) {
         throw new Error("Unable to retrieve latest version from npm");
       }
 
-      const script_path = await fs.realpath(process.argv[1]);
-      const script_dir = path.dirname(script_path);
+      const binary_path = process.argv[1];
 
-      // dist/ts/index.js
-      const package_json_path = path.join(script_dir, "..", "..", "package.json");
+      if (props_ref.current.verbose) {
+        handle_output(<Ink.Text dimColor>{JSON.stringify({ binary_path })}</Ink.Text>);
+      }
 
-      type PackageJson = { version: string };
-      const package_json = await read_json<PackageJson>(package_json_path);
+      is_brew_bun_standalone = binary_path.startsWith("/$bunfs");
 
-      if (!package_json) {
-        // unable to find read package.json, skip auto update
-        throw new Error(`Unable to read package.json [${package_json_path}]`);
+      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>);
+        }
       }
 
-      local_version = package_json.version;
-
       if (props_ref.current.verbose) {
         handle_output(
           <FormatText
@@ -118,6 +125,8 @@ export function AutoUpdate(props: Props) {
 
       const semver_result = semver_compare(latest_version, local_version);
 
+      status = "prompt";
+
       if (semver_result === 0) {
         return;
       }
@@ -137,10 +146,10 @@ export function AutoUpdate(props: Props) {
 
     auto_update()
       .then(() => {
-        patch({ status, local_version, latest_version });
+        patch({ status, local_version, latest_version, is_brew_bun_standalone });
       })
       .catch((error) => {
-        patch({ status, error, local_version, latest_version });
+        patch({ status, error, local_version, latest_version, is_brew_bun_standalone });
         onError(error);
 
         if (props_ref.current.verbose) {
@@ -161,13 +170,29 @@ export function AutoUpdate(props: Props) {
       case "init":
         return null;
 
-      case "prompt":
+      case "prompt": {
+        let install_command = "";
+        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`;
+        }
+
         return (
           <YesNoPrompt
             message={
-              <Ink.Text color={colors.yellow}>
-                New version available, would you like to update?
-              </Ink.Text>
+              <Ink.Box flexDirection="column">
+                <Ink.Text color={colors.yellow}>
+                  New version available, would you like to update?
+                </Ink.Text>
+                <Ink.Text> </Ink.Text>
+                <Command>{install_command}</Command>
+                <Ink.Text> </Ink.Text>
+                <FormatText
+                  wrapper={<Ink.Text color={colors.yellow} />}
+                  message="Would you like to run the above command to update?"
+                />
+              </Ink.Box>
             }
             onYes={async () => {
               handle_output(
@@ -184,7 +209,7 @@ export function AutoUpdate(props: Props) {
 
               patch({ status: "install" });
 
-              await cli(`npm install -g ${props.name}@latest`);
+              await cli(install_command);
 
               patch({ status: "exit" });
 
@@ -195,6 +220,7 @@ export function AutoUpdate(props: Props) {
             }}
           />
         );
+      }
 
       case "install":
         return null;

package/src/app/DependencyCheck.tsx

@@ -15,14 +15,17 @@ import * as gh from "~/github/gh";
 
 type Props = {
   children: React.ReactNode;
+  disableGithubCli?: boolean;
+  disableGithubCliAuth?: boolean;
+  disableGitRevise?: boolean;
 };
 
 export function DependencyCheck(props: Props) {
   return (
     <CheckGit>
-      <CheckGithubCli>
-        <CheckGithubCliAuth>
-          <CheckGitRevise>
+      <CheckGithubCli {...props}>
+        <CheckGithubCliAuth {...props}>
+          <CheckGitRevise {...props}>
             {/* force line break */}
             {props.children}
           </CheckGitRevise>
@@ -69,6 +72,10 @@ function CheckGit(props: Props) {
 function CheckGithubCli(props: Props) {
   const actions = Store.useActions();
 
+  if (props.disableGithubCli) {
+    return <>{props.children}</>;
+  }
+
   return (
     <Await
       fallback={
@@ -112,6 +119,10 @@ function CheckGithubCli(props: Props) {
 function CheckGithubCliAuth(props: Props) {
   const actions = Store.useActions();
 
+  if (props.disableGithubCliAuth) {
+    return <>{props.children}</>;
+  }
+
   return (
     <Await
       fallback={
@@ -164,6 +175,10 @@ function CheckGithubCliAuth(props: Props) {
 function CheckGitRevise(props: Props) {
   const actions = Store.useActions();
 
+  if (props.disableGitRevise) {
+    return <>{props.children}</>;
+  }
+
   return (
     <Await
       fallback={

package/src/app/SyncGithub.tsx

@@ -35,13 +35,6 @@ async function run() {
   const commit_range = sync_github.commit_range;
   const rebase_group_index = sync_github.rebase_group_index;
 
-  // immediately register abort_handler in case of ctrl+c exit
-  actions.register_abort_handler(async function abort_sync_github() {
-    actions.output(<Ink.Text color={colors.red}>🚨 Abort</Ink.Text>);
-    handle_exit();
-    return 17;
-  });
-
   let DEFAULT_PR_BODY = "";
   if (state.pr_template_body) {
     DEFAULT_PR_BODY = state.pr_template_body;
@@ -52,13 +45,10 @@ async function run() {
   // for all push targets in push_group_list
   // things that can be done in parallel are grouped by numbers
   //
-  // -----------------------------------
-  // 1 (before_push) temp mark draft
   // --------------------------------------
-  // 2 push simultaneously to github
+  // 1 push simultaneously to github
   // --------------------------------------
   // 2 create PR / edit PR
-  // 2 (after_push) undo temp mark draft
   // --------------------------------------
 
   try {
@@ -170,25 +160,10 @@ async function run() {
 
     invariant(group.base, "group.base must exist");
 
-    // we may temporarily mark PR as a draft before editing it
-    // if it is not already a draft PR, to avoid notification spam
-    let is_temp_draft = !group.pr?.isDraft;
-
     // before pushing reset base to master temporarily
     // avoid accidentally pointing to orphaned parent commit
     // should hopefully fix issues where a PR includes a bunch of commits after pushing
     if (group.pr) {
-      if (!group.pr.isDraft) {
-        is_temp_draft = true;
-      }
-
-      if (is_temp_draft) {
-        await github.pr_draft({
-          branch: group.id,
-          draft: true,
-        });
-      }
-
       await github.pr_edit({
         branch: group.id,
         base: master_branch,
@@ -214,18 +189,6 @@ async function run() {
           selected_url,
         }),
       });
-
-      // we may temporarily mark PR as a draft before editing it
-      // if it is not already a draft PR, to avoid notification spam
-      let is_temp_draft = !group.pr?.isDraft;
-
-      if (is_temp_draft) {
-        // mark pr as ready for review again
-        await github.pr_draft({
-          branch: group.id,
-          draft: false,
-        });
-      }
     } else {
       // create pr in github
       const pr_url = await github.pr_create({
@@ -279,28 +242,6 @@ async function run() {
       });
     }
   }
-
-  function handle_exit() {
-    actions.output(<Ink.Text color={colors.yellow}>Restoring PR state…</Ink.Text>);
-
-    for (const group of push_group_list) {
-      // we may temporarily mark PR as a draft before editing it
-      // if it is not already a draft PR, to avoid notification spam
-      let is_temp_draft = !group.pr?.isDraft;
-
-      // restore PR to non-draft state
-      if (is_temp_draft) {
-        github
-          .pr_draft({
-            branch: group.id,
-            draft: false,
-          })
-          .catch(actions.error);
-      }
-    }
-
-    actions.output(<Ink.Text color={colors.yellow}>Restored PR state.</Ink.Text>);
-  }
 }
 
 type CommitMetadataGroup = CommitMetadata.CommitRange["group_list"][number];