@damper/cli 0.9.8 → 0.9.10

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/dist/services/damper-api.d.ts

@@ -219,7 +219,7 @@ export declare class DamperApi {
             title: string;
         }>;
     }>;
-    createTask(title: string, type?: 'bug' | 'feature' | 'improvement' | 'task', description?: string): Promise<Task>;
+    createTask(title: string, type?: 'bug' | 'feature' | 'improvement' | 'task', description?: string, isPublic?: boolean): Promise<Task>;
     deleteTask(taskId: string): Promise<{
         id: string;
         deleted: boolean;

package/dist/services/damper-api.js

@@ -189,8 +189,8 @@ This project uses Damper MCP for task tracking. **You MUST follow this workflow.
         return this.request('POST', `/api/agent/changelogs/${changelogId}/items`, { taskIds });
     }
     // Create task
-    async createTask(title, type = 'task', description) {
-        return this.request('POST', '/api/agent/tasks', { title, type, status: 'planned', description });
+    async createTask(title, type = 'task', description, isPublic) {
+        return this.request('POST', '/api/agent/tasks', { title, type, status: 'planned', description, isPublic });
     }
     // Delete task (only planned, no commits)
     async deleteTask(taskId) {

package/dist/templates/CLAUDE_APPEND.md.js

@@ -27,7 +27,7 @@ ${planSection}
 1. **Do NOT commit or complete tasks without explicit user confirmation** - Always ask the user before running \`git commit\` or calling \`complete_task\`
 2. Use \`add_commit\` after each git commit
 3. Use \`add_note\` ONLY for non-obvious approach decisions (e.g. "Decision: chose X because Y")
-4. When user confirms: call \`complete_task\` with a one-line summary
+4. When user confirms: call \`complete_task\` with summary and \`reviewInstructions\` (what to test/verify)
 5. If stopping early: call \`abandon_task\` with what remains and blockers
 
 The CLI just bootstrapped this environment - YOU handle the task lifecycle.

package/dist/ui/task-picker.js

@@ -174,11 +174,19 @@ export async function pickTask(options) {
         }
     }
     console.log(pc.bold(`\nProject: ${project}`));
+    // Track last search term for passing to create flow
+    let lastSearchTerm = '';
     // Build choices with search filtering support
     const buildChoices = (term) => {
         const lowerTerm = term?.toLowerCase().trim() || '';
+        lastSearchTerm = term?.trim() || '';
         const matches = (task) => !lowerTerm || task.title.toLowerCase().includes(lowerTerm) || task.id.includes(lowerTerm);
         const filtered = [];
+        // Always show "Create new task" at the top
+        const createLabel = lastSearchTerm
+            ? pc.green(`+ New task: "${lastSearchTerm}"`)
+            : pc.green('+ Create new task');
+        filtered.push({ name: createLabel, value: { type: 'create_new' } });
         const filteredInProgress = inProgressChoices.filter(c => matches(c.task));
         if (filteredInProgress.length > 0) {
             filtered.push(new Separator(`\n${sectionHeader(`In Progress (${filteredInProgress.length})`)}`));
@@ -200,9 +208,6 @@ export async function pickTask(options) {
                 filtered.push({ name: formatTaskChoice(choice, titleWidth, layout), value: choice });
             }
         }
-        // Always show "Create new task"
-        filtered.push(new Separator(''));
-        filtered.push({ name: pc.green('+ Create new task'), value: { type: 'create_new' } });
         return filtered;
     };
     const selected = await search({
@@ -211,7 +216,7 @@ export async function pickTask(options) {
         pageSize: 20,
     });
     if (selected.type === 'create_new') {
-        return handleCreateNewTask(api);
+        return handleCreateNewTask(api, lastSearchTerm);
     }
     if (selected.type === 'in_progress') {
         const action = await select({
@@ -260,41 +265,14 @@ export async function pickTask(options) {
         action,
     };
 }
-async function generateTaskTitle(instructions, type) {
-    try {
-        const { execa } = await import('execa');
-        const prompt = [
-            `Generate a task title for a ${type} task.`,
-            'Rules:',
-            '- Max 60 characters, sentence case, no trailing period',
-            '- Verb prefix matching type: bug → "Fix …", feature → "Add …", improvement → "Improve …", task → "Set up …" / "Update …"',
-            '- Specific enough to understand without reading a description',
-            '- Examples: "Add dark mode support", "Fix login timeout on slow connections", "Improve search result ranking"',
-            'Return ONLY the title, nothing else.',
-            '',
-            `User input: ${instructions}`,
-        ].join('\n');
-        const { stdout } = await execa('claude', ['--print', '--model', 'haiku', prompt], {
-            stdio: 'pipe',
-            timeout: 15000,
-        });
-        const title = stdout.trim();
-        if (title && title.length <= 80 && !title.includes('\n')) {
-            return title;
-        }
-        return null;
-    }
-    catch {
-        return null;
-    }
-}
-async function handleCreateNewTask(api) {
-    const instructions = await input({
-        message: 'What needs to be done?',
-        validate: (value) => value.trim().length > 0 || 'Instructions are required',
+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 details = await input({
-        message: 'Additional details (optional, press Enter to skip):',
+    const description = await input({
+        message: 'Description (optional, press Enter to skip):',
     });
     const type = await select({
         message: 'Task type:',
@@ -305,24 +283,17 @@ async function handleCreateNewTask(api) {
             { name: 'Task', value: 'task' },
         ],
     });
-    const trimmed = instructions.trim();
-    const trimmedDetails = details.trim();
-    const fullInput = trimmedDetails ? `${trimmed}\n\n${trimmedDetails}` : trimmed;
-    // Generate title with Claude, fall back to truncation
-    console.log(pc.dim('\nGenerating title...'));
-    const generatedTitle = await generateTaskTitle(fullInput, type);
-    let title;
-    if (generatedTitle) {
-        title = generatedTitle;
-    }
-    else {
-        const maxTitleLen = 60;
-        title = trimmed.length <= maxTitleLen
-            ? trimmed
-            : trimmed.slice(0, trimmed.lastIndexOf(' ', maxTitleLen) || maxTitleLen) + '…';
-    }
+    const isPublic = await select({
+        message: 'Visibility:',
+        choices: [
+            { name: 'Public', value: true },
+            { name: 'Private', value: false },
+        ],
+    });
+    const trimmedTitle = title.trim();
+    const trimmedDescription = description.trim() || undefined;
     console.log(pc.dim('Creating task in Damper...'));
-    const task = await api.createTask(title, type, fullInput);
+    const task = await api.createTask(trimmedTitle, type, trimmedDescription, isPublic);
     console.log(pc.green(`✓ Created task #${shortIdRaw(task.id)}: ${task.title}`));
     return {
         task,

package/package.json

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