@damper/cli 0.1.1 → 0.1.2

package/dist/commands/cleanup.js

@@ -1,9 +1,22 @@
 import * as fs from 'node:fs';
 import { confirm, checkbox } from '@inquirer/prompts';
+import { execa } from 'execa';
 import pc from 'picocolors';
 import { getWorktrees, cleanupStaleWorktrees, removeWorktree } from '../services/state.js';
 import { createDamperApi } from '../services/damper-api.js';
 import { removeWorktreeDir } from '../services/worktree.js';
+async function hasUncommittedChanges(worktreePath) {
+    try {
+        const { stdout } = await execa('git', ['status', '--porcelain'], {
+            cwd: worktreePath,
+            stdio: 'pipe',
+        });
+        return stdout.trim().length > 0;
+    }
+    catch {
+        return false;
+    }
+}
 export async function cleanupCommand() {
     // Clean up stale entries first
     const stale = cleanupStaleWorktrees();
@@ -37,6 +50,8 @@ export async function cleanupCommand() {
             });
             continue;
         }
+        // Check for uncommitted changes
+        const uncommitted = await hasUncommittedChanges(wt.path);
         if (api) {
             try {
                 const task = await api.getTask(wt.taskId);
@@ -45,6 +60,7 @@ export async function cleanupCommand() {
                         worktree: wt,
                         task,
                         reason: 'completed',
+                        hasUncommittedChanges: uncommitted,
                     });
                 }
                 else if (task.status === 'planned' && !task.lockedBy) {
@@ -53,6 +69,7 @@ export async function cleanupCommand() {
                         worktree: wt,
                         task,
                         reason: 'abandoned',
+                        hasUncommittedChanges: uncommitted,
                     });
                 }
             }
@@ -61,6 +78,7 @@ export async function cleanupCommand() {
                 candidates.push({
                     worktree: wt,
                     reason: 'manual',
+                    hasUncommittedChanges: uncommitted,
                 });
             }
         }
@@ -69,6 +87,7 @@ export async function cleanupCommand() {
             candidates.push({
                 worktree: wt,
                 reason: 'manual',
+                hasUncommittedChanges: uncommitted,
             });
         }
     }
@@ -99,10 +118,15 @@ export async function cleanupCommand() {
                 reasonBadge = pc.dim('[manual]');
                 break;
         }
+        // Warning for uncommitted changes
+        const uncommittedWarning = c.hasUncommittedChanges
+            ? pc.red(' ⚠ uncommitted changes')
+            : '';
         return {
-            name: `${description} ${reasonBadge}\n    ${pc.dim(worktreeName)}`,
+            name: `${description} ${reasonBadge}${uncommittedWarning}\n    ${pc.dim(worktreeName)}`,
             value: c,
-            checked: c.reason === 'completed' || c.reason === 'missing',
+            // Don't auto-check if there are uncommitted changes
+            checked: (c.reason === 'completed' || c.reason === 'missing') && !c.hasUncommittedChanges,
         };
     });
     const selected = await checkbox({
@@ -114,9 +138,17 @@ export async function cleanupCommand() {
         console.log(pc.dim('\nNo worktrees selected. Nothing to clean up.\n'));
         return;
     }
+    // Check for uncommitted changes in selected worktrees
+    const withUncommitted = selected.filter(c => c.hasUncommittedChanges);
+    if (withUncommitted.length > 0) {
+        console.log(pc.yellow(`\n⚠ Warning: ${withUncommitted.length} worktree(s) have uncommitted changes that will be lost!`));
+    }
     // Confirm
+    const confirmMessage = withUncommitted.length > 0
+        ? `Remove ${selected.length} worktree(s)? (${withUncommitted.length} with uncommitted changes)`
+        : `Remove ${selected.length} worktree(s)?`;
     const confirmed = await confirm({
-        message: `Remove ${selected.length} worktree(s)?`,
+        message: confirmMessage,
         default: false,
     });
     if (!confirmed) {

package/dist/commands/setup.js

@@ -17,7 +17,7 @@ export async function setupCommand() {
     const apiKey = getConfiguredApiKey();
     if (mcpConfigured && apiKey) {
         console.log(pc.green('✓ Damper MCP configured'));
-        console.log(pc.dim(`  API key: ${apiKey.slice(0, 8)}...${apiKey.slice(-4)}`));
+        console.log(pc.dim(`  API key: ${'*'.repeat(12)} (${apiKey.length} chars)`));
         // Verify the API key works
         console.log(pc.dim('\nVerifying API key...'));
         try {

package/dist/services/worktree.js

@@ -165,16 +165,19 @@ export async function createWorktree(options) {
     }
     // Copy .env files
     const envFiles = findEnvFiles(projectRoot);
-    for (const envFile of envFiles) {
-        const source = path.join(projectRoot, envFile);
-        const target = path.join(worktreePath, envFile);
-        // Ensure parent directory exists
-        const targetDir = path.dirname(target);
-        if (!fs.existsSync(targetDir)) {
-            fs.mkdirSync(targetDir, { recursive: true });
+    if (envFiles.length > 0) {
+        console.log(pc.dim(`Copying ${envFiles.length} .env file(s) to worktree...`));
+        for (const envFile of envFiles) {
+            const source = path.join(projectRoot, envFile);
+            const target = path.join(worktreePath, envFile);
+            // Ensure parent directory exists
+            const targetDir = path.dirname(target);
+            if (!fs.existsSync(targetDir)) {
+                fs.mkdirSync(targetDir, { recursive: true });
+            }
+            console.log(pc.dim(`  ${envFile}`));
+            await fs.promises.copyFile(source, target);
         }
-        console.log(pc.dim(`Copying ${envFile}...`));
-        await fs.promises.copyFile(source, target);
     }
     // Save to state
     const worktreeState = {

package/package.json

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