@damper/cli 0.6.2 → 0.6.3

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

package/dist/services/claude.js

@@ -178,9 +178,21 @@ export async function postTaskFlow(options) {
             hasUnpushedCommits = unpushed.trim().length > 0;
         }
         catch {
-            // No upstream branch - assume all commits are unpushed
-            const { stdout: commits } = await execa('git', ['log', 'main..HEAD', '--oneline'], { cwd, stdio: 'pipe' });
-            hasUnpushedCommits = commits.trim().length > 0;
+            // No upstream branch - check against main/origin
+            try {
+                const { stdout: commits } = await execa('git', ['log', 'origin/main..HEAD', '--oneline'], { cwd, stdio: 'pipe' });
+                hasUnpushedCommits = commits.trim().length > 0;
+            }
+            catch {
+                try {
+                    const { stdout: commits } = await execa('git', ['log', 'main..HEAD', '--oneline'], { cwd, stdio: 'pipe' });
+                    hasUnpushedCommits = commits.trim().length > 0;
+                }
+                catch {
+                    // Can't determine - assume there are commits if branch differs from main
+                    hasUnpushedCommits = currentBranch !== 'main' && currentBranch !== '';
+                }
+            }
         }
     }
     catch {
@@ -202,13 +214,13 @@ export async function postTaskFlow(options) {
     }
     console.log();
     // Offer actions based on state
-    if (hasUncommittedChanges) {
-        console.log(pc.dim('You have uncommitted changes. Commit them before pushing.\n'));
-    }
-    if (hasUnpushedCommits && !hasUncommittedChanges) {
-        const { select } = await import('@inquirer/prompts');
+    const hasChanges = hasUnpushedCommits || hasUncommittedChanges;
+    if (hasChanges) {
+        if (hasUncommittedChanges) {
+            console.log(pc.yellow('⚠ There are uncommitted changes. You may want to commit them first.\n'));
+        }
         const mergeAction = await select({
-            message: 'How do you want to merge your changes?',
+            message: 'How do you want to handle your changes?',
             choices: [
                 { name: 'Create a pull request', value: 'pr' },
                 { name: 'Merge directly to main', value: 'merge' },

package/package.json

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