yggtree 1.3.0 → 1.4.0

package/dist/index.js

@@ -1,5 +1,6 @@
 import { Command } from 'commander';
 import inquirer from 'inquirer';
+import chalk from 'chalk';
 import { welcome, log } from './lib/ui.js';
 import { listCommand } from './commands/wt/list.js';
 import { createCommand } from './commands/wt/create.js';
@@ -12,9 +13,11 @@ import { pruneCommand } from './commands/wt/prune.js';
 import { execCommand } from './commands/wt/exec.js';
 import { enterCommand } from './commands/wt/enter.js';
 import { pathCommand } from './commands/wt/path.js';
+import { openCommand } from './commands/wt/open.js';
 import { applyCommand } from './commands/wt/apply.js';
 import { unapplyCommand } from './commands/wt/unapply.js';
 import { getVersion } from './lib/version.js';
+import { findSandboxRoot } from './lib/sandbox.js';
 const program = new Command();
 program
     .name('yggtree')
@@ -23,30 +26,48 @@ program
     .action(async () => {
     // Interactive Menu if no command is provided
     await welcome();
+    const isInSandbox = Boolean(await findSandboxRoot(process.cwd()));
+    const realmChoices = [
+        { name: `🌿 Grow New Realm ${chalk.dim('(create worktree)')}`, value: 'create-smart' },
+        { name: `🔀 Traverse to Another Realm ${chalk.dim('(checkout existing branch in new worktree)')}`, value: 'worktree-checkout' },
+        { name: `🌳 Grow Many Realms ${chalk.dim('(create multiple worktrees)')}`, value: 'create-multi' },
+        { name: `🧪 Forge Sandbox Realm ${chalk.dim('(create sandbox worktree)')}`, value: 'create-sandbox' },
+        { name: `🗺️  Survey Realms ${chalk.dim('(list worktrees)')}`, value: 'list' },
+        { name: `🧭 Open Realm in Tool ${chalk.dim('(open worktree in IDE/agent)')}`, value: 'open' },
+        { name: `🪓 Fell a Realm ${chalk.dim('(delete worktree)')}`, value: 'delete' },
+        { name: `🚀 Bless Realm Setup ${chalk.dim('(bootstrap worktree)')}`, value: 'bootstrap' },
+        { name: `🧹 Prune Withered Realms ${chalk.dim('(prune stale worktrees)')}`, value: 'prune' },
+        { name: `🐚 Cast a Command ${chalk.dim('(exec command in worktree)')}`, value: 'exec' },
+        { name: `🚪 Enter Realm Shell ${chalk.dim('(enter worktree)')}`, value: 'enter' },
+        { name: `📍 Reveal Realm Path ${chalk.dim('(show worktree path)')}`, value: 'path' },
+    ];
+    const sandboxChoices = [
+        { name: `✅ Graft Sandbox Changes ${chalk.dim('(apply sandbox changes)')}`, value: 'apply' },
+        { name: `↩️ Undo Sandbox Graft ${chalk.dim('(unapply sandbox changes)')}`, value: 'unapply' },
+    ];
+    const choices = isInSandbox
+        ? [
+            ...sandboxChoices,
+            new inquirer.Separator(),
+            ...realmChoices,
+            new inquirer.Separator(),
+            { name: `🚪 Leave Yggdrasil ${chalk.dim('(exit)')}`, value: 'exit' },
+        ]
+        : [
+            ...realmChoices,
+            new inquirer.Separator(),
+            ...sandboxChoices,
+            new inquirer.Separator(),
+            { name: `🚪 Leave Yggdrasil ${chalk.dim('(exit)')}`, value: 'exit' },
+        ];
     const { action } = await inquirer.prompt([
         {
             type: 'list',
             name: 'action',
             message: 'What would you like to do?',
             loop: false,
-            choices: [
-                { name: '🌿 Create new worktree (Smart Branch)', value: 'create-smart' },
-                { name: '🌳 Create multiple worktrees', value: 'create-multi' },
-                { name: '🧪 Create sandbox worktree', value: 'create-sandbox' },
-                // { name: '🌱 Create new worktree (Manual Slug)', value: 'create-slug' },
-                { name: '📋 List worktrees', value: 'list' },
-                { name: '🪓 Delete worktree', value: 'delete' },
-                { name: '🚀 Bootstrap worktree', value: 'bootstrap' },
-                { name: '🧹 Prune stale worktrees', value: 'prune' },
-                { name: '🐚 Exec command', value: 'exec' },
-                { name: '🚪 Enter worktree', value: 'enter' },
-                { name: '📍 Get worktree path', value: 'path' },
-                new inquirer.Separator(),
-                { name: '✅ Apply sandbox changes', value: 'apply' },
-                { name: '↩️  Unapply sandbox changes', value: 'unapply' },
-                new inquirer.Separator(),
-                { name: '🚪 Exit', value: 'exit' },
-            ],
+            pageSize: 12,
+            choices,
         },
     ]);
     switch (action) {
@@ -56,12 +77,15 @@ program
         case 'create-multi':
             await createCommandMulti({ bootstrap: true });
             break;
-        case 'create-slug':
+        case 'worktree-checkout':
             await createCommand({ bootstrap: true });
             break;
         case 'list':
             await listCommand();
             break;
+        case 'open':
+            await openCommand();
+            break;
         case 'delete':
             await deleteCommand();
             break;
@@ -97,8 +121,15 @@ program
 // --- Worktree Commands ---
 const wt = program.command('wt').description('Manage git worktrees');
 wt.command('list')
-    .description('List all worktrees')
-    .action(listCommand);
+    .description('List all repo-linked worktrees')
+    .option('--open', 'Open a worktree in an IDE/agent tool instead of listing')
+    .action(async (options) => {
+    if (options.open) {
+        await openCommand();
+        return;
+    }
+    await listCommand();
+});
 wt.command('create [branch]')
     .description('Create a new worktree (Smart branch detection)')
     .option('-b, --branch <name>', 'Branch name (e.g. feat/new-ui)')
@@ -122,8 +153,8 @@ wt.command('create-multi')
     .action(async (options) => {
     await createCommandMulti(options);
 });
-wt.command('create-slug [name] [ref]')
-    .description('Create a new worktree (Manual slug/ref)')
+wt.command('worktree-checkout [name] [ref]')
+    .description('Create a checkout-style worktree from an existing branch')
     .option('-n, --name <slug>', 'Worktree name (slug)')
     .option('-r, --ref <ref>', 'Existing branch or ref')
     .option('--no-bootstrap', 'Skip bootstrap (npm install + submodules)')
@@ -138,8 +169,17 @@ wt.command('create-slug [name] [ref]')
     });
 });
 wt.command('delete')
-    .description('Delete a managed worktree')
-    .action(deleteCommand);
+    .description('Delete managed worktrees')
+    .option('-a, --all', 'Include repo-linked worktrees outside ~/.yggtree (except main/current)')
+    .action(async (options) => {
+    await deleteCommand(options);
+});
+wt.command('open [worktree]')
+    .description('Open a worktree in an IDE or agent CLI')
+    .option('--tool <command>', 'Tool command to use (e.g. cursor, code, claude, codex)')
+    .action(async (worktree, options) => {
+    await openCommand(worktree, options);
+});
 wt.command('bootstrap')
     .description('Bootstrap dependencies in a worktree')
     .action(bootstrapCommand);
@@ -167,6 +207,7 @@ wt.command('path [worktree]')
 });
 wt.command('create-sandbox')
     .description('Create a sandbox worktree from current branch')
+    .option('-n, --name <name>', 'Optional sandbox name (auto-generated when omitted)')
     .option('--carry', 'Carry uncommitted changes to sandbox')
     .option('--no-carry', 'Do not carry uncommitted changes')
     .option('--no-bootstrap', 'Skip bootstrap (npm install + submodules)')

package/dist/lib/prompt.js

@@ -0,0 +1,9 @@
+import inquirer from 'inquirer';
+import autocompletePrompt from 'inquirer-autocomplete-prompt';
+let autocompleteRegistered = false;
+export function ensureAutocompletePrompt() {
+    if (!autocompleteRegistered) {
+        inquirer.registerPrompt('autocomplete', autocompletePrompt);
+        autocompleteRegistered = true;
+    }
+}

package/dist/lib/sandbox.js

@@ -11,6 +11,20 @@ export function generateSandboxName(branch) {
     const safeBranch = branch.replace(/[\\/]/g, '-');
     return `sandbox-${hash}_${safeBranch}`;
 }
+/**
+ * Normalize a custom sandbox name into a branch-safe slug.
+ * Keeps current sandbox prefix conventions for easier filtering.
+ */
+export function normalizeSandboxName(input) {
+    const cleaned = input
+        .trim()
+        .replace(/[\\/]/g, '-')
+        .replace(/\s+/g, '-')
+        .replace(/^-+|-+$/g, '');
+    if (!cleaned)
+        return '';
+    return cleaned.startsWith('sandbox-') ? cleaned : `sandbox-${cleaned}`;
+}
 /**
  * Get the path to the sandbox metadata file
  */

package/dist/lib/worktree.js

@@ -0,0 +1,52 @@
+import chalk from 'chalk';
+import fs from 'fs-extra';
+import path from 'path';
+import { WORKTREES_ROOT } from './paths.js';
+import { getSandboxMetaPath } from './sandbox.js';
+export const WORKTREE_TYPE_ORDER = {
+    MAIN: 0,
+    MANAGED: 1,
+    SANDBOX: 2,
+    LINKED: 3,
+};
+export function getWorktreeBranchName(worktree) {
+    return worktree.branch || worktree.HEAD || 'detached';
+}
+export function isManagedWorktreePath(worktreePath) {
+    return worktreePath.startsWith(WORKTREES_ROOT);
+}
+export function formatWorktreeDisplayPath(worktreePath) {
+    if (isManagedWorktreePath(worktreePath)) {
+        return path.relative(WORKTREES_ROOT, worktreePath);
+    }
+    return worktreePath.replace(process.env.HOME || '', '~');
+}
+export function findWorktreeByName(worktrees, worktreeName) {
+    return worktrees.find(worktree => {
+        const branchName = getWorktreeBranchName(worktree);
+        const relativePath = path.relative(WORKTREES_ROOT, worktree.path);
+        const basename = path.basename(worktree.path);
+        return branchName === worktreeName ||
+            relativePath === worktreeName ||
+            worktree.path === worktreeName ||
+            basename === worktreeName;
+    });
+}
+export async function detectWorktreeType(worktree, mainWorktreePath) {
+    const isManaged = isManagedWorktreePath(worktree.path);
+    if (!isManaged) {
+        return worktree.path === mainWorktreePath ? 'MAIN' : 'LINKED';
+    }
+    const hasSandboxMeta = await fs.pathExists(getSandboxMetaPath(worktree.path));
+    const isSandboxBranch = (worktree.branch || '').startsWith('sandbox-');
+    return hasSandboxMeta || isSandboxBranch ? 'SANDBOX' : 'MANAGED';
+}
+export function formatWorktreeType(type) {
+    if (type === 'SANDBOX')
+        return chalk.magenta('SANDBOX');
+    if (type === 'MANAGED')
+        return chalk.green('MANAGED');
+    if (type === 'MAIN')
+        return chalk.blue('MAIN   ');
+    return chalk.cyan('LINKED ');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yggtree",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Interactive CLI for managing git worktrees and configs",
   "main": "dist/index.js",
   "type": "module",
@@ -34,6 +34,7 @@
     "fs-extra": "^11.2.0",
     "gradient-string": "^2.0.2",
     "inquirer": "^9.2.14",
+    "inquirer-autocomplete-prompt": "^3.0.1",
     "ora": "^8.0.1",
     "zod": "^3.22.4"
   },