cluttry 1.0.3 → 1.5.0

package/src/commands/shell.ts

@@ -1,99 +0,0 @@
-/**
- * cry shell command
- *
- * Output shell integration code for easy directory navigation.
- */
-
-import * as out from '../lib/output.js';
-
-type ShellType = 'bash' | 'zsh' | 'fish';
-
-const SHELL_FUNCTIONS: Record<ShellType, string> = {
-  bash: `# cry shell integration (add to ~/.bashrc)
-crycd() {
-  local target
-  target="$(cry open "$1" --path-only 2>/dev/null)"
-  if [ -n "$target" ]; then
-    cd "$target"
-  else
-    echo "Worktree not found: $1" >&2
-    return 1
-  fi
-}
-
-# Auto-completion for crycd
-_crycd_completions() {
-  local branches
-  branches=$(cry list --json 2>/dev/null | grep -o '"branch":"[^"]*"' | cut -d'"' -f4)
-  COMPREPLY=($(compgen -W "$branches" -- "\${COMP_WORDS[COMP_CWORD]}"))
-}
-complete -F _crycd_completions crycd
-`,
-
-  zsh: `# cry shell integration (add to ~/.zshrc)
-crycd() {
-  local target
-  target="$(cry open "$1" --path-only 2>/dev/null)"
-  if [[ -n "$target" ]]; then
-    cd "$target"
-  else
-    echo "Worktree not found: $1" >&2
-    return 1
-  fi
-}
-
-# Auto-completion for crycd
-_crycd() {
-  local branches
-  branches=(\${(f)"$(cry list --json 2>/dev/null | grep -o '"branch":"[^"]*"' | cut -d'"' -f4)"})
-  _describe 'branch' branches
-}
-compdef _crycd crycd
-`,
-
-  fish: `# cry shell integration (add to ~/.config/fish/config.fish)
-function crycd
-  set -l target (cry open $argv[1] --path-only 2>/dev/null)
-  if test -n "$target"
-    cd $target
-  else
-    echo "Worktree not found: $argv[1]" >&2
-    return 1
-  end
-end
-
-# Auto-completion for crycd
-complete -c crycd -f -a "(cry list --json 2>/dev/null | grep -o '\"branch\":\"[^\"]*\"' | cut -d'\"' -f4)"
-`,
-};
-
-interface ShellOptions {
-  shell?: string;
-}
-
-export async function shell(options: ShellOptions): Promise<void> {
-  const shellEnv = process.env.SHELL ?? '';
-  let detectedShell: ShellType = 'bash';
-
-  if (options.shell) {
-    if (options.shell === 'fish' || options.shell === 'zsh' || options.shell === 'bash') {
-      detectedShell = options.shell;
-    } else {
-      out.error(`Unsupported shell: ${options.shell}`);
-      out.info('Supported shells: bash, zsh, fish');
-      process.exit(1);
-    }
-  } else if (shellEnv.includes('zsh')) {
-    detectedShell = 'zsh';
-  } else if (shellEnv.includes('fish')) {
-    detectedShell = 'fish';
-  }
-
-  const script = SHELL_FUNCTIONS[detectedShell];
-
-  out.log(out.fmt.dim(`# Shell integration for ${detectedShell}`));
-  out.log(out.fmt.dim('# Copy and paste into your shell config, or run:'));
-  out.log(out.fmt.dim(`#   cry shell >> ~/.${detectedShell === 'fish' ? 'config/fish/config.fish' : detectedShell + 'rc'}`));
-  out.newline();
-  console.log(script);
-}

package/src/commands/spawn.ts

@@ -1,169 +0,0 @@
-/**
- * cry spawn command
- *
- * Create a worktree for a branch with optional secrets handling and hooks.
- */
-
-import { existsSync } from 'node:fs';
-import path from 'node:path';
-import {
-  isGitRepo,
-  getRepoRoot,
-  getRepoName,
-  branchExists,
-  addWorktree,
-  listWorktrees,
-  runCommand,
-  commandExists,
-} from '../lib/git.js';
-import { getMergedConfig, configExists } from '../lib/config.js';
-import { getDefaultWorktreePath } from '../lib/paths.js';
-import { processSecrets } from '../lib/secrets.js';
-import * as out from '../lib/output.js';
-import type { SecretMode } from '../lib/types.js';
-
-interface SpawnOptions {
-  new?: boolean;
-  path?: string;
-  base?: string;
-  mode?: SecretMode;
-  run?: string;
-  agent?: string;
-}
-
-export async function spawn(branch: string, options: SpawnOptions): Promise<void> {
-  // 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);
-  }
-
-  const repoRoot = getRepoRoot();
-  const repoName = getRepoName();
-
-  // Load config
-  const config = configExists(repoRoot) ? getMergedConfig(repoRoot) : {
-    worktreeBaseDir: undefined,
-    defaultMode: 'none' as SecretMode,
-    include: [],
-    hooks: { postCreate: [] },
-    agentCommand: 'claude',
-  };
-
-  // Determine mode
-  const mode: SecretMode = options.mode ?? config.defaultMode;
-
-  // Calculate worktree path
-  const worktreePath = getDefaultWorktreePath(repoRoot, branch, {
-    explicitPath: options.path,
-    baseDir: options.base ?? config.worktreeBaseDir,
-    repoName,
-  });
-
-  // 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);
-  }
-
-  // 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);
-  }
-
-  // Determine if we need to create the branch
-  const needsNewBranch = options.new || !branchExists(branch, repoRoot);
-
-  out.header('Creating worktree');
-  out.log(`  Branch: ${out.fmt.branch(branch)}${needsNewBranch ? out.fmt.gray(' (new)') : ''}`);
-  out.log(`  Path:   ${out.fmt.path(worktreePath)}`);
-  out.log(`  Mode:   ${out.fmt.cyan(mode)}`);
-  out.newline();
-
-  // Create the worktree
-  try {
-    addWorktree(worktreePath, branch, needsNewBranch, repoRoot);
-    out.success('Worktree created');
-  } catch (error) {
-    out.error(`Failed to create worktree: ${(error as Error).message}`);
-    process.exit(1);
-  }
-
-  // Handle secrets
-  if (mode !== 'none' && config.include.length > 0) {
-    out.newline();
-    out.log(`Processing secrets (${mode} mode)...`);
-
-    const { processed, skipped } = await processSecrets(
-      mode,
-      config.include,
-      repoRoot,
-      worktreePath
-    );
-
-    if (processed.length > 0) {
-      out.success(`${mode === 'copy' ? 'Copied' : 'Symlinked'} ${processed.length} file(s):`);
-      for (const file of processed) {
-        out.log(`    ${out.fmt.dim('•')} ${file}`);
-      }
-    }
-
-    if (skipped.length > 0) {
-      out.warn(`Skipped ${skipped.length} file(s) for safety:`);
-      for (const file of skipped) {
-        out.log(`    ${out.fmt.dim('•')} ${file.path}: ${file.reason}`);
-      }
-    }
-  }
-
-  // Run post-create hooks from config
-  const hooks = config.hooks.postCreate;
-  if (hooks.length > 0) {
-    out.newline();
-    out.log('Running post-create hooks...');
-    for (const hook of hooks) {
-      out.log(`  ${out.fmt.dim('$')} ${hook}`);
-      const code = await runCommand(hook, worktreePath);
-      if (code !== 0) {
-        out.warn(`Hook exited with code ${code}`);
-      }
-    }
-  }
-
-  // Run --run command if provided
-  if (options.run) {
-    out.newline();
-    out.log('Running custom command...');
-    out.log(`  ${out.fmt.dim('$')} ${options.run}`);
-    const code = await runCommand(options.run, worktreePath);
-    if (code !== 0) {
-      out.warn(`Command exited with code ${code}`);
-    }
-  }
-
-  // Handle agent launch
-  const agentChoice = options.agent ?? 'none';
-  if (agentChoice === 'claude') {
-    const agentCmd = config.agentCommand;
-    out.newline();
-
-    if (commandExists(agentCmd)) {
-      out.log(`Launching ${agentCmd}...`);
-      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}`);
-}

package/src/index.ts

@@ -1,123 +0,0 @@
-#!/usr/bin/env node
-/**
- * cry - Git worktrees made painless for vibecoders
- *
- * A CLI tool for managing git worktrees with parallel AI-agent sessions in mind.
- */
-
-import { Command } from 'commander';
-import { init } from './commands/init.js';
-import { spawn } from './commands/spawn.js';
-import { list } from './commands/list.js';
-import { open } from './commands/open.js';
-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 type { SecretMode } from './lib/types.js';
-
-const program = new Command();
-
-program
-  .name('cry')
-  .description('Git worktrees made painless for vibecoders running parallel AI-agent sessions')
-  .version('1.0.0');
-
-// cry init
-program
-  .command('init')
-  .description('Initialize cry configuration in the current repository')
-  .option('-f, --force', 'Overwrite existing configuration')
-  .action(async (options) => {
-    await init({ force: options.force });
-  });
-
-// cry spawn <branch>
-program
-  .command('spawn <branch>')
-  .description('Create a worktree for a branch')
-  .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('-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')
-  .action(async (branch: string, options) => {
-    const mode = options.mode as SecretMode;
-    if (!['copy', 'symlink', 'none'].includes(mode)) {
-      console.error(`Invalid mode: ${mode}. Must be 'copy', 'symlink', or 'none'.`);
-      process.exit(1);
-    }
-    await spawn(branch, {
-      new: options.new,
-      path: options.path,
-      base: options.base,
-      mode,
-      run: options.run,
-      agent: options.agent,
-    });
-  });
-
-// cry list
-program
-  .command('list')
-  .alias('ls')
-  .description('List all worktrees with their status')
-  .option('-j, --json', 'Output as JSON')
-  .action(async (options) => {
-    await list({ json: options.json });
-  });
-
-// 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')
-  .option('-p, --path-only', 'Only print the path (for scripting)')
-  .action(async (branchOrPath: string, options) => {
-    await open(branchOrPath, { cmd: options.cmd, pathOnly: options.pathOnly });
-  });
-
-// cry rm <branch-or-path>
-program
-  .command('rm <branch-or-path>')
-  .alias('remove')
-  .description('Remove a worktree safely')
-  .option('-b, --with-branch', 'Also delete the branch')
-  .option('-f, --force', 'Force removal even if dirty')
-  .option('-y, --yes', 'Skip confirmation prompts')
-  .action(async (branchOrPath: string, options) => {
-    await rm(branchOrPath, {
-      withBranch: options.withBranch,
-      force: options.force,
-      yes: options.yes,
-    });
-  });
-
-// cry prune
-program
-  .command('prune')
-  .description('Clean up stale worktree references')
-  .action(async () => {
-    await prune();
-  });
-
-// cry doctor
-program
-  .command('doctor')
-  .description('Check and diagnose cry configuration and setup')
-  .action(async () => {
-    await doctor();
-  });
-
-// cry shell
-program
-  .command('shell')
-  .description('Output shell integration code for crycd navigation function')
-  .option('-s, --shell <shell>', 'Shell type: bash, zsh, or fish (auto-detected)')
-  .action(async (options) => {
-    await shell({ shell: options.shell });
-  });
-
-// Parse and execute
-program.parse();

package/src/lib/config.ts

@@ -1,120 +0,0 @@
-/**
- * Configuration management for cry
- */
-
-import { existsSync, readFileSync, writeFileSync } from 'node:fs';
-import path from 'node:path';
-import type { MergedConfig, CryConfig, CryLocalConfig } from './types.js';
-
-export const CONFIG_FILE = '.cry.json';
-export const LOCAL_CONFIG_FILE = '.cry.local.json';
-export const WORKTREE_INCLUDE_FILE = '.worktreeinclude';
-
-const DEFAULT_CONFIG: CryConfig = {
-  defaultMode: 'copy',
-  include: ['.env', '.env.*', '.env.local'],
-  hooks: {
-    postCreate: [],
-  },
-  agentCommand: 'claude',
-};
-
-/**
- * Load the main config file
- */
-export function loadConfig(repoRoot: string): CryConfig | null {
-  const configPath = path.join(repoRoot, CONFIG_FILE);
-  if (!existsSync(configPath)) {
-    return null;
-  }
-  try {
-    const content = readFileSync(configPath, 'utf-8');
-    return JSON.parse(content) as CryConfig;
-  } catch (error) {
-    throw new Error(`Failed to parse ${CONFIG_FILE}: ${(error as Error).message}`);
-  }
-}
-
-/**
- * Load the local config file
- */
-export function loadLocalConfig(repoRoot: string): CryLocalConfig | null {
-  const configPath = path.join(repoRoot, LOCAL_CONFIG_FILE);
-  if (!existsSync(configPath)) {
-    return null;
-  }
-  try {
-    const content = readFileSync(configPath, 'utf-8');
-    return JSON.parse(content) as CryLocalConfig;
-  } catch (error) {
-    throw new Error(`Failed to parse ${LOCAL_CONFIG_FILE}: ${(error as Error).message}`);
-  }
-}
-
-/**
- * Merge main config with local overrides
- */
-export function mergeConfig(config: CryConfig | null, localConfig: CryLocalConfig | null): MergedConfig {
-  const base = config ?? DEFAULT_CONFIG;
-
-  return {
-    worktreeBaseDir: localConfig?.worktreeBaseDir ?? base.worktreeBaseDir,
-    defaultMode: base.defaultMode,
-    include: [...(base.include ?? []), ...(localConfig?.include ?? [])],
-    hooks: {
-      postCreate: [
-        ...(base.hooks?.postCreate ?? []),
-        ...(localConfig?.hooks?.postCreate ?? []),
-      ],
-    },
-    agentCommand: localConfig?.agentCommand ?? base.agentCommand ?? 'claude',
-  };
-}
-
-/**
- * Get merged configuration
- */
-export function getMergedConfig(repoRoot: string): MergedConfig {
-  const config = loadConfig(repoRoot);
-  const localConfig = loadLocalConfig(repoRoot);
-  return mergeConfig(config, localConfig);
-}
-
-/**
- * Save the main config file
- */
-export function saveConfig(repoRoot: string, config: CryConfig): void {
-  const configPath = path.join(repoRoot, CONFIG_FILE);
-  writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n');
-}
-
-/**
- * Save the local config file
- */
-export function saveLocalConfig(repoRoot: string, config: CryLocalConfig): void {
-  const configPath = path.join(repoRoot, LOCAL_CONFIG_FILE);
-  writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n');
-}
-
-/**
- * Check if config exists
- */
-export function configExists(repoRoot: string): boolean {
-  return existsSync(path.join(repoRoot, CONFIG_FILE));
-}
-
-/**
- * Get default config
- */
-export function getDefaultConfig(): CryConfig {
-  return { ...DEFAULT_CONFIG };
-}
-
-/**
- * Create default local config
- */
-export function getDefaultLocalConfig(): CryLocalConfig {
-  return {
-    include: [],
-  };
-}