@damper/cli 0.5.15 → 0.5.17

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

package/dist/services/claude.js

@@ -1,6 +1,7 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as os from 'node:os';
+import { spawn } from 'node:child_process';
 import { execa } from 'execa';
 import pc from 'picocolors';
 const CLAUDE_SETTINGS_DIR = path.join(os.homedir(), '.claude');
@@ -110,26 +111,42 @@ export async function launchClaude(options) {
     console.log();
     // Build prompt - context is in TASK_CONTEXT.md, MCP is in .claude/settings.json
     const initialPrompt = `Read TASK_CONTEXT.md and work on task #${taskId}: ${taskTitle}`;
-    // Launch Claude Code
-    const { spawnSync } = await import('node:child_process');
     console.log(pc.dim(`Launching Claude in ${cwd}...`));
-    const result = spawnSync('claude', [initialPrompt], {
-        cwd,
-        stdio: 'inherit',
-        env: {
-            ...process.env,
-            DAMPER_API_KEY: apiKey,
-        },
+    // Launch Claude Code with proper signal handling to prevent orphaned processes
+    await new Promise((resolve) => {
+        const child = spawn('claude', [initialPrompt], {
+            cwd,
+            stdio: 'inherit',
+            env: {
+                ...process.env,
+                DAMPER_API_KEY: apiKey,
+            },
+        });
+        // Forward signals to child process
+        const forwardSignal = (signal) => {
+            if (!child.killed) {
+                child.kill(signal);
+            }
+        };
+        process.on('SIGINT', () => forwardSignal('SIGINT'));
+        process.on('SIGTERM', () => forwardSignal('SIGTERM'));
+        process.on('SIGHUP', () => forwardSignal('SIGHUP'));
+        child.on('error', (err) => {
+            if (err.code === 'ENOENT') {
+                console.log(pc.red('\nError: Claude Code CLI not found.'));
+                console.log(pc.dim('Install it with: npm install -g @anthropic-ai/claude-code\n'));
+                process.exit(1);
+            }
+            resolve();
+        });
+        child.on('close', () => {
+            // Clean up signal listeners
+            process.removeAllListeners('SIGINT');
+            process.removeAllListeners('SIGTERM');
+            process.removeAllListeners('SIGHUP');
+            resolve();
+        });
     });
-    // Check for errors
-    if (result.error) {
-        const error = result.error;
-        if (error.code === 'ENOENT') {
-            console.log(pc.red('\nError: Claude Code CLI not found.'));
-            console.log(pc.dim('Install it with: npm install -g @anthropic-ai/claude-code\n'));
-            process.exit(1);
-        }
-    }
     // Post-task flow
     console.log(pc.dim('\n─────────────────────────────────────────'));
     console.log(pc.bold('\nClaude session ended.\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.15",
+  "version": "0.5.17",
   "description": "CLI tool for orchestrating Damper task workflows with Claude Code",
   "author": "Damper <hello@usedamper.com>",
   "repository": {