@damper/cli 0.4.0 → 0.4.1

package/dist/index.js

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

package/dist/services/claude.js

@@ -236,21 +236,46 @@ export async function postTaskFlow(options) {
         console.log(pc.dim('You have uncommitted changes. Commit them before pushing.\n'));
     }
     if (hasUnpushedCommits && !hasUncommittedChanges) {
-        const shouldPush = await confirm({
-            message: 'Push commits to remote?',
-            default: true,
+        const { select } = await import('@inquirer/prompts');
+        const mergeAction = await select({
+            message: 'How do you want to merge your changes?',
+            choices: [
+                { name: 'Create a pull request', value: 'pr' },
+                { name: 'Merge directly to main', value: 'merge' },
+                { name: 'Just push (decide later)', value: 'push' },
+                { name: 'Skip (keep local)', value: 'skip' },
+            ],
         });
-        if (shouldPush) {
+        if (mergeAction === 'skip') {
+            console.log(pc.dim('Keeping changes local.\n'));
+        }
+        else if (mergeAction === 'merge') {
+            // Merge directly to main
+            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' });
+                // Push main
+                await execa('git', ['push', 'origin', 'main'], { cwd: projectRoot, stdio: 'inherit' });
+                console.log(pc.green('✓ Merged to main and pushed\n'));
+            }
+            catch (err) {
+                console.log(pc.red('Failed to merge. You may need to resolve conflicts manually.\n'));
+            }
+        }
+        else {
+            // Push first (needed for both 'pr' and 'push')
             try {
                 const { execa } = await import('execa');
                 await execa('git', ['push', '-u', 'origin', currentBranch], { cwd, stdio: 'inherit' });
                 console.log(pc.green('✓ Pushed to remote\n'));
-                // Offer to create PR
-                const shouldCreatePR = await confirm({
-                    message: 'Create a pull request?',
-                    default: true,
-                });
-                if (shouldCreatePR) {
+                // Create PR if requested
+                if (mergeAction === 'pr') {
                     try {
                         await execa('gh', ['pr', 'create', '--fill'], { cwd, stdio: 'inherit' });
                     }

package/package.json

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