@damper/cli 0.6.12 → 0.6.14

package/dist/commands/start.js

@@ -57,6 +57,7 @@ export async function startCommand(options) {
     let taskId;
     let taskTitle;
     let isResume = false;
+    let isNewTask = false;
     let worktreePath;
     let forceTakeover = options.force || false;
     if (options.taskId) {
@@ -89,6 +90,7 @@ export async function startCommand(options) {
         taskId = result.task.id;
         taskTitle = result.task.title;
         isResume = result.isResume;
+        isNewTask = result.isNewTask || false;
         forceTakeover = result.forceTakeover || options.force || false;
         if (result.worktree) {
             worktreePath = result.worktree.path;
@@ -167,5 +169,6 @@ export async function startCommand(options) {
         taskId: result.taskId,
         apiKey: result.apiKey,
         projectRoot,
+        isNewTask,
     });
 }

package/dist/services/claude.d.ts

@@ -44,6 +44,7 @@ export declare function postTaskFlow(options: {
     taskId: string;
     apiKey: string;
     projectRoot: string;
+    isNewTask?: boolean;
 }): Promise<void>;
 /**
  * Check if Claude Code CLI is installed

package/dist/services/claude.js

@@ -139,16 +139,14 @@ export async function launchClaude(options) {
         });
         child.on('close', () => resolve());
     });
-    // Post-task flow
-    console.log(pc.dim('\n─────────────────────────────────────────'));
-    console.log(pc.bold('\nClaude session ended.\n'));
+    console.log(pc.dim('\n─────────────────────────────────────────\n'));
     return { cwd, taskId, apiKey };
 }
 /**
  * Post-task actions after Claude exits
  */
 export async function postTaskFlow(options) {
-    const { cwd, taskId, apiKey, projectRoot } = options;
+    const { cwd, taskId, apiKey, projectRoot, isNewTask } = options;
     const { confirm, select } = await import('@inquirer/prompts');
     const { createDamperApi } = await import('./damper-api.js');
     const { removeWorktreeDir } = await import('./worktree.js');
@@ -156,15 +154,34 @@ export async function postTaskFlow(options) {
     // Check task status from Damper
     let taskStatus;
     let taskTitle;
+    let hasCommits = false;
     try {
         const api = createDamperApi(apiKey);
         const task = await api.getTask(taskId);
         taskStatus = task.status;
         taskTitle = task.title;
+        hasCommits = (task.commits?.length ?? 0) > 0;
     }
     catch {
         console.log(pc.yellow('Could not fetch task status from Damper.'));
     }
+    // Clean up CLI-generated modifications to tracked files before checking git status
+    // The CLI appends a "## Current Task:" section to CLAUDE.md which is never meant to be committed
+    try {
+        const claudeMdPath = path.join(cwd, 'CLAUDE.md');
+        if (fs.existsSync(claudeMdPath)) {
+            const content = fs.readFileSync(claudeMdPath, 'utf-8');
+            const marker = '## Current Task:';
+            const markerIndex = content.indexOf(marker);
+            if (markerIndex !== -1) {
+                const restored = content.slice(0, markerIndex).trimEnd() + '\n';
+                fs.writeFileSync(claudeMdPath, restored, 'utf-8');
+            }
+        }
+    }
+    catch {
+        // Ignore cleanup errors
+    }
     // Check git status
     let hasUnpushedCommits = false;
     let hasUncommittedChanges = false;
@@ -220,6 +237,7 @@ export async function postTaskFlow(options) {
     console.log();
     // Offer actions based on state
     const hasChanges = hasUnpushedCommits || hasUncommittedChanges;
+    let worktreeRemoved = false;
     if (hasChanges) {
         if (hasUncommittedChanges) {
             console.log(pc.yellow('⚠ There are uncommitted changes. You may want to commit them first.\n'));
@@ -247,9 +265,7 @@ export async function postTaskFlow(options) {
                 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'));
+                console.log(pc.green('✓ Merged to main locally\n'));
             }
             catch (err) {
                 console.log(pc.red('Failed to merge. You may need to resolve conflicts manually.\n'));
@@ -286,6 +302,7 @@ export async function postTaskFlow(options) {
         if (shouldCleanup) {
             try {
                 await removeWorktreeDir(cwd, projectRoot);
+                worktreeRemoved = true;
                 console.log(pc.green('✓ Worktree and branch removed\n'));
             }
             catch (err) {
@@ -314,6 +331,7 @@ export async function postTaskFlow(options) {
         if (shouldRemove) {
             try {
                 await removeWorktreeDir(cwd, projectRoot);
+                worktreeRemoved = true;
                 console.log(pc.green('✓ Worktree and branch removed\n'));
             }
             catch (err) {
@@ -321,10 +339,44 @@ export async function postTaskFlow(options) {
                 console.log(pc.red(`Failed to remove worktree: ${error.message}\n`));
             }
         }
-        else {
-            console.log(pc.dim('\nWorktree kept. Run `npx @damper/cli cleanup` to remove later.\n'));
+    }
+    // Offer to delete CLI-created tasks with no work done
+    let taskDeleted = false;
+    if (isNewTask && !hasCommits && taskStatus !== 'done') {
+        const shouldDelete = await confirm({
+            message: 'No work was committed. Remove task from backlog?',
+            default: true,
+        });
+        if (shouldDelete) {
+            try {
+                const api = createDamperApi(apiKey);
+                await api.deleteTask(taskId);
+                taskDeleted = true;
+                console.log(pc.green('✓ Task removed from backlog\n'));
+            }
+            catch (err) {
+                const error = err;
+                console.log(pc.yellow(`Could not delete task: ${error.message}\n`));
+            }
+        }
+    }
+    // Final summary
+    console.log(pc.dim('─────────────────────────────────────────'));
+    if (taskDeleted) {
+        console.log(pc.dim(`\n  Task removed. No changes saved.\n`));
+    }
+    else {
+        const statusColor = taskStatus === 'done' ? pc.green : taskStatus === 'in_progress' ? pc.yellow : pc.dim;
+        const statusLabel = taskStatus || 'unknown';
+        console.log(pc.bold(`\n  #${shortIdRaw(taskId)} ${taskTitle || 'Unknown task'}`) + `  ${statusColor(statusLabel)}`);
+        if (!worktreeRemoved) {
+            console.log(pc.dim(`  ${cwd}`));
+            console.log(`\n  To continue, run:`);
+            console.log(pc.cyan(`    cd ${cwd} && claude -c`));
+            console.log(pc.dim(`    or: npx @damper/cli --task ${taskId}`));
         }
     }
+    console.log();
 }
 /**
  * Check if Claude Code CLI is installed

package/dist/services/damper-api.d.ts

@@ -170,7 +170,11 @@ export declare class DamperApi {
     }>;
     getModule(name: string): Promise<Module>;
     getAgentInstructions(format?: 'markdown' | 'section'): Promise<AgentInstructions>;
-    createTask(title: string, type?: 'bug' | 'feature' | 'improvement' | 'task'): Promise<Task>;
+    createTask(title: string, type?: 'bug' | 'feature' | 'improvement' | 'task', description?: string): Promise<Task>;
+    deleteTask(taskId: string): Promise<{
+        id: string;
+        deleted: boolean;
+    }>;
     getLinkedFeedback(taskId: string): Promise<Array<{
         id: string;
         title: string;

package/dist/services/damper-api.js

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

package/dist/ui/format.d.ts

@@ -22,7 +22,9 @@ export declare function formatSubtaskProgress(progress: {
 export declare function relativeTime(date: string | Date | null | undefined): string;
 /** Returns a picocolors function for the given status */
 export declare function statusColor(status: string): (s: string) => string;
-/** Box-drawing section header: `┌─ Label ───────────────┐` */
+/** Terminal width (min 80) */
+export declare function getTerminalWidth(): number;
+/** Section header spanning terminal width: `── Label ───────────` */
 export declare function sectionHeader(label: string, width?: number): string;
 /** Compact one-liner: `🔴 ✨ #a1b2c3d4  Title  ▪ L` */
 export declare function formatTaskLine(task: Task): string;

package/dist/ui/format.js

@@ -93,11 +93,16 @@ export function statusColor(status) {
         default: return pc.dim;
     }
 }
-/** Box-drawing section header: `┌─ Label ───────────────┐` */
-export function sectionHeader(label, width = 40) {
-    const inner = `\u2500 ${label} `;
-    const remaining = Math.max(0, width - inner.length - 2); // 2 for ┌ and ┐
-    return `\u250C${inner}${'\u2500'.repeat(remaining)}\u2510`;
+/** Terminal width (min 80) */
+export function getTerminalWidth() {
+    return Math.max(80, process.stdout.columns || 80);
+}
+/** Section header spanning terminal width: `── Label ───────────` */
+export function sectionHeader(label, width) {
+    const w = width ?? getTerminalWidth();
+    const prefix = `── ${label} `;
+    const remaining = Math.max(0, w - prefix.length);
+    return pc.dim(prefix + '─'.repeat(remaining));
 }
 /** Compact one-liner: `🔴 ✨ #a1b2c3d4  Title  ▪ L` */
 export function formatTaskLine(task) {

package/dist/ui/task-picker.d.ts

@@ -11,6 +11,7 @@ interface TaskPickerResult {
     worktree?: WorktreeState;
     isResume: boolean;
     forceTakeover?: boolean;
+    isNewTask?: boolean;
 }
 export declare function pickTask(options: TaskPickerOptions): Promise<TaskPickerResult | null>;
 export {};

package/dist/ui/task-picker.js

@@ -1,38 +1,81 @@
 import { select, confirm, input, Separator } from '@inquirer/prompts';
 import pc from 'picocolors';
-import { shortId, shortIdRaw, getTypeIcon, getPriorityIcon, formatEffort, formatTaskMeta, sectionHeader, relativeTime, } from './format.js';
-function formatTaskChoice(choice) {
-    const { task } = choice;
-    const priorityIcon = getPriorityIcon(task.priority);
-    const typeIcon = getTypeIcon(task.type);
-    const id = shortId(task.id);
-    const effort = formatEffort(task.effort);
-    const firstLine = `${priorityIcon}${typeIcon} ${id}  ${task.title}${effort ? `  ${effort}` : ''}`;
+import { shortId, shortIdRaw, getTypeIcon, getPriorityIcon, formatEffort, formatSubtaskProgress, sectionHeader, relativeTime, getTerminalWidth, } from './format.js';
+// Layout constants (terminal column widths)
+const CURSOR_WIDTH = 2; // inquirer select prefix (❯ or  )
+const PRIORITY_WIDTH = 3; // emoji(2) + space(1), or 3 spaces
+const TYPE_WIDTH = 2; // emoji(2)
+const GAP1 = 1; // space after type
+const ID_WIDTH = 9; // # + 8 chars
+const GAP2 = 2; // spaces after ID
+const GAP3 = 2; // spaces between title and meta
+const META_RESERVE = 16; // max width for right-side meta
+const MIN_TITLE = 20; // minimum title column width
+const LEFT_FIXED = CURSOR_WIDTH + PRIORITY_WIDTH + TYPE_WIDTH + GAP1 + ID_WIDTH + GAP2; // 19
+const INDENT_WIDTH = PRIORITY_WIDTH + TYPE_WIDTH + GAP1 + ID_WIDTH + GAP2; // 17 (without cursor)
+function getTitleWidth() {
+    const termWidth = getTerminalWidth();
+    return Math.max(MIN_TITLE, termWidth - LEFT_FIXED - GAP3 - META_RESERVE);
+}
+function formatTableRow(task, titleWidth) {
+    // Priority: always 3 terminal cols
+    const hasPriority = task.priority === 'high' || task.priority === 'medium';
+    const priorityStr = hasPriority ? getPriorityIcon(task.priority) : '   ';
+    // Type icon: 2 terminal cols
+    const typeStr = getTypeIcon(task.type);
+    // ID: 9 visible chars
+    const idStr = shortId(task.id);
+    // Title: padded or truncated to fixed width
+    const titleStr = task.title.length > titleWidth
+        ? task.title.slice(0, titleWidth - 1) + '\u2026'
+        : task.title + ' '.repeat(titleWidth - task.title.length);
+    // Right-side meta (compact)
+    const metaParts = [];
+    if (task.effort)
+        metaParts.push(formatEffort(task.effort));
+    if (task.feedbackCount)
+        metaParts.push(pc.dim(`\u{1F4AC}${task.feedbackCount}`));
+    if (task.subtaskProgress?.total)
+        metaParts.push(formatSubtaskProgress(task.subtaskProgress));
+    const meta = metaParts.join('  ');
+    return `${priorityStr}${typeStr} ${idStr}  ${titleStr}  ${meta}`;
+}
+function formatTaskChoice(choice, titleWidth) {
+    const firstLine = formatTableRow(choice.task, titleWidth);
+    const indent = ' '.repeat(INDENT_WIDTH);
     if (choice.type === 'in_progress') {
         const worktreeName = choice.worktree.path.split('/').pop() || choice.worktree.path;
         const time = relativeTime(choice.worktree.createdAt);
         const metaParts = [worktreeName];
         if (time)
             metaParts.push(time);
-        let description = `${firstLine}\n      ${pc.dim(metaParts.join(' \u00B7 '))}`;
+        let description = `${firstLine}\n${indent}${pc.dim(metaParts.join(' \u00B7 '))}`;
         if (choice.lastNote) {
-            const note = choice.lastNote.length > 60 ? choice.lastNote.slice(0, 60) + '...' : choice.lastNote;
-            description += `\n      ${pc.dim(`Last: "${note}"`)}`;
+            const maxNoteWidth = titleWidth;
+            const note = choice.lastNote.length > maxNoteWidth ? choice.lastNote.slice(0, maxNoteWidth - 3) + '...' : choice.lastNote;
+            description += `\n${indent}${pc.dim(`Last: "${note}"`)}`;
         }
         return description;
     }
     if (choice.type === 'locked') {
-        return `${firstLine}\n      ${pc.yellow(`locked by ${choice.lockedBy}`)}`;
+        return `${firstLine}\n${indent}${pc.yellow(`locked by ${choice.lockedBy}`)}`;
     }
-    // Available task
-    const meta = formatTaskMeta(task);
-    if (meta) {
-        return `${firstLine}\n      ${meta}`;
+    // Available task - add secondary meta line if there's useful info
+    const secondaryParts = [];
+    if (choice.task.quarter)
+        secondaryParts.push(choice.task.quarter);
+    if (choice.task.hasImplementationPlan)
+        secondaryParts.push('has plan');
+    if (choice.task.labels?.length)
+        secondaryParts.push(choice.task.labels.join(' \u00B7 '));
+    if (secondaryParts.length > 0) {
+        return `${firstLine}\n${indent}${pc.dim(secondaryParts.join(` \u00B7 `))}`;
     }
     return firstLine;
 }
 export async function pickTask(options) {
     const { api, worktrees, typeFilter, statusFilter } = options;
+    const titleWidth = getTitleWidth();
     // Fetch tasks from Damper
     const { tasks, project } = await api.listTasks({
         status: statusFilter || 'all',
@@ -50,8 +93,6 @@ export async function pickTask(options) {
         const task = tasks.find(t => t.id === worktree.taskId);
         if (task) {
             worktreeTaskIds.add(task.id);
-            // Get last note for display (we'd need to fetch task detail for this)
-            // For now, we'll leave it undefined - the API doesn't include notes in list
             inProgressChoices.push({
                 type: 'in_progress',
                 task,
@@ -67,7 +108,6 @@ export async function pickTask(options) {
             continue;
         const taskAny = task;
         if (task.status === 'in_progress' && taskAny.lockedBy) {
-            // Task is locked by someone else
             lockedChoices.push({
                 type: 'locked',
                 task,
@@ -83,7 +123,7 @@ export async function pickTask(options) {
         choices.push(new Separator(`\n${sectionHeader(`In Progress (${inProgressChoices.length})`)}`));
         for (const choice of inProgressChoices) {
             choices.push({
-                name: formatTaskChoice(choice),
+                name: formatTaskChoice(choice, titleWidth),
                 value: choice,
             });
         }
@@ -92,7 +132,7 @@ export async function pickTask(options) {
         choices.push(new Separator(`\n${sectionHeader(`Available (${availableChoices.length})`)}`));
         for (const choice of availableChoices) {
             choices.push({
-                name: formatTaskChoice(choice),
+                name: formatTaskChoice(choice, titleWidth),
                 value: choice,
             });
         }
@@ -101,7 +141,7 @@ export async function pickTask(options) {
         choices.push(new Separator(`\n${sectionHeader(`Locked (${lockedChoices.length})`)}`));
         for (const choice of lockedChoices) {
             choices.push({
-                name: formatTaskChoice(choice),
+                name: formatTaskChoice(choice, titleWidth),
                 value: choice,
             });
         }
@@ -158,9 +198,9 @@ export async function pickTask(options) {
     };
 }
 async function handleCreateNewTask(api) {
-    const title = await input({
-        message: 'Task title:',
-        validate: (value) => value.trim().length > 0 || 'Title is required',
+    const instructions = await input({
+        message: 'What needs to be done?',
+        validate: (value) => value.trim().length > 0 || 'Instructions are required',
     });
     const type = await select({
         message: 'Task type:',
@@ -171,11 +211,19 @@ async function handleCreateNewTask(api) {
             { name: 'Task', value: 'task' },
         ],
     });
+    // Use instructions as description; derive a placeholder title
+    const trimmed = instructions.trim();
+    const maxTitleLen = 60;
+    const placeholderTitle = trimmed.length <= maxTitleLen
+        ? trimmed
+        : trimmed.slice(0, trimmed.lastIndexOf(' ', maxTitleLen) || maxTitleLen) + '…';
     console.log(pc.dim('\nCreating task in Damper...'));
-    const task = await api.createTask(title.trim(), type);
+    const task = await api.createTask(placeholderTitle, type, trimmed);
     console.log(pc.green(`✓ Created task #${shortIdRaw(task.id)}: ${task.title}`));
+    console.log(pc.dim('  The agent will refine the title after planning.'));
     return {
         task,
         isResume: false,
+        isNewTask: true,
     };
 }

package/package.json

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