@damper/cli 0.9.8 → 0.9.9

package/dist/services/claude.js

@@ -281,35 +281,48 @@ export async function postTaskFlow(options) {
         }
         else if (mergeAction === 'merge') {
             // Merge directly to main — first merge main into feature to resolve conflicts
+            const { execa } = await import('execa');
+            // Fetch latest main
             try {
-                const { execa } = await import('execa');
-                // Fetch latest main
                 await execa('git', ['fetch', 'origin', 'main'], { cwd, stdio: 'pipe' });
-                // Step 1: Merge origin/main INTO the feature branch (in worktree)
-                console.log(pc.dim('Merging main into feature branch...'));
-                let mainMergedIntoFeature = false;
+            }
+            catch (err) {
+                console.log(pc.red('Failed to fetch origin/main. Check your network connection.\n'));
+                return;
+            }
+            // 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 — abort and launch Claude to resolve
+                console.log(pc.yellow('Merge conflicts detected. Launching Claude to resolve...'));
+                try {
+                    await execa('git', ['merge', '--abort'], { cwd, stdio: 'pipe' });
+                }
+                catch {
+                    // merge --abort can fail if repo is in a weird state, reset instead
+                    console.log(pc.dim('Cleaning up merge state...'));
+                    await execa('git', ['reset', '--merge'], { cwd, stdio: 'pipe' }).catch(() => { });
+                }
+                await launchClaudeForMerge({ cwd, apiKey });
+                // Verify merge was completed (origin/main should be ancestor of HEAD)
                 try {
-                    await execa('git', ['merge', 'origin/main', '--no-edit'], { cwd, stdio: 'pipe' });
+                    await execa('git', ['merge-base', '--is-ancestor', 'origin/main', 'HEAD'], { cwd, stdio: 'pipe' });
                     mainMergedIntoFeature = true;
-                    console.log(pc.green('✓ Main merged into feature branch (no conflicts)'));
+                    console.log(pc.green('✓ Claude resolved merge 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'));
-                    }
+                    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) {
+            }
+            // Step 2: Merge feature → main (should be clean now)
+            if (mainMergedIntoFeature) {
+                try {
                     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' });
@@ -326,9 +339,9 @@ export async function postTaskFlow(options) {
                         console.log(pc.dim('Skipped push. Run `git push origin main` when ready.\n'));
                     }
                 }
-            }
-            catch (err) {
-                console.log(pc.red('Failed to merge. You may need to resolve conflicts manually.\n'));
+                catch (err) {
+                    console.log(pc.red('Failed to merge feature into main. You may need to resolve this manually.\n'));
+                }
             }
         }
         else {
@@ -538,12 +551,14 @@ export async function launchClaudeForReview(options) {
 }
 /**
  * Launch Claude to resolve merge conflicts
+ * Uses --allowedTools to restrict Claude to only git/file operations
+ * so it doesn't pick up task context and try to work on the task
  */
 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.';
+    const prompt = 'IMPORTANT: Your ONLY job is to resolve merge conflicts. Do NOT read TASK_CONTEXT.md or work on any task. Run: git merge origin/main --no-edit. If there are conflicts, resolve them, stage, and commit. Do not use any MCP tools.';
     await new Promise((resolve) => {
-        const child = spawn('claude', [prompt], {
+        const child = spawn('claude', ['--allowedTools', 'Bash,Read,Write,Edit,Glob,Grep', prompt], {
             cwd,
             stdio: 'inherit',
             env: { ...process.env, DAMPER_API_KEY: apiKey },

package/package.json

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