Solves merge conflicts with origin/next.

This commit is contained in:
Eyal Toledano
2025-05-16 18:15:11 -04:00
21 changed files with 566 additions and 124 deletions

View File

@@ -1073,10 +1073,16 @@ function registerCommands(programInstance) {
.command('list')
.description('List all tasks')
.option('-f, --file <file>', 'Path to the tasks file', 'tasks/tasks.json')
.option(
'-r, --report <report>',
'Path to the complexity report file',
'scripts/task-complexity-report.json'
)
.option('-s, --status <status>', 'Filter by status')
.option('--with-subtasks', 'Show subtasks for each task')
.action(async (options) => {
const tasksPath = options.file;
const reportPath = options.report;
const statusFilter = options.status;
const withSubtasks = options.withSubtasks || false;
@@ -1088,7 +1094,7 @@ function registerCommands(programInstance) {
console.log(chalk.blue('Including subtasks in listing'));
}
await listTasks(tasksPath, statusFilter, withSubtasks);
await listTasks(tasksPath, statusFilter, reportPath, withSubtasks);
});
// expand command
@@ -1384,9 +1390,15 @@ function registerCommands(programInstance) {
`Show the next task to work on based on dependencies and status${chalk.reset('')}`
)
.option('-f, --file <file>', 'Path to the tasks file', 'tasks/tasks.json')
.option(
'-r, --report <report>',
'Path to the complexity report file',
'scripts/task-complexity-report.json'
)
.action(async (options) => {
const tasksPath = options.file;
await displayNextTask(tasksPath);
const reportPath = options.report;
await displayNextTask(tasksPath, reportPath);
});
// show command
@@ -1399,6 +1411,11 @@ function registerCommands(programInstance) {
.option('-i, --id <id>', 'Task ID to show')
.option('-s, --status <status>', 'Filter subtasks by status') // ADDED status option
.option('-f, --file <file>', 'Path to the tasks file', 'tasks/tasks.json')
.option(
'-r, --report <report>',
'Path to the complexity report file',
'scripts/task-complexity-report.json'
)
.action(async (taskId, options) => {
const idArg = taskId || options.id;
const statusFilter = options.status; // ADDED: Capture status filter
@@ -1409,8 +1426,9 @@ function registerCommands(programInstance) {
}
const tasksPath = options.file;
const reportPath = options.report;
// PASS statusFilter to the display function
await displayTaskById(tasksPath, idArg, statusFilter);
await displayTaskById(tasksPath, idArg, reportPath, statusFilter);
});
// add-dependency command