@damper/cli 0.7.1 → 0.8.0

package/dist/commands/start.js

@@ -100,6 +100,24 @@ export async function startCommand(options) {
         // Resume existing worktree
         console.log(pc.green(`\n✓ Resuming: #${shortIdRaw(taskId)} ${taskTitle}`));
         console.log(pc.dim(`  Worktree: ${worktreePath}`));
+        // Re-lock the task if it was previously released
+        const task = await api.getTask(taskId);
+        if (task.status !== 'in_progress' || !task.lockedBy) {
+            console.log(pc.dim('\nRe-locking task in Damper...'));
+            try {
+                await api.startTask(taskId, forceTakeover);
+                console.log(pc.green('✓ Task locked'));
+            }
+            catch (err) {
+                const error = err;
+                if (error.lockInfo) {
+                    console.log(pc.yellow(`\n⚠️  Task is locked by "${error.lockInfo.lockedBy}" since ${error.lockInfo.lockedAt}`));
+                    console.log(pc.dim('Use --force to take over the lock.\n'));
+                    process.exit(1);
+                }
+                throw err;
+            }
+        }
         // Refresh context with latest from Damper
         console.log(pc.dim('\nRefreshing context from Damper...'));
         await refreshContext({
@@ -165,6 +183,7 @@ export async function startCommand(options) {
         taskTitle,
         apiKey,
         yolo: options.yolo,
+        isResume,
     });
     // Post-task flow: push, PR, cleanup
     await postTaskFlow({

package/dist/services/claude.d.ts

@@ -31,6 +31,7 @@ export declare function launchClaude(options: {
     taskTitle: string;
     apiKey: string;
     yolo?: boolean;
+    isResume?: boolean;
 }): Promise<{
     cwd: string;
     taskId: string;

package/dist/services/claude.js

@@ -85,19 +85,26 @@ export function configureDamperMcp() {
  * Launch Claude Code in a directory
  */
 export async function launchClaude(options) {
-    const { cwd, taskId, taskTitle, apiKey, yolo } = options;
-    console.log(pc.green(`\nStarting Claude Code for task #${shortIdRaw(taskId)}: ${taskTitle}`));
+    const { cwd, taskId, taskTitle, apiKey, yolo, isResume } = options;
+    if (isResume) {
+        console.log(pc.green(`\nResuming Claude Code for task #${shortIdRaw(taskId)}: ${taskTitle}`));
+    }
+    else {
+        console.log(pc.green(`\nStarting Claude Code for task #${shortIdRaw(taskId)}: ${taskTitle}`));
+    }
     console.log(pc.dim(`Directory: ${cwd}`));
     console.log();
-    // Show workflow explanation
-    console.log(pc.bold('Workflow:'));
-    console.log(pc.dim('  1. Claude reads TASK_CONTEXT.md and creates a plan'));
-    if (!yolo) {
-        console.log(pc.dim('  2. You approve the plan before Claude makes changes'));
-    }
-    console.log(pc.dim(`  ${yolo ? '2' : '3'}. Claude implements the task, logging progress to Damper`));
-    console.log(pc.dim(`  ${yolo ? '3' : '4'}. Claude calls complete_task (or abandon_task) when done`));
-    console.log();
+    if (!isResume) {
+        // Show workflow explanation only for new tasks
+        console.log(pc.bold('Workflow:'));
+        console.log(pc.dim('  1. Claude reads TASK_CONTEXT.md and creates a plan'));
+        if (!yolo) {
+            console.log(pc.dim('  2. You approve the plan before Claude makes changes'));
+        }
+        console.log(pc.dim(`  ${yolo ? '2' : '3'}. Claude implements the task, logging progress to Damper`));
+        console.log(pc.dim(`  ${yolo ? '3' : '4'}. Claude calls complete_task (or abandon_task) when done`));
+        console.log();
+    }
     console.log(pc.bold('When finished:'));
     console.log(pc.dim('  • Push your branch and create a PR if needed'));
     console.log(pc.dim('  • Run: npx @damper/cli cleanup'));
@@ -110,18 +117,29 @@ export async function launchClaude(options) {
         console.log(pc.cyan('Mode: Plan (will ask for approval)'));
     }
     console.log();
-    // Build prompt - context is in TASK_CONTEXT.md, MCP is in .claude/settings.json
-    // Always enter plan mode first. In yolo mode, execute without waiting for approval.
-    const planInstruction = yolo
-        ? ' After reading TASK_CONTEXT.md, use the EnterPlanMode tool to create an implementation plan, then execute it without waiting for user approval.'
-        : ' After reading TASK_CONTEXT.md, use the EnterPlanMode tool to create an implementation plan for user approval before making any code changes.';
-    const initialPrompt = `IMPORTANT: Start by reading TASK_CONTEXT.md completely. It contains the task description, implementation plan, critical rules, and architecture context.${planInstruction} Task #${taskId}: ${taskTitle}`;
-    console.log(pc.dim(`Launching Claude in ${cwd}...`));
+    // Build args based on whether we're resuming or starting fresh
+    let args;
+    if (isResume) {
+        // Resume previous conversation so Claude continues where it left off
+        const resumePrompt = `TASK_CONTEXT.md has been refreshed with the latest notes from Damper. Continue working on task #${taskId}: ${taskTitle}`;
+        args = yolo
+            ? ['--continue', '--dangerously-skip-permissions', resumePrompt]
+            : ['--continue', resumePrompt];
+        console.log(pc.dim(`Resuming Claude session in ${cwd}...`));
+    }
+    else {
+        // New task - enter plan mode first
+        const planInstruction = yolo
+            ? ' After reading TASK_CONTEXT.md, use the EnterPlanMode tool to create an implementation plan, then execute it without waiting for user approval.'
+            : ' After reading TASK_CONTEXT.md, use the EnterPlanMode tool to create an implementation plan for user approval before making any code changes.';
+        const initialPrompt = `IMPORTANT: Start by reading TASK_CONTEXT.md completely. It contains the task description, implementation plan, critical rules, and architecture context.${planInstruction} Task #${taskId}: ${taskTitle}`;
+        args = yolo ? ['--dangerously-skip-permissions', initialPrompt] : [initialPrompt];
+        console.log(pc.dim(`Launching Claude in ${cwd}...`));
+    }
     // Launch Claude Code
     // Use spawn with stdio: 'inherit' for proper TTY passthrough
     // Signals (Ctrl+C, Escape) are handled naturally since child inherits the terminal
     await new Promise((resolve) => {
-        const args = yolo ? ['--dangerously-skip-permissions', initialPrompt] : [initialPrompt];
         const child = spawn('claude', args, {
             cwd,
             stdio: 'inherit',
@@ -313,32 +331,41 @@ export async function postTaskFlow(options) {
         }
     }
     else if (taskStatus === 'in_progress') {
-        // Task not completed - always release the lock, optionally remove worktree
-        console.log(pc.dim('\nReleasing task lock...'));
-        try {
-            const api = createDamperApi(apiKey);
-            await api.abandonTask(taskId, 'Session ended via CLI');
-            console.log(pc.green(`✓ Task released back to planned status`));
-        }
-        catch (err) {
-            const error = err;
-            console.log(pc.yellow(`Could not release task: ${error.message}`));
-        }
-        // Ask about worktree cleanup
-        const shouldRemove = await confirm({
-            message: 'Remove worktree and branch?',
-            default: false,
+        // Task not completed - ask whether to keep lock for later resumption
+        const exitAction = await select({
+            message: 'Task is still in progress. What would you like to do?',
+            choices: [
+                { name: 'Keep lock (resume later)', value: 'keep' },
+                { name: 'Release lock (let others pick it up)', value: 'release' },
+                { name: 'Release lock and remove worktree', value: 'release_cleanup' },
+            ],
         });
-        if (shouldRemove) {
+        if (exitAction === 'release' || exitAction === 'release_cleanup') {
+            console.log(pc.dim('\nReleasing task lock...'));
             try {
-                await removeWorktreeDir(cwd, projectRoot);
-                worktreeRemoved = true;
-                console.log(pc.green('✓ Worktree and branch removed\n'));
+                const api = createDamperApi(apiKey);
+                await api.abandonTask(taskId, 'Session ended via CLI');
+                console.log(pc.green('✓ Task released back to planned status'));
             }
             catch (err) {
                 const error = err;
-                console.log(pc.red(`Failed to remove worktree: ${error.message}\n`));
+                console.log(pc.yellow(`Could not release task: ${error.message}`));
             }
+            if (exitAction === 'release_cleanup') {
+                try {
+                    await removeWorktreeDir(cwd, projectRoot);
+                    worktreeRemoved = true;
+                    console.log(pc.green('✓ Worktree and branch removed\n'));
+                }
+                catch (err) {
+                    const error = err;
+                    console.log(pc.red(`Failed to remove worktree: ${error.message}\n`));
+                }
+            }
+        }
+        else {
+            console.log(pc.green('✓ Lock kept — resume with:'));
+            console.log(pc.cyan(`    npx @damper/cli --task ${taskId}`));
         }
     }
     // Offer to delete CLI-created tasks with no work done

package/dist/services/worktree.js

@@ -268,20 +268,29 @@ export async function createWorktree(options) {
     };
     fs.writeFileSync(path.join(worktreePath, '.mcp.json'), JSON.stringify(mcpConfig, null, 2));
     console.log(pc.dim('Created .mcp.json with Damper MCP'));
-    // Create .claude/settings.local.json with permissions for Damper MCP tools
+    // Create .claude/settings.local.json - copy root permissions and ensure Damper MCP is allowed
     const claudeDir = path.join(worktreePath, '.claude');
     if (!fs.existsSync(claudeDir)) {
         fs.mkdirSync(claudeDir, { recursive: true });
     }
-    const claudeSettings = {
-        permissions: {
-            allow: [
-                'mcp__damper__*',
-            ],
-        },
-    };
+    // Read existing settings from root project
+    const rootSettingsPath = path.join(projectRoot, '.claude', 'settings.local.json');
+    let claudeSettings = {};
+    if (fs.existsSync(rootSettingsPath)) {
+        try {
+            claudeSettings = JSON.parse(fs.readFileSync(rootSettingsPath, 'utf-8'));
+        }
+        catch { }
+    }
+    // Ensure permissions.allow includes damper MCP
+    const permissions = (claudeSettings.permissions ?? {});
+    const allow = Array.isArray(permissions.allow) ? [...permissions.allow] : [];
+    if (!allow.includes('mcp__damper__*')) {
+        allow.unshift('mcp__damper__*');
+    }
+    claudeSettings.permissions = { ...permissions, allow };
     fs.writeFileSync(path.join(claudeDir, 'settings.local.json'), JSON.stringify(claudeSettings, null, 2));
-    console.log(pc.dim('Created .claude/settings.local.json with MCP permissions'));
+    console.log(pc.dim('Created .claude/settings.local.json with root permissions + MCP'));
     // Save to state
     const worktreeState = {
         taskId,

package/dist/ui/format.d.ts

@@ -1,4 +1,10 @@
 import type { Task } from '../services/damper-api.js';
+/** Strip ANSI escape codes from a string */
+export declare function stripAnsi(str: string): string;
+/** ANSI-aware right-pad: pads to `width` based on visible (non-ANSI) length */
+export declare function padEnd(str: string, width: number): string;
+/** ANSI-aware left-pad: pads to `width` based on visible (non-ANSI) length */
+export declare function padStart(str: string, width: number): string;
 /** Colored short ID: dim `#` + cyan first 8 chars */
 export declare function shortId(id: string): string;
 /** Plain 8-char slice (for use inside other color wrappers) */
@@ -11,6 +17,13 @@ export declare function getPriorityIcon(priority: string): string;
 export declare function formatEffort(effort: string | null | undefined): string;
 /** Dim feedback count like `💬 3`, or empty string */
 export declare function formatFeedback(count: number | null | undefined): string;
+/** Compact progress fraction like `3/5`, or empty string */
+export declare function formatProgressCompact(progress: {
+    done: number;
+    total: number;
+} | null | undefined): string;
+/** Due-date string with urgency coloring */
+export declare function formatDueDate(dueDate: string | null | undefined): string;
 /** Dim labels joined with ` · `, or empty string */
 export declare function formatLabels(labels: string[] | null | undefined): string;
 /** 10-char progress bar: green filled, dim empty, with count */

package/dist/ui/format.js

@@ -1,4 +1,19 @@
 import pc from 'picocolors';
+// ── ANSI-aware string utilities ──
+/** Strip ANSI escape codes from a string */
+export function stripAnsi(str) {
+    return str.replace(/\x1b\[[0-9;]*m/g, '');
+}
+/** ANSI-aware right-pad: pads to `width` based on visible (non-ANSI) length */
+export function padEnd(str, width) {
+    const visible = stripAnsi(str).length;
+    return visible >= width ? str : str + ' '.repeat(width - visible);
+}
+/** ANSI-aware left-pad: pads to `width` based on visible (non-ANSI) length */
+export function padStart(str, width) {
+    const visible = stripAnsi(str).length;
+    return visible >= width ? str : ' '.repeat(width - visible) + str;
+}
 /** Colored short ID: dim `#` + cyan first 8 chars */
 export function shortId(id) {
     return `${pc.dim('#')}${pc.cyan(id.slice(0, 8))}`;
@@ -21,7 +36,7 @@ export function getPriorityIcon(priority) {
     switch (priority) {
         case 'high': return '\u{1F534} ';
         case 'medium': return '\u{1F7E1} ';
-        default: return '';
+        default: return '   ';
     }
 }
 /** Dim effort badge like `▪ L`, or empty string */
@@ -36,6 +51,42 @@ export function formatFeedback(count) {
         return '';
     return pc.dim(`\u{1F4AC} ${count}`);
 }
+/** Compact progress fraction like `3/5`, or empty string */
+export function formatProgressCompact(progress) {
+    if (!progress || progress.total === 0)
+        return '';
+    return `${progress.done}/${progress.total}`;
+}
+const MONTH_SHORT = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+/** Due-date string with urgency coloring */
+export function formatDueDate(dueDate) {
+    if (!dueDate)
+        return '';
+    const due = new Date(dueDate);
+    if (isNaN(due.getTime()))
+        return '';
+    const now = new Date();
+    // Compare dates only (strip time)
+    const todayStart = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+    const dueStart = new Date(due.getFullYear(), due.getMonth(), due.getDate());
+    const diffDays = Math.round((dueStart.getTime() - todayStart.getTime()) / (1000 * 60 * 60 * 24));
+    if (diffDays < -1)
+        return pc.red(`${Math.abs(diffDays)}d over`);
+    if (diffDays === -1)
+        return pc.red('1d over');
+    if (diffDays === 0)
+        return pc.red('today');
+    if (diffDays === 1)
+        return pc.red('tmrw');
+    if (diffDays <= 7)
+        return pc.yellow(`in ${diffDays}d`);
+    const month = MONTH_SHORT[due.getMonth()];
+    const day = due.getDate();
+    if (due.getFullYear() !== now.getFullYear()) {
+        return pc.dim(`${month} ${day} '${String(due.getFullYear()).slice(2)}`);
+    }
+    return pc.dim(`${month} ${day}`);
+}
 /** Dim labels joined with ` · `, or empty string */
 export function formatLabels(labels) {
     if (!labels || labels.length === 0)

package/dist/ui/task-picker.js

@@ -1,6 +1,6 @@
 import { select, confirm, input, Separator } from '@inquirer/prompts';
 import pc from 'picocolors';
-import { shortId, shortIdRaw, getTypeIcon, getPriorityIcon, formatEffort, formatSubtaskProgress, sectionHeader, relativeTime, getTerminalWidth, } from './format.js';
+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  )
 const PRIORITY_WIDTH = 3; // emoji(2) + space(1), or 3 spaces
@@ -9,18 +9,47 @@ 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
+// Column widths for meta area
+const COL_EFFORT = 4; // "▪ L "
+const COL_PROGRESS = 5; // "  3/5" (right-aligned)
+const COL_FEEDBACK = 4; // "💬2 "
+const COL_DUE_DATE = 8; // "in 3d   " or "  Mar 15"
+const COL_GAP = 2; // gap between meta columns
+function getMetaLayout(tasks, termWidth) {
+    const hasAnyDueDate = tasks.some(t => t.dueDate);
+    const hasAnyProgress = tasks.some(t => t.subtaskProgress?.total);
+    const hasAnyFeedback = tasks.some(t => t.feedbackCount);
+    const narrow = termWidth < 100;
+    const effort = true; // always show effort column
+    const dueDate = hasAnyDueDate;
+    const progress = !narrow && hasAnyProgress;
+    const feedback = !narrow && hasAnyFeedback;
+    // Calculate total width: sum of active columns + gaps between them
+    const activeCols = [];
+    if (effort)
+        activeCols.push(COL_EFFORT);
+    if (progress)
+        activeCols.push(COL_PROGRESS);
+    if (feedback)
+        activeCols.push(COL_FEEDBACK);
+    if (dueDate)
+        activeCols.push(COL_DUE_DATE);
+    const totalWidth = activeCols.length > 0
+        ? activeCols.reduce((a, b) => a + b, 0) + (activeCols.length - 1) * COL_GAP
+        : 0;
+    return { effort, progress, feedback, dueDate, totalWidth };
+}
 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() {
+function getTitleWidth(layout) {
     const termWidth = getTerminalWidth();
-    return Math.max(MIN_TITLE, termWidth - LEFT_FIXED - GAP3 - META_RESERVE);
+    const metaWidth = layout.totalWidth > 0 ? GAP3 + layout.totalWidth : 0;
+    return Math.max(MIN_TITLE, termWidth - LEFT_FIXED - metaWidth);
 }
-function formatTableRow(task, titleWidth) {
-    // Priority: always 3 terminal cols
-    const hasPriority = task.priority === 'high' || task.priority === 'medium';
-    const priorityStr = hasPriority ? getPriorityIcon(task.priority) : '   ';
+function formatTableRow(task, titleWidth, layout) {
+    // Priority: always 3 terminal cols (getPriorityIcon returns 3 spaces for non-priority)
+    const priorityStr = getPriorityIcon(task.priority);
     // Type icon: 2 terminal cols
     const typeStr = getTypeIcon(task.type);
     // ID: 9 visible chars
@@ -29,19 +58,33 @@ function formatTableRow(task, titleWidth) {
     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}`;
+    // Build fixed-width meta columns
+    const metaCols = [];
+    if (layout.effort) {
+        const effortStr = task.effort ? formatEffort(task.effort) : '';
+        metaCols.push(padEnd(effortStr, COL_EFFORT));
+    }
+    if (layout.progress) {
+        const progressStr = task.subtaskProgress?.total
+            ? formatProgressCompact(task.subtaskProgress)
+            : '';
+        metaCols.push(padStart(progressStr, COL_PROGRESS));
+    }
+    if (layout.feedback) {
+        const feedbackStr = task.feedbackCount
+            ? pc.dim(`\u{1F4AC}${task.feedbackCount}`)
+            : '';
+        metaCols.push(padEnd(feedbackStr, COL_FEEDBACK));
+    }
+    if (layout.dueDate) {
+        const dueDateStr = formatDueDate(task.dueDate);
+        metaCols.push(padStart(dueDateStr, COL_DUE_DATE));
+    }
+    const meta = metaCols.length > 0 ? '  ' + metaCols.join(' '.repeat(COL_GAP)) : '';
+    return `${priorityStr}${typeStr} ${idStr}  ${titleStr}${meta}`;
 }
-function formatTaskChoice(choice, titleWidth) {
-    const firstLine = formatTableRow(choice.task, titleWidth);
+function formatTaskChoice(choice, titleWidth, layout) {
+    const firstLine = formatTableRow(choice.task, titleWidth, layout);
     const indent = ' '.repeat(INDENT_WIDTH);
     if (choice.type === 'in_progress') {
         const worktreeName = choice.worktree.path.split('/').pop() || choice.worktree.path;
@@ -75,7 +118,6 @@ function formatTaskChoice(choice, titleWidth) {
 }
 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',
@@ -118,12 +160,20 @@ export async function pickTask(options) {
             availableChoices.push({ type: 'available', task });
         }
     }
+    // Compute adaptive column layout based on terminal width and task data
+    const allDisplayTasks = [
+        ...inProgressChoices.map(c => c.task),
+        ...availableChoices.map(c => c.task),
+        ...lockedChoices.map(c => c.task),
+    ];
+    const layout = getMetaLayout(allDisplayTasks, getTerminalWidth());
+    const titleWidth = getTitleWidth(layout);
     const choices = [];
     if (inProgressChoices.length > 0) {
         choices.push(new Separator(`\n${sectionHeader(`In Progress (${inProgressChoices.length})`)}`));
         for (const choice of inProgressChoices) {
             choices.push({
-                name: formatTaskChoice(choice, titleWidth),
+                name: formatTaskChoice(choice, titleWidth, layout),
                 value: choice,
             });
         }
@@ -132,7 +182,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, titleWidth),
+                name: formatTaskChoice(choice, titleWidth, layout),
                 value: choice,
             });
         }
@@ -141,7 +191,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, titleWidth),
+                name: formatTaskChoice(choice, titleWidth, layout),
                 value: choice,
             });
         }

package/package.json

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