@damper/cli 0.2.1 → 0.2.3

package/dist/index.js

@@ -4,7 +4,7 @@ import { startCommand } from './commands/start.js';
 import { statusCommand } from './commands/status.js';
 import { cleanupCommand } from './commands/cleanup.js';
 import { setupCommand } from './commands/setup.js';
-const VERSION = '0.2.1';
+const VERSION = '0.2.3';
 function showHelp() {
     console.log(`
 ${pc.bold('@damper/cli')} - Agent orchestration for Damper tasks

package/dist/services/worktree.js

@@ -126,6 +126,21 @@ function findEnvFiles(projectRoot) {
     }
     return envFiles;
 }
+/**
+ * Check if a git branch exists
+ */
+async function branchExists(branchName, projectRoot) {
+    try {
+        await execa('git', ['rev-parse', '--verify', branchName], {
+            cwd: projectRoot,
+            stdio: 'pipe',
+        });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 /**
  * Create a new git worktree for a task
  */
@@ -141,15 +156,62 @@ export async function createWorktree(options) {
         };
     }
     const projectName = getProjectName(projectRoot);
+    const shortTaskId = taskId.slice(0, 8);
     const slug = slugify(taskTitle);
-    const worktreePath = path.resolve(projectRoot, '..', `${projectName}-${slug}`);
+    // Use short task ID for directory (keeps paths short), full slug for branch (more descriptive)
+    const worktreePath = path.resolve(projectRoot, '..', `${projectName}-${shortTaskId}`);
     const branchName = `feature/${slug}`;
+    // Check if worktree directory already exists
+    if (fs.existsSync(worktreePath)) {
+        console.log(pc.dim(`Worktree directory already exists at ${worktreePath}`));
+        // Check if it's a valid worktree and has the expected branch
+        try {
+            const { stdout } = await execa('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
+                cwd: worktreePath,
+                stdio: 'pipe',
+            });
+            const currentBranch = stdout.trim();
+            console.log(pc.dim(`Using existing worktree on branch ${currentBranch}`));
+            // Save to state if not tracked
+            const worktreeState = {
+                taskId,
+                path: worktreePath,
+                branch: currentBranch,
+                projectRoot,
+                createdAt: new Date().toISOString(),
+            };
+            addWorktree(worktreeState);
+            return {
+                path: worktreePath,
+                branch: currentBranch,
+                isNew: false,
+            };
+        }
+        catch {
+            // Not a valid git worktree, remove it
+            console.log(pc.dim(`Removing invalid directory at ${worktreePath}...`));
+            fs.rmSync(worktreePath, { recursive: true });
+        }
+    }
+    // Check if branch already exists
+    const branchAlreadyExists = await branchExists(branchName, projectRoot);
     // Create worktree
     console.log(pc.dim(`Creating worktree at ${worktreePath}...`));
-    await execa('git', ['worktree', 'add', worktreePath, '-b', branchName], {
-        cwd: projectRoot,
-        stdio: 'pipe',
-    });
+    if (branchAlreadyExists) {
+        // Use existing branch
+        console.log(pc.dim(`Using existing branch ${branchName}`));
+        await execa('git', ['worktree', 'add', worktreePath, branchName], {
+            cwd: projectRoot,
+            stdio: 'pipe',
+        });
+    }
+    else {
+        // Create new branch
+        await execa('git', ['worktree', 'add', worktreePath, '-b', branchName], {
+            cwd: projectRoot,
+            stdio: 'pipe',
+        });
+    }
     // Symlink node_modules
     const nodeModulesDirs = findNodeModulesDirs(projectRoot);
     for (const dir of nodeModulesDirs) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@damper/cli",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "CLI tool for orchestrating Damper task workflows with Claude Code",
   "author": "Damper <hello@usedamper.com>",
   "repository": {