git-stack-cli 0.5.2 → 0.7.0

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

@@ -2,7 +2,9 @@ import * as React from "react";
 import * as Ink from "ink";
 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";
@@ -11,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();
@@ -59,19 +61,27 @@ 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(" "));
                 if (group.pr) {
                     // ensure base matches pr in github
-                    await github.pr_base(group.id, group.base);
+                    await github.pr_edit({
+                        branch: group.id,
+                        base: group.base,
+                        body: StackSummaryTable.write({
+                            body: group.pr.body,
+                            commit_range,
+                            selected_group_id: group.id,
+                        }),
+                    });
                 }
                 else {
                     // delete local group branch if leftover
@@ -83,6 +93,11 @@ async function run(props) {
                         branch: group.id,
                         base: group.base,
                         title: group.title,
+                        body: StackSummaryTable.write({
+                            body: "",
+                            commit_range,
+                            selected_group_id: group.id,
+                        }),
                     });
                     // move back to temp branch
                     await cli(`git checkout ${temp_branch_name}`);
@@ -125,12 +140,12 @@ 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),
             "."));

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();