@damper/cli 0.3.3 → 0.3.4

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.3.3';
+const VERSION = '0.3.4';
 function showHelp() {
     console.log(`
 ${pc.bold('@damper/cli')} - Agent orchestration for Damper tasks

package/dist/services/worktree.d.ts

@@ -13,7 +13,7 @@ export interface WorktreeResult {
  */
 export declare function createWorktree(options: WorktreeOptions): Promise<WorktreeResult>;
 /**
- * Remove a git worktree
+ * Remove a git worktree and its branch
  */
 export declare function removeWorktreeDir(worktreePath: string, projectRoot: string): Promise<void>;
 /**

package/dist/services/worktree.js

@@ -257,10 +257,22 @@ export async function createWorktree(options) {
     };
 }
 /**
- * Remove a git worktree
+ * Remove a git worktree and its branch
  */
 export async function removeWorktreeDir(worktreePath, projectRoot) {
     console.log(pc.dim(`Removing worktree at ${worktreePath}...`));
+    // Get branch name before removing worktree
+    let branchName;
+    try {
+        const { stdout } = await execa('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
+            cwd: worktreePath,
+            stdio: 'pipe',
+        });
+        branchName = stdout.trim();
+    }
+    catch {
+        // Ignore - might not be able to get branch
+    }
     // Remove symlinks first to avoid issues
     const nodeModulesDirs = findNodeModulesDirs(projectRoot);
     for (const dir of nodeModulesDirs) {
@@ -279,6 +291,29 @@ export async function removeWorktreeDir(worktreePath, projectRoot) {
         cwd: projectRoot,
         stdio: 'pipe',
     });
+    // Delete the branch if it's a feature branch
+    if (branchName && branchName.startsWith('feature/')) {
+        try {
+            await execa('git', ['branch', '-d', branchName], {
+                cwd: projectRoot,
+                stdio: 'pipe',
+            });
+            console.log(pc.dim(`Deleted branch: ${branchName}`));
+        }
+        catch {
+            // Branch might not be fully merged - try force delete
+            try {
+                await execa('git', ['branch', '-D', branchName], {
+                    cwd: projectRoot,
+                    stdio: 'pipe',
+                });
+                console.log(pc.dim(`Force deleted branch: ${branchName}`));
+            }
+            catch {
+                console.log(pc.yellow(`Could not delete branch: ${branchName}`));
+            }
+        }
+    }
     // Get the worktree state to find the task ID
     const state = await import('./state.js');
     const worktree = state.getWorktreeByPath(worktreePath);

package/dist/templates/TASK_CONTEXT.md.js

@@ -33,13 +33,12 @@ export function generateTaskContext(options) {
     lines.push('- Generated this TASK_CONTEXT.md from Damper API');
     lines.push('- Configured Damper MCP tools for task lifecycle');
     lines.push('');
-    lines.push('**Help improve the tooling:** As you work, if you encounter:');
-    lines.push('- Friction or bugs in the CLI or MCP tools');
-    lines.push('- Missing context that would help future agents');
-    lines.push('- Ideas to improve the workflow or prompts');
+    lines.push('**Cleanup:** When done, call `complete_task` or `abandon_task`. The user will run');
+    lines.push('`npx @damper/cli cleanup` to remove the worktree and branch - you don\'t need to');
+    lines.push('provide manual cleanup instructions.');
     lines.push('');
-    lines.push('Use `report_issue` (category: error, feature_request, or improvement) to log them.');
-    lines.push('Your feedback directly improves the tooling for all future tasks.');
+    lines.push('**Help improve the tooling:** If you encounter friction, bugs, or have ideas,');
+    lines.push('use `report_issue` to log them. Your feedback improves tooling for all future tasks.');
     lines.push('');
     // Task Description
     if (task.description) {

package/package.json

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