clean up

Author: jonathanlab

packages/cli/src/cli.ts

@@ -6,30 +6,22 @@ import {
   getCoreCommands,
   JJ,
 } from "@array/core";
-import { abandon } from "./commands/abandon";
 import { auth } from "./commands/auth";
 import { bottom } from "./commands/bottom";
 import { checkout } from "./commands/checkout";
 import { config } from "./commands/config";
-import { conflicts } from "./commands/conflicts";
 import { continueCommand } from "./commands/continue";
 import { create } from "./commands/create";
 import { deleteChange } from "./commands/delete";
-import { disable } from "./commands/disable";
 import { down } from "./commands/down";
-import { edit } from "./commands/edit";
-import { enable } from "./commands/enable";
-import { exit } from "./commands/exit";
 import { init } from "./commands/init";
-import { list } from "./commands/list";
 import { log } from "./commands/log";
 import { merge } from "./commands/merge";
 import { modify } from "./commands/modify";
 import { restack } from "./commands/restack";
 import { stacks } from "./commands/stacks";
 import { status } from "./commands/status";
 import { submit } from "./commands/submit";
-import { swap } from "./commands/swap";
 import { sync } from "./commands/sync";
 import { top } from "./commands/top";
 import { undo } from "./commands/undo";
@@ -107,7 +99,7 @@ ${bold("CORE WORKFLOW")}
   1. ${cyan('arr create "add user auth"')}  Create a new change
   2. ${dim("(make edits - jj tracks automatically)")}
   3. ${cyan('arr create "add tests"')}      Stack another change
-  4. ${cyan("arr submit --stack")}           Create PRs for the stack
+  4. ${cyan("arr submit")}                   Create PRs for the stack
   5. ${cyan("arr sync")}                     Fetch & rebase after reviews
 
 ${bold("LEARN MORE")}
@@ -152,9 +144,9 @@ async function showStatus(): Promise<void> {
 
   console.log();
   console.log(`  ${dim("Next:")}`);
-  console.log(`    ${cyan("arr create -a")} ${dim('"msg"')}     Add to stack`);
-  console.log(`    ${cyan("arr submit --stack")}      Create PRs`);
-  console.log(`    ${cyan("arr help")}                See all commands`);
+  console.log(`    ${cyan("arr create")} ${dim('"msg"')}        Add to stack`);
+  console.log(`    ${cyan("arr submit")}               Create PRs`);
+  console.log(`    ${cyan("arr help")}                 See all commands`);
   console.log();
 }
 
@@ -256,33 +248,12 @@ export async function main(): Promise<void> {
       case "status":
         await status();
         break;
-      case "list":
-        await list();
-        break;
-      case "enable":
-        await enable(parsed.args);
-        break;
-      case "disable":
-        await disable(parsed.args);
-        break;
-      case "abandon":
-        await abandon(parsed.args[0]);
-        break;
-      case "conflicts":
-        await conflicts(parsed.args);
-        break;
-      case "swap":
-        await swap(parsed.args[0]);
-        break;
       case "create":
         await create(parsed.args.join(" "), parsed.flags);
         break;
       case "modify":
         await modify();
         break;
-      case "edit":
-        await edit(parsed.args[0], parsed.flags);
-        break;
       case "submit":
         await submit(parsed.flags);
         break;
@@ -325,11 +296,12 @@ export async function main(): Promise<void> {
       case "undo":
         await undo();
         break;
-      case "exit":
-        await exit();
-        break;
       case "help":
-        printHelp();
+        if (parsed.flags.all) {
+          printHelpAll();
+        } else {
+          printHelp();
+        }
         break;
       case "version":
         printVersion();

packages/cli/src/commands/abandon.ts

@@ -20,9 +20,9 @@ export async function checkout(id: string): Promise<void> {
     return;
   }
 
-  // Use jj revset for searching - description substring (case-insensitive)
+  // Search by: description substring OR bookmark/branch name substring (case-insensitive)
   const escaped = id.replace(/"/g, '\\"');
-  const revset = `description(substring-i:"${escaped}")`;
+  const revset = `description(substring-i:"${escaped}") | bookmarks(substring-i:"${escaped}")`;
 
   const listResult = await jj.list({ revset });
   if (!listResult.ok) {