@cardstack/boxel-cli 0.1.4 → 0.2.0-unstable.294

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardstack/boxel-cli",
-  "version": "0.1.4",
+  "version": "0.2.0-unstable.294",
   "license": "MIT",
   "description": "CLI tools for Boxel workspace management",
   "main": "./dist/index.js",
@@ -52,8 +52,8 @@
     "vite": "^6.3.2",
     "vitest": "^2.1.9",
     "@cardstack/local-types": "0.0.0",
-    "@cardstack/runtime-common": "1.0.0",
-    "@cardstack/postgres": "0.0.0"
+    "@cardstack/postgres": "0.0.0",
+    "@cardstack/runtime-common": "1.0.0"
   },
   "publishConfig": {
     "access": "public",

package/src/build-program.ts

@@ -1,11 +1,13 @@
 import { Command } from 'commander';
 import { profileCommand } from './commands/profile';
+import { registerConsolidateWorkspacesCommand } from './commands/consolidate-workspaces';
 import { registerReadTranspiledCommand } from './commands/read-transpiled';
 import { registerRealmCommand } from './commands/realm/index';
 import { registerFileCommand } from './commands/file/index';
 import { registerRunCommand } from './commands/run-command';
 import { registerSearchCommand } from './commands/search';
 import { setQuiet } from './lib/cli-log';
+import { warnIfMisplacedLocalRealmDirs } from './lib/realm-local-paths';
 
 /**
  * Construct the boxel CLI program with every command registered. Pure builder
@@ -30,6 +32,7 @@ export function buildBoxelProgram(version: string): Command {
       if (opts.quiet) {
         setQuiet(true);
       }
+      warnIfMisplacedLocalRealmDirs(process.cwd());
     });
 
   program
@@ -86,6 +89,7 @@ Environment variables (for 'add'):
   registerRunCommand(program);
   registerSearchCommand(program);
   registerReadTranspiledCommand(program);
+  registerConsolidateWorkspacesCommand(program);
 
   return program;
 }

package/src/commands/consolidate-workspaces.ts

@@ -0,0 +1,104 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import type { Command } from 'commander';
+import { findMisplacedLocalRealmDirs } from '../lib/realm-local-paths';
+
+export interface ConsolidateWorkspacesOptions {
+  dryRun?: boolean;
+}
+
+function ensureDir(dirPath: string): void {
+  if (!fs.existsSync(dirPath)) {
+    fs.mkdirSync(dirPath, { recursive: true });
+  }
+}
+
+function moveDir(from: string, to: string): void {
+  try {
+    fs.renameSync(from, to);
+  } catch (error) {
+    const err = error as NodeJS.ErrnoException;
+    if (err.code !== 'EXDEV') {
+      throw err;
+    }
+    fs.cpSync(from, to, { recursive: true });
+    fs.rmSync(from, { recursive: true, force: true });
+  }
+}
+
+export async function consolidateWorkspacesCommand(
+  rootDirInput: string | undefined,
+  options: ConsolidateWorkspacesOptions,
+): Promise<void> {
+  const rootDir = path.resolve(rootDirInput || '.');
+  const entries = findMisplacedLocalRealmDirs(rootDir);
+
+  if (entries.length === 0) {
+    console.log(`No misplaced local realm paths found under ${rootDir}`);
+    return;
+  }
+
+  console.log(`Found ${entries.length} misplaced local realm path(s):\n`);
+
+  let moved = 0;
+  let skipped = 0;
+
+  for (const entry of entries) {
+    const from = path.relative(rootDir, entry.currentDir) || '.';
+    const to = path.relative(rootDir, entry.expectedDir) || '.';
+    console.log(`- ${from} -> ${to}`);
+
+    if (options.dryRun) {
+      continue;
+    }
+
+    if (fs.existsSync(entry.expectedDir)) {
+      console.warn('  Skipping: target path already exists');
+      skipped += 1;
+      continue;
+    }
+
+    ensureDir(path.dirname(entry.expectedDir));
+    try {
+      moveDir(entry.currentDir, entry.expectedDir);
+      moved += 1;
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      console.warn(`  Skipping: failed to move (${message})`);
+      skipped += 1;
+    }
+  }
+
+  if (options.dryRun) {
+    console.log('\n[DRY RUN] No directories moved.');
+    return;
+  }
+
+  console.log(`\nMoved ${moved} director${moved === 1 ? 'y' : 'ies'}.`);
+  if (skipped > 0) {
+    console.log(
+      `Skipped ${skipped} due to existing target paths or move failures.`,
+    );
+  }
+}
+
+export function registerConsolidateWorkspacesCommand(program: Command): void {
+  program
+    .command('consolidate-workspaces')
+    .description(
+      'Move local realm mirror directories into the canonical <root>/<domain>/<owner>/<realm> layout',
+    )
+    .argument(
+      '[root-dir]',
+      'Root directory to scan (default: current directory)',
+    )
+    .option('--dry-run', 'Preview without moving anything')
+    .action(
+      async (
+        rootDir: string | undefined,
+        opts: ConsolidateWorkspacesOptions,
+      ) => {
+        await consolidateWorkspacesCommand(rootDir, opts);
+      },
+    );
+}

package/src/commands/realm/index.ts

@@ -7,6 +7,7 @@ import { registerMilestoneCommand } from './milestone';
 import { registerPullCommand } from './pull';
 import { registerPushCommand } from './push';
 import { registerRemoveCommand } from './remove';
+import { registerStatusCommand } from './status';
 import { registerSyncCommand } from './sync';
 import { registerWaitForReadyCommand } from './wait-for-ready';
 import { registerWatchCommand } from './watch';
@@ -24,7 +25,8 @@ export function registerRealmCommand(program: Command): void {
   registerPullCommand(realm);
   registerPushCommand(realm);
   registerRemoveCommand(realm);
-  registerSyncCommand(realm);
+  const sync = registerSyncCommand(realm);
+  registerStatusCommand(sync);
   registerWaitForReadyCommand(realm);
   registerWatchCommand(realm);
 }