feat: add arr trunk and arr exit commands

Author: jonathanlab

packages/cli/src/cli.ts

@@ -9,11 +9,13 @@ import {
 import { auth } from "./commands/auth";
 import { bottom } from "./commands/bottom";
 import { checkout } from "./commands/checkout";
+import { ci } from "./commands/ci";
 import { config } from "./commands/config";
 import { continueCommand } from "./commands/continue";
 import { create } from "./commands/create";
 import { deleteChange } from "./commands/delete";
 import { down } from "./commands/down";
+import { exit } from "./commands/exit";
 import { init } from "./commands/init";
 import { log } from "./commands/log";
 import { merge } from "./commands/merge";
@@ -24,6 +26,7 @@ import { status } from "./commands/status";
 import { submit } from "./commands/submit";
 import { sync } from "./commands/sync";
 import { top } from "./commands/top";
+import { trunk } from "./commands/trunk";
 import { undo } from "./commands/undo";
 import { up } from "./commands/up";
 import {
@@ -102,6 +105,10 @@ ${bold("CORE WORKFLOW")}
   4. ${cyan("arr submit")}                   Create PRs for the stack
   5. ${cyan("arr sync")}                     Fetch & rebase after reviews
 
+${bold("ESCAPE HATCH")}
+  ${cyan("arr exit")}                    Switch back to plain git if you need it.
+                            Your jj changes are preserved and you can return anytime.
+
 ${bold("LEARN MORE")}
   Documentation:    https://github.com/posthog/array
   jj documentation: https://www.jj-vcs.dev/latest/
@@ -200,6 +207,11 @@ export async function main(): Promise<void> {
   const parsed = parseArgs(Bun.argv);
   const command = resolveCommandAlias(parsed.name);
 
+  // Show expanded command when alias was used
+  if (parsed.name && parsed.name !== command) {
+    console.log(dim(`(${parsed.name} → ${command})`));
+  }
+
   if (parsed.flags.help || parsed.flags.h) {
     if (parsed.flags.all) {
       printHelpAll();
@@ -266,6 +278,9 @@ export async function main(): Promise<void> {
       case "top":
         await top();
         break;
+      case "trunk":
+        await trunk();
+        break;
       case "bottom":
         await bottom();
         break;
@@ -296,6 +311,12 @@ export async function main(): Promise<void> {
       case "undo":
         await undo();
         break;
+      case "exit":
+        await exit();
+        break;
+      case "ci":
+        await ci();
+        break;
       case "help":
         if (parsed.flags.all) {
           printHelpAll();

packages/cli/src/commands/ci.ts

@@ -0,0 +1,53 @@
+import {
+  ciWorkflowExists,
+  getBranchProtectionUrl,
+  getRepoInfoFromRemote,
+  setupCI,
+  shellExecutor,
+} from "@array/core";
+import { cyan, dim, formatSuccess, yellow } from "../utils/output";
+
+export async function ci(): Promise<void> {
+  const cwd = process.cwd();
+
+  if (ciWorkflowExists(cwd)) {
+    console.log(yellow("Stack check workflow already exists"));
+    console.log(dim("  .github/workflows/array-stack-check.yml"));
+    console.log();
+    await printInstructions(cwd);
+    return;
+  }
+
+  const result = setupCI(cwd);
+
+  if (result.created) {
+    console.log(formatSuccess("Created .github/workflows/array-stack-check.yml"));
+    console.log();
+    await printInstructions(cwd);
+  }
+}
+
+async function printInstructions(cwd: string): Promise<void> {
+  const remoteResult = await shellExecutor.execute(
+    "git",
+    ["config", "--get", "remote.origin.url"],
+    { cwd },
+  );
+
+  if (remoteResult.exitCode === 0) {
+    const repoInfo = getRepoInfoFromRemote(remoteResult.stdout.trim());
+    if (repoInfo.ok) {
+      const url = getBranchProtectionUrl(repoInfo.value.owner, repoInfo.value.repo);
+      console.log("To enforce stack ordering, add 'Stack Check' as a required check:");
+      console.log(cyan(`  ${url}`));
+      console.log(dim("  → Edit rule for 'main' → Require status checks → Add 'Stack Check'"));
+      return;
+    }
+  }
+
+  console.log("To enforce stack ordering:");
+  console.log(dim("  1. Go to Repo Settings → Branches → Branch protection rules"));
+  console.log(dim("  2. Edit rule for 'main' (or create one)"));
+  console.log(dim("  3. Enable 'Require status checks to pass'"));
+  console.log(dim("  4. Search for 'Stack Check' and add it"));
+}

packages/cli/src/commands/exit.ts

@@ -0,0 +1,11 @@
+import { cyan, dim, green } from "../utils/output";
+import { createJJ, unwrap } from "../utils/run";
+
+export async function exit(): Promise<void> {
+  const result = unwrap(await createJJ().exitToGit());
+
+  console.log(`${green(">")} Switched to git branch ${cyan(result.trunk)}`);
+  console.log();
+  console.log(dim("  You're now using plain git. Your jj changes are still safe."));
+  console.log(dim(`  To return to arr/jj, run: ${cyan("arr init")}`));
+}

packages/cli/src/commands/init.ts

@@ -2,6 +2,8 @@ import {
   checkPrerequisites,
   configureTrunk,
   detectTrunkBranches,
+  getBranchProtectionUrl,
+  getRepoInfoFromRemote,
   hasBranch,
   hasGitCommits,
   hasRemote,
@@ -13,6 +15,7 @@ import {
   isJjInitialized,
   isRepoInitialized,
   pushBranch,
+  setupCI,
 } from "@array/core";
 import {
   bold,
@@ -260,5 +263,32 @@ export async function init(
   // No .array config needed - fully stateless
   // Trunk is stored in jj's config via configureTrunk()
 
+  // Offer to set up CI workflow (default to Yes)
+  console.log();
+  const addCI = await autoConfirm("Add GitHub Action to check stack dependencies?");
+  if (addCI) {
+    const ciResult = setupCI(cwd);
+    if (ciResult.created) {
+      console.log(`  ${formatSuccess("Created .github/workflows/array-stack-check.yml")}`);
+
+      // Show direct link if we can determine the repo
+      if (remoteExists) {
+        const { shellExecutor } = await import("@array/core");
+        const remoteResult = await shellExecutor.execute(
+          "git",
+          ["config", "--get", "remote.origin.url"],
+          { cwd },
+        );
+        if (remoteResult.exitCode === 0) {
+          const repoInfo = getRepoInfoFromRemote(remoteResult.stdout.trim());
+          if (repoInfo.ok) {
+            const url = getBranchProtectionUrl(repoInfo.value.owner, repoInfo.value.repo);
+            console.log(dim(`  To make it required: ${url}`));
+          }
+        }
+      }
+    }
+  }
+
   printQuickStart();
 }

packages/cli/src/commands/log.ts

@@ -1,4 +1,9 @@
-import { datePrefixedLabel, formatRelativeTime, GitHub } from "@array/core";
+import {
+  type DiffStats,
+  datePrefixedLabel,
+  formatRelativeTime,
+  GitHub,
+} from "@array/core";
 import {
   cyan,
   dim,
@@ -11,6 +16,16 @@ import {
 } from "../utils/output";
 import { createJJ, unwrap } from "../utils/run";
 
+function formatDiffStats(stats: DiffStats): string {
+  if (stats.filesChanged === 0) return "";
+  const parts: string[] = [];
+  if (stats.insertions > 0) parts.push(green(`+${stats.insertions}`));
+  if (stats.deletions > 0) parts.push(red(`-${stats.deletions}`));
+  const filesLabel = stats.filesChanged === 1 ? "file" : "files";
+  parts.push(dim(`${stats.filesChanged} ${filesLabel}`));
+  return dim("(") + parts.join(dim(", ")) + dim(")");
+}
+
 interface PRInfo {
   number: number;
   state: "open" | "merged" | "closed";
@@ -58,6 +73,21 @@ export async function log(): Promise<void> {
     }
   }
 
+  // Fetch diff stats for all entries in parallel
+  // Use unpushed stats for modified changes, total stats otherwise
+  const diffStatsMap = new Map<string, DiffStats>();
+  const statsPromises = entries.map(async (entry) => {
+    const bookmark = entry.change.bookmarks[0];
+    const result =
+      entry.isModified && bookmark
+        ? await jj.getUnpushedDiffStats(entry.change.changeId, bookmark)
+        : await jj.getDiffStats(entry.change.changeId);
+    if (result.ok) {
+      diffStatsMap.set(entry.change.changeId, result.value);
+    }
+  });
+  await Promise.all(statsPromises);
+
   console.log();
 
   // Show empty working copy if present
@@ -82,25 +112,27 @@ export async function log(): Promise<void> {
       entries[i];
     const label = datePrefixedLabel(change.description, change.timestamp);
 
-    // Track modified changes for summary
+    // Track unpushed changes for summary
     if (isModified) modifiedCount++;
 
     // Determine status badges
     const badges: string[] = [];
-    if (isModified) badges.push(yellow("modified"));
+    if (isModified) badges.push(yellow("unpushed"));
     if (change.hasConflicts) badges.push(yellow("conflicts"));
 
     // Don't show current marker on entries when empty WC is shown above
     const marker = isCurrent && !hasEmptyWorkingCopy ? green("◉") : "○";
     const badgeStr =
       badges.length > 0 ? ` ${dim("(")}${badges.join(", ")}${dim(")")}` : "";
 
-    // Line 1: marker + branch name + change ID + badges
+    // Line 1: marker + branch name + change ID + stats + badges
     const shortId = formatChangeId(
       change.changeId.slice(0, 8),
       change.changeIdPrefix,
     );
-    console.log(`${prefix}${marker} ${label} ${shortId}${badgeStr}`);
+    const stats = diffStatsMap.get(change.changeId);
+    const statsStr = stats ? ` ${formatDiffStats(stats)}` : "";
+    console.log(`${prefix}${marker} ${label} ${shortId}${statsStr}${badgeStr}`);
 
     // Line 2: relative time
     console.log(`${prefix}│ ${dim(formatRelativeTime(change.timestamp))}`);
@@ -155,11 +187,11 @@ export async function log(): Promise<void> {
   }
   console.log();
 
-  // Show summary/guidance when there are modified changes
+  // Show summary/guidance when there are unpushed changes
   if (modifiedCount > 0) {
-    const changeWord = modifiedCount === 1 ? "change" : "changes";
+    const changeWord = modifiedCount === 1 ? "change has" : "changes have";
     console.log(
-      `${modifiedCount} ${changeWord} modified. Run ${cyan("arr submit")} to update PRs.`,
+      `${modifiedCount} ${changeWord} unpushed commits. Run ${cyan("arr submit")} to update PRs.`,
     );
     console.log();
   }

packages/cli/src/commands/status.ts

@@ -1,8 +1,25 @@
+import type { DiffStats } from "@array/core";
 import { cyan, dim, formatChangeId, green, red, yellow } from "../utils/output";
 import { createJJ, unwrap } from "../utils/run";
 
+function formatDiffStats(stats: DiffStats): string {
+  if (stats.filesChanged === 0) return "";
+  const parts: string[] = [];
+  if (stats.insertions > 0) parts.push(green(`+${stats.insertions}`));
+  if (stats.deletions > 0) parts.push(red(`-${stats.deletions}`));
+  const filesLabel = stats.filesChanged === 1 ? "file" : "files";
+  parts.push(dim(`${stats.filesChanged} ${filesLabel}`));
+  return dim("(") + parts.join(dim(", ")) + dim(")");
+}
+
 export async function status(): Promise<void> {
-  const info = unwrap(await createJJ().getStatusInfo());
+  const jj = createJJ();
+  const info = unwrap(await jj.getStatusInfo());
+
+  // Get diff stats for current change
+  const statsResult = await jj.getDiffStats("@");
+  const stats = statsResult.ok ? statsResult.value : null;
+  const statsStr = stats ? ` ${formatDiffStats(stats)}` : "";
 
   // Check if on main with no stack above (fresh start)
   const isOnMainFresh =
@@ -16,13 +33,13 @@ export async function status(): Promise<void> {
     info.changeIdPrefix,
   );
   if (isOnMainFresh) {
-    console.log(`${green("◉")} On ${cyan("main")} ${changeId}`);
+    console.log(`${green("◉")} On ${cyan("main")} ${changeId}${statsStr}`);
   } else if (info.isUndescribed) {
     const label = info.hasChanges ? "(unsaved)" : "(empty)";
-    console.log(`${green(label)} ${changeId}`);
+    console.log(`${green(label)} ${changeId}${statsStr}`);
     console.log(dim(`  ↳ ${info.stackPath.join(" → ")}`));
   } else {
-    console.log(`${green(info.name)} ${changeId}`);
+    console.log(`${green(info.name)} ${changeId}${statsStr}`);
     console.log(dim(`  ↳ ${info.stackPath.join(" → ")}`));
   }
 

packages/cli/src/commands/trunk.ts

@@ -0,0 +1,8 @@
+import { cyan, dim, green } from "../utils/output";
+import { createJJ, unwrap } from "../utils/run";
+
+export async function trunk(): Promise<void> {
+  unwrap(await createJJ().goToTrunk());
+  console.log(`${green("◉")} Started fresh on ${cyan("main")}`);
+  console.log(dim(`  Run ${cyan("arr top")} to go back to your stack`));
+}