@aku11i/phantom 2.2.4 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aku11i/phantom",
-  "version": "2.2.4",
+  "version": "3.0.0",
   "description": "A powerful CLI tool for managing Git worktrees for parallel development",
   "keywords": [
     "git",

package/phantom.js

@@ -4206,8 +4206,7 @@ var phantomConfigSchema = external_exports.object({
   preDelete: external_exports.object({
     commands: external_exports.array(external_exports.string()).optional()
   }).passthrough().optional(),
-  worktreesDirectory: external_exports.string().optional(),
-  defaultBranch: external_exports.string().optional()
+  worktreesDirectory: external_exports.string().optional()
 }).passthrough();
 function validateConfig(config) {
   const result = phantomConfigSchema.safeParse(config);
@@ -5239,6 +5238,26 @@ async function attachHandler(args2) {
       exec: {
         type: "string",
         short: "x"
+      },
+      tmux: {
+        type: "boolean",
+        short: "t"
+      },
+      "tmux-vertical": {
+        type: "boolean"
+      },
+      "tmux-v": {
+        type: "boolean"
+      },
+      "tmux-horizontal": {
+        type: "boolean"
+      },
+      "tmux-h": {
+        type: "boolean"
+      },
+      "copy-file": {
+        type: "string",
+        multiple: true
       }
     }
   });
@@ -5249,19 +5268,34 @@ async function attachHandler(args2) {
     );
   }
   const [branchName] = positionals;
-  if (values.shell && values.exec) {
+  const tmuxOption = values.tmux || values["tmux-vertical"] || values["tmux-v"] || values["tmux-horizontal"] || values["tmux-h"];
+  const copyFileOptions = values["copy-file"];
+  const tmuxDirection = values.tmux ? "new" : values["tmux-vertical"] || values["tmux-v"] ? "vertical" : values["tmux-horizontal"] || values["tmux-h"] ? "horizontal" : void 0;
+  if ([values.shell, values.exec, tmuxOption].filter(Boolean).length > 1) {
     exitWithError(
-      "Cannot use both --shell and --exec options",
+      "Cannot use --shell, --exec, and --tmux options together",
       exitCodes.validationError
     );
   }
   const gitRoot = await getGitRoot();
   const context = await createContext(gitRoot);
+  let copyFiles2 = context.config?.postCreate?.copyFiles ?? [];
+  if (copyFileOptions && copyFileOptions.length > 0) {
+    const cliCopyFiles = Array.isArray(copyFileOptions) ? copyFileOptions : [copyFileOptions];
+    copyFiles2 = [.../* @__PURE__ */ new Set([...copyFiles2, ...cliCopyFiles])];
+  }
+  const postCreateCopyFiles = copyFiles2.length > 0 ? copyFiles2 : void 0;
+  if (tmuxOption && !await isInsideTmux()) {
+    exitWithError(
+      "The --tmux option can only be used inside a tmux session",
+      exitCodes.validationError
+    );
+  }
   const result = await attachWorktreeCore(
     context.gitRoot,
     context.worktreesDirectory,
     branchName,
-    context.config?.postCreate?.copyFiles,
+    postCreateCopyFiles,
     context.config?.postCreate?.commands
   );
   if (isErr(result)) {
@@ -5275,6 +5309,7 @@ async function attachHandler(args2) {
     exitWithError(error.message, exitCodes.generalError);
   }
   output.log(`Attached phantom: ${branchName}`);
+  const worktreePath = result.value;
   if (values.shell) {
     const shellResult = await shellInWorktree(
       context.gitRoot,
@@ -5296,6 +5331,21 @@ async function attachHandler(args2) {
     if (isErr(execResult)) {
       exitWithError(execResult.error.message, exitCodes.generalError);
     }
+  } else if (tmuxDirection) {
+    output.log(
+      `Opening worktree '${branchName}' in tmux ${tmuxDirection === "new" ? "window" : "pane"}...`
+    );
+    const shell = process.env.SHELL || "/bin/sh";
+    const tmuxResult = await executeTmuxCommand({
+      direction: tmuxDirection,
+      command: shell,
+      cwd: worktreePath,
+      env: getPhantomEnv(branchName, worktreePath),
+      windowName: tmuxDirection === "new" ? branchName : void 0
+    });
+    if (isErr(tmuxResult)) {
+      exitWithError(tmuxResult.error.message, exitCodes.generalError);
+    }
   }
 }
 
@@ -5314,7 +5364,7 @@ _phantom_completion() {
     local cur prev words cword
     _init_completion || return
 
-    local commands="create attach list where delete exec review shell github gh version completion mcp"
+    local commands="create attach list where delete exec shell github gh version completion mcp"
     local global_opts="--help --version"
 
     if [[ \${cword} -eq 1 ]]; then
@@ -5354,12 +5404,17 @@ _phantom_completion() {
                     # Don't complete anything specific for exec commands
                     return 0
                     ;;
+                --copy-file)
+                    # Complete files
+                    _filedir
+                    return 0
+                    ;;
                 *)
                     if [[ \${cword} -eq 2 ]]; then
                         # First argument: branch name (not completing - user needs to provide)
                         return 0
                     else
-                        local opts="--shell --exec"
+                        local opts="--shell --exec --tmux --tmux-vertical --tmux-horizontal --copy-file"
                         COMPREPLY=( $(compgen -W "\${opts}" -- "\${cur}") )
                         return 0
                     fi
@@ -5416,24 +5471,6 @@ _phantom_completion() {
                     ;;
             esac
             ;;
-        review)
-            case "\${prev}" in
-                --base)
-                    # Don't complete anything specific for base reference
-                    return 0
-                    ;;
-                *)
-                    if [[ "\${cur}" == -* ]]; then
-                        local opts="--fzf --base"
-                        COMPREPLY=( $(compgen -W "\${opts}" -- "\${cur}") )
-                    else
-                        local worktrees=$(_phantom_list_worktrees)
-                        COMPREPLY=( $(compgen -W "\${worktrees}" -- "\${cur}") )
-                    fi
-                    return 0
-                    ;;
-            esac
-            ;;
         shell)
             case "\${prev}" in
                 --tmux|-t|--tmux-vertical|--tmux-horizontal)
@@ -5545,7 +5582,6 @@ complete -c phantom -n "__phantom_using_command" -a "list" -d "List all Git work
 complete -c phantom -n "__phantom_using_command" -a "where" -d "Output the filesystem path of a specific worktree"
 complete -c phantom -n "__phantom_using_command" -a "delete" -d "Delete a Git worktree (phantom)"
 complete -c phantom -n "__phantom_using_command" -a "exec" -d "Execute a command in a worktree directory"
-complete -c phantom -n "__phantom_using_command" -a "review" -d "Review changes in a worktree with a local PR review interface (experimental)"
 complete -c phantom -n "__phantom_using_command" -a "shell" -d "Open an interactive shell in a worktree directory"
 complete -c phantom -n "__phantom_using_command" -a "github" -d "GitHub integration commands"
 complete -c phantom -n "__phantom_using_command" -a "gh" -d "GitHub integration commands (alias)"
@@ -5569,6 +5605,10 @@ complete -c phantom -n "__phantom_using_command create" -l base -d "Branch or co
 # attach command options
 complete -c phantom -n "__phantom_using_command attach" -l shell -d "Open an interactive shell in the worktree after attaching (-s)"
 complete -c phantom -n "__phantom_using_command attach" -l exec -d "Execute a command in the worktree after attaching (-x)" -x
+complete -c phantom -n "__phantom_using_command attach" -l tmux -d "Open the worktree in a new tmux window (-t)"
+complete -c phantom -n "__phantom_using_command attach" -l tmux-vertical -d "Open the worktree in a vertical tmux pane"
+complete -c phantom -n "__phantom_using_command attach" -l tmux-horizontal -d "Open the worktree in a horizontal tmux pane"
+complete -c phantom -n "__phantom_using_command attach" -l copy-file -d "Copy specified files from the current worktree" -r
 
 # list command options
 complete -c phantom -n "__phantom_using_command list" -l fzf -d "Use fzf for interactive selection"
@@ -5591,11 +5631,6 @@ complete -c phantom -n "__phantom_using_command exec" -l tmux-vertical -d "Execu
 complete -c phantom -n "__phantom_using_command exec" -l tmux-horizontal -d "Execute command in horizontal split pane"
 complete -c phantom -n "__phantom_using_command exec" -a "(__phantom_list_worktrees)"
 
-# review command options
-complete -c phantom -n "__phantom_using_command review" -l fzf -d "Use fzf for interactive selection"
-complete -c phantom -n "__phantom_using_command review" -l base -d "Base reference for comparison" -x
-complete -c phantom -n "__phantom_using_command review" -a "(__phantom_list_worktrees)"
-
 # shell command options
 complete -c phantom -n "__phantom_using_command shell" -l fzf -d "Use fzf for interactive selection"
 complete -c phantom -n "__phantom_using_command shell" -l tmux -d "Open shell in new tmux window (-t)"
@@ -5632,7 +5667,6 @@ _phantom() {
         'where:Output the filesystem path of a specific worktree'
         'delete:Delete a Git worktree (phantom)'
         'exec:Execute a command in a worktree directory'
-        'review:Review changes in a worktree with a local PR review interface (experimental)'
         'shell:Open an interactive shell in a worktree directory'
         'github:GitHub integration commands'
         'gh:GitHub integration commands (alias)'
@@ -5653,18 +5687,16 @@ _phantom() {
                     _arguments                         '--shell[Open an interactive shell in the new worktree after creation (-s)]'                         '--exec[Execute a command in the new worktree after creation (-x)]:command:'                         '--tmux[Open the worktree in a new tmux window (-t)]'                         '--tmux-vertical[Open the worktree in a vertical tmux pane]'                         '--tmux-horizontal[Open the worktree in a horizontal tmux pane]'                         '*--copy-file[Copy specified files from the current worktree]:file:_files'                         '--base[Branch or commit to create the new worktree from (defaults to HEAD)]:branch/commit:'                         '1:name:'
                     ;;
                 attach)
-                    _arguments                         '--shell[Open an interactive shell in the worktree after attaching (-s)]'                         '--exec[Execute a command in the worktree after attaching (-x)]:command:'                         '1:branch-name:'
+                    _arguments                         '--shell[Open an interactive shell in the worktree after attaching (-s)]'                         '--exec[Execute a command in the worktree after attaching (-x)]:command:'                         '--tmux[Open the worktree in a new tmux window (-t)]'                         '--tmux-vertical[Open the worktree in a vertical tmux pane]'                         '--tmux-horizontal[Open the worktree in a horizontal tmux pane]'                         '*--copy-file[Copy specified files from the current worktree]:file:_files'                         '1:branch-name:'
                     ;;
                 list)
                     _arguments                         '--fzf[Use fzf for interactive selection]'                         '--names[Output only phantom names (for scripts and completion)]'
                     ;;
-                where|delete|review|shell)
+                where|delete|shell)
                     local worktrees
                     worktrees=(\${(f)"$(phantom list --names 2>/dev/null)"})
                     if [[ \${line[1]} == "where" ]]; then
                         _arguments                             '--fzf[Use fzf for interactive selection]'                             '1:worktree:(\${(q)worktrees[@]})'
-                    elif [[ \${line[1]} == "review" ]]; then
-                        _arguments                             '--fzf[Use fzf for interactive selection]'                             '--base[Base reference for comparison]:reference:'                             '1:worktree:(\${(q)worktrees[@]})'
                     elif [[ \${line[1]} == "shell" ]]; then
                         _arguments                             '--fzf[Use fzf for interactive selection]'                             '--tmux[Open shell in new tmux window (-t)]'                             '--tmux-vertical[Open shell in vertical split pane]'                             '--tmux-horizontal[Open shell in horizontal split pane]'                             '1:worktree:(\${(q)worktrees[@]})'
                     elif [[ \${line[1]} == "delete" ]]; then
@@ -9613,8 +9645,8 @@ async function checkoutIssue(issue, base) {
 async function checkoutPullRequest(pullRequest) {
   const gitRoot = await getGitRoot();
   const context = await createContext(gitRoot);
-  const worktreeName = `pulls/${pullRequest.number}`;
-  const localBranch = `pulls/${pullRequest.number}`;
+  const worktreeName = pullRequest.head.ref;
+  const localBranch = pullRequest.head.ref;
   const existsResult = await validateWorktreeExists(
     context.gitRoot,
     context.worktreesDirectory,
@@ -13322,7 +13354,7 @@ var StdioServerTransport = class {
 // ../mcp/package.json
 var package_default = {
   name: "@aku11i/phantom-mcp",
-  version: "2.2.4",
+  version: "3.0.0",
   private: true,
   type: "module",
   main: "./src/index.ts",
@@ -13601,97 +13633,10 @@ async function mcpHandler(args2 = []) {
   }
 }
 
-// src/handlers/review.ts
-import { parseArgs as parseArgs8 } from "node:util";
-async function reviewHandler(args2) {
-  const { positionals, values } = parseArgs8({
-    args: args2,
-    options: {
-      fzf: {
-        type: "boolean",
-        default: false
-      },
-      base: {
-        type: "string"
-      }
-    },
-    strict: true,
-    allowPositionals: true
-  });
-  const useFzf = values.fzf ?? false;
-  const base = values.base;
-  if (useFzf) {
-    if (positionals.length > 0) {
-      exitWithError(
-        "Cannot specify worktree name when using --fzf",
-        exitCodes.validationError
-      );
-    }
-  } else {
-    if (positionals.length !== 1) {
-      exitWithError(
-        "Usage: phantom review <worktree-name> [--base <ref>]",
-        exitCodes.validationError
-      );
-    }
-  }
-  try {
-    const gitRoot = await getGitRoot();
-    const context = await createContext(gitRoot);
-    let worktreeName;
-    if (useFzf) {
-      const selectResult = await selectWorktreeWithFzf(
-        context.gitRoot,
-        context.worktreesDirectory
-      );
-      if (isErr(selectResult)) {
-        exitWithError(selectResult.error.message, exitCodes.generalError);
-      }
-      if (!selectResult.value) {
-        exitWithSuccess();
-      }
-      worktreeName = selectResult.value.name;
-    } else {
-      worktreeName = positionals[0];
-    }
-    const validation = await validateWorktreeExists(
-      context.gitRoot,
-      context.worktreesDirectory,
-      worktreeName
-    );
-    if (isErr(validation)) {
-      exitWithError(validation.error.message, exitCodes.generalError);
-    }
-    const baseRef = base ?? `origin/${context.config?.defaultBranch ?? "main"}`;
-    output.log(`Opening review for worktree '${worktreeName}'...`);
-    output.log(
-      "powered by yoshiko-pg/difit (https://github.com/yoshiko-pg/difit)"
-    );
-    const command2 = ["difit", "HEAD", baseRef];
-    const result = await execInWorktree(
-      context.gitRoot,
-      context.worktreesDirectory,
-      worktreeName,
-      command2,
-      { interactive: true }
-    );
-    if (isErr(result)) {
-      const exitCode = result.error instanceof WorktreeNotFoundError ? exitCodes.notFound : result.error.exitCode || exitCodes.generalError;
-      exitWithError(result.error.message, exitCode);
-    }
-    process.exit(result.value.exitCode);
-  } catch (error) {
-    exitWithError(
-      error instanceof Error ? error.message : String(error),
-      exitCodes.generalError
-    );
-  }
-}
-
 // src/handlers/shell.ts
-import { parseArgs as parseArgs9 } from "node:util";
+import { parseArgs as parseArgs8 } from "node:util";
 async function shellHandler(args2) {
-  const { positionals, values } = parseArgs9({
+  const { positionals, values } = parseArgs8({
     args: args2,
     options: {
       fzf: {
@@ -13815,12 +13760,12 @@ async function shellHandler(args2) {
 }
 
 // src/handlers/version.ts
-import { parseArgs as parseArgs10 } from "node:util";
+import { parseArgs as parseArgs9 } from "node:util";
 
 // package.json
 var package_default2 = {
   name: "@aku11i/phantom-cli",
-  version: "2.2.4",
+  version: "3.0.0",
   private: true,
   type: "module",
   scripts: {
@@ -13852,7 +13797,7 @@ function getVersion() {
 
 // src/handlers/version.ts
 function versionHandler(args2 = []) {
-  parseArgs10({
+  parseArgs9({
     args: args2,
     options: {},
     strict: true,
@@ -13864,9 +13809,9 @@ function versionHandler(args2 = []) {
 }
 
 // src/handlers/where.ts
-import { parseArgs as parseArgs11 } from "node:util";
+import { parseArgs as parseArgs10 } from "node:util";
 async function whereHandler(args2) {
-  const { positionals, values } = parseArgs11({
+  const { positionals, values } = parseArgs10({
     args: args2,
     options: {
       fzf: {
@@ -13946,6 +13891,39 @@ var attachHelp = {
       type: "string",
       description: "Execute a command in the worktree after attaching",
       example: "--exec 'git pull'"
+    },
+    {
+      name: "tmux",
+      short: "t",
+      type: "boolean",
+      description: "Open the worktree in a new tmux window after attaching"
+    },
+    {
+      name: "tmux-vertical",
+      type: "boolean",
+      description: "Open the worktree in a vertical tmux pane after attaching"
+    },
+    {
+      name: "tmux-v",
+      type: "boolean",
+      description: "Alias for --tmux-vertical"
+    },
+    {
+      name: "tmux-horizontal",
+      type: "boolean",
+      description: "Open the worktree in a horizontal tmux pane after attaching"
+    },
+    {
+      name: "tmux-h",
+      type: "boolean",
+      description: "Alias for --tmux-horizontal"
+    },
+    {
+      name: "copy-file",
+      type: "string",
+      multiple: true,
+      description: "Copy specified files from the current worktree before attaching. Can be used multiple times",
+      example: "--copy-file .env --copy-file .npmrc"
     }
   ],
   examples: [
@@ -13960,12 +13938,21 @@ var attachHelp = {
     {
       description: "Attach to a branch and pull latest changes",
       command: "phantom attach develop --exec 'git pull'"
+    },
+    {
+      description: "Attach and open the worktree in a tmux window",
+      command: "phantom attach feature-branch --tmux"
+    },
+    {
+      description: "Attach and copy shared environment files",
+      command: "phantom attach feature-branch --copy-file .env --copy-file .npmrc"
     }
   ],
   notes: [
     "The branch must already exist locally",
     "To work with remote branches, first checkout the branch with git",
-    "Only one of --shell or --exec options can be used at a time"
+    "Only one of --shell, --exec, or tmux options can be used at a time",
+    "The tmux options require running phantom inside an active tmux session"
   ]
 };
 
@@ -14235,55 +14222,6 @@ var listHelp = {
   ]
 };
 
-// src/help/review.ts
-var reviewHelp = {
-  name: "review",
-  description: "Review changes in a worktree with a local PR review interface (experimental)",
-  usage: "phantom review [options] <worktree-name>",
-  options: [
-    {
-      name: "--fzf",
-      type: "boolean",
-      description: "Use fzf for interactive worktree selection"
-    },
-    {
-      name: "--base",
-      type: "string",
-      description: "Base reference for comparison (default: origin/<defaultBranch>)"
-    }
-  ],
-  examples: [
-    {
-      description: "Review changes against default branch",
-      command: "phantom review feature-auth"
-    },
-    {
-      description: "Review changes against specific remote branch",
-      command: "phantom review feature-login --base origin/feature-auth"
-    },
-    {
-      description: "Review changes against local branch",
-      command: "phantom review feature-auth --base main"
-    },
-    {
-      description: "Interactive worktree selection",
-      command: "phantom review --fzf"
-    },
-    {
-      description: "Interactive selection with custom base",
-      command: "phantom review --fzf --base origin/staging"
-    }
-  ],
-  notes: [
-    "\u26A0\uFE0F  This is an experimental feature and may change in future versions",
-    "Uses difit to provide a GitHub-like PR review interface locally",
-    "Default base is origin/<defaultBranch> where defaultBranch is from config or 'main'",
-    "The --base value is passed directly to difit as the comparison reference",
-    "Requires difit to be installed separately (e.g., npm install -g difit)",
-    "powered by yoshiko-pg/difit (https://github.com/yoshiko-pg/difit)"
-  ]
-};
-
 // src/help/shell.ts
 var shellHelp = {
   name: "shell",
@@ -14431,12 +14369,6 @@ var commands = [
     handler: execHandler,
     help: execHelp
   },
-  {
-    name: "review",
-    description: "Review changes in a worktree with a local PR review interface (experimental)",
-    handler: reviewHandler,
-    help: reviewHelp
-  },
   {
     name: "shell",
     description: "Open an interactive shell in a worktree directory",