cluttry 1.0.3 → 1.5.0

package/dist/commands/rm.js

@@ -7,6 +7,7 @@ import { createInterface } from 'node:readline';
 import { isGitRepo, getRepoRoot, listWorktrees, removeWorktree, deleteBranch, isWorktreeDirty, getCurrentBranch, } from '../lib/git.js';
 import { resolveBranchOrPath } from '../lib/paths.js';
 import * as out from '../lib/output.js';
+import { fail, errors } from '../lib/errors.js';
 async function confirm(message) {
     const rl = createInterface({
         input: process.stdin,
@@ -22,8 +23,7 @@ async function confirm(message) {
 export async function rm(branchOrPath, options) {
     // Check if we're in a git repo
     if (!isGitRepo()) {
-        out.error('Not a git repository. Run this command from within a git repo.');
-        process.exit(1);
+        fail(errors.notGitRepo());
     }
     const repoRoot = getRepoRoot();
     const worktrees = listWorktrees(repoRoot);
@@ -35,26 +35,18 @@ export async function rm(branchOrPath, options) {
     // Resolve the worktree
     const resolved = resolveBranchOrPath(branchOrPath, wtList, repoRoot);
     if (!resolved) {
-        out.error(`Worktree not found: ${branchOrPath}`);
-        out.info('Available worktrees:');
-        for (const wt of wtList) {
-            out.log(`  • ${wt.branch ?? '(detached)'} → ${wt.path}`);
-        }
-        process.exit(1);
+        const available = wtList.map(w => w.branch ?? w.path);
+        fail(errors.worktreeNotFound(branchOrPath, available));
     }
     const { path: wtPath, branch } = resolved;
     // Check if it's the main worktree (the original checkout)
     if (wtPath === repoRoot) {
-        out.error('Cannot remove the main worktree.');
-        out.info('This is your primary repository checkout.');
-        process.exit(1);
+        fail(errors.cannotRemoveMainWorktree());
     }
     // Check if dirty
     const dirty = isWorktreeDirty(wtPath);
     if (dirty && !options.force) {
-        out.error('Worktree has uncommitted changes.');
-        out.info('Use --force to remove anyway (changes will be lost).');
-        process.exit(1);
+        fail(errors.dirtyWorkingTree(branch ?? branchOrPath));
     }
     // Warn and confirm if dirty and force
     if (dirty && options.force && !options.yes) {

package/dist/commands/rm.js.map

@@ -1 +1 @@
-{"version":3,"file":"rm.js","sourceRoot":"","sources":["../../src/commands/rm.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rm.js","sourceRoot":"","sources":["../../src/commands/rm.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EACL,SAAS,EACT,WAAW,EACX,aAAa,EACb,cAAc,EACd,YAAY,EACZ,eAAe,EACf,gBAAgB,GACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,GAAG,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAQhD,KAAK,UAAU,OAAO,CAAC,OAAe;IACpC,MAAM,EAAE,GAAG,eAAe,CAAC;QACzB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAC;IAEH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,EAAE,CAAC,QAAQ,CAAC,GAAG,OAAO,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE;YAC1C,EAAE,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,GAAG,IAAI,MAAM,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,CAAC;QAC1E,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,EAAE,CAAC,YAAoB,EAAE,OAAkB;IAC/D,+BAA+B;IAC/B,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;QACjB,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;IAC5B,CAAC;IAED,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,SAAS,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IAE1C,oBAAoB;IACpB,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACpC,MAAM,EAAE,EAAE,CAAC,MAAM,IAAI,IAAI;QACzB,IAAI,EAAE,EAAE,CAAC,QAAQ;KAClB,CAAC,CAAC,CAAC;IAEJ,uBAAuB;IACvB,MAAM,QAAQ,GAAG,mBAAmB,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAErE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;IAE1C,0DAA0D;IAC1D,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;QACxB,IAAI,CAAC,MAAM,CAAC,wBAAwB,EAAE,CAAC,CAAC;IAC1C,CAAC;IAED,iBAAiB;IACjB,MAAM,KAAK,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IACtC,IAAI,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QAC5B,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,IAAI,YAAY,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,sCAAsC;IACtC,IAAI,KAAK,IAAI,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;QAC3C,GAAG,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC;QAChE,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,qCAAqC,CAAC,CAAC;QACvE,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IAED,sBAAsB;IACtB,GAAG,CAAC,GAAG,CAAC,sBAAsB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACtD,IAAI,CAAC;QACH,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,KAAK,EAAE,QAAQ,CAAC,CAAC;QACzD,GAAG,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAClC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,KAAK,CAAC,8BAA+B,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QACpE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,+BAA+B;IAC/B,IAAI,OAAO,CAAC,UAAU,IAAI,MAAM,EAAE,CAAC;QACjC,MAAM,aAAa,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAEjD,IAAI,MAAM,KAAK,aAAa,EAAE,CAAC;YAC7B,GAAG,CAAC,IAAI,CAAC,yBAAyB,MAAM,kDAAkD,CAAC,CAAC;QAC9F,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,GAAG,CAAC,oBAAoB,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACtD,IAAI,CAAC;gBACH,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,KAAK,EAAE,QAAQ,CAAC,CAAC;gBACvD,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;YAChC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,GAAG,CAAC,IAAI,CAAC,4BAA6B,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;gBACjE,GAAG,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;IACH,CAAC;IAED,GAAG,CAAC,OAAO,EAAE,CAAC;IACd,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AACtB,CAAC"}

package/dist/commands/spawn.d.ts

@@ -8,9 +8,12 @@ interface SpawnOptions {
     new?: boolean;
     path?: string;
     base?: string;
+    baseBranch?: string;
     mode?: SecretMode;
     run?: string;
     agent?: string;
+    finishOnExit?: boolean;
+    dryRun?: boolean;
 }
 export declare function spawn(branch: string, options: SpawnOptions): Promise<void>;
 export {};

package/dist/commands/spawn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spawn.d.ts","sourceRoot":"","sources":["../../src/commands/spawn.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAkBH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,UAAU,YAAY;IACpB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAuIhF"}
+{"version":3,"file":"spawn.d.ts","sourceRoot":"","sources":["../../src/commands/spawn.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAwBH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAGlD,UAAU,YAAY;IACpB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AA6GD,wBAAsB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA4MhF"}

package/dist/commands/spawn.js

@@ -4,16 +4,107 @@
  * Create a worktree for a branch with optional secrets handling and hooks.
  */
 import { existsSync } from 'node:fs';
-import { isGitRepo, getRepoRoot, getRepoName, branchExists, addWorktree, listWorktrees, runCommand, commandExists, } from '../lib/git.js';
+import { spawn as spawnProcess } from 'node:child_process';
+import { isGitRepo, getRepoRoot, getRepoName, branchExists, addWorktree, listWorktrees, runCommand, commandExists, getCurrentBranch, isDetachedHead, getDefaultBranch, } from '../lib/git.js';
 import { getMergedConfig, configExists } from '../lib/config.js';
 import { getDefaultWorktreePath } from '../lib/paths.js';
-import { processSecrets } from '../lib/secrets.js';
+import { processSecrets, generateCopyPlan, formatCopyPlan } from '../lib/secrets.js';
+import { createSessionManifest } from '../lib/session.js';
 import * as out from '../lib/output.js';
+import { fail, errors } from '../lib/errors.js';
+import { finish } from './finish.js';
+/**
+ * Run an agent command and wait for it to exit
+ * Returns the exit code and whether it was interrupted
+ */
+async function runAgentWithExitHandling(command, cwd) {
+    return new Promise((resolve) => {
+        const isWindows = process.platform === 'win32';
+        const shell = isWindows ? 'cmd.exe' : '/bin/sh';
+        const shellArgs = isWindows ? ['/c', command] : ['-c', command];
+        let interrupted = false;
+        const child = spawnProcess(shell, shellArgs, {
+            cwd,
+            stdio: 'inherit',
+            env: process.env,
+        });
+        // Handle Ctrl+C gracefully
+        const sigintHandler = () => {
+            interrupted = true;
+            child.kill('SIGINT');
+        };
+        const sigtermHandler = () => {
+            interrupted = true;
+            child.kill('SIGTERM');
+        };
+        process.on('SIGINT', sigintHandler);
+        process.on('SIGTERM', sigtermHandler);
+        child.on('close', (code) => {
+            // Clean up signal handlers
+            process.removeListener('SIGINT', sigintHandler);
+            process.removeListener('SIGTERM', sigtermHandler);
+            resolve({ exitCode: code ?? 1, interrupted });
+        });
+        child.on('error', () => {
+            process.removeListener('SIGINT', sigintHandler);
+            process.removeListener('SIGTERM', sigtermHandler);
+            resolve({ exitCode: 1, interrupted });
+        });
+    });
+}
+/**
+ * Show post-agent menu and handle user choice
+ */
+async function showPostAgentMenu(worktreePath, agentExitCode, interrupted) {
+    const readline = await import('node:readline');
+    // Change to worktree directory for finish command
+    process.chdir(worktreePath);
+    out.newline();
+    out.header('Agent Session Ended');
+    if (interrupted) {
+        out.log(out.fmt.yellow('  Agent was interrupted (Ctrl+C)'));
+    }
+    else if (agentExitCode !== 0) {
+        out.log(out.fmt.yellow(`  Agent exited with error (code ${agentExitCode})`));
+    }
+    else {
+        out.log(out.fmt.green('  Agent exited successfully'));
+    }
+    out.newline();
+    out.log('What would you like to do?');
+    out.log(`  ${out.fmt.bold('f')}) Finish session (commit, PR, cleanup)`);
+    out.log(`  ${out.fmt.bold('c')}) Cleanup only (remove worktree)`);
+    out.log(`  ${out.fmt.bold('n')}) Do nothing (exit)`);
+    const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout,
+    });
+    const answer = await new Promise((resolve) => {
+        rl.question('Choice [f/c/n]: ', (ans) => {
+            rl.close();
+            resolve(ans.toLowerCase().trim());
+        });
+    });
+    if (answer === 'f' || answer === 'finish') {
+        // Run finish in interactive mode
+        await finish({});
+    }
+    else if (answer === 'c' || answer === 'cleanup') {
+        // Run finish with cleanup only, skip PR
+        await finish({
+            skipCommit: true,
+            cleanup: true,
+        });
+    }
+    else {
+        out.log(out.fmt.dim('Exiting without cleanup.'));
+        out.log(`  ${out.fmt.dim('Run')} cry finish ${out.fmt.dim('later to complete the session.')}`);
+    }
+}
 export async function spawn(branch, options) {
     // Check if we're in a git repo
     if (!isGitRepo()) {
-        out.error('Not a git repository. Run this command from within a git repo.');
-        process.exit(1);
+        fail(errors.notGitRepo());
     }
     const repoRoot = getRepoRoot();
     const repoName = getRepoName();
@@ -35,26 +126,70 @@ export async function spawn(branch, options) {
     });
     // Check if destination already exists
     if (existsSync(worktreePath)) {
-        out.error(`Destination already exists: ${worktreePath}`);
-        out.info('Remove it first or choose a different path with --path');
-        process.exit(1);
+        fail(errors.destinationExists(worktreePath));
     }
     // Check if worktree already exists for this branch
     const existingWorktrees = listWorktrees(repoRoot);
     const existingForBranch = existingWorktrees.find((w) => w.branch === branch);
     if (existingForBranch) {
-        out.error(`A worktree already exists for branch '${branch}'`);
-        out.info(`Path: ${existingForBranch.worktree}`);
-        out.info('Remove it first with: cry rm ' + branch);
-        process.exit(1);
+        fail(errors.worktreeAlreadyExists(branch, existingForBranch.worktree));
     }
     // Determine if we need to create the branch
     const needsNewBranch = options.new || !branchExists(branch, repoRoot);
+    // Determine base branch with proper fallback chain:
+    // 1. User-provided --base-branch option
+    // 2. Current branch (if not detached)
+    // 3. Default branch (origin/HEAD or main/master)
+    // 4. Error if detached HEAD and no fallback
+    let baseBranch;
+    if (options.baseBranch) {
+        baseBranch = options.baseBranch;
+    }
+    else if (isDetachedHead(repoRoot)) {
+        // Try to get default branch as fallback
+        const defaultBranch = getDefaultBranch(repoRoot);
+        if (defaultBranch) {
+            baseBranch = defaultBranch;
+            out.warn(`Detached HEAD detected. Using default branch '${defaultBranch}' as base.`);
+        }
+        else {
+            fail(errors.detachedHead());
+        }
+    }
+    else {
+        const currentBranch = getCurrentBranch(repoRoot);
+        if (currentBranch) {
+            baseBranch = currentBranch;
+        }
+        else {
+            // Fallback to default branch
+            const defaultBranch = getDefaultBranch(repoRoot);
+            baseBranch = defaultBranch ?? 'main';
+        }
+    }
     out.header('Creating worktree');
     out.log(`  Branch: ${out.fmt.branch(branch)}${needsNewBranch ? out.fmt.gray(' (new)') : ''}`);
+    out.log(`  Base:   ${out.fmt.branch(baseBranch)}`);
     out.log(`  Path:   ${out.fmt.path(worktreePath)}`);
     out.log(`  Mode:   ${out.fmt.cyan(mode)}`);
     out.newline();
+    // Handle dry-run mode
+    if (options.dryRun) {
+        out.header('Dry Run - Copy Plan');
+        if (mode === 'none') {
+            out.log(out.fmt.dim('  Secret mode is "none" — no files will be copied/symlinked'));
+        }
+        else if (config.include.length === 0) {
+            out.log(out.fmt.dim('  No include patterns configured'));
+        }
+        else {
+            const plan = await generateCopyPlan(config.include, repoRoot);
+            out.log(formatCopyPlan(plan, mode));
+        }
+        out.newline();
+        out.log(out.fmt.dim('Dry run complete. No changes were made.'));
+        return;
+    }
     // Create the worktree
     try {
         addWorktree(worktreePath, branch, needsNewBranch, repoRoot);
@@ -64,6 +199,22 @@ export async function spawn(branch, options) {
         out.error(`Failed to create worktree: ${error.message}`);
         process.exit(1);
     }
+    // Create session manifest
+    const agentChoice = options.agent ?? 'none';
+    try {
+        const session = createSessionManifest({
+            repoRoot,
+            branch,
+            baseBranch,
+            worktreePath,
+            agent: agentChoice !== 'none' ? agentChoice : undefined,
+        });
+        out.success(`Session created: ${out.fmt.dim(session.id)}`);
+    }
+    catch (error) {
+        // Non-fatal: session manifest is helpful but not required
+        out.warn(`Could not create session manifest: ${error.message}`);
+    }
     // Handle secrets
     if (mode !== 'none' && config.include.length > 0) {
         out.newline();
@@ -106,22 +257,34 @@ export async function spawn(branch, options) {
         }
     }
     // Handle agent launch
-    const agentChoice = options.agent ?? 'none';
-    if (agentChoice === 'claude') {
-        const agentCmd = config.agentCommand;
+    if (agentChoice === 'claude' || agentChoice === 'cursor') {
+        // Determine the actual command to run
+        // For 'claude', use config.agentCommand (defaults to 'claude')
+        // For 'cursor', use 'cursor' command
+        const agentCmd = agentChoice === 'cursor' ? 'cursor' : config.agentCommand;
         out.newline();
         if (commandExists(agentCmd)) {
             out.log(`Launching ${agentCmd}...`);
-            await runCommand(agentCmd, worktreePath);
+            if (options.finishOnExit) {
+                // Use special handler that waits for exit and shows menu
+                const { exitCode, interrupted } = await runAgentWithExitHandling(agentCmd, worktreePath);
+                await showPostAgentMenu(worktreePath, exitCode, interrupted);
+            }
+            else {
+                // Just run the command normally
+                await runCommand(agentCmd, worktreePath);
+            }
         }
         else {
             out.warn(`Agent command '${agentCmd}' not found.`);
             out.info('Install Claude Code: https://docs.anthropic.com/claude-code');
         }
     }
-    // Final summary
-    out.newline();
-    out.header('Worktree ready');
-    out.log(`  ${out.fmt.dim('cd')} ${worktreePath}`);
+    // Final summary (only if not using finish-on-exit, since finish handles its own output)
+    if (!options.finishOnExit || agentChoice === 'none') {
+        out.newline();
+        out.header('Worktree ready');
+        out.log(`  ${out.fmt.dim('cd')} ${worktreePath}`);
+    }
 }
 //# sourceMappingURL=spawn.js.map

package/dist/commands/spawn.js.map

@@ -1 +1 @@
-{"version":3,"file":"spawn.js","sourceRoot":"","sources":["../../src/commands/spawn.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"spawn.js","sourceRoot":"","sources":["../../src/commands/spawn.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -3,6 +3,10 @@
  * cry - Git worktrees made painless for vibecoders
  *
  * A CLI tool for managing git worktrees with parallel AI-agent sessions in mind.
+ *
+ * Shorthand syntax:
+ *   cry <name>           → cry spawn <name> --new
+ *   cry <name> claude    → cry spawn <name> --new --agent claude
  */
 export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA;;;;GAIG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA;;;;;;;;GAQG"}

package/dist/index.js

@@ -3,6 +3,10 @@
  * cry - Git worktrees made painless for vibecoders
  *
  * A CLI tool for managing git worktrees with parallel AI-agent sessions in mind.
+ *
+ * Shorthand syntax:
+ *   cry <name>           → cry spawn <name> --new
+ *   cry <name> claude    → cry spawn <name> --new --agent claude
  */
 import { Command } from 'commander';
 import { init } from './commands/init.js';
@@ -13,11 +17,111 @@ import { rm } from './commands/rm.js';
 import { prune } from './commands/prune.js';
 import { doctor } from './commands/doctor.js';
 import { shell } from './commands/shell.js';
+import { finish } from './commands/finish.js';
+import { explainCopy } from './commands/explain-copy.js';
+import { resume } from './commands/resume.js';
+import { gc } from './commands/gc.js';
+import { completions } from './commands/completions.js';
+// Known subcommands - shorthand parsing must not interfere with these
+const SUBCOMMANDS = new Set([
+    'init',
+    'spawn',
+    'list', 'ls',
+    'open',
+    'rm', 'remove',
+    'prune',
+    'doctor',
+    'explain-copy',
+    'shell',
+    'finish',
+    'resume',
+    'gc',
+    'completions',
+    'help',
+]);
+// Known agent values for shorthand parsing
+const KNOWN_AGENTS = new Set(['claude', 'cursor', 'none']);
+/**
+ * Check if an argument looks like an option (starts with -)
+ */
+function isOption(arg) {
+    return arg.startsWith('-');
+}
+/**
+ * Transform shorthand syntax into explicit spawn command
+ *
+ * cry feat-auth        → cry spawn feat-auth --new
+ * cry feat-auth claude → cry spawn feat-auth --new --agent claude
+ */
+function transformShorthand(args) {
+    // args[0] is 'node', args[1] is script path
+    // Real arguments start at index 2
+    const realArgs = args.slice(2);
+    // No arguments or first arg is an option → pass through
+    if (realArgs.length === 0 || isOption(realArgs[0])) {
+        return args;
+    }
+    const firstArg = realArgs[0];
+    // First arg is a known subcommand → pass through
+    if (SUBCOMMANDS.has(firstArg)) {
+        return args;
+    }
+    // First arg looks like a branch name → shorthand mode
+    const branchName = firstArg;
+    const remainingArgs = realArgs.slice(1);
+    // Build new args array
+    const newArgs = [args[0], args[1], 'spawn', branchName, '--new'];
+    // Check if second arg is a known agent
+    if (remainingArgs.length > 0 && KNOWN_AGENTS.has(remainingArgs[0])) {
+        const agent = remainingArgs[0];
+        newArgs.push('--agent', agent);
+        // Pass through any remaining args (options)
+        newArgs.push(...remainingArgs.slice(1));
+    }
+    else {
+        // Pass through all remaining args
+        newArgs.push(...remainingArgs);
+    }
+    return newArgs;
+}
+// Transform arguments before Commander parses them
+const transformedArgs = transformShorthand(process.argv);
 const program = new Command();
 program
     .name('cry')
-    .description('Git worktrees made painless for vibecoders running parallel AI-agent sessions')
-    .version('1.0.0');
+    .description(`Git worktrees made painless for vibecoders running parallel AI-agent sessions
+
+Shorthand syntax:
+  cry <name>           Create worktree for new branch <name>
+  cry <name> claude    Create worktree and launch Claude agent
+
+Quick start:
+  cry init                     # Initialize in repo
+  cry feat-auth                # Create worktree for new branch
+  cry feat-auth claude         # Create and launch Claude agent
+
+Workflow examples:
+  cry spawn feat-auth --new    # Explicit: create new branch worktree
+  cry list                     # List all worktrees
+  cry open feat-auth           # Open worktree in agent/editor
+  cry resume feat-auth         # Resume session by name
+  cry finish                   # Commit, push, create PR, cleanup
+  cry rm feat-auth             # Remove worktree
+
+Finish flow (run from worktree):
+  cry finish                   # Interactive: commit → PR → cleanup
+  cry finish --dry-run         # Preview what would happen
+  cry finish -m "Add auth"     # Commit with message, create PR
+  cry finish --cleanup         # Auto-cleanup after PR
+
+Safety notes:
+  • Never auto-merges PRs
+  • Never deletes without confirmation (unless --yes)
+  • Only copies gitignored files to worktrees (secrets safety)
+
+Shell completions:
+  cry completions fish > ~/.config/fish/completions/cry.fish`)
+    .version('1.5.0');
 // cry init
 program
     .command('init')
@@ -33,9 +137,12 @@ program
     .option('-n, --new', 'Create a new branch (equivalent to git worktree add -b)')
     .option('-p, --path <dir>', 'Explicit path for the worktree')
     .option('-b, --base <dir>', 'Base directory for worktrees')
+    .option('--base-branch <branch>', 'Base branch for PRs (default: current branch)')
     .option('-m, --mode <mode>', 'Secret handling mode: copy, symlink, or none', 'copy')
     .option('-r, --run <cmd>', 'Command to run after creating worktree')
     .option('-a, --agent <agent>', 'Launch agent after setup: claude or none', 'none')
+    .option('--finish-on-exit', 'After agent exits, show finish menu (commit, PR, cleanup)')
+    .option('--dry-run', 'Show what would happen without creating the worktree')
     .action(async (branch, options) => {
     const mode = options.mode;
     if (!['copy', 'symlink', 'none'].includes(mode)) {
@@ -46,9 +153,12 @@ program
         new: options.new,
         path: options.path,
         base: options.base,
+        baseBranch: options.baseBranch,
         mode,
         run: options.run,
         agent: options.agent,
+        finishOnExit: options.finishOnExit,
+        dryRun: options.dryRun,
     });
 });
 // cry list
@@ -60,14 +170,21 @@ program
     .action(async (options) => {
     await list({ json: options.json });
 });
-// cry open <branch-or-path>
+// cry open [branch-or-path]
 program
-    .command('open <branch-or-path>')
-    .description('Open or navigate to a worktree by branch name or path')
-    .option('-c, --cmd <cmd>', 'Command to execute in the worktree directory')
+    .command('open [branch-or-path]')
+    .description('Open a worktree in agent (Claude) or editor (VS Code)')
+    .option('-c, --cmd <cmd>', 'Custom command to execute in the worktree directory')
     .option('-p, --path-only', 'Only print the path (for scripting)')
+    .option('-a, --agent', 'Open in agent (Claude Code)')
+    .option('-e, --editor', 'Open in editor (VS Code)')
     .action(async (branchOrPath, options) => {
-    await open(branchOrPath, { cmd: options.cmd, pathOnly: options.pathOnly });
+    await open(branchOrPath, {
+        cmd: options.cmd,
+        pathOnly: options.pathOnly,
+        agent: options.agent,
+        editor: options.editor,
+    });
 });
 // cry rm <branch-or-path>
 program
@@ -98,6 +215,14 @@ program
     .action(async () => {
     await doctor();
 });
+// cry explain-copy
+program
+    .command('explain-copy')
+    .description('Explain which files will be copied/symlinked and which are blocked')
+    .option('-j, --json', 'Output as JSON')
+    .action(async (options) => {
+    await explainCopy({ json: options.json });
+});
 // cry shell
 program
     .command('shell')
@@ -106,6 +231,70 @@ program
     .action(async (options) => {
     await shell({ shell: options.shell });
 });
-// Parse and execute
-program.parse();
+// cry finish
+program
+    .command('finish')
+    .description('Complete session: show summary, optionally create PR, and cleanup')
+    .option('-j, --json', 'Output as JSON (summary only, no actions)')
+    .option('-m, --message <msg>', 'Commit message (stages all, commits, non-interactive)')
+    .option('--skip-commit', 'Skip commit step entirely (still safe)')
+    .option('--dry-run', 'Show what would happen without executing')
+    .option('--pr', 'Force PR creation path')
+    .option('--cleanup', 'Auto-cleanup after successful PR (skip prompt)')
+    .option('--skip-cleanup', 'Skip cleanup prompt entirely')
+    .option('--non-interactive', 'Never prompt; errors on dirty unless --allow-dirty')
+    .option('--allow-dirty', 'Allow proceeding with dirty working tree in non-interactive mode')
+    .option('--delete-branch', 'Delete branch during cleanup (with --cleanup)')
+    .action(async (options) => {
+    await finish({
+        json: options.json,
+        message: options.message,
+        skipCommit: options.skipCommit,
+        dryRun: options.dryRun,
+        pr: options.pr,
+        cleanup: options.cleanup,
+        noCleanup: options.skipCleanup,
+        nonInteractive: options.nonInteractive,
+        allowDirty: options.allowDirty,
+        deleteBranch: options.deleteBranch,
+    });
+});
+// cry resume <nameOrId>
+program
+    .command('resume <nameOrId>')
+    .description('Resume an existing session by branch name or session ID')
+    .option('-a, --agent <agent>', 'Launch agent in the session (e.g., claude)')
+    .option('--cd', 'Print cd command for shell copy/paste')
+    .action(async (nameOrId, options) => {
+    await resume(nameOrId, {
+        agent: options.agent,
+        cd: options.cd,
+    });
+});
+// cry gc
+program
+    .command('gc')
+    .description('Clean up stale session manifests and git worktree references')
+    .option('--dry-run', 'Show what would be cleaned without making changes')
+    .option('-y, --yes', 'Skip confirmation prompts')
+    .option('--manifests-only', 'Only remove stale manifests, skip git worktree prune')
+    .action(async (options) => {
+    await gc({
+        dryRun: options.dryRun,
+        yes: options.yes,
+        manifestsOnly: options.manifestsOnly,
+    });
+});
+// cry completions [shell]
+program
+    .command('completions [shell]')
+    .description('Generate shell completions (bash, zsh, fish)')
+    .option('-s, --shell <shell>', 'Shell type (bash, zsh, fish)')
+    .action(async (shell, options) => {
+    await completions(shell, {
+        shell: options.shell,
+    });
+});
+// Parse with transformed arguments
+program.parse(transformedArgs);
 //# sourceMappingURL=index.js.map