more bugfixes

Author: jonathanlab

apps/cli/README.md

@@ -52,18 +52,36 @@ arr exit                # back to git
 arr help --all          # show all commands
 ```
 
-## Workflow
+## Example
 
 ```
-echo "hello" > hello.txt        # no need to stage, jj tracks automatically
-arr create "add hello"          # save as a change
-
-echo "world" > world.txt
-arr create "add world"          # save as another change
-
-arr submit                      # push all as stacked PRs
-
-arr sync                        # after reviews, sync with trunk
+$ echo "user model" >> user_model.ts
+$ arr create "Add user model"
+✓ Created add-user-model-qtrsqm
+
+$ echo "user api" >> user_api.ts
+$ arr create "Add user API"
+✓ Created add-user-api-nnmzrt
+
+$ arr log
+◉ (working copy)
+│ Empty
+○ 12-23-add-user-api nnmzrtzz (+1, 1 file)
+│ Not submitted
+○ 12-23-add-user-model qtrsqmmy (+1, 1 file)
+│ Not submitted
+○ main
+
+$ arr submit
+Created PR #8: 12-23-add-user-model
+  https://github.com/username/your-repo/pull/8
+Created PR #9: 12-23-add-user-api
+  https://github.com/username/your-repo/pull/9
+
+$ arr merge
+...
+
+$ arr sync
 ```
 
 Each change becomes a PR. PRs are stacked so reviewers see the dependency.

apps/cli/src/cli.ts

@@ -161,37 +161,17 @@ async function showStatus(): Promise<void> {
 async function showWelcome(context: Context): Promise<void> {
   const { select } = await import("./utils/prompt");
 
-  console.log();
-  console.log(`  ${bold("Array")} ${dim("- Stacked PRs for jj")}`);
-  console.log();
-
-  if (!context.jjInstalled) {
-    console.log(`  ${dim("jj is required but not installed.")}`);
-    console.log();
-    console.log(`  Install jj first:`);
-    console.log(`    ${cyan("brew install jj")}`);
-    console.log();
-    console.log(`  Then run ${cyan("arr init")} to get started.`);
+  // If jj not installed or not in git repo, delegate to init for full setup flow
+  if (!context.jjInstalled || !context.inGitRepo) {
+    await init();
     return;
   }
 
-  if (!context.inGitRepo) {
-    console.log(`  ${dim("Not a git repository.")}`);
-    console.log();
-
-    const choice = await select("What would you like to do?", [
-      { label: "Initialize git + Array here", value: "init" },
-      { label: "See all commands", value: "help" },
-    ]);
-
-    if (choice === "init") {
-      await init();
-    } else if (choice === "help") {
-      printHelp();
-    }
-    return;
-  }
+  console.log();
+  console.log(`  ${bold("Array")} ${dim("- Stacked PRs for jj")}`);
+  console.log();
 
+  // In git repo but jj not initialized - offer to initialize
   const choice = await select("Get started:", [
     { label: "Initialize Array in this repo", value: "init" },
     { label: "See all commands", value: "help" },

apps/cli/src/commands/merge.ts

@@ -11,19 +11,35 @@ interface MergeFlags {
 export async function merge(flags: MergeFlags = {}): Promise<void> {
   const jj = createJJ();
   const github = new GitHub(process.cwd());
+  const trunk = jj.getTrunk();
 
-  const { workingCopy } = unwrap(await jj.status());
+  const { workingCopy, parents } = unwrap(await jj.status());
 
-  if (workingCopy.bookmarks.length === 0) {
+  let bookmarkName: string | null = null;
+  let changeId: string | null = null;
+
+  if (workingCopy.bookmarks.length > 0) {
+    bookmarkName = workingCopy.bookmarks[0];
+    changeId = workingCopy.changeId;
+  } else if (workingCopy.isEmpty && workingCopy.description.trim() === "") {
+    // On empty WC, look at the parent below for a bookmark with a PR
+    for (const parent of parents) {
+      if (parent.bookmarks.length > 0) {
+        bookmarkName = parent.bookmarks[0];
+        changeId = parent.changeId;
+        break;
+      }
+    }
+  }
+
+  if (!bookmarkName) {
     console.error(
       formatError(
         "No bookmark on current change. Submit first with 'arr submit'",
       ),
     );
     process.exit(1);
   }
-
-  const bookmarkName = workingCopy.bookmarks[0];
   const pr = unwrap(await github.getPRForBranch(bookmarkName));
 
   if (!pr) {
@@ -45,15 +61,43 @@ export async function merge(flags: MergeFlags = {}): Promise<void> {
     process.exit(1);
   }
 
+  // Check if this is a stacked PR (base is not trunk)
+  if (pr.baseRefName !== trunk) {
+    console.error(
+      formatError(
+        `Cannot merge: PR #${pr.number} is stacked on ${cyan(pr.baseRefName)}`,
+      ),
+    );
+    console.log(
+      dim(`  Merge the base PR first, or use 'arr merge --stack' to merge all`),
+    );
+    process.exit(1);
+  }
+
   let method: "merge" | "squash" | "rebase" = "squash";
   if (flags.merge) method = "merge";
   if (flags.rebase) method = "rebase";
 
   console.log(`Merging PR #${cyan(String(pr.number))}: ${pr.title}`);
 
-  unwrap(await github.mergePR(pr.number, { method }));
+  // Merge and delete the remote branch to prevent stale references
+  unwrap(
+    await github.mergePR(pr.number, {
+      method,
+      deleteHead: true,
+      headRef: bookmarkName,
+    }),
+  );
   console.log(formatSuccess(`Merged PR #${pr.number}`));
 
+  // Clean up local state: delete bookmark and abandon change
+  if (bookmarkName) {
+    await jj.deleteBookmark(bookmarkName);
+  }
+  if (changeId) {
+    await jj.abandon(changeId);
+  }
+
   console.log(dim("  Syncing to update local state..."));
   unwrap(await jj.sync());
   console.log(formatSuccess("Done! Change has been merged and synced."));

apps/cli/src/utils/context.ts

@@ -4,50 +4,29 @@ import {
   checkContext as checkContextCore,
   isContextValid,
 } from "@array/core";
-import { cyan, red } from "./output";
+import { cyan, dim } from "./output";
 
 export { type Context, type ContextLevel, isContextValid };
 
 export function checkContext(): Promise<Context> {
   return checkContextCore(process.cwd());
 }
 
-export function printContextError(context: Context, level: ContextLevel): void {
+export function printContextError(
+  context: Context,
+  _level: ContextLevel,
+): void {
+  // All context errors point to arr init, which handles all setup flows
   console.log();
-
   if (!context.jjInstalled) {
-    console.log(
-      `  ${red("Error:")} jj (Jujutsu) is required but not installed.`,
-    );
-    console.log();
-    console.log(`  Install via Homebrew:`);
-    console.log(`    ${cyan("brew install jj")}`);
-    console.log();
-    console.log(`  Or via Cargo:`);
-    console.log(`    ${cyan("cargo install jj-cli")}`);
-    return;
-  }
-
-  if (!context.inGitRepo) {
-    console.log(`  ${red("Error:")} Not in a git repository.`);
-    console.log();
-    console.log(`  Run this command in an existing git repo, or:`);
-    console.log(`    ${cyan("git init && arr init")}`);
-    return;
-  }
-
-  if (!context.jjInitialized) {
-    console.log(`  ${red("Error:")} This repo is not using jj yet.`);
-    console.log();
-    console.log(`  Initialize jj:`);
-    console.log(`    ${cyan("jj git init --colocate")}`);
-    return;
-  }
-
-  if (level === "array" && !context.arrayInitialized) {
-    console.log(`  ${red("Error:")} Array changesets not initialized.`);
-    console.log();
-    console.log(`  Run ${cyan("arr init")} to enable changeset features.`);
-    return;
+    console.log(`  ${dim("jj is required but not installed.")}`);
+  } else if (!context.inGitRepo) {
+    console.log(`  ${dim("Not in a git repository.")}`);
+  } else if (!context.jjInitialized) {
+    console.log(`  ${dim("This repo is not using jj yet.")}`);
+  } else {
+    console.log(`  ${dim("Array is not initialized.")}`);
   }
+  console.log();
+  console.log(`  Run ${cyan("arr init")} to get started.`);
 }

packages/core/src/github.ts

@@ -54,7 +54,11 @@ export interface GitHubClient {
   ): Promise<Result<Map<number, PRStatus>>>;
   mergePR(
     prNumber: number,
-    options?: { method?: "merge" | "squash" | "rebase"; deleteHead?: boolean },
+    options?: {
+      method?: "merge" | "squash" | "rebase";
+      deleteHead?: boolean;
+      headRef?: string;
+    },
   ): Promise<Result<void>>;
   updatePR(
     prNumber: number,
@@ -349,7 +353,11 @@ export class GitHub implements GitHubClient {
 
   async mergePR(
     prNumber: number,
-    options?: { method?: "merge" | "squash" | "rebase"; deleteHead?: boolean },
+    options?: {
+      method?: "merge" | "squash" | "rebase";
+      deleteHead?: boolean;
+      headRef?: string;
+    },
   ): Promise<Result<void>> {
     const repoResult = await this.getRepoInfo();
     if (!repoResult.ok) return repoResult;
@@ -366,6 +374,18 @@ export class GitHub implements GitHubClient {
         merge_method: method,
       });
 
+      if (options?.deleteHead && options?.headRef) {
+        try {
+          await octokit.git.deleteRef({
+            owner,
+            repo,
+            ref: `heads/${options.headRef}`,
+          });
+        } catch {
+          // Branch deletion is best-effort, don't fail the merge
+        }
+      }
+
       return ok(undefined);
     } catch (e) {
       const error = e as Error & { status?: number; message?: string };

packages/core/src/jj.ts

@@ -94,6 +94,12 @@ export class JJ {
     );
   }
 
+  async deleteBookmark(name: string): Promise<Result<void>> {
+    const result = await this.run(["bookmark", "delete", name]);
+    if (!result.ok) return result;
+    return ok(undefined);
+  }
+
   private async getNavigationResult(): Promise<Result<NavigationResult>> {
     const status = await this.status();
     if (!status.ok) return status;