split up jj into cmomands, remove dead code

Author: jonathanlab

CLAUDE.md

@@ -45,8 +45,9 @@
 ### Avoid Barrel Files
 
 Barrel files:
+
 - Break tree-shaking
-- Create circular dependency risks  
+- Create circular dependency risks
 - Hide the true source of imports
 - Make refactoring harder
 
@@ -82,10 +83,6 @@ See [ARCHITECTURE.md](./ARCHITECTURE.md) for detailed patterns (DI, services, tR
 ### Core Package (packages/core)
 
 - Shared business logic for jj/GitHub operations
-- `pnpm --filter @array/core test` - Run bun tests
-- `pnpm --filter @array/core typecheck` - Type check
-- Uses Bun's test runner with `mock()` for test doubles
-- Test helpers in `tests/helpers/` (MockGitHub, TestRepo, withTestRepo)
 
 ## Key Libraries
 
@@ -106,29 +103,3 @@ TODO: Update me
 
 - `pnpm test` - Run tests across all packages
 - Array app: Vitest with jsdom, helpers in `apps/array/src/test/`
-- Core package: Bun test runner, helpers in `packages/core/tests/helpers/`
-
-### Running Specific Tests (Bun)
-
-```bash
-# Run all tests in a directory
-bun test tests/integration
-
-# Run a specific test file
-bun test tests/integration/sync/sync.test.ts
-
-# Run tests matching a pattern (--test-name-pattern / -t)
-bun test -t "sync fetches"
-
-# Run with concurrency (default: 20)
-bun test --concurrent
-
-# Limit concurrent tests
-bun test --concurrent --max-concurrency 10
-
-# Increase timeout (default: 5000ms)
-bun test --timeout 15000
-
-# Watch mode
-bun test --watch
-```

apps/cli/src/cli.ts

@@ -5,7 +5,9 @@ import {
   type CommandInfo,
   getCommandsByCategory,
   getCoreCommands,
-} from "@array/core";
+  getRequiredContext,
+  resolveCommandAlias,
+} from "@array/core/commands";
 import { auth } from "./commands/auth";
 import { bottom } from "./commands/bottom";
 import { checkout } from "./commands/checkout";
@@ -19,6 +21,7 @@ import { exit } from "./commands/exit";
 import { init } from "./commands/init";
 import { log } from "./commands/log";
 import { merge } from "./commands/merge";
+import { restack } from "./commands/restack";
 import { squash } from "./commands/squash";
 import { status } from "./commands/status";
 import { submit } from "./commands/submit";
@@ -27,6 +30,7 @@ import { top } from "./commands/top";
 import { trunk } from "./commands/trunk";
 import { undo } from "./commands/undo";
 import { up } from "./commands/up";
+import { type ParsedCommand, parseArgs } from "./utils/args";
 import {
   checkContext,
   isContextValid,
@@ -41,12 +45,6 @@ import {
   hint,
   message,
 } from "./utils/output";
-import {
-  getRequiredContext,
-  type ParsedCommand,
-  parseArgs,
-  resolveCommandAlias,
-} from "./utils/parser";
 
 type CommandHandler = (parsed: ParsedCommand) => Promise<void>;
 
@@ -64,6 +62,7 @@ const COMMANDS: Record<string, CommandHandler> = {
   bottom: () => bottom(),
   log: () => log(),
   sync: () => sync(),
+  restack: () => restack(),
   checkout: (p) => checkout(p.args[0]),
   delete: (p) => deleteChange(p.args[0], { yes: !!p.flags.yes || !!p.flags.y }),
   squash: (p) => squash(p.args[0]),

apps/cli/src/commands/auth.ts

@@ -1,10 +1,10 @@
 import {
-  COMMANDS,
   checkGhAuth,
   ghAuthLogin,
   isGhInstalled,
   saveAuthState,
-} from "@array/core";
+} from "@array/core/auth";
+import { COMMANDS } from "@array/core/commands";
 import {
   arr,
   blank,

apps/cli/src/commands/bottom.ts

@@ -1,6 +1,7 @@
+import { bottom as bottomCommand } from "@array/core/commands/bottom";
 import { printNav } from "../utils/output";
-import { createJJ, unwrap } from "../utils/run";
+import { unwrap } from "../utils/run";
 
 export async function bottom(): Promise<void> {
-  printNav("down", unwrap(await createJJ().navigateBottom()));
+  printNav("down", unwrap(await bottomCommand()));
 }

apps/cli/src/commands/checkout.ts

@@ -1,20 +1,21 @@
-import { changeLabel } from "@array/core";
+import { checkout as checkoutCmd } from "@array/core/commands/checkout";
+import { changeLabel } from "@array/core/slugify";
 import { cyan, dim, formatSuccess, message } from "../utils/output";
-import { createJJ, findChange, requireArg, unwrap } from "../utils/run";
+import { findChange, requireArg, unwrap } from "../utils/run";
 
 export async function checkout(id: string): Promise<void> {
   requireArg(id, "Usage: arr checkout <id>");
-  const jj = createJJ();
 
   // Handle trunk checkout - creates new empty change on main
   if (id === "main" || id === "master" || id === "trunk") {
-    unwrap(await jj.new({ parents: [id === "trunk" ? "trunk()" : id] }));
+    unwrap(await checkoutCmd(id));
     message(formatSuccess(`Switched to ${cyan(id)}`));
     return;
   }
 
-  const change = await findChange(jj, id, { includeBookmarks: true });
-  unwrap(await jj.edit(change.changeId));
+  // For other targets, resolve via findChange first
+  const change = await findChange(id, { includeBookmarks: true });
+  unwrap(await checkoutCmd(change.changeId));
 
   const label = changeLabel(change.description, change.changeId);
   message(

apps/cli/src/commands/ci.ts

@@ -3,10 +3,10 @@ import {
   enableStackCheckProtection,
   getBranchProtectionUrl,
   getRepoInfoFromRemote,
-  JJ,
   setupCI,
-  shellExecutor,
-} from "@array/core";
+} from "@array/core/ci";
+import { shellExecutor } from "@array/core/executor";
+import { getTrunk } from "@array/core/jj";
 import {
   blank,
   cyan,
@@ -90,8 +90,7 @@ async function tryEnableProtection(
   repoInfo: { owner: string; repo: string },
   isUpdate: boolean,
 ): Promise<boolean> {
-  const jj = new JJ({ cwd });
-  const trunk = await jj.getTrunk();
+  const trunk = await getTrunk(cwd);
 
   status(isUpdate ? "Updating ruleset..." : `Creating ruleset for ${trunk}...`);
 

apps/cli/src/commands/config.ts

@@ -2,7 +2,7 @@ import {
   createDefaultUserConfig,
   loadUserConfig,
   saveUserConfig,
-} from "@array/core";
+} from "@array/core/config";
 import {
   blank,
   bold,

apps/cli/src/commands/create.ts

@@ -1,4 +1,5 @@
-import { COMMANDS, datePrefixedLabel } from "@array/core";
+import { COMMANDS } from "@array/core/commands";
+import { create as createCmd } from "@array/core/commands/create";
 import {
   arr,
   cyan,
@@ -7,7 +8,7 @@ import {
   indent,
   message,
 } from "../utils/output";
-import { createJJ, requireArg, unwrap } from "../utils/run";
+import { requireArg, unwrap } from "../utils/run";
 import { showTip } from "../utils/tips";
 
 export async function create(msg: string): Promise<void> {
@@ -16,10 +17,9 @@ export async function create(msg: string): Promise<void> {
     "Usage: arr create <description>\n  Creates a change with current file modifications",
   );
 
-  unwrap(await createJJ().create({ message: msg, all: true }));
+  const result = unwrap(await createCmd(msg));
 
-  const label = datePrefixedLabel(msg, new Date());
-  message(formatSuccess(`Created ${cyan(label)}`));
+  message(formatSuccess(`Created ${cyan(result.bookmarkName)}`));
   indent(
     `${dim("Run")} ${arr(COMMANDS.submit.name)} ${dim("to create a PR, or keep editing")}`,
   );

apps/cli/src/commands/delete.ts

@@ -1,4 +1,5 @@
-import { changeLabel } from "@array/core";
+import { deleteChange as deleteCmd } from "@array/core/commands/delete";
+import { changeLabel } from "@array/core/slugify";
 import {
   cyan,
   dim,
@@ -9,16 +10,15 @@ import {
   yellow,
 } from "../utils/output";
 import { confirm } from "../utils/prompt";
-import { createJJ, findChange, requireArg, unwrap } from "../utils/run";
+import { findChange, requireArg, unwrap } from "../utils/run";
 
 export async function deleteChange(
   id: string,
   options?: { yes?: boolean },
 ): Promise<void> {
   requireArg(id, "Usage: arr delete <id>");
-  const jj = createJJ();
 
-  const change = await findChange(jj, id);
+  const change = await findChange(id);
   const label = changeLabel(change.description, change.changeId);
 
   // Confirm deletion since work will be lost
@@ -32,7 +32,7 @@ export async function deleteChange(
     return;
   }
 
-  const result = unwrap(await jj.delete(change.changeId));
+  const result = unwrap(await deleteCmd(change.changeId));
 
   message(formatSuccess(`Deleted change ${cyan(label)}`));
 

apps/cli/src/commands/down.ts

@@ -1,4 +1,5 @@
-import { COMMANDS } from "@array/core";
+import { COMMANDS } from "@array/core/commands";
+import { down as downCommand } from "@array/core/commands/down";
 import {
   arr,
   cyan,
@@ -8,10 +9,10 @@ import {
   hint,
   message,
 } from "../utils/output";
-import { createJJ, unwrap } from "../utils/run";
+import { unwrap } from "../utils/run";
 
 export async function down(): Promise<void> {
-  const result = unwrap(await createJJ().navigateDown());
+  const result = unwrap(await downCommand());
 
   if (result.createdOnTrunk) {
     message(`${green("◉")} Started fresh on ${cyan("main")}`);