@aku11i/phantom 1.3.0 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aku11i/phantom",
-  "version": "1.3.0",
+  "version": "2.0.0",
   "description": "A powerful CLI tool for managing Git worktrees for parallel development",
   "keywords": [
     "git",
@@ -31,5 +31,8 @@
     "README.md",
     "LICENSE"
   ],
+  "engines": {
+    "node": ">=22.0.0"
+  },
   "dependencies": {}
 }

package/phantom.js

@@ -4203,13 +4203,15 @@ var phantomConfigSchema = external_exports.object({
     copyFiles: external_exports.array(external_exports.string()).optional(),
     commands: external_exports.array(external_exports.string()).optional()
   }).passthrough().optional(),
+  preDelete: external_exports.object({
+    commands: external_exports.array(external_exports.string()).optional()
+  }).passthrough().optional(),
   worktreesDirectory: external_exports.string().optional()
 }).passthrough();
 function validateConfig(config) {
   const result = phantomConfigSchema.safeParse(config);
   if (!result.success) {
     const error = result.error;
-    const formattedError = error.format();
     const firstError = error.errors[0];
     const path3 = firstError.path.join(".");
     const message = path3 ? `${path3}: ${firstError.message}` : firstError.message;
@@ -4403,7 +4405,7 @@ async function fetch(options = {}) {
 }
 
 // ../git/src/libs/list-worktrees.ts
-async function listWorktrees(gitRoot) {
+async function listWorktrees(_gitRoot) {
   const { stdout: stdout2 } = await executeGitCommand([
     "worktree",
     "list",
@@ -4695,7 +4697,7 @@ async function selectWithFzf(items, options = {}) {
 
 // ../core/src/worktree/validate.ts
 import fs2 from "node:fs/promises";
-async function validateWorktreeExists(gitRoot, worktreeDirectory, name) {
+async function validateWorktreeExists(_gitRoot, worktreeDirectory, name) {
   const worktreePath = getWorktreePathFromDirectory(worktreeDirectory, name);
   try {
     await fs2.access(worktreePath);
@@ -4704,7 +4706,7 @@ async function validateWorktreeExists(gitRoot, worktreeDirectory, name) {
     return err(new WorktreeNotFoundError(name));
   }
 }
-async function validateWorktreeDoesNotExist(gitRoot, worktreeDirectory, name) {
+async function validateWorktreeDoesNotExist(_gitRoot, worktreeDirectory, name) {
   const worktreePath = getWorktreePathFromDirectory(worktreeDirectory, name);
   try {
     await fs2.access(worktreePath);
@@ -4879,6 +4881,39 @@ async function createWorktree(gitRoot, worktreeDirectory, name, options, postCre
   }
 }
 
+// ../core/src/worktree/pre-delete.ts
+async function executePreDeleteCommands(options) {
+  const { gitRoot, worktreesDirectory, worktreeName, commands: commands2 } = options;
+  const executedCommands = [];
+  for (const command2 of commands2) {
+    console.log(`Executing pre-delete command: ${command2}`);
+    const shell = process.env.SHELL || "/bin/sh";
+    const cmdResult = await execInWorktree(
+      gitRoot,
+      worktreesDirectory,
+      worktreeName,
+      [shell, "-c", command2]
+    );
+    if (isErr(cmdResult)) {
+      const errorMessage = cmdResult.error instanceof Error ? cmdResult.error.message : String(cmdResult.error);
+      return err(
+        new Error(
+          `Failed to execute pre-delete command "${command2}": ${errorMessage}`
+        )
+      );
+    }
+    if (cmdResult.value.exitCode !== 0) {
+      return err(
+        new Error(
+          `Pre-delete command failed with exit code ${cmdResult.value.exitCode}: ${command2}`
+        )
+      );
+    }
+    executedCommands.push(command2);
+  }
+  return ok({ executedCommands });
+}
+
 // ../core/src/worktree/delete.ts
 async function getWorktreeChangesStatus(worktreePath) {
   try {
@@ -4900,19 +4935,14 @@ async function getWorktreeChangesStatus(worktreePath) {
   };
 }
 async function removeWorktree(gitRoot, worktreePath, force = false) {
-  try {
-    await executeGitCommand(["worktree", "remove", worktreePath], {
-      cwd: gitRoot
-    });
-  } catch (error) {
-    try {
-      await executeGitCommand(["worktree", "remove", "--force", worktreePath], {
-        cwd: gitRoot
-      });
-    } catch {
-      throw new Error("Failed to remove worktree");
-    }
+  const args2 = ["worktree", "remove"];
+  if (force) {
+    args2.push("--force");
   }
+  args2.push(worktreePath);
+  await executeGitCommand(args2, {
+    cwd: gitRoot
+  });
 }
 async function deleteBranch(gitRoot, branchName) {
   try {
@@ -4923,7 +4953,7 @@ async function deleteBranch(gitRoot, branchName) {
     return err(new WorktreeError(`branch delete failed: ${errorMessage}`));
   }
 }
-async function deleteWorktree(gitRoot, worktreeDirectory, name, options) {
+async function deleteWorktree(gitRoot, worktreeDirectory, name, options, preDeleteCommands) {
   const { force = false } = options || {};
   const validation = await validateWorktreeExists(
     gitRoot,
@@ -4942,6 +4972,18 @@ async function deleteWorktree(gitRoot, worktreeDirectory, name, options) {
       )
     );
   }
+  if (preDeleteCommands && preDeleteCommands.length > 0) {
+    console.log("\nRunning pre-delete commands...");
+    const preDeleteResult = await executePreDeleteCommands({
+      gitRoot,
+      worktreesDirectory: worktreeDirectory,
+      worktreeName: name,
+      commands: preDeleteCommands
+    });
+    if (isErr(preDeleteResult)) {
+      return err(new WorktreeError(preDeleteResult.error.message));
+    }
+  }
   try {
     await removeWorktree(gitRoot, worktreePath, force);
     const branchName = name;
@@ -5231,7 +5273,6 @@ async function attachHandler(args2) {
     }
     exitWithError(error.message, exitCodes.generalError);
   }
-  const worktreePath = result.value;
   output.log(`Attached phantom: ${branchName}`);
   if (values.shell) {
     const shellResult = await shellInWorktree(
@@ -5931,7 +5972,8 @@ async function deleteHandler(args2) {
       worktreeName,
       {
         force: forceDelete
-      }
+      },
+      context.config?.preDelete?.commands
     );
     if (isErr(result)) {
       const exitCode = result.error instanceof WorktreeNotFoundError ? exitCodes.validationError : result.error instanceof WorktreeError && result.error.message.includes("uncommitted changes") ? exitCodes.validationError : exitCodes.generalError;
@@ -9526,8 +9568,21 @@ async function checkoutIssue(issue, base) {
   }
   const gitRoot = await getGitRoot();
   const context = await createContext(gitRoot);
-  const worktreeName = `issue-${issue.number}`;
-  const branchName = `issue-${issue.number}`;
+  const worktreeName = `issues/${issue.number}`;
+  const branchName = `issues/${issue.number}`;
+  const existsResult = await validateWorktreeExists(
+    context.gitRoot,
+    context.worktreesDirectory,
+    worktreeName
+  );
+  if (!isErr(existsResult)) {
+    return ok({
+      message: `Issue #${issue.number} is already checked out`,
+      worktree: worktreeName,
+      path: existsResult.value.path,
+      alreadyExists: true
+    });
+  }
   const result = await createWorktree(
     context.gitRoot,
     context.worktreesDirectory,
@@ -9540,18 +9595,6 @@ async function checkoutIssue(issue, base) {
     context.config?.postCreate?.commands
   );
   if (isErr(result)) {
-    if (result.error instanceof WorktreeAlreadyExistsError) {
-      const worktreePath = getWorktreePathFromDirectory(
-        context.worktreesDirectory,
-        worktreeName
-      );
-      return ok({
-        message: `Worktree for issue #${issue.number} is already checked out`,
-        worktree: worktreeName,
-        path: worktreePath,
-        alreadyExists: true
-      });
-    }
     return err(result.error);
   }
   return ok({
@@ -9565,8 +9608,21 @@ async function checkoutIssue(issue, base) {
 async function checkoutPullRequest(pullRequest) {
   const gitRoot = await getGitRoot();
   const context = await createContext(gitRoot);
-  const worktreeName = `pr-${pullRequest.number}`;
-  const localBranch = `pr-${pullRequest.number}`;
+  const worktreeName = `pulls/${pullRequest.number}`;
+  const localBranch = `pulls/${pullRequest.number}`;
+  const existsResult = await validateWorktreeExists(
+    context.gitRoot,
+    context.worktreesDirectory,
+    worktreeName
+  );
+  if (!isErr(existsResult)) {
+    return ok({
+      message: `PR #${pullRequest.number} is already checked out`,
+      worktree: worktreeName,
+      path: existsResult.value.path,
+      alreadyExists: true
+    });
+  }
   const upstream = pullRequest.isFromFork ? `origin/pull/${pullRequest.number}/head` : `origin/${pullRequest.head.ref}`;
   const refspec = `${upstream.replace("origin/", "")}:${localBranch}`;
   const fetchResult = await fetch({ refspec });
@@ -9595,18 +9651,6 @@ async function checkoutPullRequest(pullRequest) {
     context.config?.postCreate?.commands
   );
   if (isErr(attachResult)) {
-    if (attachResult.error instanceof WorktreeAlreadyExistsError) {
-      const worktreePath = getWorktreePathFromDirectory(
-        context.worktreesDirectory,
-        worktreeName
-      );
-      return ok({
-        message: `Worktree for PR #${pullRequest.number} is already checked out`,
-        worktree: worktreeName,
-        path: worktreePath,
-        alreadyExists: true
-      });
-    }
     return err(attachResult.error);
   }
   const message = pullRequest.isFromFork ? `Checked out PR #${pullRequest.number} from fork ${pullRequest.head.repo.full_name}` : `Checked out PR #${pullRequest.number} from branch ${pullRequest.head.ref}`;
@@ -9866,8 +9910,8 @@ var githubCheckoutHelp = {
     }
   ],
   notes: [
-    "For PRs: Creates worktree named 'pr-{number}' with the PR's branch",
-    "For Issues: Creates worktree named 'issue-{number}' with a new branch",
+    "For PRs: Creates worktree named 'pulls/{number}' with the PR's branch",
+    "For Issues: Creates worktree named 'issues/{number}' with a new branch",
     "",
     "Requirements:",
     "  - GitHub CLI (gh) must be installed",
@@ -13223,7 +13267,7 @@ var StdioServerTransport = class {
 // ../mcp/package.json
 var package_default = {
   name: "@aku11i/phantom-mcp",
-  version: "1.3.0",
+  version: "2.0.0",
   private: true,
   type: "module",
   main: "./src/index.ts",
@@ -13311,7 +13355,8 @@ var deleteWorktreeTool = {
       name,
       {
         force
-      }
+      },
+      context.config?.preDelete?.commands
     );
     if (!isOk(result)) {
       throw new Error(result.error.message);
@@ -13633,7 +13678,7 @@ import { parseArgs as parseArgs9 } from "node:util";
 // package.json
 var package_default2 = {
   name: "@aku11i/phantom-cli",
-  version: "1.3.0",
+  version: "2.0.0",
   private: true,
   type: "module",
   scripts: {