workon 3.5.0 → 3.5.2

package/dist/cli.js

@@ -269,10 +269,11 @@ var init_project = __esm({
         return this._events;
       }
       set path(path8) {
-        if (this._base) {
+        const pathFile = File.from(path8);
+        if (this._base && !pathFile.isAbsolute()) {
           this._path = this._base.join(path8);
         } else {
-          this._path = File.from(path8);
+          this._path = pathFile;
         }
         this._path = this._path.absolutify();
       }
@@ -365,17 +366,17 @@ var init_environment = __esm({
           return this.projects;
         }
         const defaults = this.config.getDefaults();
-        if (!defaults?.base) {
-          this.projects = [];
-          return this.projects;
-        }
-        const baseDir = File2.from(defaults.base);
+        const baseDir = defaults?.base ? File2.from(defaults.base).absolutify() : null;
         const projectsMap = this.config.getProjects();
-        this.projects = Object.entries(projectsMap).map(([name, project]) => ({
-          ...project,
-          name,
-          path: baseDir.join(project.path)
-        }));
+        this.projects = Object.entries(projectsMap).map(([name, project]) => {
+          const projectPath = File2.from(project.path);
+          const resolvedPath = baseDir && !projectPath.isAbsolute() ? baseDir.join(project.path) : projectPath;
+          return {
+            ...project,
+            name,
+            path: resolvedPath
+          };
+        });
         return this.projects;
       }
       static getProjectEnvironment(base, _matching) {
@@ -1568,11 +1569,12 @@ var init_worktree = __esm({
         if (worktree.isMain) {
           throw new Error("Cannot remove the main worktree");
         }
-        if (!force && await this.hasUncommittedChanges(name)) {
+        const pathMissing = !existsSync2(worktree.path);
+        if (!pathMissing && !force && await this.hasUncommittedChanges(name)) {
           throw new Error(`Worktree '${name}' has uncommitted changes. Use --force to remove anyway.`);
         }
         const args = ["worktree", "remove"];
-        if (force) {
+        if (force || pathMissing) {
           args.push("--force");
         }
         args.push(worktree.path);
@@ -1591,6 +1593,9 @@ var init_worktree = __esm({
         if (!worktree) {
           throw new Error(`Worktree '${nameOrPath}' not found`);
         }
+        if (!existsSync2(worktree.path)) {
+          return false;
+        }
         const worktreeGit = simpleGit2(worktree.path);
         const status = await worktreeGit.status();
         return !status.isClean();
@@ -1932,6 +1937,7 @@ var init_utils = __esm({
 import { Command } from "commander";
 import chalk from "chalk";
 import path2 from "path";
+import { existsSync as existsSync3 } from "fs";
 function createListCommand(ctx) {
   const { config, log } = ctx;
   return new Command("list").description("List worktrees for the current project").option("-a, --all", "Show all worktrees (including main)").action(async (options) => {
@@ -1965,9 +1971,10 @@ Worktrees for ${displayName}:`));
     for (const wt of worktrees) {
       const isManaged = managedPaths.has(wt.path);
       const mainLabel = wt.isMain ? chalk.gray(" (main)") : "";
-      const externalLabel = !wt.isMain && !isManaged ? chalk.yellow(" (external)") : "";
+      const missingLabel = !wt.isMain && !existsSync3(wt.path) ? chalk.red(" (missing)") : "";
+      const externalLabel = !wt.isMain && !isManaged && !missingLabel ? chalk.yellow(" (external)") : "";
       const branchDisplay = wt.branch === "(detached)" ? chalk.yellow(wt.branch) : chalk.green(wt.branch);
-      console.log(`  ${chalk.cyan(wt.name)}${mainLabel}${externalLabel}`);
+      console.log(`  ${chalk.cyan(wt.name)}${mainLabel}${missingLabel}${externalLabel}`);
       console.log(`    Branch: ${branchDisplay}`);
       console.log(`    Path:   ${chalk.gray(wt.path)}`);
       console.log(`    HEAD:   ${chalk.gray(wt.head.substring(0, 8))}`);
@@ -2104,6 +2111,7 @@ import { Command as Command3 } from "commander";
 import chalk3 from "chalk";
 import ora2 from "ora";
 import path3 from "path";
+import { existsSync as existsSync4 } from "fs";
 import { confirm as confirm5 } from "@inquirer/prompts";
 function createRemoveCommand(ctx) {
   const { config, log } = ctx;
@@ -2133,22 +2141,29 @@ function createRemoveCommand(ctx) {
       log.error("Cannot remove the main worktree");
       process.exit(1);
     }
-    const hasChanges = await manager.hasUncommittedChanges(name);
-    if (hasChanges && !options.force) {
-      log.warn(`Worktree '${name}' has uncommitted changes.`);
-      if (!options.yes) {
-        const shouldForce = await confirm5({
-          message: "Do you want to force removal and lose these changes?",
-          default: false
-        });
-        if (!shouldForce) {
-          log.info("Removal cancelled.");
-          return;
+    const pathMissing = !existsSync4(worktree.path);
+    if (pathMissing) {
+      log.warn(`Worktree directory is missing from disk: ${worktree.path}`);
+      options.force = true;
+    }
+    if (!pathMissing) {
+      const hasChanges = await manager.hasUncommittedChanges(name);
+      if (hasChanges && !options.force) {
+        log.warn(`Worktree '${name}' has uncommitted changes.`);
+        if (!options.yes) {
+          const shouldForce = await confirm5({
+            message: "Do you want to force removal and lose these changes?",
+            default: false
+          });
+          if (!shouldForce) {
+            log.info("Removal cancelled.");
+            return;
+          }
+          options.force = true;
+        } else {
+          log.error("Use --force to remove worktrees with uncommitted changes.");
+          process.exit(1);
         }
-        options.force = true;
-      } else {
-        log.error("Use --force to remove worktrees with uncommitted changes.");
-        process.exit(1);
       }
     }
     if (!options.yes) {
@@ -2904,7 +2919,7 @@ async function initProject(defaultName, fromUser, ctx) {
       default: defaults?.base ? File5.from(defaults.base).join(name).path : name
     });
     let answerFile = File5.from(pathAnswer);
-    const defaultBase = defaults?.base ? File5.from(defaults.base) : File5.cwd();
+    const defaultBase = defaults?.base ? File5.from(defaults.base).absolutify() : File5.cwd();
     if (!answerFile.isAbsolute()) {
       answerFile = defaultBase.join(answerFile.path);
     }
@@ -2918,7 +2933,8 @@ async function initProject(defaultName, fromUser, ctx) {
     } catch {
       answerFile = answerFile.absolutify();
     }
-    basePath = answerFile.relativize(defaultBase.path).path;
+    const relPath = answerFile.relativize(defaultBase.path);
+    basePath = relPath && !relPath.path.startsWith("..") ? relPath.path : answerFile.path;
   }
   const ide = await select4({
     message: "What is the IDE?",
@@ -3111,18 +3127,21 @@ async function createProjectManage(ctx) {
       return true;
     }
   });
-  const defaultPath = defaults?.base ? File5.from(defaults.base).join(name).path : name;
+  const defaultPath = defaults?.base ? File5.from(defaults.base).absolutify().join(name).path : name;
   const pathInput = await input5({
     message: "Project path:",
     default: defaultPath
   });
   let relativePath = pathInput;
   if (defaults?.base) {
-    const baseDir = File5.from(defaults.base);
+    const baseDir = File5.from(defaults.base).absolutify();
     const pathFile = File5.from(pathInput);
     try {
       if (pathFile.isAbsolute()) {
-        relativePath = pathFile.relativize(baseDir.path).path;
+        const relPath = pathFile.relativize(baseDir.path);
+        if (relPath && !relPath.path.startsWith("..")) {
+          relativePath = relPath.path;
+        }
       }
     } catch {
       relativePath = pathInput;
@@ -3183,11 +3202,14 @@ async function editProjectManage(ctx) {
   });
   let relativePath = pathInput;
   if (defaults?.base) {
-    const baseDir = File5.from(defaults.base);
+    const baseDir = File5.from(defaults.base).absolutify();
     const pathFile = File5.from(pathInput);
     try {
       if (pathFile.isAbsolute()) {
-        relativePath = pathFile.relativize(baseDir.path).path;
+        const relPath = pathFile.relativize(baseDir.path);
+        if (relPath && !relPath.path.startsWith("..")) {
+          relativePath = relPath.path;
+        }
       }
     } catch {
       relativePath = pathInput;
@@ -4097,7 +4119,7 @@ init_environment();
 init_registry();
 init_open2();
 import { Command as Command16 } from "commander";
-import { readFileSync as readFileSync2, existsSync as existsSync4 } from "fs";
+import { readFileSync as readFileSync2, existsSync as existsSync6 } from "fs";
 import { join as join2, dirname as dirname2 } from "path";
 import { fileURLToPath } from "url";
 import loog from "loog";
@@ -4277,10 +4299,13 @@ async function createProject(ctx) {
   });
   let relativePath = pathInput;
   if (defaults?.base) {
-    const baseDir = File7.from(defaults.base);
+    const baseDir = File7.from(defaults.base).absolutify();
     const pathFile = File7.from(pathInput);
     try {
-      relativePath = pathFile.relativize(baseDir.path).path;
+      const relPath = pathFile.relativize(baseDir.path);
+      if (relPath && !relPath.path.startsWith("..")) {
+        relativePath = relPath.path;
+      }
     } catch {
       relativePath = pathInput;
     }
@@ -4352,11 +4377,14 @@ async function editProject(ctx) {
   });
   let relativePath = pathInput;
   if (defaults?.base) {
-    const baseDir = File7.from(defaults.base);
+    const baseDir = File7.from(defaults.base).absolutify();
     const pathFile = File7.from(pathInput);
     try {
       if (pathFile.isAbsolute()) {
-        relativePath = pathFile.relativize(baseDir.path).path;
+        const relPath = pathFile.relativize(baseDir.path);
+        if (relPath && !relPath.path.startsWith("..")) {
+          relativePath = relPath.path;
+        }
       }
     } catch {
       relativePath = pathInput;
@@ -4464,7 +4492,7 @@ async function listProjects(ctx) {
 
 // src/commands/add.ts
 import { Command as Command14 } from "commander";
-import { existsSync as existsSync3, readFileSync } from "fs";
+import { existsSync as existsSync5, readFileSync } from "fs";
 import { basename as basename2, resolve } from "path";
 import File8 from "phylo";
 import { confirm as confirm10 } from "@inquirer/prompts";
@@ -4486,7 +4514,7 @@ async function addProject(pathArg, options, ctx) {
   const projects = config.getProjects();
   const targetPath = resolve(pathArg);
   log.debug(`Resolved path: ${targetPath}`);
-  if (!existsSync3(targetPath)) {
+  if (!existsSync5(targetPath)) {
     log.error(`Path does not exist: ${targetPath}`);
     process.exit(1);
   }
@@ -4524,7 +4552,7 @@ async function addProject(pathArg, options, ctx) {
   log.debug(`IDE: ${ide}`);
   let relativePath = targetPath;
   if (defaults?.base) {
-    const baseDir = File8.from(defaults.base);
+    const baseDir = File8.from(defaults.base).absolutify();
     try {
       const relPath = pathFile.relativize(baseDir.path);
       if (relPath && !relPath.path.startsWith("..")) {
@@ -4570,7 +4598,7 @@ function discoverProject(targetPath, log) {
     packageJson: null
   };
   const packageJsonPath = resolve(targetPath, "package.json");
-  if (existsSync3(packageJsonPath)) {
+  if (existsSync5(packageJsonPath)) {
     discovery.isNode = true;
     log.debug("Detected Node project (package.json found)");
     try {
@@ -4586,25 +4614,25 @@ function discoverProject(targetPath, log) {
     }
   }
   const bunLockPath = resolve(targetPath, "bun.lockb");
-  if (existsSync3(bunLockPath)) {
+  if (existsSync5(bunLockPath)) {
     discovery.isBun = true;
     log.debug("Detected Bun project (bun.lockb found)");
   }
   const vscodeDir = resolve(targetPath, ".vscode");
   const cursorDir = resolve(targetPath, ".cursor");
   const ideaDir = resolve(targetPath, ".idea");
-  if (existsSync3(cursorDir)) {
+  if (existsSync5(cursorDir)) {
     discovery.detectedIde = "cursor";
     log.debug("Detected Cursor (.cursor directory found)");
-  } else if (existsSync3(vscodeDir)) {
+  } else if (existsSync5(vscodeDir)) {
     discovery.detectedIde = "code";
     log.debug("Detected VS Code (.vscode directory found)");
-  } else if (existsSync3(ideaDir)) {
+  } else if (existsSync5(ideaDir)) {
     discovery.detectedIde = "idea";
     log.debug("Detected IntelliJ IDEA (.idea directory found)");
   }
   const claudeMdPath = resolve(targetPath, "CLAUDE.md");
-  if (existsSync3(claudeMdPath)) {
+  if (existsSync5(claudeMdPath)) {
     discovery.hasClaude = true;
     log.debug("Detected Claude Code project (CLAUDE.md found)");
   }
@@ -4900,7 +4928,7 @@ function findPackageJson() {
     join2(process.cwd(), "package.json")
   ];
   for (const p of paths) {
-    if (existsSync4(p)) {
+    if (existsSync6(p)) {
       return p;
     }
   }