@damper/cli 0.9.18 → 0.9.20

package/dist/services/claude.js

@@ -335,7 +335,7 @@ export async function postTaskFlow(options) {
                     console.log(pc.dim('Cleaning up merge state...'));
                     await execa('git', ['reset', '--merge'], { cwd, stdio: 'pipe' }).catch(() => { });
                 }
-                await launchClaudeForMerge({ cwd, apiKey });
+                await launchClaudeForMerge({ cwd, apiKey, taskTitle });
                 // 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' });
@@ -582,15 +582,44 @@ 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
+ * so it doesn't pick up task context and try to work on the task.
+ * Runs with --dangerously-skip-permissions for fully autonomous resolution.
  */
 async function launchClaudeForMerge(options) {
-    const { cwd, apiKey } = options;
-    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.';
+    const { cwd, apiKey, taskTitle } = options;
+    const taskContext = taskTitle
+        ? `You are merging a feature branch for task "${taskTitle}" into main.`
+        : 'You are merging a feature branch into main.';
+    const prompt = [
+        `MERGE CONFLICT RESOLUTION — Your ONLY job is to resolve merge conflicts.`,
+        '',
+        taskContext,
+        '',
+        'Steps:',
+        '1. Run: git merge origin/main --no-edit',
+        '2. If there are conflicts, identify all conflicted files with: git diff --name-only --diff-filter=U',
+        '3. Read each conflicted file and resolve the conflicts:',
+        '   - For CLAUDE.md: keep the main (origin/main) version entirely — the feature branch appends a temporary task section that must not be merged',
+        '   - For code conflicts: combine both sides logically, preserving the intent of both the feature branch changes and main branch updates',
+        '   - For package.json / lock files: accept the version that satisfies both sides, preferring the newer version',
+        '4. Stage all resolved files with: git add <file>',
+        '5. Commit the merge with: git commit --no-edit',
+        '6. Verify no conflicts remain with: git diff --name-only --diff-filter=U',
+        '',
+        'IMPORTANT:',
+        '- Do NOT read TASK_CONTEXT.md or work on the task itself',
+        '- Do NOT use any MCP tools — only use Bash, Read, Write, Edit, Glob, Grep',
+        '- Do NOT make any changes beyond resolving the merge conflicts',
+        '- If a conflict is too complex to resolve confidently, leave it and explain what needs manual attention',
+    ].join('\n');
     const mergeLabel = 'Resolving merge conflicts';
     setTerminalTitle(mergeLabel);
     await new Promise((resolve) => {
-        const child = spawn('claude', ['--allowedTools', 'Bash,Read,Write,Edit,Glob,Grep', prompt], {
+        const child = spawn('claude', [
+            '--allowedTools', 'Bash,Read,Write,Edit,Glob,Grep',
+            '--dangerously-skip-permissions',
+            prompt,
+        ], {
             cwd,
             stdio: 'inherit',
             env: { ...process.env, DAMPER_API_KEY: apiKey },

package/dist/ui/task-picker.js

@@ -1,5 +1,6 @@
 import { search, select, confirm, input, Separator } from '@inquirer/prompts';
 import pc from 'picocolors';
+import * as readline from 'readline';
 import { shortId, shortIdRaw, getTypeIcon, getPriorityIcon, formatEffort, formatProgressCompact, formatDueDate, sectionHeader, relativeTime, getTerminalWidth, padEnd, padStart, } from './format.js';
 // Layout constants (terminal column widths)
 const CURSOR_WIDTH = 2; // inquirer select prefix (❯ or  )
@@ -265,15 +266,50 @@ export async function pickTask(options) {
         action,
     };
 }
+function multilineInput(message) {
+    return new Promise((resolve) => {
+        process.stdout.write(`${pc.bold(pc.green('?'))} ${pc.bold(message)} ${pc.dim('(Enter to skip)')}\n`);
+        const lines = [];
+        let hintShown = false;
+        let hintTimer = null;
+        const rl = readline.createInterface({
+            input: process.stdin,
+            output: process.stdout,
+            prompt: '',
+        });
+        const showHint = () => {
+            if (!hintShown) {
+                hintShown = true;
+                process.stdout.write(pc.dim('  (Press Enter on an empty line to submit)\n'));
+            }
+        };
+        rl.on('line', (line) => {
+            if (hintTimer)
+                clearTimeout(hintTimer);
+            if (lines.length === 0 && line === '') {
+                rl.close();
+                return;
+            }
+            if (line === '' && lines[lines.length - 1] === '') {
+                lines.pop(); // remove trailing empty line
+                rl.close();
+                return;
+            }
+            lines.push(line);
+            hintTimer = setTimeout(showHint, 50);
+        });
+        rl.on('close', () => {
+            resolve(lines.join('\n'));
+        });
+    });
+}
 async function handleCreateNewTask(api, searchTerm) {
     const title = await input({
         message: 'Task title:',
         default: searchTerm || undefined,
         validate: (value) => value.trim().length > 0 || 'Title is required',
     });
-    const description = await input({
-        message: 'Description (optional, press Enter to skip):',
-    });
+    const description = await multilineInput('Description (optional):');
     const type = await select({
         message: 'Task type:',
         choices: [

package/package.json

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