git-stack-cli 2.1.0-beta → 2.1.1-beta

package/dist/js/index.js

@@ -28099,6 +28099,7 @@ var require_last = __commonJS((exports, module) => {
 
 // src/index.tsx
 var React55 = __toESM(require_react(), 1);
+import fs14 from "node:fs/promises";
 
 // 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";
@@ -38015,9 +38016,21 @@ var RE3 = {
 
 // src/core/github.tsx
 var React24 = __toESM(require_react(), 1);
+import crypto from "node:crypto";
+import fs9 from "node:fs/promises";
+import path6 from "node:path";
+
+// src/core/get_tmp_dir.ts
 import fs8 from "node:fs/promises";
 import os2 from "node:os";
 import path5 from "node:path";
+async function get_tmp_dir() {
+  const dir = path5.join(os2.tmpdir(), "git-stack-cli");
+  await fs8.mkdir(dir, { recursive: true });
+  return dir;
+}
+
+// src/core/github.tsx
 async function pr_list() {
   const state = Store.getState();
   const actions = state.actions;
@@ -38146,15 +38159,21 @@ async function pr_draft(args) {
 }
 var JSON_FIELDS = "--json id,number,state,baseRefName,headRefName,commits,title,body,url,isDraft";
 async function gh_json(command) {
-  const tmp_pr_json = path5.join(os2.tmpdir(), "git-stack-gh.json");
+  let hash = crypto.createHash("md5").update(command).digest("hex");
+  let tmp_filename = safe_filename(`gh_json-${hash}`);
+  const tmp_pr_json = path6.join(await get_tmp_dir(), `${tmp_filename}.json`);
   const options = { ignoreExitCode: true };
   const cli_result = await cli(`gh ${command} > ${tmp_pr_json}`, options);
   if (cli_result.code !== 0) {
     return new Error(cli_result.output);
   }
-  const json_str = await fs8.readFile(tmp_pr_json, "utf-8");
-  const json = JSON.parse(json_str);
-  return json;
+  const json_str = String(await fs9.readFile(tmp_pr_json));
+  try {
+    const json = JSON.parse(json_str);
+    return json;
+  } catch (error) {
+    return new Error(`gh_json JSON.parse: ${error}`);
+  }
 }
 function handle_error(output) {
   const state = Store.getState();
@@ -38166,14 +38185,15 @@ function handle_error(output) {
 }
 async function write_body_file(args) {
   invariant(args.body, "args.body must exist");
-  const temp_dir = os2.tmpdir();
-  let temp_filename = `git-stack-body-${args.base}`;
-  temp_filename = temp_filename.replace(RE4.non_alphanumeric_dash, "-");
-  const temp_path = path5.join(temp_dir, temp_filename);
+  let tmp_filename = safe_filename(`git-stack-body-${args.base}`);
+  const temp_path = path6.join(await get_tmp_dir(), tmp_filename);
   await safe_rm(temp_path);
-  await fs8.writeFile(temp_path, args.body);
+  await fs9.writeFile(temp_path, args.body);
   return temp_path;
 }
+function safe_filename(value) {
+  return value.replace(RE4.non_alphanumeric_dash, "-");
+}
 var RE4 = {
   non_alphanumeric_dash: /[^a-zA-Z0-9_-]+/g
 };
@@ -38327,9 +38347,8 @@ function lines(value) {
 var UNASSIGNED = "unassigned";
 
 // src/core/GitReviseTodo.ts
-import fs9 from "node:fs/promises";
-import os3 from "node:os";
-import path6 from "node:path";
+import fs10 from "node:fs/promises";
+import path7 from "node:path";
 function GitReviseTodo(args) {
   const commit_list = [];
   const group_list = args.commit_range.group_list;
@@ -38365,7 +38384,7 @@ GitReviseTodo.todo = function todo(args) {
   return todo2;
 };
 GitReviseTodo.execute = async function grt_execute(args) {
-  const tmp_git_sequence_editor_path = path6.join(os3.tmpdir(), "git-sequence-editor.sh");
+  const tmp_git_sequence_editor_path = path7.join(await get_tmp_dir(), "git-sequence-editor.sh");
   const GIT_SEQUENCE_EDITOR_SCRIPT = `#!/bin/sh
 
 # Example
@@ -38403,8 +38422,8 @@ echo "------ END ------"
 echo "$GIT_REVISE_TODO" > "$git_revise_todo_path"
 `;
   invariant(GIT_SEQUENCE_EDITOR_SCRIPT, "GIT_SEQUENCE_EDITOR_SCRIPT must exist");
-  await fs9.writeFile(tmp_git_sequence_editor_path, GIT_SEQUENCE_EDITOR_SCRIPT);
-  await fs9.chmod(tmp_git_sequence_editor_path, "755");
+  await fs10.writeFile(tmp_git_sequence_editor_path, GIT_SEQUENCE_EDITOR_SCRIPT);
+  await fs10.chmod(tmp_git_sequence_editor_path, "755");
   const git_revise_todo = GitReviseTodo(args);
   const command = [
     `GIT_EDITOR="${tmp_git_sequence_editor_path}"`,
@@ -38481,7 +38500,7 @@ function DetectInitialPR(props) {
     const branch_name2 = Store.getState().branch_name;
     const commit_range = Store.getState().commit_range;
     invariant(branch_name2, "branch_name must exist");
-    invariant(commit_range, "branch_name must exist");
+    invariant(commit_range, "commit_range must exist");
     try {
       let has_existing_metadata = false;
       for (const commit2 of commit_range.commit_list) {
@@ -38513,7 +38532,7 @@ function DetectInitialPR(props) {
     const branch_name2 = Store.getState().branch_name;
     const commit_range = import_cloneDeep.default(Store.getState().commit_range);
     invariant(branch_name2, "branch_name must exist");
-    invariant(commit_range, "branch_name must exist");
+    invariant(commit_range, "commit_range must exist");
     for (const group of commit_range.group_list) {
       group.id = branch_name2;
       group.title = state.pr?.title || "-";
@@ -38845,16 +38864,16 @@ var React32 = __toESM(require_react(), 1);
 
 // src/commands/Rebase.tsx
 var React31 = __toESM(require_react(), 1);
-import fs10 from "node:fs";
+import fs11 from "node:fs";
 
 // src/core/short_id.ts
-import crypto from "node:crypto";
+import crypto2 from "node:crypto";
 function short_id() {
   const timestamp = Date.now();
   const js_max_bits = 53;
   const timestamp_bits = Math.floor(Math.log2(timestamp)) + 1;
   const padding_bits = js_max_bits - timestamp_bits;
-  const random = crypto.randomInt(0, Math.pow(2, padding_bits));
+  const random = crypto2.randomInt(0, Math.pow(2, padding_bits));
   const combined = interleave_bits(timestamp, random);
   return encode(combined);
 }
@@ -38998,7 +39017,7 @@ Rebase.run = async function run4() {
     cli.sync(`git clean -df`, spawn_options);
     cli.sync(`git checkout ${branch_name}`, spawn_options);
     cli.sync(`git branch -D ${temp_branch_name}`, spawn_options);
-    if (fs10.existsSync(cwd2)) {
+    if (fs11.existsSync(cwd2)) {
       process.chdir(cwd2);
     }
     cli.sync(`pwd`, spawn_options);
@@ -39021,7 +39040,7 @@ function LocalMergeRebase() {
 
 // src/app/ManualRebase.tsx
 var React33 = __toESM(require_react(), 1);
-import fs11 from "node:fs";
+import fs12 from "node:fs";
 function ManualRebase() {
   return /* @__PURE__ */ React33.createElement(Await, {
     fallback: /* @__PURE__ */ React33.createElement(Text, {
@@ -39121,7 +39140,7 @@ async function run5() {
     cli.sync(`git clean -df`, spawn_options);
     cli.sync(`git checkout ${branch_name}`, spawn_options);
     cli.sync(`git branch -D ${temp_branch_name}`, spawn_options);
-    if (fs11.existsSync(cwd2)) {
+    if (fs12.existsSync(cwd2)) {
       process.chdir(cwd2);
     }
     cli.sync(`pwd`, spawn_options);
@@ -39380,8 +39399,8 @@ function PreLocalMergeRebase() {
 
 // src/app/PreManualRebase.tsx
 var React38 = __toESM(require_react(), 1);
-import fs12 from "node:fs/promises";
-import path7 from "node:path";
+import fs13 from "node:fs/promises";
+import path8 from "node:path";
 function PreManualRebase() {
   return /* @__PURE__ */ React38.createElement(Await, {
     fallback: null,
@@ -39403,7 +39422,7 @@ async function run7() {
   for (const key of PR_TEMPLATE_KEY_LIST) {
     const pr_template_fn = PR_TEMPLATE[key];
     if (await safe_exists(pr_template_fn(repo_root))) {
-      pr_template_body = await fs12.readFile(pr_template_fn(repo_root), "utf-8");
+      pr_template_body = await fs13.readFile(pr_template_fn(repo_root), "utf-8");
       actions.output(/* @__PURE__ */ React38.createElement(FormatText, {
         wrapper: /* @__PURE__ */ React38.createElement(Text, {
           color: colors.yellow
@@ -39418,7 +39437,7 @@ async function run7() {
   }
   let pr_templates = [];
   if (await safe_exists(PR_TEMPLATE.TemplateDir(repo_root))) {
-    pr_templates = await fs12.readdir(PR_TEMPLATE.TemplateDir(repo_root));
+    pr_templates = await fs13.readdir(PR_TEMPLATE.TemplateDir(repo_root));
   }
   actions.set((state2) => {
     state2.pr_template_body = pr_template_body;
@@ -39441,10 +39460,10 @@ async function run7() {
   });
 }
 var PR_TEMPLATE = Object.freeze({
-  Github: (root) => path7.join(root, ".github", "pull_request_template.md"),
-  Root: (root) => path7.join(root, "pull_request_template.md"),
-  Docs: (root) => path7.join(root, "docs", "pull_request_template.md"),
-  TemplateDir: (root) => path7.join(root, ".github", "PULL_REQUEST_TEMPLATE")
+  Github: (root) => path8.join(root, ".github", "pull_request_template.md"),
+  Root: (root) => path8.join(root, "pull_request_template.md"),
+  Docs: (root) => path8.join(root, "docs", "pull_request_template.md"),
+  TemplateDir: (root) => path8.join(root, ".github", "PULL_REQUEST_TEMPLATE")
 });
 var PR_TEMPLATE_KEY_LIST = Object.keys(PR_TEMPLATE);
 
@@ -40426,7 +40445,7 @@ function Providers(props) {
 
 // src/app/RebaseCheck.tsx
 var React48 = __toESM(require_react(), 1);
-import path8 from "node:path";
+import path9 from "node:path";
 function reducer5(state, patch) {
   return { ...state, ...patch };
 }
@@ -40464,8 +40483,8 @@ function RebaseCheck(props) {
     try {
       const git_dir = (await cli(`git rev-parse --absolute-git-dir`)).stdout;
       let is_rebase = false;
-      is_rebase ||= await safe_exists(path8.join(git_dir, "rebase-apply"));
-      is_rebase ||= await safe_exists(path8.join(git_dir, "rebase-merge"));
+      is_rebase ||= await safe_exists(path9.join(git_dir, "rebase-apply"));
+      is_rebase ||= await safe_exists(path9.join(git_dir, "rebase-merge"));
       const status = is_rebase ? "prompt" : "done";
       patch({ status });
     } catch (err) {
@@ -42021,9 +42040,9 @@ var parser = new YargsParser({
   format,
   normalize,
   resolve: resolve2,
-  require: (path9) => {
+  require: (path10) => {
     if (true) {
-      return __require(path9);
+      return __require(path10);
     } else
       ;
   }
@@ -45606,7 +45625,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.0-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.1-beta").showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`").help("help", "Show usage via `git stack help`").argv;
 }
 var GlobalOptions = {
   verbose: {
@@ -45715,6 +45734,8 @@ var FixupOptions = {
       maybe_verbose_help();
       process.exit(238);
     });
+    const tmp_dir = await get_tmp_dir();
+    await fs14.rm(tmp_dir, { recursive: true });
     const ink = render_default(/* @__PURE__ */ React55.createElement(App2, null), {
       exitOnCtrlC: false
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "2.1.0-beta",
+  "version": "2.1.1-beta",
   "description": "",
   "author": "magus",
   "license": "MIT",
@@ -52,6 +52,7 @@
     "zustand": "^4.4.4"
   },
   "devDependencies": {
+    "@oven/bun-darwin-aarch64": "1.1.42",
     "@types/chalk": "^2.2.0",
     "@types/lodash": "^4.17.7",
     "@types/luxon": "^3.4.2",

package/src/app/DetectInitialPR.tsx

@@ -108,7 +108,7 @@ export function DetectInitialPR(props: Props) {
     const commit_range = Store.getState().commit_range;
 
     invariant(branch_name, "branch_name must exist");
-    invariant(commit_range, "branch_name must exist");
+    invariant(commit_range, "commit_range must exist");
 
     try {
       let has_existing_metadata = false;
@@ -149,7 +149,7 @@ export function DetectInitialPR(props: Props) {
     const commit_range = cloneDeep(Store.getState().commit_range);
 
     invariant(branch_name, "branch_name must exist");
-    invariant(commit_range, "branch_name must exist");
+    invariant(commit_range, "commit_range must exist");
 
     for (const group of commit_range.group_list) {
       group.id = branch_name;

package/src/core/GitReviseTodo.ts

@@ -1,9 +1,9 @@
 import fs from "node:fs/promises";
-import os from "node:os";
 import path from "node:path";
 
 import * as Metadata from "~/core/Metadata";
 import { cli } from "~/core/cli";
+import { get_tmp_dir } from "~/core/get_tmp_dir";
 import { invariant } from "~/core/invariant";
 import { safe_rm } from "~/core/safe_rm";
 
@@ -109,7 +109,7 @@ GitReviseTodo.todo = function todo(args: CommitListArgs) {
 
 GitReviseTodo.execute = async function grt_execute(args: ExecuteArgs) {
   // generate temporary directory and drop sequence editor script
-  const tmp_git_sequence_editor_path = path.join(os.tmpdir(), "git-sequence-editor.sh");
+  const tmp_git_sequence_editor_path = path.join(await get_tmp_dir(), "git-sequence-editor.sh");
 
   // replaced at build time with literal contents of `scripts/git-sequence-editor.sh`
   const GIT_SEQUENCE_EDITOR_SCRIPT = process.env.GIT_SEQUENCE_EDITOR_SCRIPT;

package/src/core/get_tmp_dir.ts

@@ -0,0 +1,12 @@
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+
+export async function get_tmp_dir(): Promise<string> {
+  const dir = path.join(os.tmpdir(), "git-stack-cli");
+
+  // ensure tmp directory exists
+  await fs.mkdir(dir, { recursive: true });
+
+  return dir;
+}

package/src/core/github.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 
+import crypto from "node:crypto";
 import fs from "node:fs/promises";
-import os from "node:os";
 import path from "node:path";
 
 import * as Ink from "ink-cjs";
@@ -10,6 +10,7 @@ import { Brackets } from "~/app/Brackets";
 import { Store } from "~/app/Store";
 import { cli } from "~/core/cli";
 import { colors } from "~/core/colors";
+import { get_tmp_dir } from "~/core/get_tmp_dir";
 import { invariant } from "~/core/invariant";
 import { safe_quote } from "~/core/safe_quote";
 import { safe_rm } from "~/core/safe_rm";
@@ -228,7 +229,10 @@ const JSON_FIELDS = "--json id,number,state,baseRefName,headRefName,commits,titl
 // consistent handle gh cli commands returning json
 // redirect to tmp file to avoid scrollback overflow causing scrollback to be cleared
 async function gh_json<T>(command: string): Promise<T | Error> {
-  const tmp_pr_json = path.join(os.tmpdir(), "git-stack-gh.json");
+  // hash command for unique short string
+  let hash = crypto.createHash("md5").update(command).digest("hex");
+  let tmp_filename = safe_filename(`gh_json-${hash}`);
+  const tmp_pr_json = path.join(await get_tmp_dir(), `${tmp_filename}.json`);
 
   const options = { ignoreExitCode: true };
   const cli_result = await cli(`gh ${command} > ${tmp_pr_json}`, options);
@@ -238,9 +242,13 @@ async function gh_json<T>(command: string): Promise<T | Error> {
   }
 
   // read from file
-  const json_str = await fs.readFile(tmp_pr_json, "utf-8");
-  const json = JSON.parse(json_str);
-  return json;
+  const json_str = String(await fs.readFile(tmp_pr_json));
+  try {
+    const json = JSON.parse(json_str);
+    return json;
+  } catch (error) {
+    return new Error(`gh_json JSON.parse: ${error}`);
+  }
 }
 
 function handle_error(output: string): never {
@@ -258,15 +266,12 @@ function handle_error(output: string): never {
 async function write_body_file(args: EditPullRequestArgs) {
   invariant(args.body, "args.body must exist");
 
-  const temp_dir = os.tmpdir();
-
   // ensure unique filename is safe for filesystem
   // base (group id) might contain slashes, e.g. dev/magus/gs-3cmrMBSUj
   // the flashes would mess up the filesystem path to this file
-  let temp_filename = `git-stack-body-${args.base}`;
-  temp_filename = temp_filename.replace(RE.non_alphanumeric_dash, "-");
+  let tmp_filename = safe_filename(`git-stack-body-${args.base}`);
 
-  const temp_path = path.join(temp_dir, temp_filename);
+  const temp_path = path.join(await get_tmp_dir(), tmp_filename);
 
   await safe_rm(temp_path);
 
@@ -275,6 +280,10 @@ async function write_body_file(args: EditPullRequestArgs) {
   return temp_path;
 }
 
+function safe_filename(value: string): string {
+  return value.replace(RE.non_alphanumeric_dash, "-");
+}
+
 type Commit = {
   authoredDate: string; // "2023-10-22T23:13:35Z"
   authors: [

package/src/index.tsx

@@ -4,11 +4,14 @@
 
 import * as React from "react";
 
+import fs from "node:fs/promises";
+
 import * as Ink from "ink-cjs";
 
 import { App } from "~/app/App";
 import { Store } from "~/app/Store";
 import { command } from "~/command";
+import { get_tmp_dir } from "~/core/get_tmp_dir";
 import { pretty_json } from "~/core/pretty_json";
 
 (async function main() {
@@ -33,6 +36,10 @@ import { pretty_json } from "~/core/pretty_json";
       process.exit(238);
     });
 
+    // cleanup leftover temporary files from previous run
+    const tmp_dir = await get_tmp_dir();
+    await fs.rm(tmp_dir, { recursive: true });
+
     const ink = Ink.render(<App />, {
       // If true, each update will be rendered as a separate output, without replacing the previous one.
       // debug: true,