@damper/cli 0.5.14 → 0.5.16

package/dist/commands/start.js

@@ -1,7 +1,7 @@
 import * as fs from 'node:fs';
 import pc from 'picocolors';
 import { createDamperApi } from '../services/damper-api.js';
-import { createWorktree, getGitRoot } from '../services/worktree.js';
+import { createWorktree, getMainProjectRoot } from '../services/worktree.js';
 import { bootstrapContext, refreshContext } from '../services/context-bootstrap.js';
 import { pickTask } from '../ui/task-picker.js';
 import { launchClaude, postTaskFlow, isClaudeInstalled, isDamperMcpConfigured, configureDamperMcp } from '../services/claude.js';
@@ -15,10 +15,10 @@ export async function startCommand(options) {
         console.log(pc.dim('Install it with: npm install -g @anthropic-ai/claude-code\n'));
         process.exit(1);
     }
-    // Get project root (git root)
+    // Get project root (main repo, not a worktree)
     let projectRoot;
     try {
-        projectRoot = await getGitRoot(process.cwd());
+        projectRoot = await getMainProjectRoot(process.cwd());
     }
     catch {
         console.log(pc.red('\nError: Not in a git repository.'));

package/dist/index.js

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

package/dist/services/claude.js

@@ -274,26 +274,23 @@ export async function postTaskFlow(options) {
         }
     }
     else if (taskStatus === 'in_progress') {
-        // Task not completed - offer options
-        const action = await select({
-            message: 'Task is still in progress. What would you like to do?',
-            choices: [
-                { name: 'Keep for later (resume with npx @damper/cli)', value: 'keep' },
-                { name: 'Release task and remove worktree', value: 'release' },
-            ],
+        // Task not completed - always release the lock, optionally remove worktree
+        console.log(pc.dim('\nReleasing task lock...'));
+        try {
+            const api = createDamperApi(apiKey);
+            await api.abandonTask(taskId, 'Session ended via CLI');
+            console.log(pc.green(`✓ Task released back to planned status`));
+        }
+        catch (err) {
+            const error = err;
+            console.log(pc.yellow(`Could not release task: ${error.message}`));
+        }
+        // Ask about worktree cleanup
+        const shouldRemove = await confirm({
+            message: 'Remove worktree and branch?',
+            default: false,
         });
-        if (action === 'release') {
-            // Release the task back to planned
-            try {
-                const api = createDamperApi(apiKey);
-                await api.abandonTask(taskId, 'Released via CLI');
-                console.log(pc.green(`✓ Task released back to planned status`));
-            }
-            catch (err) {
-                const error = err;
-                console.log(pc.yellow(`Could not release task: ${error.message}`));
-            }
-            // Remove worktree
+        if (shouldRemove) {
             try {
                 await removeWorktreeDir(cwd, projectRoot);
                 console.log(pc.green('✓ Worktree and branch removed\n'));
@@ -304,7 +301,7 @@ export async function postTaskFlow(options) {
             }
         }
         else {
-            console.log(pc.dim('\nRun `npx @damper/cli` to resume later.\n'));
+            console.log(pc.dim('\nWorktree kept. Run `npx @damper/cli cleanup` to remove later.\n'));
         }
     }
 }

package/dist/services/worktree.d.ts

@@ -33,3 +33,8 @@ export declare function isInWorktree(dir: string): Promise<boolean>;
  * Get the git root directory
  */
 export declare function getGitRoot(dir: string): Promise<string>;
+/**
+ * Get the main project root (not a worktree).
+ * If we're in a worktree, this returns the main repo's path.
+ */
+export declare function getMainProjectRoot(dir: string): Promise<string>;

package/dist/services/worktree.js

@@ -418,3 +418,33 @@ export async function getGitRoot(dir) {
     });
     return stdout.trim();
 }
+/**
+ * Get the main project root (not a worktree).
+ * If we're in a worktree, this returns the main repo's path.
+ */
+export async function getMainProjectRoot(dir) {
+    // Get the common git directory (shared by all worktrees)
+    const { stdout: gitCommonDir } = await execa('git', ['rev-parse', '--git-common-dir'], {
+        cwd: dir,
+        stdio: 'pipe',
+    });
+    const commonDir = gitCommonDir.trim();
+    // If it's just '.git', we're in the main repo
+    if (commonDir === '.git') {
+        return getGitRoot(dir);
+    }
+    // Otherwise, the common dir is something like '/path/to/main-repo/.git'
+    // Strip the '/.git' to get the main repo path
+    if (commonDir.endsWith('/.git')) {
+        return commonDir.slice(0, -5);
+    }
+    // Fallback: resolve relative path
+    const gitRoot = await getGitRoot(dir);
+    const resolvedCommon = path.resolve(gitRoot, commonDir);
+    // Strip .git suffix
+    if (resolvedCommon.endsWith('.git')) {
+        return resolvedCommon.slice(0, -4);
+    }
+    // Last resort: just return git root
+    return gitRoot;
+}

package/package.json

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