git-stack-cli 2.1.1-beta → 2.1.3

package/README.md

@@ -126,8 +126,10 @@ Managing even a few stacked diffs requires a relatively strong knowledge of `git
 Ensure `node --version` is the same across both projects you are using to test the `git-stack` cli
 
 ```bash
+corepack enable
+
 git submodule update --init --recursive
-npm i
+pnpm i
 pnpm run dev
 pnpm link --global
 

package/dist/js/index.js

@@ -28100,6 +28100,7 @@ var require_last = __commonJS((exports, module) => {
 // src/index.tsx
 var React55 = __toESM(require_react(), 1);
 import fs14 from "node:fs/promises";
+import path10 from "node:path";
 
 // 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/render.js
 import { Stream } from "node:stream";
@@ -37090,11 +37091,24 @@ var BaseStore = createStore()(immer2((set2, get) => ({
         state.mutate.output(state, { node });
       });
     },
-    error(message) {
-      set2((state) => {
-        const node = /* @__PURE__ */ React16.createElement(Text, {
+    error(error) {
+      let node;
+      if (typeof error === "string") {
+        node = /* @__PURE__ */ React16.createElement(Text, {
+          color: colors.red
+        }, error);
+      } else if (error instanceof Error) {
+        node = /* @__PURE__ */ React16.createElement(Box_default, {
+          flexDirection: "column"
+        }, /* @__PURE__ */ React16.createElement(Text, {
+          color: colors.red
+        }, error.stack));
+      } else {
+        node = /* @__PURE__ */ React16.createElement(Text, {
           color: colors.red
-        }, message);
+        }, `Unhandled error: ${JSON.stringify(error)}`);
+      }
+      set2((state) => {
         state.mutate.output(state, { node });
       });
     },
@@ -37280,9 +37294,7 @@ async function cli(unsafe_command, unsafe_options) {
       };
       state.actions.set((state2) => state2.mutate.end_pending_output(state2, id));
       state.actions.debug(log.end(result));
-      state.actions.debug(result.output);
-      state.actions.debug(`
-`);
+      state.actions.debug(log.output(result));
       if (!options.ignoreExitCode && result.code !== 0) {
         reject(new Error(log.error(result)));
       } else {
@@ -37318,7 +37330,7 @@ cli.sync = function cli_sync(unsafe_command, unsafe_options) {
     duration
   };
   state.actions.debug(log.end(result));
-  state.actions.debug(result.output);
+  state.actions.debug(log.output(result));
   if (!options.ignoreExitCode && result.code !== 0) {
     throw new Error(log.error(result));
   }
@@ -37336,6 +37348,10 @@ var log = {
     const { command, code, duration } = result;
     return `[end] ${command} (exit_code=${code} duration=${duration})`;
   },
+  output(result) {
+    return `${result.output}
+`;
+  },
   error(result) {
     const { command, code, duration } = result;
     return `${command} (exit_code=${code} duration=${duration})`;
@@ -37797,7 +37813,7 @@ function Url(props) {
 import fs7 from "node:fs";
 import path4 from "node:path";
 function is_command_available(command) {
-  const PATH = "/Users/noah/github/git-stack-cli/node_modules/.bin:/Users/noah/.cache/node/corepack/v1/pnpm/9.15.4/dist/node-gyp-bin:/Users/noah/github/git-stack-cli/node_modules/.bin:/Users/noah/.cache/node/corepack/v1/pnpm/9.15.4/dist/node-gyp-bin:/Users/noah/github/git-stack-cli/node_modules/.bin:/Users/noah/.cache/node/corepack/v1/pnpm/9.15.4/dist/node-gyp-bin:/Users/noah/.rvm/gems/ruby-2.6.3/bin:/Users/noah/.rvm/gems/ruby-2.6.3@global/bin:/Users/noah/.rvm/rubies/ruby-2.6.3/bin:/Users/noah/Library/pnpm:/Users/noah/.bun/bin:/Users/noah/Library/Caches/fnm_multishells/45565_1737429645385/bin:/usr/local/sbin:/usr/local/bin:/usr/local/bin:/usr/local/sbin:/Users/noah/.dotfiles/bin:/usr/local/sbin:/usr/local/bin:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin:/Library/Apple/usr/bin:/Applications/Postgres.app/Contents/Versions/latest/bin:/Users/noah/.cargo/bin:/Applications/iTerm.app/Contents/Resources/utilities:/Users/noah/google-cloud-sdk/bin:/Users/noah/.yarn/bin:/Users/noah/.fastlane/bin:/usr/local/opt/fzf/bin:/Users/noah/google-cloud-sdk/bin:/Users/noah/.yarn/bin:/Users/noah/.fastlane/bin:/Users/noah/.rvm/bin";
+  const PATH = "/Users/noah/github/git-stack-cli/node_modules/.bin:/Users/noah/.cache/node/corepack/v1/pnpm/9.15.4/dist/node-gyp-bin:/Users/noah/github/git-stack-cli/node_modules/.bin:/Users/noah/.cache/node/corepack/v1/pnpm/9.15.4/dist/node-gyp-bin:/Users/noah/github/git-stack-cli/node_modules/.bin:/Users/noah/.cache/node/corepack/v1/pnpm/9.15.4/dist/node-gyp-bin:/Users/noah/.rvm/gems/ruby-3.0.0/bin:/Users/noah/.rvm/gems/ruby-3.0.0@global/bin:/Users/noah/.rvm/rubies/ruby-3.0.0/bin:/Users/noah/Library/pnpm:/Users/noah/.bun/bin:/Users/noah/Library/Caches/fnm_multishells/99719_1742855928667/bin:/usr/local/sbin:/usr/local/bin:/usr/local/bin:/usr/local/sbin:/Users/noah/.dotfiles/bin:/usr/local/sbin:/usr/local/bin:/Users/noah/.openai/bin:/Users/noah/.virtualenvs/openai/bin:/Users/noah/.pyenv/shims:/Users/noah/.pyenv/bin:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin:/Library/Apple/usr/bin:/usr/local/go/bin:/Users/noah/.cargo/bin:/Users/noah/Applications/iTerm.app/Contents/Resources/utilities:/Users/noah/.openai/bin:/Users/noah/google-cloud-sdk/bin:/Users/noah/.yarn/bin:/Users/noah/.fastlane/bin:/usr/local/go/bin:/usr/local/opt/fzf/bin:/Users/noah/google-cloud-sdk/bin:/Users/noah/.yarn/bin:/Users/noah/.fastlane/bin:/usr/local/go/bin:/Users/noah/.rvm/bin";
   invariant(PATH, "PATH env must exist");
   const path_list = PATH.split(path4.delimiter);
   for (const dir of path_list) {
@@ -40002,8 +40018,7 @@ function SelectCommitRangesInternal(props) {
     let branch_prefix = "";
     if (argv["branch-prefix"]) {
       branch_prefix = argv["branch-prefix"];
-    } else if (process.env.GIT_STACK_BRANCH_PREFIX) {
-      branch_prefix = process.env.GIT_STACK_BRANCH_PREFIX;
+    } else if ("") {
     }
     return `${branch_prefix}${gs_short_id()}`;
   }
@@ -45625,7 +45640,7 @@ var yargs_default = Yargs;
 
 // src/command.ts
 async function command2() {
-  return yargs_default(hideBin(process.argv)).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.1.1-beta").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)).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.1.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: {
@@ -45745,7 +45760,11 @@ var FixupOptions = {
       state.argv = argv;
       state.cwd = process.cwd();
     });
-    Store.getState().actions.debug(pretty_json(argv));
+    const actions = Store.getState().actions;
+    actions.debug(pretty_json(argv));
+    const PATH = process.env["PATH"];
+    const PATH_LIST = pretty_json(PATH.split(path10.delimiter));
+    actions.debug(`process.env.PATH ${PATH_LIST}`);
     await ink.waitUntilExit();
   } catch (err) {
     console.error(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "2.1.1-beta",
+  "version": "2.1.3",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/src/app/Store.tsx

@@ -84,7 +84,7 @@ export type State = {
     unmount(): void;
     newline(): void;
     json(value: pretty_json.JSONValue): void;
-    error(message: string): void;
+    error(error: unknown): void;
     output(node: React.ReactNode): void;
     debug(node: React.ReactNode, id?: string): void;
 
@@ -176,9 +176,24 @@ const BaseStore = createStore<State>()(
         });
       },
 
-      error(message) {
+      error(error) {
+        let node: React.ReactNode;
+
+        if (typeof error === "string") {
+          node = <Ink.Text color={colors.red}>{error}</Ink.Text>;
+        } else if (error instanceof Error) {
+          node = (
+            <Ink.Box flexDirection="column">
+              <Ink.Text color={colors.red}>{error.stack}</Ink.Text>
+            </Ink.Box>
+          );
+        } else {
+          node = (
+            <Ink.Text color={colors.red}>{`Unhandled error: ${JSON.stringify(error)}`}</Ink.Text>
+          );
+        }
+
         set((state) => {
-          const node = <Ink.Text color={colors.red}>{message}</Ink.Text>;
           state.mutate.output(state, { node });
         });
       },

package/src/core/cli.ts

@@ -79,8 +79,7 @@ export async function cli(
 
       state.actions.set((state) => state.mutate.end_pending_output(state, id));
       state.actions.debug(log.end(result));
-      state.actions.debug(result.output);
-      state.actions.debug("\n");
+      state.actions.debug(log.output(result));
 
       if (!options.ignoreExitCode && result.code !== 0) {
         reject(new Error(log.error(result)));
@@ -131,7 +130,7 @@ cli.sync = function cli_sync(
   };
 
   state.actions.debug(log.end(result));
-  state.actions.debug(result.output);
+  state.actions.debug(log.output(result));
 
   if (!options.ignoreExitCode && result.code !== 0) {
     throw new Error(log.error(result));
@@ -154,6 +153,10 @@ const log = {
     return `[end] ${command} (exit_code=${code} duration=${duration})`;
   },
 
+  output(result: Return) {
+    return `${result.output}\n`;
+  },
+
   error(result: Return) {
     const { command, code, duration } = result;
     return `${command} (exit_code=${code} duration=${duration})`;

package/src/core/pretty_json.ts

@@ -1,5 +1,11 @@
 export namespace pretty_json {
-  export type JSONValue = null | number | string | boolean | { [key: string]: JSONValue };
+  export type JSONValue =
+    | null
+    | number
+    | string
+    | boolean
+    | { [key: string]: JSONValue }
+    | Array<JSONValue>;
 }
 
 export function pretty_json<T extends pretty_json.JSONValue>(input: T): string {

package/src/index.tsx

@@ -5,6 +5,7 @@
 import * as React from "react";
 
 import fs from "node:fs/promises";
+import path from "node:path";
 
 import * as Ink from "ink-cjs";
 
@@ -56,7 +57,13 @@ import { pretty_json } from "~/core/pretty_json";
       state.cwd = process.cwd();
     });
 
-    Store.getState().actions.debug(pretty_json(argv as any));
+    const actions = Store.getState().actions;
+
+    actions.debug(pretty_json(argv as any));
+
+    const PATH = process.env["PATH"];
+    const PATH_LIST = pretty_json(PATH.split(path.delimiter));
+    actions.debug(`process.env.PATH ${PATH_LIST}`);
 
     await ink.waitUntilExit();