@aku11i/phantom 5.1.0 → 6.1.0

package/README.md

@@ -7,14 +7,14 @@ Phantom makes Git worktrees simple and intuitive, enabling you to run multiple t
 ## Installation
 
 ```bash
-npm install -g @aku11i/phantom
+npm install -g @phantompane/cli
 ```
 
 ## Documentation
 
 For detailed documentation, examples, and advanced usage, please visit:
 
-https://github.com/aku11i/phantom
+https://github.com/phantompane/phantom
 
 ## License
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aku11i/phantom",
-  "version": "5.1.0",
+  "version": "6.1.0",
   "description": "A powerful CLI tool for managing Git worktrees for parallel development",
   "keywords": [
     "git",
@@ -12,13 +12,13 @@
     "parallel",
     "mcp"
   ],
-  "homepage": "https://github.com/aku11i/phantom#readme",
+  "homepage": "https://github.com/phantompane/phantom#readme",
   "bugs": {
-    "url": "https://github.com/aku11i/phantom/issues"
+    "url": "https://github.com/phantompane/phantom/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/aku11i/phantom.git"
+    "url": "git+https://github.com/phantompane/phantom.git"
   },
   "license": "MIT",
   "author": "aku11i",
@@ -35,4 +35,4 @@
     "node": ">=22.0.0"
   },
   "dependencies": {}
-}
+}

package/phantom.js

@@ -21091,6 +21091,7 @@ var phantomConfigSchema = external_exports.object({
   preDelete: external_exports.object({
     commands: external_exports.array(external_exports.string()).optional()
   }).passthrough().optional(),
+  directoryNameSeparator: external_exports.string().optional(),
   worktreesDirectory: external_exports.string().optional()
 }).passthrough();
 function validateConfig(config2) {
@@ -21151,8 +21152,9 @@ function getWorktreesDirectory(gitRoot, worktreesDirectory) {
   }
   return join(gitRoot, ".git", "phantom", "worktrees");
 }
-function getWorktreePathFromDirectory(worktreeDirectory, name) {
-  return join(worktreeDirectory, name);
+function getWorktreePathFromDirectory(worktreeDirectory, name, directoryNameSeparator) {
+  const directoryName = directoryNameSeparator === "/" ? name : name.replaceAll("/", directoryNameSeparator);
+  return join(worktreeDirectory, directoryName);
 }
 
 // ../git/src/executor.ts
@@ -21338,7 +21340,8 @@ var PreferencesValidationError = class extends Error {
 var preferencesSchema = external_exports.object({
   editor: external_exports.string().optional(),
   ai: external_exports.string().optional(),
-  worktreesDirectory: external_exports.string().optional()
+  worktreesDirectory: external_exports.string().optional(),
+  directoryNameSeparator: external_exports.string().optional()
 }).passthrough();
 function parsePreferences(output2) {
   if (!output2) {
@@ -21364,6 +21367,8 @@ function parsePreferences(output2) {
       preferences.ai = value;
     } else if (strippedKey === "worktreesdirectory") {
       preferences.worktreesDirectory = value;
+    } else if (strippedKey === "directorynameseparator") {
+      preferences.directoryNameSeparator = value;
     }
   }
   const parsed = preferencesSchema.safeParse(preferences);
@@ -21390,17 +21395,14 @@ async function createContext(gitRoot) {
   const configResult = await loadConfig(gitRoot);
   const config2 = isOk(configResult) ? configResult.value : null;
   const preferences = await loadPreferences();
-  const worktreesDirectoryPreference = preferences.worktreesDirectory;
   const worktreesDirectoryConfig = config2?.worktreesDirectory;
-  if (worktreesDirectoryConfig !== void 0) {
-    console.warn(
-      "The 'worktreesDirectory' option in phantom.config.json is deprecated and will be removed in the next version. Configure 'phantom preferences set worktreesDirectory <path-from-repo-root>' instead."
-    );
-  }
+  const worktreesDirectoryPreference = preferences.worktreesDirectory;
   const worktreesDirectory = worktreesDirectoryPreference ?? worktreesDirectoryConfig;
+  const directoryNameSeparator = preferences.directoryNameSeparator || config2?.directoryNameSeparator || "/";
   return {
     gitRoot,
     worktreesDirectory: getWorktreesDirectory(gitRoot, worktreesDirectory),
+    directoryNameSeparator,
     config: config2,
     preferences
   };
@@ -21850,10 +21852,11 @@ async function executePostCreateCommands(options) {
   }
   return ok({ executedCommands });
 }
-async function copyFilesToWorktree(gitRoot, worktreesDirectory, worktreeName, filesToCopy) {
+async function copyFilesToWorktree(gitRoot, worktreesDirectory, worktreeName, filesToCopy, directoryNameSeparator) {
   const worktreePath = getWorktreePathFromDirectory(
     worktreesDirectory,
-    worktreeName
+    worktreeName,
+    directoryNameSeparator
   );
   const copyResult = await copyFiles(gitRoot, worktreePath, filesToCopy);
   if (isErr(copyResult)) {
@@ -21863,12 +21866,16 @@ async function copyFilesToWorktree(gitRoot, worktreesDirectory, worktreeName, fi
 }
 
 // ../core/src/worktree/attach.ts
-async function attachWorktreeCore(gitRoot, worktreeDirectory, name, postCreateCopyFiles, postCreateCommands) {
+async function attachWorktreeCore(gitRoot, worktreeDirectory, name, postCreateCopyFiles, postCreateCommands, directoryNameSeparator) {
   const validation = validateWorktreeName(name);
   if (isErr(validation)) {
     return validation;
   }
-  const worktreePath = getWorktreePathFromDirectory(worktreeDirectory, name);
+  const worktreePath = getWorktreePathFromDirectory(
+    worktreeDirectory,
+    name,
+    directoryNameSeparator
+  );
   if (existsSync(worktreePath)) {
     return err(new WorktreeAlreadyExistsError(name));
   }
@@ -21888,7 +21895,8 @@ async function attachWorktreeCore(gitRoot, worktreeDirectory, name, postCreateCo
       gitRoot,
       worktreeDirectory,
       name,
-      postCreateCopyFiles
+      postCreateCopyFiles,
+      directoryNameSeparator
     );
     if (isErr(copyResult)) {
       console.warn(
@@ -21913,13 +21921,17 @@ async function attachWorktreeCore(gitRoot, worktreeDirectory, name, postCreateCo
 
 // ../core/src/worktree/create.ts
 import fs3 from "node:fs/promises";
-async function createWorktree(gitRoot, worktreeDirectory, name, options, postCreateCopyFiles, postCreateCommands) {
+async function createWorktree(gitRoot, worktreeDirectory, name, options, postCreateCopyFiles, postCreateCommands, directoryNameSeparator) {
   const nameValidation = validateWorktreeName(name);
   if (isErr(nameValidation)) {
     return nameValidation;
   }
   const { branch = name, base = "HEAD" } = options;
-  const worktreePath = getWorktreePathFromDirectory(worktreeDirectory, name);
+  const worktreePath = getWorktreePathFromDirectory(
+    worktreeDirectory,
+    name,
+    directoryNameSeparator
+  );
   try {
     await fs3.access(worktreeDirectory);
   } catch {
@@ -21960,7 +21972,8 @@ async function createWorktree(gitRoot, worktreeDirectory, name, options, postCre
         gitRoot,
         worktreeDirectory,
         name,
-        postCreateCopyFiles
+        postCreateCopyFiles,
+        directoryNameSeparator
       );
       if (isErr(copyResult)) {
         if (!copyError) {
@@ -22130,13 +22143,17 @@ var MAX_RETRIES = 10;
 function generate() {
   return (0, import_human_id.humanId)({ separator: "-", capitalize: false });
 }
-async function generateUniqueName(gitRoot, worktreesDirectory) {
+async function generateUniqueName(gitRoot, worktreesDirectory, directoryNameSeparator) {
   for (let i = 0; i < MAX_RETRIES; i++) {
     const name = generate();
     if (isErr(validateWorktreeName(name))) {
       continue;
     }
-    const worktreePath = getWorktreePathFromDirectory(worktreesDirectory, name);
+    const worktreePath = getWorktreePathFromDirectory(
+      worktreesDirectory,
+      name,
+      directoryNameSeparator
+    );
     if (await validateWorktreeDirectoryExists(worktreePath)) {
       continue;
     }
@@ -22394,7 +22411,8 @@ async function attachHandler(args2) {
     context.worktreesDirectory,
     branchName,
     postCreateCopyFiles,
-    context.config?.postCreate?.commands
+    context.config?.postCreate?.commands,
+    context.directoryNameSeparator
   );
   if (isErr(result)) {
     const error48 = result.error;
@@ -22725,19 +22743,19 @@ _phantom_completion() {
                 return 0
             elif [[ \${words[2]} == "get" ]]; then
                 if [[ \${cword} -eq 3 ]]; then
-                    local keys="editor ai worktreesDirectory"
+                    local keys="editor ai worktreesDirectory directoryNameSeparator"
                     COMPREPLY=( $(compgen -W "\${keys}" -- "\${cur}") )
                     return 0
                 fi
             elif [[ \${words[2]} == "set" ]]; then
                 if [[ \${cword} -eq 3 ]]; then
-                    local keys="editor ai worktreesDirectory"
+                    local keys="editor ai worktreesDirectory directoryNameSeparator"
                     COMPREPLY=( $(compgen -W "\${keys}" -- "\${cur}") )
                     return 0
                 fi
             elif [[ \${words[2]} == "remove" ]]; then
                 if [[ \${cword} -eq 3 ]]; then
-                    local keys="editor ai worktreesDirectory"
+                    local keys="editor ai worktreesDirectory directoryNameSeparator"
                     COMPREPLY=( $(compgen -W "\${keys}" -- "\${cur}") )
                     return 0
                 fi
@@ -22890,7 +22908,7 @@ complete -c phantom -n "__phantom_using_command" -a "exec" -d "Execute a command
 complete -c phantom -n "__phantom_using_command" -a "edit" -d "Open a worktree in your configured editor"
 complete -c phantom -n "__phantom_using_command" -a "ai" -d "Launch your configured AI coding assistant in a worktree"
 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 "preferences" -d "Manage editor/ai/worktreesDirectory preferences (stored in git config --global)"
+complete -c phantom -n "__phantom_using_command" -a "preferences" -d "Manage editor/ai/worktreesDirectory/directoryNameSeparator preferences (stored in git config --global)"
 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)"
 complete -c phantom -n "__phantom_using_command" -a "version" -d "Display phantom version information"
@@ -22957,9 +22975,9 @@ complete -c phantom -n "__phantom_using_command ai" -a "(__phantom_list_worktree
 
 # preferences command
 complete -c phantom -n "__phantom_using_command preferences" -a "get set remove" -d "Manage preferences"
-complete -c phantom -n "__phantom_using_command preferences get" -a "editor ai worktreesDirectory" -d "Preference key"
-complete -c phantom -n "__phantom_using_command preferences set" -a "editor ai worktreesDirectory" -d "Preference key"
-complete -c phantom -n "__phantom_using_command preferences remove" -a "editor ai worktreesDirectory" -d "Preference key"
+complete -c phantom -n "__phantom_using_command preferences get" -a "editor ai worktreesDirectory directoryNameSeparator" -d "Preference key"
+complete -c phantom -n "__phantom_using_command preferences set" -a "editor ai worktreesDirectory directoryNameSeparator" -d "Preference key"
+complete -c phantom -n "__phantom_using_command preferences remove" -a "editor ai worktreesDirectory directoryNameSeparator" -d "Preference key"
 
 # shell command options
 complete -c phantom -n "__phantom_using_command shell" -l fzf -d "Use fzf for interactive selection"
@@ -23013,7 +23031,7 @@ _phantom() {
         'edit:Open a worktree in your configured editor'
         'ai:Launch your configured AI coding assistant in a worktree'
         'shell:Open an interactive shell in a worktree directory'
-        'preferences:Manage editor/ai/worktreesDirectory preferences (git config --global)'
+        'preferences:Manage editor/ai/worktreesDirectory/directoryNameSeparator preferences (git config --global)'
         'github:GitHub integration commands'
         'gh:GitHub integration commands (alias)'
         'version:Display phantom version information'
@@ -23069,7 +23087,7 @@ _phantom() {
                     _arguments                         '1:worktree:(\${(q)worktrees[@]})'
                     ;;
                 preferences)
-                    _arguments                         '1:subcommand:(get set remove)'                         '2:key:(editor ai worktreesDirectory)'
+                    _arguments                         '1:subcommand:(get set remove)'                         '2:key:(editor ai worktreesDirectory directoryNameSeparator)'
                     ;;
                 completion)
                     _arguments                         '1:shell:(fish zsh bash)'
@@ -23193,7 +23211,8 @@ async function createHandler(args2) {
     if (!worktreeName) {
       const nameResult = await generateUniqueName(
         gitRoot,
-        context.worktreesDirectory
+        context.worktreesDirectory,
+        context.directoryNameSeparator
       );
       if (isErr(nameResult)) {
         exitWithError(nameResult.error.message, exitCodes.generalError);
@@ -23217,7 +23236,8 @@ async function createHandler(args2) {
         base: baseOption
       },
       filesToCopy.length > 0 ? filesToCopy : void 0,
-      context.config?.postCreate?.commands
+      context.config?.postCreate?.commands,
+      context.directoryNameSeparator
     );
     if (isErr(result)) {
       const exitCode = result.error instanceof WorktreeAlreadyExistsError ? exitCodes.validationError : exitCodes.generalError;
@@ -27511,7 +27531,8 @@ async function checkoutIssue(issue2, base) {
       base
     },
     context.config?.postCreate?.copyFiles,
-    context.config?.postCreate?.commands
+    context.config?.postCreate?.commands,
+    context.directoryNameSeparator
   );
   if (isErr(result)) {
     return err(result.error);
@@ -27573,7 +27594,8 @@ async function checkoutPullRequest(pullRequest, worktreeName = pullRequest.isFro
     context.worktreesDirectory,
     worktreeName,
     context.config?.postCreate?.copyFiles,
-    context.config?.postCreate?.commands
+    context.config?.postCreate?.commands,
+    context.directoryNameSeparator
   );
   if (isErr(attachResult)) {
     return err(attachResult.error);
@@ -31679,7 +31701,7 @@ function object2(shape, params) {
   return new ZodMiniObject(def);
 }
 
-// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.26.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-compat.js
+// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-compat.js
 function isZ4Schema(s) {
   const schema5 = s;
   return !!schema5._zod;
@@ -31823,7 +31845,7 @@ function getLiteralValue(schema5) {
   return void 0;
 }
 
-// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.26.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/types.js
+// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/types.js
 var LATEST_PROTOCOL_VERSION = "2025-11-25";
 var SUPPORTED_PROTOCOL_VERSIONS = [LATEST_PROTOCOL_VERSION, "2025-06-18", "2025-03-26", "2024-11-05", "2024-10-07"];
 var RELATED_TASK_META_KEY = "io.modelcontextprotocol/related-task";
@@ -33341,7 +33363,7 @@ var UrlElicitationRequiredError = class extends McpError {
   }
 };
 
-// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.26.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/interfaces.js
+// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/interfaces.js
 function isTerminal(status) {
   return status === "completed" || status === "failed" || status === "cancelled";
 }
@@ -34630,7 +34652,7 @@ var zodToJsonSchema = (schema5, options) => {
   return combined;
 };
 
-// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.26.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-json-schema-compat.js
+// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-json-schema-compat.js
 function mapMiniTarget(t) {
   if (!t)
     return "draft-7";
@@ -34672,7 +34694,7 @@ function parseWithCompat(schema5, data) {
   return result.data;
 }
 
-// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.26.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/protocol.js
+// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/protocol.js
 var DEFAULT_REQUEST_TIMEOUT_MSEC = 6e4;
 var Protocol = class {
   constructor(_options) {
@@ -35620,7 +35642,7 @@ function mergeCapabilities(base, additional) {
   return result;
 }
 
-// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.26.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/validation/ajv-provider.js
+// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/validation/ajv-provider.js
 var import_ajv = __toESM(require_ajv(), 1);
 var import_ajv_formats = __toESM(require_dist2(), 1);
 function createDefaultAjvInstance() {
@@ -35688,7 +35710,7 @@ var AjvJsonSchemaValidator = class {
   }
 };
 
-// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.26.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/server.js
+// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/server.js
 var ExperimentalServerTasks = class {
   constructor(_server) {
     this._server = _server;
@@ -35710,6 +35732,147 @@ var ExperimentalServerTasks = class {
   requestStream(request2, resultSchema, options) {
     return this._server.requestStream(request2, resultSchema, options);
   }
+  /**
+   * Sends a sampling request and returns an AsyncGenerator that yields response messages.
+   * The generator is guaranteed to end with either a 'result' or 'error' message.
+   *
+   * For task-augmented requests, yields 'taskCreated' and 'taskStatus' messages
+   * before the final result.
+   *
+   * @example
+   * ```typescript
+   * const stream = server.experimental.tasks.createMessageStream({
+   *     messages: [{ role: 'user', content: { type: 'text', text: 'Hello' } }],
+   *     maxTokens: 100
+   * }, {
+   *     onprogress: (progress) => {
+   *         // Handle streaming tokens via progress notifications
+   *         console.log('Progress:', progress.message);
+   *     }
+   * });
+   *
+   * for await (const message of stream) {
+   *     switch (message.type) {
+   *         case 'taskCreated':
+   *             console.log('Task created:', message.task.taskId);
+   *             break;
+   *         case 'taskStatus':
+   *             console.log('Task status:', message.task.status);
+   *             break;
+   *         case 'result':
+   *             console.log('Final result:', message.result);
+   *             break;
+   *         case 'error':
+   *             console.error('Error:', message.error);
+   *             break;
+   *     }
+   * }
+   * ```
+   *
+   * @param params - The sampling request parameters
+   * @param options - Optional request options (timeout, signal, task creation params, onprogress, etc.)
+   * @returns AsyncGenerator that yields ResponseMessage objects
+   *
+   * @experimental
+   */
+  createMessageStream(params, options) {
+    const clientCapabilities = this._server.getClientCapabilities();
+    if ((params.tools || params.toolChoice) && !clientCapabilities?.sampling?.tools) {
+      throw new Error("Client does not support sampling tools capability.");
+    }
+    if (params.messages.length > 0) {
+      const lastMessage = params.messages[params.messages.length - 1];
+      const lastContent = Array.isArray(lastMessage.content) ? lastMessage.content : [lastMessage.content];
+      const hasToolResults = lastContent.some((c) => c.type === "tool_result");
+      const previousMessage = params.messages.length > 1 ? params.messages[params.messages.length - 2] : void 0;
+      const previousContent = previousMessage ? Array.isArray(previousMessage.content) ? previousMessage.content : [previousMessage.content] : [];
+      const hasPreviousToolUse = previousContent.some((c) => c.type === "tool_use");
+      if (hasToolResults) {
+        if (lastContent.some((c) => c.type !== "tool_result")) {
+          throw new Error("The last message must contain only tool_result content if any is present");
+        }
+        if (!hasPreviousToolUse) {
+          throw new Error("tool_result blocks are not matching any tool_use from the previous message");
+        }
+      }
+      if (hasPreviousToolUse) {
+        const toolUseIds = new Set(previousContent.filter((c) => c.type === "tool_use").map((c) => c.id));
+        const toolResultIds = new Set(lastContent.filter((c) => c.type === "tool_result").map((c) => c.toolUseId));
+        if (toolUseIds.size !== toolResultIds.size || ![...toolUseIds].every((id) => toolResultIds.has(id))) {
+          throw new Error("ids of tool_result blocks and tool_use blocks from previous message do not match");
+        }
+      }
+    }
+    return this.requestStream({
+      method: "sampling/createMessage",
+      params
+    }, CreateMessageResultSchema, options);
+  }
+  /**
+   * Sends an elicitation request and returns an AsyncGenerator that yields response messages.
+   * The generator is guaranteed to end with either a 'result' or 'error' message.
+   *
+   * For task-augmented requests (especially URL-based elicitation), yields 'taskCreated'
+   * and 'taskStatus' messages before the final result.
+   *
+   * @example
+   * ```typescript
+   * const stream = server.experimental.tasks.elicitInputStream({
+   *     mode: 'url',
+   *     message: 'Please authenticate',
+   *     elicitationId: 'auth-123',
+   *     url: 'https://example.com/auth'
+   * }, {
+   *     task: { ttl: 300000 } // Task-augmented for long-running auth flow
+   * });
+   *
+   * for await (const message of stream) {
+   *     switch (message.type) {
+   *         case 'taskCreated':
+   *             console.log('Task created:', message.task.taskId);
+   *             break;
+   *         case 'taskStatus':
+   *             console.log('Task status:', message.task.status);
+   *             break;
+   *         case 'result':
+   *             console.log('User action:', message.result.action);
+   *             break;
+   *         case 'error':
+   *             console.error('Error:', message.error);
+   *             break;
+   *     }
+   * }
+   * ```
+   *
+   * @param params - The elicitation request parameters
+   * @param options - Optional request options (timeout, signal, task creation params, etc.)
+   * @returns AsyncGenerator that yields ResponseMessage objects
+   *
+   * @experimental
+   */
+  elicitInputStream(params, options) {
+    const clientCapabilities = this._server.getClientCapabilities();
+    const mode = params.mode ?? "form";
+    switch (mode) {
+      case "url": {
+        if (!clientCapabilities?.elicitation?.url) {
+          throw new Error("Client does not support url elicitation.");
+        }
+        break;
+      }
+      case "form": {
+        if (!clientCapabilities?.elicitation?.form) {
+          throw new Error("Client does not support form elicitation.");
+        }
+        break;
+      }
+    }
+    const normalizedParams = mode === "form" && params.mode === void 0 ? { ...params, mode: "form" } : params;
+    return this.requestStream({
+      method: "elicitation/create",
+      params: normalizedParams
+    }, ElicitResultSchema, options);
+  }
   /**
    * Gets the current status of a task.
    *
@@ -35760,7 +35923,7 @@ var ExperimentalServerTasks = class {
   }
 };
 
-// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.26.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/helpers.js
+// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/helpers.js
 function assertToolsCallTaskCapability(requests, method, entityName) {
   if (!requests) {
     throw new Error(`${entityName} does not support task creation (required for ${method})`);
@@ -35795,7 +35958,7 @@ function assertClientRequestTaskCapability(requests, method, entityName) {
   }
 }
 
-// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.26.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/server/index.js
+// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/server/index.js
 var Server = class extends Protocol {
   /**
    * Initializes this server with the given name and version information.
@@ -36175,7 +36338,7 @@ var Server = class extends Protocol {
   }
 };
 
-// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.26.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/server/completable.js
+// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/server/completable.js
 var COMPLETABLE_SYMBOL = /* @__PURE__ */ Symbol.for("mcp.completable");
 function isCompletable(schema5) {
   return !!schema5 && typeof schema5 === "object" && COMPLETABLE_SYMBOL in schema5;
@@ -36189,7 +36352,7 @@ var McpZodTypeKind;
   McpZodTypeKind2["Completable"] = "McpCompletable";
 })(McpZodTypeKind || (McpZodTypeKind = {}));
 
-// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.26.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/toolNameValidation.js
+// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/toolNameValidation.js
 var TOOL_NAME_REGEX = /^[A-Za-z0-9._-]{1,128}$/;
 function validateToolName(name) {
   const warnings = [];
@@ -36247,7 +36410,7 @@ function validateAndWarnToolName(name) {
   return result.isValid;
 }
 
-// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.26.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/mcp-server.js
+// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/mcp-server.js
 var ExperimentalMcpServerTasks = class {
   constructor(_mcpServer) {
     this._mcpServer = _mcpServer;
@@ -36262,7 +36425,7 @@ var ExperimentalMcpServerTasks = class {
   }
 };
 
-// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.26.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/server/mcp.js
+// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/server/mcp.js
 var McpServer = class {
   constructor(serverInfo, options) {
     this._registeredResources = {};
@@ -37048,10 +37211,10 @@ var EMPTY_COMPLETION_RESULT = {
   }
 };
 
-// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.26.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js
+// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js
 import process3 from "node:process";
 
-// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.26.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/stdio.js
+// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/stdio.js
 var ReadBuffer = class {
   append(chunk) {
     this._buffer = this._buffer ? Buffer.concat([this._buffer, chunk]) : chunk;
@@ -37079,7 +37242,7 @@ function serializeMessage(message) {
   return JSON.stringify(message) + "\n";
 }
 
-// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.26.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js
+// ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js
 var StdioServerTransport = class {
   constructor(_stdin = process3.stdin, _stdout = process3.stdout) {
     this._stdin = _stdin;
@@ -37142,28 +37305,30 @@ var StdioServerTransport = class {
 
 // ../mcp/package.json
 var package_default = {
-  name: "@aku11i/phantom-mcp",
-  version: "5.1.0",
+  name: "@phantompane/mcp",
+  version: "6.1.0",
   private: true,
   type: "module",
   main: "./src/index.ts",
   types: "./src/index.ts",
   scripts: {
+    lint: "oxfmt --check . && oxlint .",
+    fix: "oxfmt --write . && oxlint --fix .",
     typecheck: "tsc --noEmit",
     test: 'node --test --experimental-strip-types --experimental-test-module-mocks "src/**/*.test.js"',
     inspect: "npx @modelcontextprotocol/inspector node --no-warnings --experimental-strip-types src/dev.ts"
   },
   dependencies: {
-    "@aku11i/phantom-core": "workspace:*",
-    "@aku11i/phantom-git": "workspace:*",
-    "@aku11i/phantom-github": "workspace:*",
-    "@aku11i/phantom-process": "workspace:*",
-    "@aku11i/phantom-shared": "workspace:*",
-    "@modelcontextprotocol/sdk": "^1.26.0",
+    "@phantompane/core": "workspace:*",
+    "@phantompane/git": "workspace:*",
+    "@phantompane/github": "workspace:*",
+    "@phantompane/process": "workspace:*",
+    "@phantompane/shared": "workspace:*",
+    "@modelcontextprotocol/sdk": "^1.27.1",
     zod: "^4.3.6"
   },
   devDependencies: {
-    "@modelcontextprotocol/inspector": "^0.20.0"
+    "@modelcontextprotocol/inspector": "^0.21.1"
   }
 };
 
@@ -37188,7 +37353,8 @@ var createWorktreeTool = {
         base: baseBranch
       },
       context.config?.postCreate?.copyFiles,
-      context.config?.postCreate?.commands
+      context.config?.postCreate?.commands,
+      context.directoryNameSeparator
     );
     if (!isOk(result)) {
       throw new Error(result.error.message);
@@ -37440,6 +37606,10 @@ var preferencesHelp = {
       command: "phantom preferences set worktreesDirectory ../phantom-worktrees",
       description: "Store a custom worktreesDirectory (relative to the Git repository root) for all commands"
     },
+    {
+      command: 'phantom preferences set directoryNameSeparator "-"',
+      description: "Store a separator for flattening worktree directory names while keeping branch names unchanged"
+    },
     {
       command: "phantom preferences remove editor",
       description: "Remove the editor preference (fallback to env/default)"
@@ -37455,7 +37625,8 @@ var preferencesHelp = {
     "Supported keys:",
     "  editor - used by 'phantom edit', preferred over $EDITOR",
     "  ai - used by 'phantom ai'",
-    "  worktreesDirectory - path relative to the Git repo root for storing worktrees (defaults to .git/phantom/worktrees)"
+    "  worktreesDirectory - path relative to the Git repo root for storing worktrees (defaults to .git/phantom/worktrees)",
+    "  directoryNameSeparator - replaces '/' in worktree directory names only (defaults to / for nested directories)"
   ]
 };
 var preferencesGetHelp = {
@@ -37474,9 +37645,15 @@ var preferencesGetHelp = {
     {
       command: "phantom preferences get worktreesDirectory",
       description: "Show the preferred worktrees directory (relative to repo root)"
+    },
+    {
+      command: "phantom preferences get directoryNameSeparator",
+      description: "Show the preferred worktree directory name separator"
     }
   ],
-  notes: ["Supported keys: editor, ai, worktreesDirectory"]
+  notes: [
+    "Supported keys: editor, ai, worktreesDirectory, directoryNameSeparator"
+  ]
 };
 var preferencesSetHelp = {
   name: "preferences set",
@@ -37494,11 +37671,16 @@ var preferencesSetHelp = {
     {
       command: "phantom preferences set worktreesDirectory ../phantom-worktrees",
       description: "Store worktrees in ../phantom-worktrees relative to the Git repository root"
+    },
+    {
+      command: 'phantom preferences set directoryNameSeparator "-"',
+      description: "Flatten worktree directory names such as feature/test to feature-test"
     }
   ],
   notes: [
-    "Supported keys: editor, ai, worktreesDirectory",
-    "For worktreesDirectory, provide a path relative to the Git repository root; defaults to .git/phantom/worktrees when unset"
+    "Supported keys: editor, ai, worktreesDirectory, directoryNameSeparator",
+    "For worktreesDirectory, provide a path relative to the Git repository root; defaults to .git/phantom/worktrees when unset",
+    "For directoryNameSeparator, '/' keeps nested directories; any other string replaces '/' only in the directory path"
   ]
 };
 var preferencesRemoveHelp = {
@@ -37517,9 +37699,15 @@ var preferencesRemoveHelp = {
     {
       command: "phantom preferences remove worktreesDirectory",
       description: "Unset the custom worktrees directory preference"
+    },
+    {
+      command: "phantom preferences remove directoryNameSeparator",
+      description: "Restore nested worktree directories that follow branch slashes"
     }
   ],
-  notes: ["Supported keys: editor, ai, worktreesDirectory"]
+  notes: [
+    "Supported keys: editor, ai, worktreesDirectory, directoryNameSeparator"
+  ]
 };
 
 // src/handlers/preferences.ts
@@ -37533,7 +37721,12 @@ async function preferencesHandler(args2) {
 
 // src/handlers/preferences-get.ts
 import { parseArgs as parseArgs10 } from "node:util";
-var supportedKeys = ["editor", "ai", "worktreesDirectory"];
+var supportedKeys = [
+  "editor",
+  "ai",
+  "worktreesDirectory",
+  "directoryNameSeparator"
+];
 async function preferencesGetHandler(args2) {
   const { positionals } = parseArgs10({
     args: args2,
@@ -37556,7 +37749,7 @@ async function preferencesGetHandler(args2) {
   }
   try {
     const preferences = await loadPreferences();
-    const value = inputKey === "editor" ? preferences.editor : inputKey === "ai" ? preferences.ai : inputKey === "worktreesDirectory" ? preferences.worktreesDirectory : void 0;
+    const value = inputKey === "editor" ? preferences.editor : inputKey === "ai" ? preferences.ai : inputKey === "worktreesDirectory" ? preferences.worktreesDirectory : inputKey === "directoryNameSeparator" ? preferences.directoryNameSeparator : void 0;
     if (value === void 0) {
       output.log(
         `Preference '${inputKey}' is not set (git config --global phantom.${inputKey})`
@@ -37575,7 +37768,12 @@ async function preferencesGetHandler(args2) {
 
 // src/handlers/preferences-remove.ts
 import { parseArgs as parseArgs11 } from "node:util";
-var supportedKeys2 = ["editor", "ai", "worktreesDirectory"];
+var supportedKeys2 = [
+  "editor",
+  "ai",
+  "worktreesDirectory",
+  "directoryNameSeparator"
+];
 async function preferencesRemoveHandler(args2) {
   const { positionals } = parseArgs11({
     args: args2,
@@ -37614,7 +37812,12 @@ async function preferencesRemoveHandler(args2) {
 }
 
 // src/handlers/preferences-set.ts
-var supportedKeys3 = ["editor", "ai", "worktreesDirectory"];
+var supportedKeys3 = [
+  "editor",
+  "ai",
+  "worktreesDirectory",
+  "directoryNameSeparator"
+];
 async function preferencesSetHandler(args2) {
   if (args2.length < 2) {
     exitWithError(
@@ -37781,8 +37984,8 @@ import { parseArgs as parseArgs13 } from "node:util";
 
 // package.json
 var package_default2 = {
-  name: "@aku11i/phantom-cli",
-  version: "5.1.0",
+  name: "@phantompane/cli-private",
+  version: "6.1.0",
   private: true,
   type: "module",
   scripts: {
@@ -37791,6 +37994,8 @@ var package_default2 = {
     build: "node build.ts",
     precompile: "rm -f output/*",
     compile: "node --no-warnings --experimental-strip-types build-executable.ts",
+    lint: "oxfmt --check . && oxlint .",
+    fix: "oxfmt --write . && oxlint --fix .",
     typecheck: "tsc --noEmit",
     "test:shell": "pnpm run test:shell:bash && pnpm run test:shell:zsh && pnpm run test:shell:fish",
     "test:shell:bash": "node --test --experimental-strip-types --experimental-test-module-mocks src/completions/phantom.bash.test.shell.js",
@@ -37800,12 +38005,12 @@ var package_default2 = {
     prepublishOnly: "pnpm build"
   },
   dependencies: {
-    "@aku11i/phantom-core": "workspace:*",
-    "@aku11i/phantom-git": "workspace:*",
-    "@aku11i/phantom-github": "workspace:*",
-    "@aku11i/phantom-mcp": "workspace:*",
-    "@aku11i/phantom-process": "workspace:*",
-    "@aku11i/phantom-shared": "workspace:*"
+    "@phantompane/core": "workspace:*",
+    "@phantompane/git": "workspace:*",
+    "@phantompane/github": "workspace:*",
+    "@phantompane/mcp": "workspace:*",
+    "@phantompane/process": "workspace:*",
+    "@phantompane/shared": "workspace:*"
   }
 };