@damper/cli 0.8.0 → 0.9.0

package/dist/services/claude.js

@@ -274,17 +274,41 @@ export async function postTaskFlow(options) {
             console.log(pc.dim('Keeping changes local.\n'));
         }
         else if (mergeAction === 'merge') {
-            // Merge directly to main
+            // Merge directly to main — first merge main into feature to resolve conflicts
             try {
                 const { execa } = await import('execa');
-                console.log(pc.dim('Switching to main and merging...'));
                 // Fetch latest main
                 await execa('git', ['fetch', 'origin', 'main'], { cwd, stdio: 'pipe' });
-                // Checkout main in the main project root (not worktree)
-                await execa('git', ['checkout', 'main'], { cwd: projectRoot, stdio: 'pipe' });
-                // Merge the feature branch
-                await execa('git', ['merge', currentBranch, '--no-edit'], { cwd: projectRoot, stdio: 'inherit' });
-                console.log(pc.green('✓ Merged to main locally\n'));
+                // Step 1: Merge origin/main INTO the feature branch (in worktree)
+                console.log(pc.dim('Merging main into feature branch...'));
+                let mainMergedIntoFeature = false;
+                try {
+                    await execa('git', ['merge', 'origin/main', '--no-edit'], { cwd, stdio: 'pipe' });
+                    mainMergedIntoFeature = true;
+                    console.log(pc.green('✓ Main merged into feature branch (no conflicts)'));
+                }
+                catch {
+                    // Merge conflicts — launch Claude to resolve
+                    console.log(pc.yellow('Merge conflicts detected. Launching Claude to resolve...'));
+                    await execa('git', ['merge', '--abort'], { cwd, stdio: 'pipe' });
+                    await launchClaudeForMerge({ cwd, apiKey });
+                    // Verify merge was completed (origin/main should be ancestor of HEAD)
+                    try {
+                        await execa('git', ['merge-base', '--is-ancestor', 'origin/main', 'HEAD'], { cwd, stdio: 'pipe' });
+                        mainMergedIntoFeature = true;
+                        console.log(pc.green('✓ Claude resolved merge conflicts'));
+                    }
+                    catch {
+                        console.log(pc.red('Claude did not complete the merge. Skipping merge to main.\n'));
+                    }
+                }
+                // Step 2: Merge feature → main (should be clean now)
+                if (mainMergedIntoFeature) {
+                    console.log(pc.dim('Merging feature into main...'));
+                    await execa('git', ['checkout', 'main'], { cwd: projectRoot, stdio: 'pipe' });
+                    await execa('git', ['merge', currentBranch, '--no-edit'], { cwd: projectRoot, stdio: 'inherit' });
+                    console.log(pc.green('✓ Merged to main locally\n'));
+                }
             }
             catch (err) {
                 console.log(pc.red('Failed to merge. You may need to resolve conflicts manually.\n'));
@@ -406,6 +430,22 @@ export async function postTaskFlow(options) {
     }
     console.log();
 }
+/**
+ * Launch Claude to resolve merge conflicts
+ */
+async function launchClaudeForMerge(options) {
+    const { cwd, apiKey } = options;
+    const prompt = 'Merge origin/main into the current branch and resolve any conflicts. Run: git merge origin/main --no-edit. If there are conflicts, resolve them, then stage and commit.';
+    await new Promise((resolve) => {
+        const child = spawn('claude', [prompt], {
+            cwd,
+            stdio: 'inherit',
+            env: { ...process.env, DAMPER_API_KEY: apiKey },
+        });
+        child.on('error', () => resolve());
+        child.on('close', () => resolve());
+    });
+}
 /**
  * Check if Claude Code CLI is installed
  */

package/package.json

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