git-stack-cli 0.2.1 → 0.3.1

package/README.md

@@ -1,5 +1,7 @@
 # git-stack-cli
 
+> create stacked diffs (PRs) on Github from a single branch by grouping commits
+
 ## install
 
 ```bash
@@ -15,13 +17,15 @@ git multi-diff
 npm run dev
 npm link
 
-git stack
-git multi-diff
+git stack --debug
+git multi-diff --debug
 ```
 
 
 ## TODO
 
+- point value for querying all pr for user vs individual pr status (current)?
+
 - select commit ranges
   - capture PR title when creating new group
 

package/dist/__fixtures__/metadata.js

@@ -1,5 +1,7 @@
 // prettier-ignore
 export const METADATA = {
+    "username": "magus",
+    "repo_path": "magus/git-multi-diff-playground",
     "head": "1a50c5fe3cd129547c5c34a54d1611ec06ab213e",
     "merge_base": "9528176b12abf81c779bc5244afc7d760f6fa422",
     "branch_name": "dev/noah/a-test",

package/dist/app/App copy.js

@@ -0,0 +1,30 @@
+import * as React from "react";
+import { Debug } from "./Debug.js";
+import { DependencyCheck } from "./DependencyCheck.js";
+import { GatherMetadata } from "./GatherMetadata.js";
+import { GithubApiError } from "./GithubApiError.js";
+import { Main } from "./Main.js";
+import { Output } from "./Output.js";
+import { Store } from "./Store.js";
+export function App() {
+    const ink = Store.useState((state) => state.ink);
+    const argv = Store.useState((state) => state.argv);
+    if (!ink || !argv) {
+        return null;
+    }
+    // // debug component
+    // return (
+    //   <React.Fragment>
+    //     <Debug />
+    //     <Output />
+    //     <GithubApiError />
+    //   </React.Fragment>
+    // );
+    return (React.createElement(Providers, null,
+        React.createElement(Debug, null),
+        React.createElement(Output, null),
+        !argv.debug ? null : React.createElement(GithubApiError, null),
+        React.createElement(DependencyCheck, null,
+            React.createElement(GatherMetadata, null,
+                React.createElement(Main, null)))));
+}

package/dist/app/App.js

@@ -5,6 +5,7 @@ import { GatherMetadata } from "./GatherMetadata.js";
 import { GithubApiError } from "./GithubApiError.js";
 import { Main } from "./Main.js";
 import { Output } from "./Output.js";
+import { Providers } from "./Providers.js";
 import { Store } from "./Store.js";
 export function App() {
     const ink = Store.useState((state) => state.ink);
@@ -20,7 +21,7 @@ export function App() {
     //     <GithubApiError />
     //   </React.Fragment>
     // );
-    return (React.createElement(React.Fragment, null,
+    return (React.createElement(Providers, null,
         React.createElement(Debug, null),
         React.createElement(Output, null),
         !argv.debug ? null : React.createElement(GithubApiError, null),

package/dist/app/Brackets copy.js

@@ -0,0 +1,10 @@
+import * as React from "react";
+import * as Ink from "ink";
+export function Brackets(props) {
+    const color = "#f97316";
+    const text_color = "#06b6d4";
+    return (React.createElement(Ink.Text, { color: text_color },
+        React.createElement(Ink.Text, { color: color }, "["),
+        props.children,
+        React.createElement(Ink.Text, { color: color }, "]")));
+}

package/dist/app/Brackets.js

@@ -2,7 +2,7 @@ import * as React from "react";
 import * as Ink from "ink";
 export function Brackets(props) {
     const color = "#f97316";
-    const text_color = "#06b6d4";
+    const text_color = "#38bdf8";
     return (React.createElement(Ink.Text, { color: text_color },
         React.createElement(Ink.Text, { color: color }, "["),
         props.children,

package/dist/app/Command.js

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

package/dist/app/Debug.js

@@ -8,15 +8,16 @@ import { Store } from "./Store.js";
 export function Debug() {
     const actions = Store.useActions();
     const state = Store.useState((state) => state);
-    const debug = Store.useState((state) => state.argv?.debug);
+    const argv = Store.useState((state) => state.argv);
     React.useEffect(function debugMessageOnce() {
-        if (debug) {
-            actions.output(React.createElement(Ink.Text, { color: "yellow" }, "Debug mode enabled"));
+        actions.debug(React.createElement(Ink.Text, { color: "yellow" }, "Debug mode enabled"));
+        if (argv?.verbose) {
+            actions.debug(React.createElement(Ink.Text, { dimColor: true }, JSON.stringify(argv, null, 2)));
         }
-    }, [debug]);
+    }, [argv]);
     React.useEffect(function syncStateJson() {
         invariant(state.cwd, "state.cwd must exist");
-        if (!debug) {
+        if (!argv?.["write-state-json"]) {
             return;
         }
         const output_file = path.join(state.cwd, "git-multi-diff-state.json");
@@ -26,6 +27,6 @@ export function Debug() {
         const serialized = json.serialize(state);
         const content = JSON.stringify(serialized, null, 2);
         fs.writeFileSync(output_file, content);
-    }, [debug, state]);
+    }, [argv, state]);
     return null;
 }

package/dist/app/DependencyCheck.js

@@ -2,51 +2,68 @@ import * as React from "react";
 import * as Ink from "ink";
 import { cli } from "../core/cli.js";
 import { is_command_available } from "../core/is_command_available.js";
+import { match_group } from "../core/match_group.js";
 import { Await } from "./Await.js";
+import { Command } from "./Command.js";
+import { Parens } from "./Parens.js";
 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.Box, null,
-            React.createElement(Ink.Text, null, "Checking git install...")), function: async () => {
+    return (React.createElement(Await, { fallback: React.createElement(Ink.Text, { color: "yellow" },
+            "Checking ",
+            React.createElement(Command, null, "git"),
+            " install..."), function: async () => {
             if (is_command_available("git")) {
                 return;
             }
-            actions.output(React.createElement(Ink.Text, null,
-                React.createElement(Ink.Text, { color: "yellow" }, "git"),
+            actions.output(React.createElement(Ink.Text, { color: "yellow" },
+                React.createElement(Command, null, "git"),
                 " must be installed."));
             actions.exit(2);
         } },
-        React.createElement(Await, { fallback: React.createElement(Ink.Box, null,
-                React.createElement(Ink.Text, null, "Checking gh install...")), function: async () => {
+        React.createElement(Await, { fallback: React.createElement(Ink.Text, { color: "yellow" },
+                React.createElement(Ink.Text, null,
+                    "Checking ",
+                    React.createElement(Command, null, "gh"),
+                    " install...")), function: async () => {
                 if (is_command_available("gh")) {
                     return;
                 }
-                actions.output(React.createElement(Ink.Text, null,
-                    React.createElement(Ink.Text, { color: "yellow" }, "gh"),
+                actions.output(React.createElement(Ink.Text, { color: "yellow" },
+                    React.createElement(Command, null, "gh"),
                     " must be installed."));
-                actions.output(React.createElement(Ink.Box, { flexDirection: "row", gap: 1 },
-                    React.createElement(Ink.Text, null, "Visit"),
-                    React.createElement(Ink.Text, { color: "#38bdf8" }, "https://cli.github.com"),
-                    React.createElement(Ink.Text, null, "to install the github cli"),
-                    React.createElement(Ink.Text, null,
-                        "(",
-                        React.createElement(Ink.Text, { color: "yellow" }, "gh"),
-                        ")")));
+                actions.output(React.createElement(Ink.Text, { color: "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 "),
+                    React.createElement(Parens, null,
+                        React.createElement(Command, null, "gh"))));
                 actions.exit(3);
             } },
-            React.createElement(Await, { fallback: React.createElement(Ink.Box, null,
-                    React.createElement(Ink.Text, null, "Checking gh auth status...")), function: async () => {
-                    const gh_auth_status_cli = await cli(`gh auth status`, {
+            React.createElement(Await, { fallback: React.createElement(Ink.Text, { color: "yellow" },
+                    React.createElement(Ink.Text, null,
+                        "Checking ",
+                        React.createElement(Command, null, "gh auth status"),
+                        "...")), function: async () => {
+                    const auth_output = await cli(`gh auth status`, {
                         ignoreExitCode: true,
                     });
-                    if (gh_auth_status_cli.code === 0) {
+                    if (auth_output.code === 0) {
+                        const username = match_group(auth_output.stdout, RE.auth_username, "username");
+                        actions.set((state) => {
+                            state.username = username;
+                        });
                         return;
                     }
-                    actions.output(React.createElement(Ink.Box, { flexDirection: "row", gap: 1 },
-                        React.createElement(Ink.Text, { color: "yellow" }, "gh"),
-                        React.createElement(Ink.Text, null, "requires login, please run"),
-                        React.createElement(Ink.Text, null,
-                            React.createElement(Ink.Text, { color: "yellow" }, "gh auth login"))));
+                    actions.output(React.createElement(Ink.Text, { color: "yellow" },
+                        React.createElement(Command, null, "gh"),
+                        React.createElement(Ink.Text, null, " requires login, please run "),
+                        React.createElement(Command, null, "gh auth login")));
                     actions.exit(4);
                 } }, props.children))));
 }
+const RE = {
+    // Logged in to github.com as magus
+    auth_username: /Logged in to github.com as (?<username>[^\s]+)/,
+};

package/dist/app/FormatText.js

@@ -0,0 +1,7 @@
+import * as React from "react";
+import { FormattedMessage } from "react-intl";
+export function FormatText(props) {
+    return (React.createElement(FormattedMessage, { id: "FormatText", defaultMessage: props.message, values: props.values }, (chunks) => {
+        return React.cloneElement(props.wrapper, {}, chunks);
+    }));
+}

package/dist/app/GatherMetadata.js

@@ -4,6 +4,7 @@ import * as CommitMetadata from "../core/CommitMetadata.js";
 import { cli } from "../core/cli.js";
 import { invariant } from "../core/invariant.js";
 import * as json from "../core/json.js";
+import { match_group } from "../core/match_group.js";
 import { Await } from "./Await.js";
 import { Store } from "./Store.js";
 export function GatherMetadata(props) {
@@ -34,13 +35,20 @@ async function gather_metadata() {
         actions.exit(0);
         return;
     }
+    // git@github.com:magus/git-multi-diff-playground.git
+    // https://github.com/magus/git-multi-diff-playground.git
+    const origin_url = (await cli(`git config --get remote.origin.url`)).stdout;
+    const repo_path = match_group(origin_url, RE.repo_path, "repo_path");
     const branch_name = (await cli("git rev-parse --abbrev-ref HEAD")).stdout;
+    Store.setState((state) => {
+        state.repo_path = repo_path;
+        state.head = head;
+        state.merge_base = merge_base;
+        state.branch_name = branch_name;
+    });
     try {
         const commit_range = await CommitMetadata.range();
         Store.setState((state) => {
-            state.head = head;
-            state.merge_base = merge_base;
-            state.branch_name = branch_name;
             state.commit_range = commit_range;
             state.step = "status";
         });
@@ -52,3 +60,8 @@ async function gather_metadata() {
         }
     }
 }
+const RE = {
+    // git@github.com:magus/git-multi-diff-playground.git
+    // https://github.com/magus/git-multi-diff-playground.git
+    repo_path: /(?<repo_path>[^:^/]+\/[^/]+)\.git/,
+};

package/dist/app/ManualRebase.js

@@ -9,10 +9,10 @@ import { invariant } from "../core/invariant.js";
 import { Await } from "./Await.js";
 import { Brackets } from "./Brackets.js";
 import { Store } from "./Store.js";
-export function ManualRebase() {
-    return (React.createElement(Await, { fallback: React.createElement(Ink.Text, { color: "yellow" }, "Rebasing commits..."), function: run }));
+export function ManualRebase(props) {
+    return (React.createElement(Await, { fallback: React.createElement(Ink.Text, { color: "yellow" }, "Rebasing commits..."), function: () => run(props) }));
 }
-async function run() {
+async function run(props) {
     const state = Store.getState();
     const actions = state.actions;
     const branch_name = state.branch_name;
@@ -61,21 +61,23 @@ async function run() {
                 "Syncing ",
                 React.createElement(Brackets, null, group.pr?.title || group.id),
                 "..."));
-            // push to origin since github requires commit shas to line up perfectly
-            await cli(`git push -f origin HEAD:${group.id}`);
-            if (group.pr) {
-                // ensure base matches pr in github
-                await github.pr_base(group.id, group.base);
-            }
-            else {
-                // delete local group branch if leftover
-                await cli(`git branch -D ${group.id}`, { ignoreExitCode: true });
-                // move to temporary branch for creating pr
-                await cli(`git checkout -b ${group.id}`);
-                // create pr in github
-                await github.pr_create(group.id, group.base);
-                // move back to temp branch
-                await cli(`git checkout ${temp_branch_name}`);
+            if (!props.skipSync) {
+                // push to origin since github requires commit shas to line up perfectly
+                await cli(`git push -f origin HEAD:${group.id}`);
+                if (group.pr) {
+                    // ensure base matches pr in github
+                    await github.pr_base(group.id, group.base);
+                }
+                else {
+                    // delete local group branch if leftover
+                    await cli(`git branch -D ${group.id}`, { ignoreExitCode: true });
+                    // move to temporary branch for creating pr
+                    await cli(`git checkout -b ${group.id}`);
+                    // create pr in github
+                    await github.pr_create(group.id, group.base);
+                    // move back to temp branch
+                    await cli(`git checkout ${temp_branch_name}`);
+                }
             }
         }
         // after all commits have been cherry-picked and amended

package/dist/app/Parens.js

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

package/dist/app/Providers.js

@@ -0,0 +1,5 @@
+import * as React from "react";
+import { IntlProvider } from "react-intl";
+export function Providers(props) {
+    return React.createElement(IntlProvider, { locale: "en" }, props.children);
+}

package/dist/app/SelectCommitRanges.js

@@ -3,6 +3,7 @@ import * as Ink from "ink";
 import { v4 as uuid_v4 } from "uuid";
 import { invariant } from "../core/invariant.js";
 import { wrap_index } from "../core/wrap_index.js";
+import { FormatText } from "./FormatText.js";
 import { MultiSelect } from "./MultiSelect.js";
 import { Parens } from "./Parens.js";
 import { Store } from "./Store.js";
@@ -47,10 +48,10 @@ function SelectCommitRangesInternal(props) {
     }
     group_list.push(...new_group_list);
     for (const group of props.commit_range.group_list) {
-        if (group.pr) {
+        if (group.id !== props.commit_range.UNASSIGNED) {
             group_list.push({
                 id: group.id,
-                title: group.pr.title,
+                title: group.pr?.title || group.id,
             });
         }
     }
@@ -59,7 +60,8 @@ function SelectCommitRangesInternal(props) {
     const current_index = group_list.findIndex((g) => g.id === selected_group_id);
     Ink.useInput((input, key) => {
         const inputLower = input.toLowerCase();
-        if (unassigned_count === 0 && inputLower === "s") {
+        const hasUnassignedCommits = unassigned_count > 0;
+        if (!hasUnassignedCommits && (inputLower === "r" || inputLower === "s")) {
             actions.set((state) => {
                 state.commit_map = {};
                 for (const [sha, id] of commit_map.entries()) {
@@ -67,12 +69,18 @@ function SelectCommitRangesInternal(props) {
                         state.commit_map[sha] = id;
                     }
                 }
-                state.step = "manual-rebase";
+                switch (inputLower) {
+                    case "s":
+                        state.step = "manual-rebase";
+                        break;
+                    case "r":
+                        state.step = "manual-rebase-no-sync";
+                }
             });
             return;
         }
         // only allow create when on unassigned group
-        if (isUnassigned && inputLower === "c") {
+        if (hasUnassignedCommits && inputLower === "c") {
             const id = uuid_v4();
             actions.output(React.createElement(Ink.Box, null,
                 React.createElement(Ink.Text, { dimColor: true }, "Created new group "),
@@ -121,10 +129,10 @@ function SelectCommitRangesInternal(props) {
         };
     });
     items.reverse();
-    // console.debug({ group, isUnassigned });
+    // console.debug({ current_index, group, isUnassigned });
     return (React.createElement(Ink.Box, { flexDirection: "column" },
         React.createElement(Ink.Box, { height: 1 }),
-        React.createElement(MultiSelect, { key: current_index, items: items, onSelect: (args) => {
+        React.createElement(MultiSelect, { key: group.id, items: items, onSelect: (args) => {
                 // console.debug("onSelect", args);
                 const key = args.item.sha;
                 let value;
@@ -144,24 +152,29 @@ function SelectCommitRangesInternal(props) {
                 React.createElement(Ink.Text, { wrap: "truncate-end" }, title)),
             React.createElement(Ink.Text, null, right_arrow)),
         React.createElement(Ink.Box, { height: 1 }),
-        unassigned_count > 0 ? (React.createElement(Ink.Text, { color: "gray" },
-            React.createElement(Ink.Text, { color: "#3b82f6", bold: true }, unassigned_count),
-            React.createElement(Ink.Text, null, " unassigned commits"),
-            !isUnassigned ? null : (React.createElement(Ink.Text, { color: "gray" },
-                React.createElement(Ink.Text, null, ", press "),
-                React.createElement(Ink.Text, { bold: true, color: "#22c55e" }, "c"),
+        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" },
+                    React.createElement(Parens, null, "c"),
+                    "reate")),
+            } })) : (React.createElement(React.Fragment, null,
+            React.createElement(Ink.Text, null,
+                "🎉 Done! Press ",
+                React.createElement(Ink.Text, { bold: true, color: "#22c55e" }, "s"),
                 " to ",
                 React.createElement(Ink.Text, { bold: true, color: "#22c55e" },
-                    React.createElement(Parens, null, "c"),
-                    "reate"),
-                " a new group")))) : (React.createElement(Ink.Text, null,
-            "🎉 Done! Press ",
-            React.createElement(Ink.Text, { bold: true, color: "#22c55e" }, "s"),
-            " to ",
-            React.createElement(Ink.Text, { bold: true, color: "#22c55e" },
-                React.createElement(Parens, null, "s"),
-                "ync"),
-            " the commits to Github")),
+                    React.createElement(Parens, null, "s"),
+                    "ync"),
+                " the commits to Github"),
+            React.createElement(Ink.Text, { color: "gray" },
+                React.createElement(Ink.Text, null, "Press "),
+                React.createElement(Ink.Text, { bold: true, color: "#22c55e" }, "r"),
+                " to locally ",
+                React.createElement(Ink.Text, { bold: true, color: "#22c55e" },
+                    React.createElement(Parens, null, "r"),
+                    "ebase"),
+                " only"))),
         React.createElement(Ink.Box, null,
             React.createElement(Ink.Text, { color: "gray" },
                 React.createElement(Ink.Text, null, "Press "),

package/dist/app/StatusTable.js

@@ -14,8 +14,9 @@ export function StatusTable() {
             status: "",
             title: "",
             url: "",
+            id: group.id,
         };
-        if (!group.pr) {
+        if (group.id === commit_range.UNASSIGNED) {
             row.icon = "⭑";
             row.status = "NEW";
             row.title = "Unassigned";
@@ -31,9 +32,19 @@ export function StatusTable() {
                 row.icon = "✔";
                 row.status = "SYNCED";
             }
-            row.title = group.pr.title;
-            row.count = `${group.pr.commits.length}/${group.commits.length}`;
-            row.url = group.pr.url;
+            if (group.pr) {
+                if (group.pr.state === "MERGED") {
+                    row.icon = "↗";
+                    row.status = "MERGED";
+                }
+                row.title = group.pr.title;
+                row.count = `${group.pr.commits.length}/${group.commits.length}`;
+                row.url = group.pr.url;
+            }
+            else {
+                row.title = group.id;
+                row.count = `0/${group.commits.length}`;
+            }
         }
         row_list.push(row);
     }
@@ -75,7 +86,7 @@ export function StatusTable() {
     return (React.createElement(Ink.Box, { flexDirection: "column", width: available_width },
         React.createElement(Ink.Box, { height: 1 }),
         row_list.map((row) => {
-            return (React.createElement(Ink.Box, { key: row.url, 
+            return (React.createElement(Ink.Box, { key: row.id, 
                 // borderStyle="round"
                 flexDirection: "row", columnGap: columnGap, width: available_width },
                 React.createElement(Ink.Box, { width: max_col_width.icon },

package/dist/app/Store.js

@@ -7,6 +7,8 @@ const BaseStore = createStore()(immer((set, get) => ({
     argv: null,
     ink: null,
     cwd: null,
+    username: null,
+    repo_path: null,
     head: null,
     merge_base: null,
     branch_name: null,

package/dist/app/Url copy.js

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

package/dist/app/Url.js

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

package/dist/app/YesNoPrompt.js

@@ -2,8 +2,10 @@ import * as React from "react";
 import * as Ink from "ink";
 import { Parens } from "./Parens.js";
 export function YesNoPrompt(props) {
+    const [answer, set_answer] = React.useState("");
     Ink.useInput((input) => {
         const inputLower = input.toLowerCase();
+        set_answer(inputLower);
         switch (inputLower) {
             case "n":
                 return props.onNo();
@@ -11,13 +13,27 @@ export function YesNoPrompt(props) {
                 return props.onYes();
         }
     });
+    // prettier-ignore
+    const y = React.createElement(Ink.Text, { bold: true, color: "#22c55e" }, "Y");
+    const n = React.createElement(Ink.Text, { color: "#ef4444" }, "n");
+    let choices;
+    switch (answer) {
+        case "y":
+            choices = y;
+            break;
+        case "n":
+            choices = n;
+            break;
+        default:
+            choices = (React.createElement(React.Fragment, null,
+                y,
+                React.createElement(Ink.Text, null, "/"),
+                n));
+    }
     return (React.createElement(Ink.Box, { flexDirection: "column" },
         React.createElement(Ink.Box, null,
             React.createElement(Ink.Text, { color: "yellow" }, props.message),
             React.createElement(Ink.Text, null, " "),
             React.createElement(Parens, null,
-                React.createElement(Ink.Text, { color: "gray" },
-                    React.createElement(Ink.Text, { bold: true, color: "#22c55e" }, "Y"),
-                    "/",
-                    React.createElement(Ink.Text, { color: "#ef4444" }, "n"))))));
+                React.createElement(Ink.Text, { color: "gray" }, choices)))));
 }

package/dist/app/main.js

@@ -22,6 +22,8 @@ export function Main() {
             return React.createElement(SelectCommitRanges, null);
         case "manual-rebase":
             return React.createElement(ManualRebase, null);
+        case "manual-rebase-no-sync":
+            return React.createElement(ManualRebase, { skipSync: true });
         case "post-rebase-status":
             return React.createElement(PostRebaseStatus, null);
         default:

package/dist/command.js

@@ -1,22 +1,62 @@
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 export async function command() {
-    return yargs(hideBin(process.argv))
+    const debug_argv = await yargs(hideBin(process.argv))
+        .option("debug", {
+        type: "boolean",
+        description: "Enable debug mode with more options for debugging",
+    })
+        .help(false).argv;
+    if (!debug_argv.debug) {
+        return NormalMode();
+    }
+    return DebugMode();
+}
+function NormalMode() {
+    return (yargs(hideBin(process.argv))
+        .option("force", {
+        type: "boolean",
+        description: "Force sync even if no changes are detected",
+    })
+        .option("check", {
+        type: "boolean",
+        description: "Print status table without syncing",
+    })
+        .option("debug", {
+        type: "boolean",
+        description: "Enable debug mode with more options for debugging",
+    })
+        // disallow unknown options
+        .strict()
+        .help().argv);
+}
+function DebugMode() {
+    return (yargs(hideBin(process.argv))
         .option("force", {
         type: "boolean",
-        description: "force",
+        description: "Force sync even if no changes are detected",
     })
         .option("check", {
         type: "boolean",
-        description: "check",
+        description: "Print status table without syncing",
     })
         .option("debug", {
         type: "boolean",
-        description: "debug",
+        description: "Enable debug mode with more options for debugging",
+    })
+        .option("verbose", {
+        type: "boolean",
+        description: "Log extra information during execution",
+    })
+        .option("write-state-json", {
+        type: "boolean",
+        description: "Write state to local json file for debugging",
     })
         .option("mock-metadata", {
         type: "boolean",
-        description: "mock-metadata",
+        description: "Mock local store metadata for testing",
     })
-        .help().argv;
+        // disallow unknown options
+        .strict()
+        .help().argv);
 }

package/dist/core/CommitMetadata.js

@@ -2,6 +2,9 @@ import * as Metadata from "./Metadata.js";
 import { cli } from "./cli.js";
 import * as github from "./github.js";
 export async function range(commit_map) {
+    // gather all open prs in repo first
+    // cheaper query to populate cache
+    await github.pr_list();
     const commit_list = await get_commit_list();
     let invalid = false;
     const group_map = new Map();
@@ -11,9 +14,8 @@ export async function range(commit_map) {
         if (commit_map) {
             id = commit_map[commit.sha];
         }
-        const pr = commit.pr;
-        if (!pr) {
-            // console.debug("INVALID", "MISSING PR", commit.message);
+        if (!id) {
+            // console.debug("INVALID", "MISSING ID", commit.message);
             invalid = true;
         }
         if (id) {
@@ -33,7 +35,7 @@ export async function range(commit_map) {
         }
         const group = group_map.get(id) || {
             id,
-            pr,
+            pr: null,
             base: null,
             dirty: false,
             commits: [],
@@ -47,6 +49,12 @@ export async function range(commit_map) {
     let unassigned_group;
     for (let i = 0; i < group_value_list.length; i++) {
         const group = group_value_list[i];
+        if (group.id !== UNASSIGNED) {
+            const pr_result = await github.pr_status(group.id);
+            if (pr_result && pr_result.state !== "CLOSED") {
+                group.pr = pr_result;
+            }
+        }
         // console.debug("group", group.pr?.title.substring(0, 40));
         // console.debug("  ", "id", group.id);
         if (group.id === UNASSIGNED) {
@@ -117,18 +125,10 @@ export async function commit(sha) {
     const raw_message = (await cli(`git show -s --format=%B ${sha}`)).stdout;
     const branch_id = await Metadata.read(raw_message);
     const message = display_message(raw_message);
-    let pr = null;
-    if (branch_id) {
-        const pr_result = await github.pr_status(branch_id);
-        if (pr_result && pr_result.state === "OPEN") {
-            pr = pr_result;
-        }
-    }
     return {
         sha,
         message,
         raw_message,
-        pr,
         branch_id,
     };
 }

package/dist/core/cli.js

@@ -20,6 +20,7 @@ export async function cli(command, unsafe_options) {
             }
             else {
                 const result = {
+                    command,
                     code: code || 0,
                     stdout: stdout.trimEnd(),
                     stderr: stderr.trimEnd(),
@@ -40,5 +41,5 @@ cli.sync = function cli_sync(command, unsafe_options) {
     const stderr = String(spawn_return.stderr);
     const output = String(spawn_return.output);
     const code = spawn_return.status || 0;
-    return { code, stdout, stderr, output };
+    return { command, code, stdout, stderr, output };
 };

package/dist/core/env.js

@@ -0,0 +1,4 @@
+export function env() {
+    const DEV = process.env["DEV"];
+    return { DEV };
+}

package/dist/core/github.js

@@ -1,20 +1,46 @@
 import * as React from "react";
 import * as Ink from "ink";
+import { Brackets } from "../app/Brackets.js";
 import { Store } from "../app/Store.js";
 import { cli } from "./cli.js";
-export async function pr_status(branch) {
+import { invariant } from "./invariant.js";
+// prettier-ignore
+const JSON_FIELDS = "--json number,state,baseRefName,headRefName,commits,title,url";
+export async function pr_list() {
     const state = Store.getState();
     const actions = state.actions;
-    const result = await cli(`gh pr view ${branch} --json number,state,baseRefName,headRefName,commits,title,url`, {
+    const username = state.username;
+    const repo_path = state.repo_path;
+    invariant(username, "username must exist");
+    invariant(repo_path, "repo_path must exist");
+    const cli_result = await cli(`gh pr list --repo ${repo_path} --author ${username} --state open ${JSON_FIELDS}`, {
         ignoreExitCode: true,
     });
-    if (result.code !== 0) {
-        actions.output(React.createElement(Ink.Text, { color: "#ef4444" }, result.output));
-        actions.set((state) => {
-            state.step = "github-api-error";
-        });
-        throw new Error("Unable to fetch PR status");
+    if (cli_result.code !== 0) {
+        handle_error(cli_result.output);
     }
+    const result_pr_list = JSON.parse(cli_result.stdout);
+    actions.debug(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, null, " open PRs from "),
+        React.createElement(Brackets, null, repo_path),
+        React.createElement(Ink.Text, null, " authored by "),
+        React.createElement(Brackets, null, username)));
+    actions.set((state) => {
+        for (const pr of result_pr_list) {
+            state.pr[pr.headRefName] = pr;
+        }
+    });
+    return result_pr_list;
+}
+export async function pr_status(branch) {
+    const state = Store.getState();
+    const actions = state.actions;
+    const username = state.username;
+    const repo_path = state.repo_path;
+    invariant(username, "username must exist");
+    invariant(repo_path, "repo_path must exist");
     const cache = state.pr[branch];
     if (cache) {
         actions.debug(React.createElement(Ink.Text, null,
@@ -31,15 +57,36 @@ export async function pr_status(branch) {
         React.createElement(Ink.Text, { bold: true, color: "#ef4444" }, "MISS"),
         React.createElement(Ink.Text, null, " "),
         React.createElement(Ink.Text, { dimColor: true }, branch)));
-    const pr = JSON.parse(result.stdout);
+    const cli_result = await cli(`gh pr view ${branch} --repo ${repo_path} ${JSON_FIELDS}`, {
+        ignoreExitCode: true,
+    });
+    if (cli_result.code !== 0) {
+        // handle_error(cli_result.output);
+        return null;
+    }
+    const pr = JSON.parse(cli_result.stdout);
     actions.set((state) => {
         state.pr[pr.headRefName] = pr;
     });
     return pr;
 }
 export async function pr_create(branch, base) {
-    await cli(`gh pr create --fill --head ${branch} --base ${base}`);
+    const cli_result = await cli(`gh pr create --fill --head ${branch} --base ${base}`);
+    if (cli_result.code !== 0) {
+        handle_error(cli_result.output);
+    }
 }
 export async function pr_base(branch, base) {
-    await cli(`gh pr edit ${branch} --base ${base}`);
+    const cli_result = await cli(`gh pr edit ${branch} --base ${base}`);
+    if (cli_result.code !== 0) {
+        handle_error(cli_result.output);
+    }
+}
+function handle_error(output) {
+    const state = Store.getState();
+    const actions = state.actions;
+    actions.set((state) => {
+        state.step = "github-api-error";
+    });
+    throw new Error(output);
 }

package/dist/core/is_dev.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "0.2.1",
+  "version": "0.3.1",
   "description": "",
   "author": "magus",
   "license": "MIT",
@@ -29,6 +29,7 @@
     "immer": "^10.0.3",
     "ink": "^4.4.1",
     "react": "^18.2.0",
+    "react-intl": "^6.5.5",
     "uuid": "^9.0.1",
     "yargs": "^17.7.2",
     "zustand": "^4.4.4"