bunbunbunbunbunbun

Author: jonathanlab

.github/workflows/agent-release.yml

@@ -46,6 +46,9 @@ jobs:
       - name: Install pnpm
         run: npm install -g pnpm
 
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 

.github/workflows/build.yml

@@ -18,12 +18,13 @@ jobs:
           persist-credentials: false
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
-        
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
           node-version: 22
           cache: 'pnpm'
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Build electron-trpc

.github/workflows/release.yml

@@ -50,6 +50,9 @@ jobs:
           node-version: 22
           cache: "pnpm"
 
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+
       - name: Bump minor version
         id: version
         run: |

.github/workflows/typecheck.yml

@@ -20,6 +20,8 @@ jobs:
         with:
           node-version: 22
           cache: "pnpm"
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Run type check

apps/cli/README.md

@@ -21,12 +21,30 @@ Stacked PRs keep reviews small and manageable. Managing them with `git` is painf
 
 `arr` makes it easy to create, manage and submit (stacked) PRs by using `jj` under the hood.
 
+## Install
+
+Requires [Bun](https://bun.sh).
+
+```
+git clone https://github.com/posthog/array
+cd array
+pnpm install
+pnpm --filter @array/core build
+```
+
+Then install the `arr` command (symlinked to `~/bin/arr`):
+
+```
+./apps/cli/arr.sh install
+```
+
 ## Usage
 
 ```
 arr init                # set up arr in a git repo
 arr create "message"    # new change on stack
 arr submit              # push stack, create PRs
+arr merge               # merge PR via GitHub
 arr sync                # fetch, rebase, cleanup merged
 arr up / arr down       # navigate stack
 arr log                 # show stack

apps/cli/arr.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+# Wrapper script to run arr CLI via bun.
+SOURCE="${BASH_SOURCE[0]}"
+while [ -L "$SOURCE" ]; do
+  DIR="$(cd "$(dirname "$SOURCE")" && pwd)"
+  SOURCE="$(readlink "$SOURCE")"
+  [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE"
+done
+SCRIPT_DIR="$(cd "$(dirname "$SOURCE")" && pwd)"
+
+# Self-install: ./arr.sh install
+if [ "$1" = "install" ]; then
+  mkdir -p ~/bin
+  ln -sf "$SCRIPT_DIR/arr.sh" ~/bin/arr
+  echo "Installed: ~/bin/arr -> $SCRIPT_DIR/arr.sh"
+  echo "Make sure ~/bin is in your PATH"
+  exit 0
+fi
+
+exec bun run "$SCRIPT_DIR/src/bin.ts" "$@"

apps/cli/src/cli.ts

@@ -103,7 +103,8 @@ ${bold("CORE WORKFLOW")}
   3. ${dim("(make more edits)")}\t\t\tStack more work
   4. ${cyan('arr create "add user api"')}\t\tSave as another change
   5. ${cyan("arr submit")}\t\t\t\tCreate PRs for the stack
-  6. ${cyan("arr sync")}\t\t\t\tFetch & rebase after reviews
+  6. ${cyan("arr merge")}\t\t\t\tMerge PRs from the CLI
+  7. ${cyan("arr sync")}\t\t\t\tFetch & rebase after reviews
 
 ${bold("ESCAPE HATCH")}
   ${cyan("arr exit")}\t\t\t\tSwitch back to plain git if you need it.

apps/cli/toggle.sh

@@ -8,6 +8,7 @@ export interface CommandInfo {
   context: ContextLevel;
   category: CommandCategory;
   core?: boolean;
+  disabled?: boolean;
 }
 
 export type CommandCategory =
@@ -49,7 +50,7 @@ export const COMMANDS: Record<string, CommandInfo> = {
     aliases: ["m"],
     context: "jj",
     category: "workflow",
-    core: true,
+    disabled: true,
   },
   submit: {
     name: "submit",
@@ -146,6 +147,7 @@ export const COMMANDS: Record<string, CommandInfo> = {
     aliases: ["cont"],
     context: "jj",
     category: "management",
+    disabled: true,
   },
   delete: {
     name: "delete",
@@ -154,19 +156,21 @@ export const COMMANDS: Record<string, CommandInfo> = {
     aliases: ["dl"],
     context: "jj",
     category: "management",
+    disabled: true,
   },
   merge: {
     name: "merge",
-    description: "Merge the PR for the current change via GitHub",
+    description: "Merge PRs from trunk to the current change via GitHub",
     context: "jj",
     category: "management",
+    core: true,
   },
   restack: {
     name: "restack",
     description: "Rebase the current stack onto trunk",
     context: "jj",
     category: "management",
-    core: true,
+    disabled: true,
   },
   undo: {
     name: "undo",
@@ -240,15 +244,18 @@ export function resolveCommandAlias(alias: string): string {
 }
 
 export function isKnownCommand(command: string): boolean {
-  return command in COMMANDS;
+  const cmd = COMMANDS[command];
+  return cmd !== undefined && !cmd.disabled;
 }
 
 export function getCommandsByCategory(
   category: CommandCategory,
 ): CommandInfo[] {
-  return Object.values(COMMANDS).filter((cmd) => cmd.category === category);
+  return Object.values(COMMANDS).filter(
+    (cmd) => cmd.category === category && !cmd.disabled,
+  );
 }
 
 export function getCoreCommands(): CommandInfo[] {
-  return Object.values(COMMANDS).filter((cmd) => cmd.core);
+  return Object.values(COMMANDS).filter((cmd) => cmd.core && !cmd.disabled);
 }