cluttry 1.0.3 → 1.5.0

package/dist/lib/errors.js

@@ -0,0 +1,251 @@
+/**
+ * Structured error handling for cry CLI
+ *
+ * Each error includes:
+ * - what: What happened
+ * - why: Why it likely happened
+ * - fix: Exact command(s) the user should run
+ */
+import * as out from './output.js';
+/**
+ * Print a structured error message and exit
+ */
+export function fail(error) {
+    out.error(error.what);
+    out.newline();
+    out.log(`${out.fmt.bold('Why:')} ${error.why}`);
+    out.newline();
+    out.log(out.fmt.bold('Fix:'));
+    const fixes = Array.isArray(error.fix) ? error.fix : [error.fix];
+    for (const fix of fixes) {
+        out.log(`  ${out.fmt.cyan(fix)}`);
+    }
+    process.exit(1);
+}
+/**
+ * Print a structured error without exiting (for non-fatal errors)
+ */
+export function printError(error) {
+    out.error(error.what);
+    out.newline();
+    out.log(`${out.fmt.bold('Why:')} ${error.why}`);
+    out.newline();
+    out.log(out.fmt.bold('Fix:'));
+    const fixes = Array.isArray(error.fix) ? error.fix : [error.fix];
+    for (const fix of fixes) {
+        out.log(`  ${out.fmt.cyan(fix)}`);
+    }
+}
+// ─────────────────────────────────────────────────────────────────────────────
+// Common error factories
+// ─────────────────────────────────────────────────────────────────────────────
+export const errors = {
+    notGitRepo() {
+        return {
+            what: 'Not a git repository.',
+            why: 'cry requires a git repository to manage worktrees. The current directory is not inside a git repo.',
+            fix: [
+                'cd /path/to/your/repo',
+                'git init  # or clone an existing repo',
+            ],
+        };
+    },
+    gitNotInstalled() {
+        return {
+            what: 'Git is not installed or not in PATH.',
+            why: 'cry requires git to manage worktrees. Git was not found on your system.',
+            fix: [
+                'brew install git  # macOS',
+                'sudo apt install git  # Ubuntu/Debian',
+                'https://git-scm.com/downloads',
+            ],
+        };
+    },
+    branchAlreadyExists(branch) {
+        return {
+            what: `Branch '${branch}' already exists.`,
+            why: 'You used --new but the branch already exists locally or remotely.',
+            fix: [
+                `cry spawn ${branch}  # use existing branch (without --new)`,
+                `cry spawn ${branch}-v2 --new  # choose a different name`,
+                `git branch -d ${branch}  # delete the existing branch first`,
+            ],
+        };
+    },
+    worktreeAlreadyExists(branch, existingPath) {
+        return {
+            what: `A worktree already exists for branch '${branch}'.`,
+            why: `The branch is already checked out in another worktree at: ${existingPath}`,
+            fix: [
+                `cry rm ${branch}  # remove the existing worktree`,
+                `cry open ${branch}  # open the existing worktree instead`,
+            ],
+        };
+    },
+    destinationExists(path) {
+        return {
+            what: `Destination already exists: ${path}`,
+            why: 'The target directory for the worktree already exists on disk.',
+            fix: [
+                `rm -rf "${path}"  # remove the directory`,
+                `cry spawn <branch> --path /different/path  # use a different path`,
+            ],
+        };
+    },
+    dirtyWorkingTree(branch) {
+        return {
+            what: 'Worktree has uncommitted changes.',
+            why: 'There are modified or untracked files that would be lost.',
+            fix: [
+                'git status  # see what changed',
+                'git add . && git commit -m "WIP"  # commit changes',
+                `cry rm ${branch} --force  # remove anyway (changes lost)`,
+            ],
+        };
+    },
+    ghNotInstalled() {
+        return {
+            what: 'GitHub CLI (gh) is not installed.',
+            why: 'cry uses the gh CLI to create pull requests. It was not found on your system.',
+            fix: [
+                'brew install gh  # macOS',
+                'sudo apt install gh  # Ubuntu/Debian',
+                'https://cli.github.com/',
+                'gh auth login  # after installing, authenticate',
+            ],
+        };
+    },
+    ghNotAuthenticated() {
+        return {
+            what: 'GitHub CLI is not authenticated.',
+            why: 'You have gh installed but have not logged in yet.',
+            fix: [
+                'gh auth login',
+                'gh auth status  # verify authentication',
+            ],
+        };
+    },
+    noRemoteConfigured() {
+        return {
+            what: 'No remote repository configured.',
+            why: 'This repository has no origin remote, so there is nowhere to push or create PRs.',
+            fix: [
+                'git remote add origin https://github.com/user/repo.git',
+                'git remote add origin git@github.com:user/repo.git',
+                'git remote -v  # list current remotes',
+            ],
+        };
+    },
+    pushFailed(branch) {
+        return {
+            what: `Failed to push branch '${branch}'.`,
+            why: 'The push was rejected. This could be due to no remote, auth issues, or branch protection.',
+            fix: [
+                'git remote -v  # check remote is configured',
+                'gh auth status  # check GitHub authentication',
+                `git push -u origin ${branch}  # try manually`,
+                'git fetch origin && git rebase origin/main  # if behind remote',
+            ],
+        };
+    },
+    permissionDenied(path) {
+        return {
+            what: `Permission denied: ${path}`,
+            why: 'You do not have permission to read or write to this path.',
+            fix: [
+                `ls -la "${path}"  # check permissions`,
+                `sudo chown -R $(whoami) "${path}"  # take ownership (if appropriate)`,
+                'Try a different directory with --path',
+            ],
+        };
+    },
+    worktreeNotFound(nameOrPath, available) {
+        const availableList = available.slice(0, 5).map(a => `  • ${a}`).join('\n');
+        return {
+            what: `Worktree not found: ${nameOrPath}`,
+            why: 'No worktree matches that branch name or path.',
+            fix: [
+                'cry list  # see all worktrees',
+                `Available:\n${availableList}`,
+            ],
+        };
+    },
+    sessionNotFound(nameOrId) {
+        return {
+            what: `Session not found: ${nameOrId}`,
+            why: 'No session matches that branch name or session ID.',
+            fix: [
+                'cry list  # see all worktrees and sessions',
+                'cry spawn <branch> --new  # create a new session',
+            ],
+        };
+    },
+    detachedHead() {
+        return {
+            what: 'Cannot determine base branch: HEAD is detached.',
+            why: 'You are not on a branch, so cry cannot determine the PR target.',
+            fix: [
+                'git checkout main  # switch to a branch first',
+                'cry spawn <branch> --new --base-branch main  # specify base explicitly',
+            ],
+        };
+    },
+    configNotFound() {
+        return {
+            what: 'No .cry.json found.',
+            why: 'This repository has not been initialized with cry.',
+            fix: [
+                'cry init  # initialize cry in this repo',
+            ],
+        };
+    },
+    agentNotFound(agent) {
+        return {
+            what: `Agent command not found: ${agent}`,
+            why: `The '${agent}' command is not installed or not in your PATH.`,
+            fix: agent === 'claude' ? [
+                'npm install -g @anthropic-ai/claude-code',
+                'https://docs.anthropic.com/claude-code',
+            ] : agent === 'cursor' ? [
+                'Download Cursor from https://cursor.sh',
+                'Ensure cursor CLI is in your PATH',
+            ] : [
+                `Install ${agent} or update agentCommand in .cry.json`,
+            ],
+        };
+    },
+    editorNotFound(editor) {
+        return {
+            what: `Editor command not found: ${editor}`,
+            why: `The '${editor}' command is not installed or not in your PATH.`,
+            fix: editor === 'code' ? [
+                'Install VS Code from https://code.visualstudio.com',
+                'Run "Shell Command: Install code in PATH" from VS Code',
+            ] : [
+                `Install ${editor} or update editorCommand in .cry.json`,
+            ],
+        };
+    },
+    cannotRemoveMainWorktree() {
+        return {
+            what: 'Cannot remove the main worktree.',
+            why: 'This is your primary repository checkout. Removing it would delete your repo.',
+            fix: [
+                'cry list  # see worktrees - the main one cannot be removed',
+                'Use cry rm <branch> to remove other worktrees',
+            ],
+        };
+    },
+    worktreeMissing(path, branch) {
+        return {
+            what: `Worktree no longer exists: ${path}`,
+            why: 'The worktree directory was deleted but the session manifest still exists.',
+            fix: [
+                `cry spawn ${branch} --new  # recreate the worktree`,
+                'cry gc  # clean up stale sessions',
+                'cry prune  # clean up git worktree references',
+            ],
+        };
+    },
+};
+//# sourceMappingURL=errors.js.map

package/dist/lib/errors.js.map

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

package/dist/lib/git.d.ts

@@ -4,6 +4,7 @@
 import type { WorktreeInfo } from './types.js';
 /**
  * Execute a git command and return stdout
+ * Uses spawnSync to properly handle arguments with spaces
  */
 export declare function git(args: string[], cwd?: string): string;
 /**
@@ -26,6 +27,22 @@ export declare function branchExists(branch: string, cwd?: string): boolean;
  * Get the current branch name
  */
 export declare function getCurrentBranch(cwd?: string): string | null;
+/**
+ * Check if HEAD is detached (not on any branch)
+ */
+export declare function isDetachedHead(cwd?: string): boolean;
+/**
+ * Get the default branch name (from origin/HEAD or common defaults)
+ */
+export declare function getDefaultBranch(cwd?: string): string | null;
+/**
+ * Get the merge-base between two refs
+ */
+export declare function getMergeBase(ref1: string, ref2: string, cwd?: string): string | null;
+/**
+ * Get the upstream tracking branch for the current branch
+ */
+export declare function getUpstreamBranch(cwd?: string): string | null;
 /**
  * Check if a file is tracked by git
  */

package/dist/lib/git.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/lib/git.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C;;GAEG;AACH,wBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CASxD;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAO/C;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAGhD;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAOlE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAM5D;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAOjE;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAOjE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,EAAE,CAiC1D;AAED;;GAEG;AACH,wBAAgB,WAAW,CACzB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,OAAO,EACrB,GAAG,CAAC,EAAE,MAAM,GACX,IAAI,CAUN;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAOvF;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAG/E;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAO7D;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAMzD;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAoBxE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CASlD"}
+{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/lib/git.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C;;;GAGG;AACH,wBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAaxD;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAO/C;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAGhD;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAOlE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAW5D;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAOpD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAqB5D;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAMpF;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAO7D;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAOjE;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAOjE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,EAAE,CAiC1D;AAED;;GAEG;AACH,wBAAgB,WAAW,CACzB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,OAAO,EACrB,GAAG,CAAC,EAAE,MAAM,GACX,IAAI,CAUN;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAOvF;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAG/E;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAO7D;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAMzD;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAoBxE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAWlD"}

package/dist/lib/git.js

@@ -1,21 +1,23 @@
 /**
  * Git operations for cry
  */
-import { execSync, spawn } from 'node:child_process';
+import { execSync, spawn, spawnSync } from 'node:child_process';
 import path from 'node:path';
 /**
  * Execute a git command and return stdout
+ * Uses spawnSync to properly handle arguments with spaces
  */
 export function git(args, cwd) {
-    const options = cwd ? { cwd, encoding: 'utf-8' } : { encoding: 'utf-8' };
-    try {
-        return execSync(`git ${args.join(' ')}`, { ...options, stdio: ['pipe', 'pipe', 'pipe'] }).trim();
-    }
-    catch (error) {
-        const execError = error;
-        const stderr = execError.stderr?.toString?.() || execError.message || 'Unknown git error';
+    const result = spawnSync('git', args, {
+        cwd,
+        encoding: 'utf-8',
+        stdio: ['pipe', 'pipe', 'pipe'],
+    });
+    if (result.status !== 0) {
+        const stderr = result.stderr?.toString?.() || result.error?.message || 'Unknown git error';
         throw new Error(stderr.trim());
     }
+    return (result.stdout || '').trim();
 }
 /**
  * Check if we're in a git repository
@@ -59,7 +61,71 @@ export function branchExists(branch, cwd) {
  */
 export function getCurrentBranch(cwd) {
     try {
-        return git(['rev-parse', '--abbrev-ref', 'HEAD'], cwd);
+        const branch = git(['rev-parse', '--abbrev-ref', 'HEAD'], cwd);
+        // Returns 'HEAD' when in detached state
+        if (branch === 'HEAD') {
+            return null;
+        }
+        return branch;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Check if HEAD is detached (not on any branch)
+ */
+export function isDetachedHead(cwd) {
+    try {
+        const branch = git(['rev-parse', '--abbrev-ref', 'HEAD'], cwd);
+        return branch === 'HEAD';
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Get the default branch name (from origin/HEAD or common defaults)
+ */
+export function getDefaultBranch(cwd) {
+    // Try origin/HEAD first
+    try {
+        const ref = git(['symbolic-ref', 'refs/remotes/origin/HEAD'], cwd);
+        // Returns something like "refs/remotes/origin/main"
+        const match = ref.match(/refs\/remotes\/origin\/(.+)$/);
+        if (match) {
+            return match[1];
+        }
+    }
+    catch {
+        // origin/HEAD not set, try other methods
+    }
+    // Try to find main or master
+    for (const candidate of ['main', 'master']) {
+        if (branchExists(candidate, cwd)) {
+            return candidate;
+        }
+    }
+    return null;
+}
+/**
+ * Get the merge-base between two refs
+ */
+export function getMergeBase(ref1, ref2, cwd) {
+    try {
+        return git(['merge-base', ref1, ref2], cwd);
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Get the upstream tracking branch for the current branch
+ */
+export function getUpstreamBranch(cwd) {
+    try {
+        const upstream = git(['rev-parse', '--abbrev-ref', '@{upstream}'], cwd);
+        return upstream;
     }
     catch {
         return null;
@@ -213,8 +279,10 @@ export function runCommand(command, cwd) {
  */
 export function commandExists(cmd) {
     try {
+        // Extract just the command name (first word) from a potentially complex command
+        const cmdName = cmd.split(/\s+/)[0];
         const isWindows = process.platform === 'win32';
-        const checkCmd = isWindows ? `where ${cmd}` : `which ${cmd}`;
+        const checkCmd = isWindows ? `where ${cmdName}` : `which ${cmdName}`;
         execSync(checkCmd, { stdio: 'pipe' });
         return true;
     }

package/dist/lib/git.js.map

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

package/dist/lib/safety.d.ts

@@ -0,0 +1,79 @@
+/**
+ * Safety module for dangerous operations
+ *
+ * This module enforces hard safety constraints:
+ * 1. Never auto-merge PRs
+ * 2. Never delete branches/worktrees without explicit confirmation
+ * 3. Never copy tracked files to worktrees
+ *
+ * All dangerous operations must go through this module.
+ */
+/**
+ * Types of dangerous operations
+ */
+export type DangerousOperation = 'delete_worktree' | 'delete_branch' | 'force_remove_dirty' | 'cleanup_session' | 'merge_pr';
+/**
+ * Confirmation state for dangerous operations
+ */
+export interface ConfirmationState {
+    operation: DangerousOperation;
+    confirmed: boolean;
+    method: 'prompt' | 'flag' | 'none';
+}
+/**
+ * HARD CONSTRAINT: Merge is never allowed by default
+ * This function always returns false - merge must be done manually
+ */
+export declare function isMergeAllowed(): boolean;
+/**
+ * HARD CONSTRAINT: Check if deletion is explicitly confirmed
+ *
+ * Deletion requires EITHER:
+ * - Interactive confirmation (user typed 'y')
+ * - Explicit --yes flag
+ * - Explicit --cleanup flag (for finish command)
+ */
+export declare function isDeletionConfirmed(state: ConfirmationState): boolean;
+/**
+ * Require explicit confirmation for a dangerous operation
+ *
+ * @param operation - Type of dangerous operation
+ * @param options - Confirmation options
+ * @returns ConfirmationState with confirmed status
+ */
+export declare function requireConfirmation(operation: DangerousOperation, options: {
+    skipPrompt?: boolean;
+    autoConfirm?: boolean;
+    message?: string;
+}): Promise<ConfirmationState>;
+/**
+ * Assert that a dangerous operation was properly confirmed
+ * Throws if not confirmed - use this as a guard
+ */
+export declare function assertConfirmed(state: ConfirmationState): void;
+/**
+ * HARD CONSTRAINT: Check if a file can be copied to worktree
+ *
+ * A file can ONLY be copied if:
+ * 1. It is NOT tracked by git
+ * 2. It IS ignored by git (in .gitignore)
+ *
+ * This function does not do the actual check - that's in secrets.ts
+ * This documents the invariant.
+ */
+export interface FileCopyDecision {
+    path: string;
+    allowed: boolean;
+    reason: string;
+    isTracked: boolean;
+    isIgnored: boolean;
+}
+/**
+ * Validate that a file copy decision follows safety rules
+ */
+export declare function validateFileCopy(decision: FileCopyDecision): void;
+/**
+ * Safety summary for logging/debugging
+ */
+export declare function getSafetyConstraints(): string[];
+//# sourceMappingURL=safety.d.ts.map

package/dist/lib/safety.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"safety.d.ts","sourceRoot":"","sources":["../../src/lib/safety.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAC1B,iBAAiB,GACjB,eAAe,GACf,oBAAoB,GACpB,iBAAiB,GACjB,UAAU,CAAC;AAEf;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,kBAAkB,CAAC;IAC9B,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC;CACpC;AAED;;;GAGG;AACH,wBAAgB,cAAc,IAAI,OAAO,CAIxC;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAWrE;AAED;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,kBAAkB,EAC7B,OAAO,EAAE;IACP,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GACA,OAAO,CAAC,iBAAiB,CAAC,CAmB5B;AAuCD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI,CAO9D;AAED;;;;;;;;;GASG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAgBjE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,EAAE,CAM/C"}

package/dist/lib/safety.js

@@ -0,0 +1,133 @@
+/**
+ * Safety module for dangerous operations
+ *
+ * This module enforces hard safety constraints:
+ * 1. Never auto-merge PRs
+ * 2. Never delete branches/worktrees without explicit confirmation
+ * 3. Never copy tracked files to worktrees
+ *
+ * All dangerous operations must go through this module.
+ */
+import * as readline from 'node:readline';
+/**
+ * HARD CONSTRAINT: Merge is never allowed by default
+ * This function always returns false - merge must be done manually
+ */
+export function isMergeAllowed() {
+    // SAFETY: Auto-merge is NEVER allowed
+    // Users must merge PRs manually through GitHub UI
+    return false;
+}
+/**
+ * HARD CONSTRAINT: Check if deletion is explicitly confirmed
+ *
+ * Deletion requires EITHER:
+ * - Interactive confirmation (user typed 'y')
+ * - Explicit --yes flag
+ * - Explicit --cleanup flag (for finish command)
+ */
+export function isDeletionConfirmed(state) {
+    if (!state.confirmed) {
+        return false;
+    }
+    // Must have explicit confirmation method
+    if (state.method === 'none') {
+        return false;
+    }
+    return true;
+}
+/**
+ * Require explicit confirmation for a dangerous operation
+ *
+ * @param operation - Type of dangerous operation
+ * @param options - Confirmation options
+ * @returns ConfirmationState with confirmed status
+ */
+export async function requireConfirmation(operation, options) {
+    // If --yes or --cleanup flag provided, treat as confirmed via flag
+    if (options.skipPrompt || options.autoConfirm) {
+        return {
+            operation,
+            confirmed: true,
+            method: 'flag',
+        };
+    }
+    // Otherwise, require interactive prompt
+    const message = options.message ?? getDefaultMessage(operation);
+    const confirmed = await promptConfirmation(message);
+    return {
+        operation,
+        confirmed,
+        method: confirmed ? 'prompt' : 'none',
+    };
+}
+/**
+ * Interactive confirmation prompt
+ */
+async function promptConfirmation(message) {
+    const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout,
+    });
+    return new Promise((resolve) => {
+        rl.question(`${message} [y/N] `, (answer) => {
+            rl.close();
+            const normalized = answer.toLowerCase().trim();
+            resolve(normalized === 'y' || normalized === 'yes');
+        });
+    });
+}
+/**
+ * Get default confirmation message for an operation
+ */
+function getDefaultMessage(operation) {
+    switch (operation) {
+        case 'delete_worktree':
+            return 'Remove worktree?';
+        case 'delete_branch':
+            return 'Delete branch?';
+        case 'force_remove_dirty':
+            return 'Worktree has uncommitted changes. Remove anyway?';
+        case 'cleanup_session':
+            return 'Clean up session (remove worktree)?';
+        case 'merge_pr':
+            // This should never be called - merge is not allowed
+            return 'Merge is not supported. Please merge manually.';
+    }
+}
+/**
+ * Assert that a dangerous operation was properly confirmed
+ * Throws if not confirmed - use this as a guard
+ */
+export function assertConfirmed(state) {
+    if (!isDeletionConfirmed(state)) {
+        throw new Error(`Safety violation: ${state.operation} was not explicitly confirmed. ` +
+            `Use --yes flag or answer 'y' to confirmation prompt.`);
+    }
+}
+/**
+ * Validate that a file copy decision follows safety rules
+ */
+export function validateFileCopy(decision) {
+    // HARD CONSTRAINT: Tracked files are NEVER copied
+    if (decision.isTracked && decision.allowed) {
+        throw new Error(`Safety violation: Attempted to copy tracked file '${decision.path}'. ` +
+            `Tracked files must NEVER be copied to worktrees.`);
+    }
+    // HARD CONSTRAINT: Non-ignored files should not be copied
+    if (!decision.isIgnored && decision.allowed) {
+        throw new Error(`Safety violation: Attempted to copy non-ignored file '${decision.path}'. ` +
+            `Only gitignored files can be copied to worktrees.`);
+    }
+}
+/**
+ * Safety summary for logging/debugging
+ */
+export function getSafetyConstraints() {
+    return [
+        'Never auto-merge PRs (merge must be done manually)',
+        'Never delete branches/worktrees without explicit --yes flag or prompt confirmation',
+        'Never copy tracked files to worktrees (only gitignored files allowed)',
+    ];
+}
+//# sourceMappingURL=safety.js.map