git-stack-cli 0.6.0 → 0.7.1

package/README.md

@@ -16,5 +16,5 @@ git stack
 npm run dev
 npm link
 
-git stack --debug
+git stack --verbose
 ```

package/dist/__fixtures__/metadata.js

@@ -5,40 +5,16 @@ export const METADATA = {
         "invalid": false,
         "group_list": [
             {
-                "id": "79402548-a996-4c2a-a338-86633040358e",
-                "pr": {
-                    "baseRefName": "d9fc206e-70ce-4b1c-b950-1f54cf1fe112",
-                    "commits": [
-                        {
-                            "authoredDate": "2023-10-29T21:58:16Z",
-                            "authors": [
-                                {
-                                    "email": "noah@iamnoah.com",
-                                    "id": "MDQ6VXNlcjI5MDA4NA==",
-                                    "login": "magus",
-                                    "name": "magus"
-                                }
-                            ],
-                            "committedDate": "2023-11-17T10:43:34Z",
-                            "messageBody": "git-multi-diff-id: 79402548-a996-4c2a-a338-86633040358e",
-                            "messageHeadline": "orange color",
-                            "oid": "3dcc44fbe1f293d0c212e71dfcd459e9d88879a8"
-                        }
-                    ],
-                    "headRefName": "79402548-a996-4c2a-a338-86633040358e",
-                    "number": 32,
-                    "state": "OPEN",
-                    "title": "orange color",
-                    "url": "https://github.com/magus/git-multi-diff-playground/pull/32"
-                },
-                "base": "d9fc206e-70ce-4b1c-b950-1f54cf1fe112",
-                "dirty": false,
+                "id": "unassigned",
+                "pr": null,
+                "base": null,
+                "dirty": true,
                 "commits": [
                     {
                         "sha": "3dcc44fbe1f293d0c212e71dfcd459e9d88879a8",
                         "message": "orange color",
-                        "raw_message": "orange color\n\ngit-multi-diff-id: 79402548-a996-4c2a-a338-86633040358e",
-                        "branch_id": "79402548-a996-4c2a-a338-86633040358e"
+                        "raw_message": "orange color",
+                        "branch_id": null
                     }
                 ]
             },
@@ -422,6 +398,7 @@ export const METADATA = {
                 "branch_id": "79402548-a996-4c2a-a338-86633040358e"
             }
         ],
+        "pr_lookup": {},
         "UNASSIGNED": "unassigned"
     },
     "pr": {

package/dist/app/AutoUpdate.js

@@ -3,6 +3,7 @@ import fs from "node:fs";
 import path from "node:path";
 import * as Ink from "ink";
 import { cli } from "../core/cli.js";
+import { colors } from "../core/colors.js";
 import { fetch_json } from "../core/fetch_json.js";
 import { read_json } from "../core/read_json.js";
 import { semver_compare } from "../core/semver_compare.js";
@@ -87,7 +88,7 @@ export function AutoUpdate(props) {
             patch({ status, error, local_version, latest_version });
             onError(error);
             if (props_ref.current.verbose) {
-                handle_output(React.createElement(Ink.Text, { key: "error", dimColor: true, color: "red" }, error?.message));
+                handle_output(React.createElement(Ink.Text, { key: "error", dimColor: true, color: colors.red }, error?.message));
             }
         });
     }, []);
@@ -96,10 +97,10 @@ export function AutoUpdate(props) {
             case "init":
                 return null;
             case "prompt":
-                return (React.createElement(YesNoPrompt, { message: React.createElement(Ink.Text, { color: "yellow" }, "New version available, would you like to update?"), onYes: async () => {
+                return (React.createElement(YesNoPrompt, { message: React.createElement(Ink.Text, { color: colors.yellow }, "New version available, would you like to update?"), onYes: async () => {
                         handle_output(React.createElement(FormatText, { key: "install", wrapper: React.createElement(Ink.Text, null), message: "Installing {name}@{version}...", values: {
-                                name: React.createElement(Ink.Text, { color: "yellow" }, props.name),
-                                version: (React.createElement(Ink.Text, { color: "#38bdf8" }, state.latest_version)),
+                                name: (React.createElement(Ink.Text, { color: colors.yellow }, props.name)),
+                                version: (React.createElement(Ink.Text, { color: colors.blue }, state.latest_version)),
                             } }));
                         patch({ status: "install" });
                         await cli(`npm install -g ${props.name}@latest`);

package/dist/app/Brackets.js

@@ -1,8 +1,9 @@
 import * as React from "react";
 import * as Ink from "ink";
+import { colors } from "../core/colors.js";
 export function Brackets(props) {
-    const color = "#f97316";
-    const text_color = "#38bdf8";
+    const color = colors.orange;
+    const text_color = colors.blue;
     return (React.createElement(Ink.Text, { color: text_color },
         React.createElement(Ink.Text, { color: color }, "["),
         props.children,

package/dist/app/Command.js

@@ -1,6 +1,7 @@
 import * as React from "react";
 import * as Ink from "ink";
+import { colors } from "../core/colors.js";
 export function Command(props) {
-    const text_color = "#f97316";
+    const text_color = colors.orange;
     return (React.createElement(Ink.Text, { bold: true, color: text_color }, props.children));
 }

package/dist/app/Debug.js

@@ -2,6 +2,7 @@ import * as React from "react";
 import fs from "node:fs";
 import path from "node:path";
 import * as Ink from "ink";
+import { colors } from "../core/colors.js";
 import { invariant } from "../core/invariant.js";
 import * as json from "../core/json.js";
 import { Store } from "./Store.js";
@@ -12,7 +13,7 @@ export function Debug() {
     const debug = Store.useState((state) => state.select.debug(state));
     React.useEffect(function debugMessageOnce() {
         if (debug) {
-            actions.output(React.createElement(Ink.Text, { color: "yellow" }, "Debug mode enabled"));
+            actions.output(React.createElement(Ink.Text, { color: colors.yellow }, "Debug mode enabled"));
         }
     }, [argv]);
     React.useEffect(function syncStateJson() {

package/dist/app/DependencyCheck.js

@@ -1,6 +1,7 @@
 import * as React from "react";
 import * as Ink from "ink";
 import { cli } from "../core/cli.js";
+import { colors } from "../core/colors.js";
 import { is_command_available } from "../core/is_command_available.js";
 import { match_group } from "../core/match_group.js";
 import { semver_compare } from "../core/semver_compare.js";
@@ -11,19 +12,19 @@ import { Store } from "./Store.js";
 import { Url } from "./Url.js";
 export function DependencyCheck(props) {
     const actions = Store.useActions();
-    return (React.createElement(Await, { fallback: React.createElement(Ink.Text, { color: "yellow" },
+    return (React.createElement(Await, { fallback: React.createElement(Ink.Text, { color: colors.yellow },
             "Checking ",
             React.createElement(Command, null, "git"),
             " install..."), function: async () => {
             if (is_command_available("git")) {
                 return;
             }
-            actions.output(React.createElement(Ink.Text, { color: "yellow" },
+            actions.output(React.createElement(Ink.Text, { color: colors.yellow },
                 React.createElement(Command, null, "git"),
                 " must be installed."));
             actions.exit(2);
         } },
-        React.createElement(Await, { fallback: React.createElement(Ink.Text, { color: "yellow" },
+        React.createElement(Await, { fallback: React.createElement(Ink.Text, { color: colors.yellow },
                 "Checking ",
                 React.createElement(Command, null, "node"),
                 " install..."), function: async () => {
@@ -32,12 +33,12 @@ export function DependencyCheck(props) {
                 if (semver_result >= 0) {
                     return;
                 }
-                actions.output(React.createElement(Ink.Text, { color: "yellow" },
+                actions.output(React.createElement(Ink.Text, { color: colors.yellow },
                     React.createElement(Command, null, "node"),
                     " must be installed."));
                 actions.exit(2);
             } },
-            React.createElement(Await, { fallback: React.createElement(Ink.Text, { color: "yellow" },
+            React.createElement(Await, { fallback: React.createElement(Ink.Text, { color: colors.yellow },
                     React.createElement(Ink.Text, null,
                         "Checking ",
                         React.createElement(Command, null, "gh"),
@@ -45,10 +46,10 @@ export function DependencyCheck(props) {
                     if (is_command_available("gh")) {
                         return;
                     }
-                    actions.output(React.createElement(Ink.Text, { color: "yellow" },
+                    actions.output(React.createElement(Ink.Text, { color: colors.yellow },
                         React.createElement(Command, null, "gh"),
                         " must be installed."));
-                    actions.output(React.createElement(Ink.Text, { color: "yellow" },
+                    actions.output(React.createElement(Ink.Text, { color: colors.yellow },
                         React.createElement(Ink.Text, null, "Visit "),
                         React.createElement(Url, null, "https://cli.github.com"),
                         React.createElement(Ink.Text, null, " to install the github cli "),
@@ -56,7 +57,7 @@ export function DependencyCheck(props) {
                             React.createElement(Command, null, "gh"))));
                     actions.exit(3);
                 } },
-                React.createElement(Await, { fallback: React.createElement(Ink.Text, { color: "yellow" },
+                React.createElement(Await, { fallback: React.createElement(Ink.Text, { color: colors.yellow },
                         React.createElement(Ink.Text, null,
                             "Checking ",
                             React.createElement(Command, null, "gh auth status"),
@@ -71,7 +72,7 @@ export function DependencyCheck(props) {
                             });
                             return;
                         }
-                        actions.output(React.createElement(Ink.Text, { color: "yellow" },
+                        actions.output(React.createElement(Ink.Text, { color: colors.yellow },
                             React.createElement(Command, null, "gh"),
                             React.createElement(Ink.Text, null, " requires login, please run "),
                             React.createElement(Command, null, "gh auth login")));

package/dist/app/GatherMetadata.js

@@ -1,33 +1,60 @@
 import * as React from "react";
 import * as Ink from "ink";
 import { cli } from "../core/cli.js";
+import { colors } from "../core/colors.js";
 import { invariant } from "../core/invariant.js";
 import { match_group } from "../core/match_group.js";
 import { Await } from "./Await.js";
+import { Brackets } from "./Brackets.js";
+import { FormatText } from "./FormatText.js";
 import { Store } from "./Store.js";
 export function GatherMetadata(props) {
     const argv = Store.useState((state) => state.argv);
     invariant(argv, "argv must exist");
-    const fallback = (React.createElement(Ink.Text, { color: "yellow" }, "Gathering local git information..."));
+    const fallback = (React.createElement(Ink.Text, { color: colors.yellow }, "Gathering local git information..."));
     return (React.createElement(Await, { fallback: fallback, function: gather_metadata }, props.children));
 }
 async function gather_metadata() {
     const actions = Store.getState().actions;
+    const argv = Store.getState().argv;
+    invariant(argv, "argv must exist");
     try {
+        // default to master branch, fallback to main
+        let master_branch;
+        if (argv.branch) {
+            actions.debug(React.createElement(FormatText, { message: "Setting master branch to {branch}", values: {
+                    branch: React.createElement(Brackets, null, argv.branch),
+                } }));
+            master_branch = argv.branch;
+        }
+        else {
+            const detect_master = await cli(`git branch --list "${BRANCH.master}" --color=never`);
+            if (detect_master.stdout !== "") {
+                master_branch = BRANCH.master;
+            }
+            else {
+                actions.debug(React.createElement(FormatText, { message: "Could not find {master} branch, falling back to {main}", values: {
+                        master: React.createElement(Brackets, null, BRANCH.master),
+                        main: React.createElement(Brackets, null, BRANCH.main),
+                    } }));
+                master_branch = BRANCH.main;
+            }
+        }
         const branch_name = (await cli("git rev-parse --abbrev-ref HEAD")).stdout;
         // handle when there are no detected changes
-        if (branch_name === "master") {
+        if (branch_name === master_branch) {
             actions.newline();
             actions.error("Must run within a branch.");
             actions.exit(0);
             return;
         }
         const head = (await cli("git rev-parse HEAD")).stdout;
-        const merge_base = (await cli("git merge-base HEAD master")).stdout;
+        const merge_base = (await cli(`git merge-base HEAD ${master_branch}`))
+            .stdout;
         // handle when there are no detected changes
         if (head === merge_base) {
             actions.newline();
-            actions.output(React.createElement(Ink.Text, { color: "gray" }, "No changes detected."));
+            actions.output(React.createElement(Ink.Text, { color: colors.gray }, "No changes detected."));
             actions.exit(0);
             return;
         }
@@ -37,6 +64,7 @@ async function gather_metadata() {
         const repo_path = match_group(origin_url, RE.repo_path, "repo_path");
         Store.setState((state) => {
             state.repo_path = repo_path;
+            state.master_branch = master_branch;
             state.head = head;
             state.merge_base = merge_base;
             state.branch_name = branch_name;
@@ -49,6 +77,7 @@ async function gather_metadata() {
                 actions.error(err.message);
             }
         }
+        actions.exit(7);
     }
 }
 const RE = {
@@ -56,3 +85,7 @@ const RE = {
     // https://github.com/magus/git-multi-diff-playground.git
     repo_path: /(?<repo_path>[^:^/]+\/[^/]+)\.git/,
 };
+const BRANCH = {
+    master: "master",
+    main: "main",
+};

package/dist/app/GithubApiError.js

@@ -1,6 +1,7 @@
 import * as React from "react";
 import * as Ink from "ink";
 import { cli } from "../core/cli.js";
+import { colors } from "../core/colors.js";
 import * as date from "../core/date.js";
 import { invariant } from "../core/invariant.js";
 import { Await } from "./Await.js";
@@ -41,9 +42,9 @@ async function run() {
             React.createElement(Ink.Text, null, "/"),
             React.createElement(Ink.Text, null, limit)),
         React.createElement(Ink.Text, null, " will reset at "),
-        React.createElement(Ink.Text, { bold: true, color: "yellow" }, reset_time),
+        React.createElement(Ink.Text, { bold: true, color: colors.yellow }, reset_time),
         React.createElement(Ink.Text, null, " "),
         React.createElement(Parens, null,
             React.createElement(Ink.Text, null, "in "),
-            React.createElement(Ink.Text, { bold: true, color: "yellow" }, time_until))));
+            React.createElement(Ink.Text, { bold: true, color: colors.yellow }, time_until))));
 }

package/dist/app/LocalCommitStatus.js

@@ -1,6 +1,7 @@
 import * as React from "react";
 import * as Ink from "ink";
 import * as CommitMetadata from "../core/CommitMetadata.js";
+import { colors } from "../core/colors.js";
 import { invariant } from "../core/invariant.js";
 import * as json from "../core/json.js";
 import { Await } from "./Await.js";
@@ -8,7 +9,7 @@ import { Store } from "./Store.js";
 export function LocalCommitStatus(props) {
     const argv = Store.useState((state) => state.argv);
     invariant(argv, "argv must exist");
-    const fallback = (React.createElement(Ink.Text, { color: "yellow" }, "Fetching PR status from Github..."));
+    const fallback = (React.createElement(Ink.Text, { color: colors.yellow }, "Fetching PR status from Github..."));
     if (argv["mock-metadata"]) {
         return (React.createElement(Await, { fallback: fallback, function: mock_metadata }, props.children));
     }

package/dist/app/LocalMergeRebase.js

@@ -3,6 +3,7 @@ import * as Ink from "ink";
 import * as CommitMetadata from "../core/CommitMetadata.js";
 import * as Metadata from "../core/Metadata.js";
 import { cli } from "../core/cli.js";
+import { colors } from "../core/colors.js";
 import { invariant } from "../core/invariant.js";
 import { short_id } from "../core/short_id.js";
 import { Await } from "./Await.js";
@@ -11,32 +12,33 @@ import { FormatText } from "./FormatText.js";
 import { Parens } from "./Parens.js";
 import { Store } from "./Store.js";
 export function LocalMergeRebase() {
-    return (React.createElement(Await, { fallback: React.createElement(Ink.Text, { color: "yellow" }, "Rebasing commits..."), function: run }));
+    return (React.createElement(Await, { fallback: React.createElement(Ink.Text, { color: colors.yellow }, "Rebasing commits..."), function: run }));
 }
 async function run() {
     const state = Store.getState();
     const actions = state.actions;
     const branch_name = state.branch_name;
     const commit_range = state.commit_range;
+    const master_branch = state.master_branch;
     invariant(branch_name, "branch_name must exist");
     invariant(commit_range, "commit_range must exist");
     // always listen for SIGINT event and restore git state
     process.once("SIGINT", handle_exit);
     const temp_branch_name = `${branch_name}_${short_id()}`;
     try {
-        await cli(`git fetch --no-tags -v origin master:master`);
-        const master_sha = (await cli(`git rev-parse master`)).stdout;
+        await cli(`git fetch --no-tags -v origin ${master_branch}:${master_branch}`);
+        const master_sha = (await cli(`git rev-parse ${master_branch}`)).stdout;
         const rebase_merge_base = master_sha;
         // create temporary branch based on merge base
         await cli(`git checkout -b ${temp_branch_name} ${rebase_merge_base}`);
         for (let i = 0; i < commit_range.commit_list.length; i++) {
             const commit = commit_range.commit_list[i];
-            const commit_pr = commit_range.pr_map.get(commit.branch_id || "");
+            const commit_pr = commit_range.pr_lookup[commit.branch_id || ""];
             // drop commits that are in groups of merged PRs
             const merged_pr = commit_pr?.state === "MERGED";
             if (merged_pr) {
                 if (actions.isDebug()) {
-                    actions.output(React.createElement(FormatText, { wrapper: React.createElement(Ink.Text, { color: "yellow", wrap: "truncate-end" }), message: "Dropping {commit_message} {pr_status}", values: {
+                    actions.output(React.createElement(FormatText, { wrapper: React.createElement(Ink.Text, { color: colors.yellow, wrap: "truncate-end" }), message: "Dropping {commit_message} {pr_status}", values: {
                             commit_message: React.createElement(Brackets, null, commit.message),
                             pr_status: React.createElement(Parens, null, "MERGED"),
                         } }));
@@ -45,14 +47,14 @@ async function run() {
             }
             // cherry-pick and amend commits one by one
             if (actions.isDebug()) {
-                actions.output(React.createElement(FormatText, { wrapper: React.createElement(Ink.Text, { color: "yellow", wrap: "truncate-end" }), message: "Picking {commit_message}", values: {
+                actions.output(React.createElement(FormatText, { wrapper: React.createElement(Ink.Text, { color: colors.yellow, wrap: "truncate-end" }), message: "Picking {commit_message}", values: {
                         commit_message: React.createElement(Brackets, null, commit.message),
                     } }));
             }
             await cli(`git cherry-pick ${commit.sha}`);
             if (commit.branch_id && !commit_pr) {
                 if (actions.isDebug()) {
-                    actions.output(React.createElement(FormatText, { wrapper: React.createElement(Ink.Text, { color: "yellow", wrap: "truncate-end" }), message: "Cleaning up unused group {group}", values: {
+                    actions.output(React.createElement(FormatText, { wrapper: React.createElement(Ink.Text, { color: colors.yellow, wrap: "truncate-end" }), message: "Cleaning up unused group {group}", values: {
                             group: React.createElement(Brackets, null, commit.branch_id),
                         } }));
                 }
@@ -99,15 +101,15 @@ async function run() {
         }
     }
     function handle_exit() {
-        actions.output(React.createElement(Ink.Text, { color: "yellow" },
+        actions.output(React.createElement(Ink.Text, { color: colors.yellow },
             "Restoring ",
             React.createElement(Brackets, null, branch_name),
             "..."));
         restore_git();
-        actions.output(React.createElement(Ink.Text, { color: "yellow" },
+        actions.output(React.createElement(Ink.Text, { color: colors.yellow },
             "Restored ",
             React.createElement(Brackets, null, branch_name),
             "."));
-        actions.exit(5);
+        actions.exit(6);
     }
 }

package/dist/app/ManualRebase.js

@@ -4,6 +4,7 @@ import * as CommitMetadata from "../core/CommitMetadata.js";
 import * as Metadata from "../core/Metadata.js";
 import * as StackSummaryTable from "../core/StackSummaryTable.js";
 import { cli } from "../core/cli.js";
+import { colors } from "../core/colors.js";
 import * as github from "../core/github.js";
 import { invariant } from "../core/invariant.js";
 import { short_id } from "../core/short_id.js";
@@ -12,7 +13,7 @@ import { Brackets } from "./Brackets.js";
 import { FormatText } from "./FormatText.js";
 import { Store } from "./Store.js";
 export function ManualRebase(props) {
-    return (React.createElement(Await, { fallback: React.createElement(Ink.Text, { color: "yellow" }, "Rebasing commits..."), function: () => run(props) }));
+    return (React.createElement(Await, { fallback: React.createElement(Ink.Text, { color: colors.yellow }, "Rebasing commits..."), function: () => run(props) }));
 }
 async function run(props) {
     const state = Store.getState();
@@ -49,9 +50,11 @@ async function run(props) {
     try {
         // create temporary branch based on merge base
         await cli(`git checkout -b ${temp_branch_name} ${rebase_merge_base}`);
+        const pr_url_list = commit_range.group_list.map(get_group_url);
         for (let i = rebase_group_index; i < commit_range.group_list.length; i++) {
             const group = commit_range.group_list[i];
             invariant(group.base, "group.base must exist");
+            const selected_url = get_group_url(group);
             // cherry-pick and amend commits one by one
             for (const commit of group.commits) {
                 await cli(`git cherry-pick ${commit.sha}`);
@@ -60,13 +63,13 @@ async function run(props) {
                     await cli(`git commit --amend -m "${new_message}"`);
                 }
             }
-            actions.output(React.createElement(FormatText, { wrapper: React.createElement(Ink.Text, { color: "yellow", wrap: "truncate-end" }), message: "Syncing {group}\u2026", values: {
+            actions.output(React.createElement(FormatText, { wrapper: React.createElement(Ink.Text, { color: colors.yellow, wrap: "truncate-end" }), message: "Syncing {group}\u2026", values: {
                     group: (React.createElement(Brackets, null, group.pr?.title || group.title || group.id)),
                 } }));
             if (!props.skipSync) {
                 // push to origin since github requires commit shas to line up perfectly
                 const git_push_command = [`git push -f origin HEAD:${group.id}`];
-                if (argv["no-verify"]) {
+                if (argv.verify === false) {
                     git_push_command.push("--no-verify");
                 }
                 await cli(git_push_command.join(" "));
@@ -77,8 +80,8 @@ async function run(props) {
                         base: group.base,
                         body: StackSummaryTable.write({
                             body: group.pr.body,
-                            commit_range,
-                            selected_group_id: group.id,
+                            pr_url_list,
+                            selected_url,
                         }),
                     });
                 }
@@ -88,21 +91,51 @@ async function run(props) {
                     // move to temporary branch for creating pr
                     await cli(`git checkout -b ${group.id}`);
                     // create pr in github
-                    await github.pr_create({
+                    const pr_url = await github.pr_create({
                         branch: group.id,
                         base: group.base,
                         title: group.title,
-                        body: StackSummaryTable.write({
-                            body: "",
-                            commit_range,
-                            selected_group_id: group.id,
-                        }),
+                        body: "",
                     });
+                    if (!pr_url) {
+                        throw new Error("unable to create pr");
+                    }
+                    // update pr_url_list with created pr_url
+                    for (let i = 0; i < pr_url_list.length; i++) {
+                        const url = pr_url_list[i];
+                        if (url === selected_url) {
+                            pr_url_list[i] = pr_url;
+                        }
+                    }
                     // move back to temp branch
                     await cli(`git checkout ${temp_branch_name}`);
                 }
             }
         }
+        // finally, ensure all prs have the updated stack table from updated pr_url_list
+        for (let i = 0; i < commit_range.group_list.length; i++) {
+            const group = commit_range.group_list[i];
+            // use the updated pr_url_list to get the actual selected_url
+            const selected_url = pr_url_list[i];
+            invariant(group.base, "group.base must exist");
+            const body = group.pr?.body || "";
+            const update_body = StackSummaryTable.write({
+                body,
+                pr_url_list,
+                selected_url,
+            });
+            if (update_body === body) {
+                actions.debug(`Skipping body update for ${selected_url}`);
+            }
+            else {
+                actions.debug(`Update body for ${selected_url}`);
+                await github.pr_edit({
+                    branch: group.id,
+                    base: group.base,
+                    body: update_body,
+                });
+            }
+        }
         // after all commits have been cherry-picked and amended
         // move the branch pointer to the newly created temporary branch
         // now we are in locally in sync with github and on the original branch
@@ -139,15 +172,16 @@ async function run(props) {
         }
     }
     function handle_exit() {
-        actions.output(React.createElement(Ink.Text, { color: "yellow" },
+        actions.output(React.createElement(Ink.Text, { color: colors.yellow },
             "Restoring ",
             React.createElement(Brackets, null, branch_name),
             "..."));
         restore_git();
-        actions.output(React.createElement(Ink.Text, { color: "yellow" },
+        actions.output(React.createElement(Ink.Text, { color: colors.yellow },
             "Restored ",
             React.createElement(Brackets, null, branch_name),
             "."));
         actions.exit(5);
     }
 }
+const get_group_url = (group) => group.pr?.url || group.id;

package/dist/app/MultiSelect.js

@@ -1,6 +1,7 @@
 import * as React from "react";
 import * as Ink from "ink";
 import { clamp } from "../core/clamp.js";
+import { colors } from "../core/colors.js";
 import { wrap_index } from "../core/wrap_index.js";
 export function MultiSelect(props) {
     const [selected_set, select] = React.useReducer((state, value) => {
@@ -52,12 +53,13 @@ export function MultiSelect(props) {
         // console.debug({ item, selected, state });
         props.onSelect({ item, selected, state });
     }, [selected_set]);
-    Ink.useInput((_input, key) => {
+    Ink.useInput((input, key) => {
         if (props.disabled) {
             // console.debug("[MultiSelect] disabled, ignoring input");
             return;
         }
-        if (key.return) {
+        const space = input === " ";
+        if (key.return || space) {
             selectRef.current = true;
             const item = props.items[index];
             if (!item.disabled) {
@@ -100,7 +102,7 @@ function ItemRow(props) {
     let underline;
     let dimColor;
     if (props.active) {
-        color = "#38bdf8";
+        color = colors.blue;
         underline = true;
     }
     if (props.selected) {
@@ -125,7 +127,7 @@ function Radio(props) {
     if (props.selected) {
         // display = "✓";
         display = "◉";
-        color = "green";
+        color = colors.green;
     }
     else {
         // display = " ";
@@ -133,7 +135,7 @@ function Radio(props) {
         color = "";
     }
     if (props.disabled) {
-        color = "gray";
+        color = colors.gray;
         dimColor = true;
     }
     return (React.createElement(Ink.Text, { bold: props.selected, color: color, dimColor: dimColor }, display));

package/dist/app/Parens.js

@@ -1,7 +1,8 @@
 import * as React from "react";
 import * as Ink from "ink";
+import { colors } from "../core/colors.js";
 export function Parens(props) {
-    const color = "#38bdf8";
+    const color = colors.blue;
     return (React.createElement(Ink.Text, null,
         React.createElement(Ink.Text, { color: color }, "("),
         props.children,

package/dist/app/SelectCommitRanges.js

@@ -1,5 +1,6 @@
 import * as React from "react";
 import * as Ink from "ink";
+import { colors } from "../core/colors.js";
 import { invariant } from "../core/invariant.js";
 import { short_id } from "../core/short_id.js";
 import { wrap_index } from "../core/wrap_index.js";
@@ -72,7 +73,7 @@ function SelectCommitRangesInternal(props) {
                 state.commit_map = {};
                 for (const [sha, id] of commit_map.entries()) {
                     if (id) {
-                        const group = new_group_list.find((g) => g.id === id);
+                        const group = group_list.find((g) => g.id === id);
                         // console.debug({ sha, id, group });
                         if (group) {
                             state.commit_map[sha] = group;
@@ -155,37 +156,37 @@ function SelectCommitRangesInternal(props) {
                 React.createElement(Ink.Text, { wrap: "truncate-end" }, group.title)),
             React.createElement(Ink.Text, null, right_arrow)),
         React.createElement(Ink.Box, { height: 1 }),
-        unassigned_count > 0 ? (React.createElement(FormatText, { wrapper: React.createElement(Ink.Text, { color: "gray" }), message: "{count} unassigned commits, press {c} to {create} a new group", values: {
-                count: (React.createElement(Ink.Text, { color: "#3b82f6", bold: true }, unassigned_count)),
-                c: (React.createElement(Ink.Text, { bold: true, color: "#22c55e" }, "c")),
-                create: (React.createElement(Ink.Text, { bold: true, color: "#22c55e" },
+        unassigned_count > 0 ? (React.createElement(FormatText, { wrapper: React.createElement(Ink.Text, { color: colors.gray }), message: "{count} unassigned commits, press {c} to {create} a new group", values: {
+                count: (React.createElement(Ink.Text, { color: colors.yellow, bold: true }, unassigned_count)),
+                c: (React.createElement(Ink.Text, { bold: true, color: colors.green }, "c")),
+                create: (React.createElement(Ink.Text, { bold: true, color: colors.green },
                     React.createElement(Parens, null, "c"),
                     "reate")),
             } })) : (React.createElement(React.Fragment, null,
             React.createElement(FormatText, { wrapper: React.createElement(Ink.Text, null), message: "\uD83C\uDF89 Done! Press {s} to {sync} the commits to Github", values: {
-                    s: (React.createElement(Ink.Text, { bold: true, color: "#22c55e" }, "s")),
-                    sync: (React.createElement(Ink.Text, { bold: true, color: "#22c55e" },
+                    s: (React.createElement(Ink.Text, { bold: true, color: colors.green }, "s")),
+                    sync: (React.createElement(Ink.Text, { bold: true, color: colors.green },
                         React.createElement(Parens, null, "s"),
                         "ync")),
                 } }))),
         !group_input ? null : (React.createElement(React.Fragment, null,
             React.createElement(Ink.Box, { height: 1 }),
-            React.createElement(FormatText, { wrapper: React.createElement(Ink.Text, { color: "gray" }), message: "Enter a title for the PR {note}", values: {
+            React.createElement(FormatText, { wrapper: React.createElement(Ink.Text, { color: colors.gray }), message: "Enter a title for the PR {note}", values: {
                     note: (React.createElement(Parens, null,
                         React.createElement(FormatText, { message: "press {enter} to submit", values: {
-                                enter: (React.createElement(Ink.Text, { bold: true, color: "#22c55e" }, SYMBOL.enter)),
+                                enter: (React.createElement(Ink.Text, { bold: true, color: colors.green }, SYMBOL.enter)),
                             } }))),
                 } }),
             React.createElement(TextInput, { onSubmit: submit_group_input }),
             React.createElement(Ink.Box, { height: 1 }))),
         React.createElement(Ink.Box, null,
-            React.createElement(FormatText, { wrapper: React.createElement(Ink.Text, { color: "gray" }), message: "Press {left} and {right} to view PR groups", values: {
-                    left: (React.createElement(Ink.Text, { bold: true, color: "#22c55e" }, SYMBOL.left)),
-                    right: (React.createElement(Ink.Text, { bold: true, color: "#22c55e" }, SYMBOL.right)),
+            React.createElement(FormatText, { wrapper: React.createElement(Ink.Text, { color: colors.gray }), message: "Press {left} and {right} to view PR groups", values: {
+                    left: (React.createElement(Ink.Text, { bold: true, color: colors.green }, SYMBOL.left)),
+                    right: (React.createElement(Ink.Text, { bold: true, color: colors.green }, SYMBOL.right)),
                 } })),
         React.createElement(Ink.Box, null,
-            React.createElement(FormatText, { wrapper: React.createElement(Ink.Text, { color: "gray" }), message: "Press {enter} to toggle commit selection", values: {
-                    enter: (React.createElement(Ink.Text, { bold: true, color: "#22c55e" }, SYMBOL.enter)),
+            React.createElement(FormatText, { wrapper: React.createElement(Ink.Text, { color: colors.gray }), message: "Press {enter} to toggle commit selection", values: {
+                    enter: (React.createElement(Ink.Text, { bold: true, color: colors.green }, SYMBOL.enter)),
                 } }))));
     function submit_group_input(title) {
         const id = short_id();

package/dist/app/Status.js

@@ -1,5 +1,6 @@
 import * as React from "react";
 import * as Ink from "ink";
+import { colors } from "../core/colors.js";
 import { invariant } from "../core/invariant.js";
 import { Await } from "./Await.js";
 import { StatusTable } from "./StatusTable.js";
@@ -26,7 +27,7 @@ async function run(args) {
     }
     for (let i = 0; i < commit_range.commit_list.length; i++) {
         const commit = commit_range.commit_list[i];
-        const commit_pr = commit_range.pr_map.get(commit.branch_id || "");
+        const commit_pr = commit_range.pr_lookup[commit.branch_id || ""];
         if (commit.branch_id && !commit_pr) {
             needs_rebase = true;
         }
@@ -51,9 +52,9 @@ async function run(args) {
     }
     else {
         actions.output(React.createElement(Ink.Text, null, "\u2705 Everything up to date."));
-        actions.output(React.createElement(Ink.Text, { color: "gray" },
+        actions.output(React.createElement(Ink.Text, { color: colors.gray },
             React.createElement(Ink.Text, null, "Run with"),
-            React.createElement(Ink.Text, { bold: true, color: "yellow" }, ` --force `),
+            React.createElement(Ink.Text, { bold: true, color: colors.yellow }, ` --force `),
             React.createElement(Ink.Text, null, "to force update all pull requests.")));
         actions.exit(0);
     }

package/dist/app/StatusTable.js

@@ -1,6 +1,7 @@
 import * as React from "react";
 import * as Ink from "ink";
 import { assertNever } from "../core/assertNever.js";
+import { colors } from "../core/colors.js";
 import { invariant } from "../core/invariant.js";
 import { Store } from "./Store.js";
 import { Table } from "./Table.js";
@@ -11,14 +12,12 @@ export function StatusTable() {
     const row_list = [];
     for (const group of commit_range.group_list) {
         const row = {
-            icon: "",
             count: "",
             status: "NEW",
             title: "",
             url: "",
         };
         if (group.id === commit_range.UNASSIGNED) {
-            row.icon = "⭑";
             row.status = "NEW";
             row.title = "Unassigned";
             row.count = `0/${group.commits.length}`;
@@ -26,16 +25,13 @@ export function StatusTable() {
         }
         else {
             if (group.dirty) {
-                row.icon = "!";
                 row.status = "OUTDATED";
             }
             else {
-                row.icon = "✔";
                 row.status = "SYNCED";
             }
             if (group.pr) {
                 if (group.pr.state === "MERGED") {
-                    row.icon = "↗";
                     row.status = "MERGED";
                 }
                 row.title = group.pr.title;
@@ -49,25 +45,21 @@ export function StatusTable() {
         }
         row_list.push(row);
     }
-    return (React.createElement(Table, { data: row_list, fillColumn: "title", 
-        // maxWidth={{
-        //   title: 30,
-        // }}
-        columnGap: 3, columns: {
-            icon: IconColumn,
+    return (React.createElement(Table, { data: row_list, fillColumn: "title", maxWidth: {
+            status: (v) => v + 2,
+        }, columnGap: 3, columns: {
             status: StatusColumn,
             count: CountColumn,
             title: TitleColumn,
             url: UrlColumn,
         } }));
 }
-function IconColumn(props) {
-    const value = props.row[props.column];
-    return (React.createElement(Ink.Text, { color: get_status_color(props.row), bold: get_status_bold(props.row) }, value));
-}
 function StatusColumn(props) {
     const value = props.row[props.column];
-    return (React.createElement(Ink.Text, { color: get_status_color(props.row), bold: get_status_bold(props.row) }, value));
+    return (React.createElement(Ink.Text, { color: get_status_color(props.row), bold: get_status_bold(props.row) },
+        get_status_icon(props.row),
+        " ",
+        value));
 }
 function CountColumn(props) {
     const value = props.row[props.column];
@@ -81,19 +73,35 @@ function UrlColumn(props) {
     const value = props.row[props.column];
     return React.createElement(Url, { dimColor: true }, value);
 }
+function get_status_icon(row) {
+    switch (row.status) {
+        case "NEW":
+            return "⭑";
+        case "OUTDATED":
+            return "!";
+        case "MERGED":
+            return "↗";
+        case "SYNCED":
+            return "✔";
+        default:
+            assertNever(row.status);
+            return "?";
+        // unicode question mark in box
+    }
+}
 function get_status_color(row) {
     switch (row.status) {
         case "NEW":
-            return "yellow";
+            return colors.yellow;
         case "OUTDATED":
-            return "red";
+            return colors.red;
         case "MERGED":
-            return "purple";
+            return colors.purple;
         case "SYNCED":
-            return "green";
+            return colors.green;
         default:
             assertNever(row.status);
-            return "gray";
+            return colors.gray;
     }
 }
 function get_status_bold(row) {

package/dist/app/Store.js

@@ -2,6 +2,7 @@ import * as React from "react";
 import * as Ink from "ink";
 import { createStore, useStore } from "zustand";
 import { immer } from "zustand/middleware/immer";
+import { colors } from "../core/colors.js";
 import { Exit } from "./Exit.js";
 const BaseStore = createStore()(immer((set, get) => ({
     argv: null,
@@ -9,6 +10,7 @@ const BaseStore = createStore()(immer((set, get) => ({
     cwd: null,
     username: null,
     repo_path: null,
+    master_branch: "master",
     head: null,
     merge_base: null,
     branch_name: null,
@@ -41,7 +43,7 @@ const BaseStore = createStore()(immer((set, get) => ({
         },
         error(message) {
             set((state) => {
-                state.mutate.output(state, React.createElement(Ink.Text, { color: "#ef4444" }, message));
+                state.mutate.output(state, React.createElement(Ink.Text, { color: colors.red }, message));
             });
         },
         output(node) {

package/dist/app/Table.js

@@ -6,8 +6,7 @@ export function Table(props) {
         return (React.createElement(Container, null,
             React.createElement(Ink.Text, { dimColor: true }, "No data found.")));
     }
-    const sample_row = props.data[0];
-    const RowColumnList = Object.keys(sample_row);
+    const RowColumnList = Object.keys(props.columns);
     // walk data and discover max width for each column
     const max_col_width = {};
     for (const col of RowColumnList) {
@@ -17,10 +16,12 @@ export function Table(props) {
         for (const col of RowColumnList) {
             const row_col = row[col];
             max_col_width[col] = Math.max(String(row_col).length, max_col_width[col]);
-            const maxWidth = props.maxWidth?.[col];
-            if (is_finite_value(maxWidth)) {
-                max_col_width[col] = Math.min(maxWidth - 1, max_col_width[col]);
-            }
+        }
+    }
+    for (const col of RowColumnList) {
+        const maxWidth = props.maxWidth?.[col];
+        if (maxWidth) {
+            max_col_width[col] = maxWidth(max_col_width[col]);
         }
     }
     const { stdout } = Ink.useStdout();
@@ -45,7 +46,7 @@ export function Table(props) {
             max_col_width[props.fillColumn] = Math.min(max_col_width[props.fillColumn], remaining_space);
         }
     }
-    // console.debug({ available_width, remaining_space, max_col_width });
+    // console.debug({ available_width, max_col_width });
     return (React.createElement(Container, null, props.data.map((row, i) => {
         return (React.createElement(Ink.Box, { key: i, 
             // borderStyle="round"

package/dist/app/TextInput.js

@@ -1,5 +1,6 @@
 import * as React from "react";
 import * as Ink from "ink";
+import { colors } from "../core/colors.js";
 export function TextInput(props) {
     const [value, set_value] = React.useState(get_value(props));
     React.useEffect(function sync_value_prop() {
@@ -41,9 +42,9 @@ export function TextInput(props) {
         props.onChange?.(next_value);
     });
     // console.debug("[TextInput]", { value });
-    return (React.createElement(Ink.Box, { borderStyle: "single", minHeight: 1, borderColor: "yellow", borderDimColor: true },
-        React.createElement(Ink.Text, null, value || "‎"),
-        !caret_visible ? null : (React.createElement(Ink.Text, { color: "yellow", dimColor: true }, "|"))));
+    return (React.createElement(Ink.Box, { borderStyle: "single", minHeight: 1, borderColor: colors.yellow, borderDimColor: true },
+        React.createElement(Ink.Text, null, value || ""),
+        React.createElement(Ink.Text, { color: colors.yellow, dimColor: true, inverse: caret_visible }, " ")));
 }
 function get_value(props) {
     return props.value || "";

package/dist/app/Url.js

@@ -1,6 +1,6 @@
 import * as React from "react";
 import * as Ink from "ink";
+import { colors } from "../core/colors.js";
 export function Url(props) {
-    const text_color = "#38bdf8";
-    return (React.createElement(Ink.Text, { bold: true, color: text_color, ...props }, props.children));
+    return (React.createElement(Ink.Text, { bold: true, color: colors.blue, ...props }, props.children));
 }

package/dist/app/YesNoPrompt.js

@@ -1,5 +1,6 @@
 import * as React from "react";
 import * as Ink from "ink";
+import { colors } from "../core/colors.js";
 import { Parens } from "./Parens.js";
 export function YesNoPrompt(props) {
     const [answer, set_answer] = React.useState("");
@@ -14,8 +15,8 @@ export function YesNoPrompt(props) {
         }
     });
     // prettier-ignore
-    const y = React.createElement(Ink.Text, { bold: true, color: "#22c55e" }, "Y");
-    const n = React.createElement(Ink.Text, { color: "#ef4444" }, "n");
+    const y = React.createElement(Ink.Text, { bold: true, color: colors.green }, "Y");
+    const n = React.createElement(Ink.Text, { color: colors.red }, "n");
     let choices;
     switch (answer) {
         case "y":
@@ -32,8 +33,8 @@ export function YesNoPrompt(props) {
     }
     return (React.createElement(Ink.Box, { flexDirection: "column" },
         React.createElement(Ink.Box, null,
-            typeof props.message === "object" ? (props.message) : (React.createElement(Ink.Text, { color: "yellow" }, props.message)),
+            typeof props.message === "object" ? (props.message) : (React.createElement(Ink.Text, { color: colors.yellow }, props.message)),
             React.createElement(Ink.Text, null, " "),
             React.createElement(Parens, null,
-                React.createElement(Ink.Text, { color: "gray" }, choices)))));
+                React.createElement(Ink.Text, { color: colors.gray }, choices)))));
 }

package/dist/command.js

@@ -26,6 +26,11 @@ export async function command() {
         alias: ["v"],
         default: false,
         description: "Enable verbose mode with more detailed output for debugging",
+    })
+        .option("branch", {
+        type: "string",
+        alias: ["b"],
+        description: `Set the master branch name, defaults to "master" (or "main" if "master" is not found)`,
     })
         .option("write-state-json", {
         hidden: true,

package/dist/core/CommitMetadata.js

@@ -1,12 +1,14 @@
+import { Store } from "../app/Store.js";
 import * as Metadata from "./Metadata.js";
 import { cli } from "./cli.js";
 import * as github from "./github.js";
 export async function range(commit_group_map) {
+    const master_branch = Store.getState().master_branch;
     // gather all open prs in repo first
     // cheaper query to populate cache
     await github.pr_list();
     const commit_list = await get_commit_list();
-    const pr_map = new Map();
+    const pr_lookup = {};
     let invalid = false;
     const group_map = new Map();
     for (const commit of commit_list) {
@@ -63,7 +65,7 @@ export async function range(commit_group_map) {
             const pr_result = await github.pr_status(group.id);
             if (pr_result && pr_result.state !== "CLOSED") {
                 group.pr = pr_result;
-                pr_map.set(group.id, pr_result);
+                pr_lookup[group.id] = pr_result;
             }
         }
         // console.debug("group", group.pr?.title.substring(0, 40));
@@ -75,7 +77,7 @@ export async function range(commit_group_map) {
             group_list.push(group);
         }
         if (i === 0) {
-            group.base = "master";
+            group.base = master_branch;
         }
         else {
             const last_group = group_value_list[i - 1];
@@ -119,7 +121,7 @@ export async function range(commit_group_map) {
     if (unassigned_group) {
         group_list.unshift(unassigned_group);
     }
-    return { invalid, group_list, commit_list, pr_map, UNASSIGNED };
+    return { invalid, group_list, commit_list, pr_lookup, UNASSIGNED };
 }
 async function get_commit_list() {
     const log_result = await cli(`git log master..HEAD --oneline --format=%H --color=never`);

package/dist/core/StackSummaryTable.js

@@ -1,17 +1,19 @@
 export function write(args) {
-    const group_list = args.commit_range?.group_list;
-    if (!Array.isArray(group_list) || group_list.length === 0) {
-        return "";
-    }
     const stack_list = [];
-    for (const group of group_list) {
-        if (group.pr?.url) {
-            const selected = args.selected_group_id === group.id;
+    for (const pr_url of args.pr_url_list) {
+        if (pr_url) {
+            const selected = args.selected_url === pr_url;
             const icon = selected ? "👉" : "⏳";
-            stack_list.push(`- ${icon} ${group.pr.url}`);
+            stack_list.push(`- ${icon} ${pr_url}`);
         }
     }
-    const stack_table = TEMPLATE.stack_table(["", ...stack_list, "", ""].join("\n"));
+    let stack_table;
+    if (stack_list.length > 1) {
+        stack_table = TEMPLATE.stack_table(["", ...stack_list, "", ""].join("\n"));
+    }
+    else {
+        stack_table = "";
+    }
     let result = args.body;
     if (RE.stack_table.test(result)) {
         // replace stack table

package/dist/core/chalk.js

@@ -0,0 +1,83 @@
+import chalk from "chalk";
+function create_color_proxy(base) {
+    return new Proxy(base, {
+        get(target, prop) {
+            switch (prop) {
+                case "test":
+                    return test;
+                case "bracket":
+                    return (str) => [
+                        target.bold.whiteBright("["),
+                        str,
+                        target.bold.whiteBright("]"),
+                    ].join("");
+                case "url":
+                    return target.bold.underline.blueBright;
+                case "cmd":
+                    return target.bold.yellow;
+                case "branch":
+                    return target.bold.green;
+            }
+            const target_prop = target[prop];
+            return target_prop;
+        },
+        apply(target, _this_arg, arguments_list) {
+            return target(...arguments_list);
+        },
+    });
+}
+export const color = create_color_proxy(chalk);
+function test() {
+    const PROP_LIST = [
+        "reset",
+        "bold",
+        "dim",
+        "italic",
+        "underline",
+        "overline",
+        "inverse",
+        "hidden",
+        "strikethrough",
+        "visible",
+        "black",
+        "red",
+        "green",
+        "yellow",
+        "blue",
+        "magenta",
+        "cyan",
+        "white",
+        "blackBright",
+        "gray",
+        "grey",
+        "redBright",
+        "greenBright",
+        "yellowBright",
+        "blueBright",
+        "magentaBright",
+        "cyanBright",
+        "whiteBright",
+        "bgBlack",
+        "bgRed",
+        "bgGreen",
+        "bgYellow",
+        "bgBlue",
+        "bgMagenta",
+        "bgCyan",
+        "bgWhite",
+        "bgBlackBright",
+        "bgGray",
+        "bgGrey",
+        "bgRedBright",
+        "bgGreenBright",
+        "bgYellowBright",
+        "bgBlueBright",
+        "bgMagentaBright",
+        "bgCyanBright",
+        "bgWhiteBright",
+    ];
+    for (const prop of PROP_LIST) {
+        // eslint-disable-next-line no-console
+        console.debug(chalk[prop](prop));
+    }
+}

package/dist/core/colors.js

@@ -0,0 +1,15 @@
+// ink uses chalk internally
+// https://github.com/vadimdemedes/ink#color
+export const colors = {
+    red: "rgb(248, 81, 73)",
+    // red-emphasis rgb(218, 54, 51)
+    green: "rgb(63, 185, 80)",
+    // green-emphasis rgb(35, 134, 54)
+    purple: "rgb(163, 113, 247)",
+    // purple-emphasis rgb(137, 87, 229)
+    blue: "rgb(47, 129, 247)",
+    orange: "rgb(255, 166, 87)",
+    yellow: "rgb(234, 179, 8)",
+    gray: "rgb(110, 118, 129)",
+    lightGray: "rgb(125, 133, 144)",
+};

package/dist/core/github.js

@@ -5,6 +5,7 @@ import path from "node:path";
 import * as Ink from "ink";
 import { Brackets } from "../app/Brackets.js";
 import { Store } from "../app/Store.js";
+import { colors } from "../core/colors.js";
 import { cli } from "./cli.js";
 import { invariant } from "./invariant.js";
 import { safe_quote } from "./safe_quote.js";
@@ -27,7 +28,7 @@ export async function pr_list() {
     if (actions.isDebug()) {
         actions.output(React.createElement(Ink.Text, { dimColor: true },
             React.createElement(Ink.Text, null, "Github cache "),
-            React.createElement(Ink.Text, { bold: true, color: "yellow" }, result_pr_list.length),
+            React.createElement(Ink.Text, { bold: true, color: colors.yellow }, result_pr_list.length),
             React.createElement(Ink.Text, null, " open PRs from "),
             React.createElement(Brackets, null, repo_path),
             React.createElement(Ink.Text, null, " authored by "),
@@ -53,7 +54,7 @@ export async function pr_status(branch) {
             actions.output(React.createElement(Ink.Text, null,
                 React.createElement(Ink.Text, { dimColor: true }, "Github pr_status cache"),
                 React.createElement(Ink.Text, null, " "),
-                React.createElement(Ink.Text, { bold: true, color: "#22c55e" }, "HIT "),
+                React.createElement(Ink.Text, { bold: true, color: colors.green }, "HIT "),
                 React.createElement(Ink.Text, null, " "),
                 React.createElement(Ink.Text, { dimColor: true }, branch)));
         }
@@ -63,7 +64,7 @@ export async function pr_status(branch) {
         actions.output(React.createElement(Ink.Text, null,
             React.createElement(Ink.Text, { dimColor: true }, "Github pr_status cache"),
             React.createElement(Ink.Text, null, " "),
-            React.createElement(Ink.Text, { bold: true, color: "#ef4444" }, "MISS"),
+            React.createElement(Ink.Text, { bold: true, color: colors.red }, "MISS"),
             React.createElement(Ink.Text, null, " "),
             React.createElement(Ink.Text, { dimColor: true }, branch)));
     }
@@ -85,7 +86,9 @@ export async function pr_create(args) {
     const cli_result = await cli(`gh pr create --fill --head ${args.branch} --base ${args.base} --title="${title}" --body="${args.body}"`);
     if (cli_result.code !== 0) {
         handle_error(cli_result.output);
+        return null;
     }
+    return cli_result.stdout;
 }
 export async function pr_edit(args) {
     const cli_result = await cli(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "description": "",
   "author": "magus",
   "license": "MIT",
@@ -21,7 +21,8 @@
     "dev": "tsc --watch",
     "lint": "eslint . --fix",
     "prettier": "prettier ./src --write",
-    "test": "npm run prettier && npm run lint && npm run build"
+    "test": "npm run prettier && npm run lint && npm run build",
+    "prepublishOnly": "npm test"
   },
   "dependencies": {
     "chalk": "^5.3.0",