git-stack-cli 1.3.1 → 1.3.3

package/dist/cjs/index.cjs

@@ -27128,29 +27128,37 @@ const RE$2 = {
     all_double_quote: /"/g,
 };
 
-function write$1(message, stack_id) {
+function write$1(message, values) {
     let result = message;
     // escape double-quote for cli
     result = safe_quote(result);
     // remove any previous metadata lines
     result = remove(result);
-    const line_list = [result, "", TEMPLATE$1.stack_id(stack_id)];
+    const line_list = [result, "", TEMPLATE$1.stack_id(values.id)];
+    if (values.title) {
+        line_list.push(TEMPLATE$1.group_title(values.title));
+    }
     const new_message = line_list.join("\n");
     return new_message;
 }
 function read(message) {
-    const match = message.match(RE$1.stack_id);
-    if (!match?.groups) {
-        return null;
+    const values = { id: null, title: null };
+    const match_id = message.match(RE$1.stack_id);
+    if (match_id?.groups) {
+        values.id = match_id.groups["id"];
+        invariant(values.id, "id must exist");
     }
-    const id = match.groups["id"];
-    invariant(id, "id must exist");
-    return id;
+    const match_title = message.match(RE$1.group_title);
+    if (match_title?.groups) {
+        values.title = match_title.groups["title"];
+    }
+    return values;
 }
 function remove(message) {
     let result = message;
     // remove metadata
     result = result.replace(new RegExp(RE$1.stack_id, "gmi"), "");
+    result = result.replace(new RegExp(RE$1.group_title, "gmi"), "");
     result = result.trimEnd();
     return result;
 }
@@ -27158,9 +27166,13 @@ const TEMPLATE$1 = {
     stack_id(id) {
         return `git-stack-id: ${id}`;
     },
+    group_title(title) {
+        return `git-stack-title: ${title}`;
+    },
 };
 const RE$1 = {
     stack_id: new RegExp(TEMPLATE$1.stack_id("(?<id>[a-z0-9-+=]+)"), "i"),
+    group_title: new RegExp(TEMPLATE$1.group_title("(?<title>[^\\n^\\r]+)"), "i"),
 };
 
 // prettier-ignore
@@ -27282,7 +27294,7 @@ async function range(commit_group_map) {
     const group_map = new Map();
     for (const commit of commit_list) {
         let id = commit.branch_id;
-        let title = id;
+        let title = commit.title || id;
         // use commit map if provided (via select commit ranges)
         if (commit_group_map) {
             const group = commit_group_map[commit.sha];
@@ -27409,13 +27421,16 @@ async function get_commit_list() {
 }
 async function commit(sha) {
     const full_message = (await cli(`git show -s --format=%B ${sha}`)).stdout;
-    const branch_id = await read(full_message);
+    const metadata = await read(full_message);
+    const branch_id = metadata?.id;
     const subject_line = get_subject_line(full_message);
+    const title = metadata?.title;
     return {
         sha,
         full_message,
         subject_line,
         branch_id,
+        title,
     };
 }
 function get_subject_line(message) {
@@ -27582,7 +27597,8 @@ async function run$3() {
             await cli(`git add --all`);
             let new_message;
             if (commit.branch_id) {
-                new_message = write$1(commit.full_message, commit.branch_id);
+                const metadata = { id: commit.branch_id };
+                new_message = write$1(commit.full_message, metadata);
             }
             else {
                 new_message = commit.full_message;
@@ -27716,7 +27732,8 @@ function GitReviseTodo(args) {
         const group = group_list[i];
         for (const commit of group.commits) {
             // update git commit message with stack id
-            const message_with_id = write$1(commit.full_message, group.id);
+            const metadata = { id: group.id, title: group.title };
+            const message_with_id = write$1(commit.full_message, metadata);
             // get first 12 characters of commit sha
             const sha = commit.sha.slice(0, 12);
             // generate git revise entry
@@ -27943,6 +27960,12 @@ echo "$GIT_REVISE_TODO" > "$git_revise_todo_path"
             `git`,
             `revise --edit -i ${rebase_merge_base}`,
         ]);
+        // early return since we do not need to sync
+        if (!argv.sync) {
+            return;
+        }
+        // in order to sync we walk from rebase_group_index to HEAD
+        // checking out each group and syncing to github
         // start from HEAD and work backward to rebase_group_index
         const push_group_list = [];
         let lookback_index = 0;
@@ -27999,7 +28022,8 @@ echo "$GIT_REVISE_TODO" > "$git_revise_todo_path"
                 await cli(`rm ${PATCH_FILE}`);
                 // add all changes to stage
                 await cli(`git add --all`);
-                const new_message = write$1(commit.full_message, group.id);
+                const metadata = { id: group.id, title: group.title };
+                const new_message = write$1(commit.full_message, metadata);
                 const git_commit_comand = [`git commit -m "${new_message}"`];
                 if (argv.verify === false) {
                     git_commit_comand.push("--no-verify");
@@ -28578,6 +28602,7 @@ function SelectCommitRanges() {
 }
 function SelectCommitRangesInternal(props) {
     const actions = Store.useActions();
+    const argv = Store.useState((state) => state.argv);
     const [selected_group_id, set_selected_group_id] = reactExports.useState(props.commit_range.UNASSIGNED);
     const [group_input, set_group_input] = reactExports.useState(false);
     const [new_group_list, create_group] = reactExports.useReducer((group_list, group) => {
@@ -28619,7 +28644,7 @@ function SelectCommitRangesInternal(props) {
         }
         group_list.push({
             id: group.id,
-            title: group.pr?.title || group.id,
+            title: group.pr?.title || group.title || group.id,
         });
     }
     let current_index = group_list.findIndex((g) => g.id === selected_group_id);
@@ -28723,13 +28748,17 @@ function SelectCommitRangesInternal(props) {
                 create: (reactExports.createElement(Text, { bold: true, color: colors.green },
                     reactExports.createElement(Parens, null, "c"),
                     "reate")),
-            } })) : (reactExports.createElement(reactExports.Fragment, null,
-            reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, null), message: "\uD83C\uDF89 Done! Press {s} to {sync} the commits to Github", values: {
-                    s: (reactExports.createElement(Text, { bold: true, color: colors.green }, "s")),
-                    sync: (reactExports.createElement(Text, { bold: true, color: colors.green },
-                        reactExports.createElement(Parens, null, "s"),
-                        "ync")),
-                } }))),
+            } })) : (reactExports.createElement(reactExports.Fragment, null, argv.sync ? (reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, null), message: "\uD83C\uDF89 Done! Press {s} to {sync} the commits to Github", values: {
+                s: (reactExports.createElement(Text, { bold: true, color: colors.green }, "s")),
+                sync: (reactExports.createElement(Text, { bold: true, color: colors.green },
+                    reactExports.createElement(Parens, null, "s"),
+                    "ync")),
+            } })) : (reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, null), message: "\uD83C\uDF89 Done! Press {s} to {save} the commits locally", values: {
+                s: (reactExports.createElement(Text, { bold: true, color: colors.green }, "s")),
+                save: (reactExports.createElement(Text, { bold: true, color: colors.green },
+                    reactExports.createElement(Parens, null, "s"),
+                    "save")),
+            } })))),
         !group_input ? null : (reactExports.createElement(reactExports.Fragment, null,
             reactExports.createElement(Box, { height: 1 }),
             reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.gray }), message: "Enter a title for the PR {note}", values: {
@@ -28787,13 +28816,6 @@ async function run() {
             needs_rebase = true;
         }
     }
-    for (let i = 0; i < commit_range.commit_list.length; i++) {
-        const commit = commit_range.commit_list[i];
-        const commit_pr = commit_range.pr_lookup[commit.branch_id || ""];
-        if (commit.branch_id && !commit_pr) {
-            needs_rebase = true;
-        }
-    }
     if (argv.check) {
         actions.exit(0);
     }
@@ -34319,7 +34341,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.3.1" )
+        .version("1.3.3" )
         .showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`")
         .help("help", "Show usage via `git stack help`").argv);
 }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "git-stack-cli",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "",
   "author": "magus",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/magus/git-stack-cli.git"
+    "url": "git+https://github.com/magus/git-stack-cli.git"
   },
   "type": "module",
   "bin": {

package/scripts/release-npm.ts

@@ -70,34 +70,6 @@ console.debug();
 console.debug("https://www.npmjs.com/package/git-stack-cli");
 console.debug();
 
-// // https://github.com/magus/git-stack-cli/releases/download/0.8.9/git-stack-cli-linux
-// async function create_asset(name: string) {
-//   const sha256_cmd = await spawn.sync(`shasum -a 256 ${name}`);
-//   const match = sha256_cmd.stdout.match(/(?<sha256>[^\s]+)/i);
-
-//   if (!match?.groups) {
-//     throw new Error(`unable to get sha256 for ${name}`);
-//   }
-
-//   const sha256 = match.groups.sha256;
-
-//   const url = `https://github.com/magus/git-stack-cli/releases/download/${version}/${name}`;
-
-//   return { name, sha256, url };
-// }
-
-// function reFind(list: Array<string>, re: RegExp) {
-//   for (const str of list) {
-//     const match = str.match(re);
-
-//     if (match?.groups) {
-//       return match.groups.value;
-//     }
-//   }
-
-//   return null;
-// }
-
 async function input(prompt: string) {
   process.stdout.write(prompt);
   for await (const value of console) {

package/src/app/LocalMergeRebase.tsx

@@ -112,7 +112,8 @@ async function run() {
 
       let new_message;
       if (commit.branch_id) {
-        new_message = Metadata.write(commit.full_message, commit.branch_id);
+        const metadata = { id: commit.branch_id };
+        new_message = Metadata.write(commit.full_message, metadata);
       } else {
         new_message = commit.full_message;
       }

package/src/app/ManualRebase.tsx

@@ -155,6 +155,14 @@ async function run() {
       `revise --edit -i ${rebase_merge_base}`,
     ]);
 
+    // early return since we do not need to sync
+    if (!argv.sync) {
+      return;
+    }
+
+    // in order to sync we walk from rebase_group_index to HEAD
+    // checking out each group and syncing to github
+
     // start from HEAD and work backward to rebase_group_index
     const push_group_list = [];
     let lookback_index = 0;
@@ -241,7 +249,8 @@ async function run() {
         // add all changes to stage
         await cli(`git add --all`);
 
-        const new_message = Metadata.write(commit.full_message, group.id);
+        const metadata = { id: group.id, title: group.title };
+        const new_message = Metadata.write(commit.full_message, metadata);
         const git_commit_comand = [`git commit -m "${new_message}"`];
 
         if (argv.verify === false) {

package/src/app/SelectCommitRanges.tsx

@@ -33,6 +33,8 @@ type SimpleGroup = { id: string; title: string };
 function SelectCommitRangesInternal(props: Props) {
   const actions = Store.useActions();
 
+  const argv = Store.useState((state) => state.argv);
+
   const [selected_group_id, set_selected_group_id] = React.useState(
     props.commit_range.UNASSIGNED
   );
@@ -99,7 +101,7 @@ function SelectCommitRangesInternal(props: Props) {
 
     group_list.push({
       id: group.id,
-      title: group.pr?.title || group.id,
+      title: group.pr?.title || group.title || group.id,
     });
   }
 
@@ -259,22 +261,41 @@ function SelectCommitRangesInternal(props: Props) {
         />
       ) : (
         <React.Fragment>
-          <FormatText
-            wrapper={<Ink.Text />}
-            message="🎉 Done! Press {s} to {sync} the commits to Github"
-            values={{
-              s: (
-                <Ink.Text bold color={colors.green}>
-                  s
-                </Ink.Text>
-              ),
-              sync: (
-                <Ink.Text bold color={colors.green}>
-                  <Parens>s</Parens>ync
-                </Ink.Text>
-              ),
-            }}
-          />
+          {argv.sync ? (
+            <FormatText
+              wrapper={<Ink.Text />}
+              message="🎉 Done! Press {s} to {sync} the commits to Github"
+              values={{
+                s: (
+                  <Ink.Text bold color={colors.green}>
+                    s
+                  </Ink.Text>
+                ),
+                sync: (
+                  <Ink.Text bold color={colors.green}>
+                    <Parens>s</Parens>ync
+                  </Ink.Text>
+                ),
+              }}
+            />
+          ) : (
+            <FormatText
+              wrapper={<Ink.Text />}
+              message="🎉 Done! Press {s} to {save} the commits locally"
+              values={{
+                s: (
+                  <Ink.Text bold color={colors.green}>
+                    s
+                  </Ink.Text>
+                ),
+                save: (
+                  <Ink.Text bold color={colors.green}>
+                    <Parens>s</Parens>save
+                  </Ink.Text>
+                ),
+              }}
+            />
+          )}
         </React.Fragment>
       )}
 

package/src/app/Status.tsx

@@ -36,15 +36,6 @@ async function run() {
     }
   }
 
-  for (let i = 0; i < commit_range.commit_list.length; i++) {
-    const commit = commit_range.commit_list[i];
-    const commit_pr = commit_range.pr_lookup[commit.branch_id || ""];
-
-    if (commit.branch_id && !commit_pr) {
-      needs_rebase = true;
-    }
-  }
-
   if (argv.check) {
     actions.exit(0);
   } else if (needs_rebase) {

package/src/core/CommitMetadata.ts

@@ -36,7 +36,7 @@ export async function range(commit_group_map?: CommitGroupMap) {
 
   for (const commit of commit_list) {
     let id = commit.branch_id;
-    let title = id;
+    let title = commit.title || id;
 
     // use commit map if provided (via select commit ranges)
     if (commit_group_map) {
@@ -189,14 +189,17 @@ async function get_commit_list() {
 
 export async function commit(sha: string) {
   const full_message = (await cli(`git show -s --format=%B ${sha}`)).stdout;
-  const branch_id = await Metadata.read(full_message);
+  const metadata = await Metadata.read(full_message);
+  const branch_id = metadata?.id;
   const subject_line = get_subject_line(full_message);
+  const title = metadata?.title;
 
   return {
     sha,
     full_message,
     subject_line,
     branch_id,
+    title,
   };
 }
 

package/src/core/GitReviseTodo.test.ts

@@ -16,21 +16,25 @@ test("git-revise-todo from commit range with single new commit", () => {
       "lemon color",
       "",
       "git-stack-id: E63ytp5dj",
+      "git-stack-title: lemon color",
       "",
       "++ pick d36d63499425",
       "cantaloupe color",
       "",
       "git-stack-id: E63ytp5dj",
+      "git-stack-title: lemon color",
       "",
       "++ pick 4f98dd3e67d0",
       "banana sweet",
       "",
       "git-stack-id: E63ytp5dj",
+      "git-stack-title: lemon color",
       "",
       "++ pick f143d03c723c",
       "apple sweet",
       "",
       "git-stack-id: E63ytp5dj",
+      "git-stack-title: lemon color",
     ].join("\n")
   );
 });
@@ -48,6 +52,7 @@ test("git-revise-todo from commit range with single new commit in new group", ()
       "apple sweet",
       "",
       "git-stack-id: 6Ak-qn+5Z",
+      "git-stack-title: new group",
     ].join("\n")
   );
 });
@@ -93,6 +98,7 @@ const SINGLE_COMMIT_EXISTING_GROUP: CommitMetadata.CommitRange = {
           "full_message": "banana color\n\ngit-stack-id: AAWsYx1UU",
           "subject_line": "banana color",
           "branch_id": "AAWsYx1UU",
+          "title": null,
         },
       ],
     },
@@ -164,24 +170,28 @@ const SINGLE_COMMIT_EXISTING_GROUP: CommitMetadata.CommitRange = {
           "full_message": "lemon color\n\ngit-stack-id: E63ytp5dj",
           "subject_line": "lemon color",
           "branch_id": "E63ytp5dj",
+          "title": null,
         },
         {
           "sha": "d36d63499425bb46a1e62c2c9df1a4332b13004f",
           "full_message": "cantaloupe color\n\ngit-stack-id: E63ytp5dj",
           "subject_line": "cantaloupe color",
           "branch_id": "E63ytp5dj",
+          "title": null,
         },
         {
           "sha": "4f98dd3e67d03b79d7a12480c7d1c2fcbd186ac5",
           "full_message": "banana sweet\n\ngit-stack-id: E63ytp5dj",
           "subject_line": "banana sweet",
           "branch_id": "E63ytp5dj",
+          "title": null,
         },
         {
           "sha": "f143d03c723c9f5231a81c1e12098511611898cb",
           "full_message": "apple sweet",
           "subject_line": "apple sweet",
           "branch_id": null,
+          "title": null,
         },
       ],
     },
@@ -192,30 +202,35 @@ const SINGLE_COMMIT_EXISTING_GROUP: CommitMetadata.CommitRange = {
       "full_message": "banana color\n\ngit-stack-id: AAWsYx1UU",
       "subject_line": "banana color",
       "branch_id": "AAWsYx1UU",
+      "title": null,
     },
     {
       "sha": "3cb22661ecff6c872e96ce9c40b31c824938cab7",
       "full_message": "lemon color\n\ngit-stack-id: E63ytp5dj",
       "subject_line": "lemon color",
       "branch_id": "E63ytp5dj",
+      "title": null,
     },
     {
       "sha": "d36d63499425bb46a1e62c2c9df1a4332b13004f",
       "full_message": "cantaloupe color\n\ngit-stack-id: E63ytp5dj",
       "subject_line": "cantaloupe color",
       "branch_id": "E63ytp5dj",
+      "title": null,
     },
     {
       "sha": "4f98dd3e67d03b79d7a12480c7d1c2fcbd186ac5",
       "full_message": "banana sweet\n\ngit-stack-id: E63ytp5dj",
       "subject_line": "banana sweet",
       "branch_id": "E63ytp5dj",
+      "title": null,
     },
     {
       "sha": "f143d03c723c9f5231a81c1e12098511611898cb",
       "full_message": "apple sweet",
       "subject_line": "apple sweet",
       "branch_id": null,
+      "title": null,
     },
   ],
   "pr_lookup": {
@@ -348,6 +363,7 @@ const SINGLE_COMMIT_NEW_GROUP: CommitMetadata.CommitRange = {
           "full_message": "banana color\n\ngit-stack-id: AAWsYx1UU",
           "subject_line": "banana color",
           "branch_id": "AAWsYx1UU",
+          "title": null,
         },
       ],
     },
@@ -419,18 +435,21 @@ const SINGLE_COMMIT_NEW_GROUP: CommitMetadata.CommitRange = {
           "full_message": "lemon color\n\ngit-stack-id: E63ytp5dj",
           "subject_line": "lemon color",
           "branch_id": "E63ytp5dj",
+          "title": null,
         },
         {
           "sha": "d36d63499425bb46a1e62c2c9df1a4332b13004f",
           "full_message": "cantaloupe color\n\ngit-stack-id: E63ytp5dj",
           "subject_line": "cantaloupe color",
           "branch_id": "E63ytp5dj",
+          "title": null,
         },
         {
           "sha": "4f98dd3e67d03b79d7a12480c7d1c2fcbd186ac5",
           "full_message": "banana sweet\n\ngit-stack-id: E63ytp5dj",
           "subject_line": "banana sweet",
           "branch_id": "E63ytp5dj",
+          "title": null,
         },
       ],
     },
@@ -446,6 +465,7 @@ const SINGLE_COMMIT_NEW_GROUP: CommitMetadata.CommitRange = {
           "full_message": "apple sweet",
           "subject_line": "apple sweet",
           "branch_id": null,
+          "title": null,
         },
       ],
     },
@@ -456,30 +476,35 @@ const SINGLE_COMMIT_NEW_GROUP: CommitMetadata.CommitRange = {
       "full_message": "banana color\n\ngit-stack-id: AAWsYx1UU",
       "subject_line": "banana color",
       "branch_id": "AAWsYx1UU",
+      "title": null,
     },
     {
       "sha": "3cb22661ecff6c872e96ce9c40b31c824938cab7",
       "full_message": "lemon color\n\ngit-stack-id: E63ytp5dj",
       "subject_line": "lemon color",
       "branch_id": "E63ytp5dj",
+      "title": null,
     },
     {
       "sha": "d36d63499425bb46a1e62c2c9df1a4332b13004f",
       "full_message": "cantaloupe color\n\ngit-stack-id: E63ytp5dj",
       "subject_line": "cantaloupe color",
       "branch_id": "E63ytp5dj",
+      "title": null,
     },
     {
       "sha": "4f98dd3e67d03b79d7a12480c7d1c2fcbd186ac5",
       "full_message": "banana sweet\n\ngit-stack-id: E63ytp5dj",
       "subject_line": "banana sweet",
       "branch_id": "E63ytp5dj",
+      "title": null,
     },
     {
       "sha": "f143d03c723c9f5231a81c1e12098511611898cb",
       "full_message": "apple sweet",
       "subject_line": "apple sweet",
       "branch_id": null,
+      "title": null,
     },
   ],
   "pr_lookup": {

package/src/core/GitReviseTodo.ts

@@ -56,7 +56,8 @@ export function GitReviseTodo(args: Args): string {
 
     for (const commit of group.commits) {
       // update git commit message with stack id
-      const message_with_id = Metadata.write(commit.full_message, group.id);
+      const metadata = { id: group.id, title: group.title };
+      const message_with_id = Metadata.write(commit.full_message, metadata);
 
       // get first 12 characters of commit sha
       const sha = commit.sha.slice(0, 12);

package/src/core/Metadata.test.ts

@@ -11,9 +11,15 @@ test("read handles bulleted lists", () => {
     "- move logic inside if branch",
     "",
     "git-stack-id: DdKIFyufW",
+    "git-stack-title: saved group title",
   ].join("\n");
 
-  expect(Metadata.read(body)).toEqual("DdKIFyufW");
+  const metadata = Metadata.read(body);
+
+  expect(metadata).toEqual({
+    id: "DdKIFyufW",
+    title: "saved group title",
+  });
 });
 
 test("write handles bulleted lists", () => {
@@ -27,7 +33,12 @@ test("write handles bulleted lists", () => {
     "git-stack-id: DdKIFyufW",
   ].join("\n");
 
-  expect(Metadata.write(body, "abcd1234")).toEqual(
+  const metadata = {
+    id: "abcd1234",
+    title: "banana",
+  };
+
+  expect(Metadata.write(body, metadata)).toEqual(
     [
       "[feat] implement various features",
       "",
@@ -36,6 +47,30 @@ test("write handles bulleted lists", () => {
       "- move logic inside if branch",
       "",
       "git-stack-id: abcd1234",
+      "git-stack-title: banana",
+    ].join("\n")
+  );
+});
+
+test("removes metadata", () => {
+  const body = [
+    "[feat] implement various features",
+    "",
+    "- keyboard modality escape key",
+    "- centralize settings",
+    "- move logic inside if branch",
+    "",
+    "git-stack-id: DdKIFyufW",
+    "git-stack-title: this is a PR title",
+  ].join("\n");
+
+  expect(Metadata.remove(body)).toEqual(
+    [
+      "[feat] implement various features",
+      "",
+      "- keyboard modality escape key",
+      "- centralize settings",
+      "- move logic inside if branch",
     ].join("\n")
   );
 });

package/src/core/Metadata.ts

@@ -1,7 +1,17 @@
 import { invariant } from "~/core/invariant";
 import { safe_quote } from "~/core/safe_quote";
 
-export function write(message: string, stack_id: string) {
+type InputMetadataValues = {
+  id: string;
+  title?: string;
+};
+
+type OutputMetadataValues = {
+  id: null | string;
+  title: null | string;
+};
+
+export function write(message: string, values: InputMetadataValues) {
   let result = message;
 
   // escape double-quote for cli
@@ -10,23 +20,34 @@ export function write(message: string, stack_id: string) {
   // remove any previous metadata lines
   result = remove(result);
 
-  const line_list = [result, "", TEMPLATE.stack_id(stack_id)];
+  const line_list = [result, "", TEMPLATE.stack_id(values.id)];
+
+  if (values.title) {
+    line_list.push(TEMPLATE.group_title(values.title));
+  }
+
   const new_message = line_list.join("\n");
 
   return new_message;
 }
 
-export function read(message: string): null | string {
-  const match = message.match(RE.stack_id);
+export function read(message: string): OutputMetadataValues {
+  const values: OutputMetadataValues = { id: null, title: null };
+
+  const match_id = message.match(RE.stack_id);
 
-  if (!match?.groups) {
-    return null;
+  if (match_id?.groups) {
+    values.id = match_id.groups["id"];
+    invariant(values.id, "id must exist");
   }
 
-  const id = match.groups["id"];
-  invariant(id, "id must exist");
+  const match_title = message.match(RE.group_title);
+
+  if (match_title?.groups) {
+    values.title = match_title.groups["title"];
+  }
 
-  return id;
+  return values;
 }
 
 export function remove(message: string) {
@@ -34,6 +55,7 @@ export function remove(message: string) {
 
   // remove metadata
   result = result.replace(new RegExp(RE.stack_id, "gmi"), "");
+  result = result.replace(new RegExp(RE.group_title, "gmi"), "");
 
   result = result.trimEnd();
 
@@ -44,8 +66,13 @@ const TEMPLATE = {
   stack_id(id: string) {
     return `git-stack-id: ${id}`;
   },
+
+  group_title(title: string) {
+    return `git-stack-title: ${title}`;
+  },
 };
 
 const RE = {
   stack_id: new RegExp(TEMPLATE.stack_id("(?<id>[a-z0-9-+=]+)"), "i"),
+  group_title: new RegExp(TEMPLATE.group_title("(?<title>[^\\n^\\r]+)"), "i"),
 };