@nijaru/tk 0.0.2 → 0.0.4

package/src/db/storage.ts

@@ -7,9 +7,11 @@ import {
   writeFileSync,
   realpathSync,
   lstatSync,
+  renameSync,
 } from "fs";
 import { join, resolve, basename } from "path";
 import { getTasksDir, getWorkingDir } from "../lib/root";
+import { isTaskOverdue } from "../lib/time";
 import type { Task, Config, Status, Priority, TaskWithMeta, LogEntry } from "../types";
 import { DEFAULT_CONFIG, taskId, parseId, generateRef } from "../types";
 
@@ -31,6 +33,22 @@ function getConfigPath(tasksDir: string): string {
   return join(tasksDir, "config.json");
 }
 
+/**
+ * Write a file atomically by writing to a temporary file and renaming it.
+ */
+function atomicWrite(path: string, content: string): void {
+  const tempPath = `${path}.tmp.${generateRef()}`;
+  try {
+    writeFileSync(tempPath, content);
+    renameSync(tempPath, path);
+  } catch (e) {
+    if (existsSync(tempPath)) {
+      unlinkSync(tempPath);
+    }
+    throw e;
+  }
+}
+
 function validatePathSafety(path: string, tasksDir: string): boolean {
   try {
     if (existsSync(path)) {
@@ -50,17 +68,45 @@ function validatePathSafety(path: string, tasksDir: string): boolean {
   }
 }
 
-function isTaskOverdue(dueDate: string | null, status: Status): boolean {
-  if (!dueDate || status === "done") return false;
-  const today = new Date();
-  today.setHours(0, 0, 0, 0);
-  const parts = dueDate.split("-").map(Number);
-  const year = parts[0];
-  const month = parts[1];
-  const day = parts[2];
-  if (!year || !month || !day) return false;
-  const due = new Date(year, month - 1, day);
-  return due < today;
+const STATUS_ORDER: Record<Status, number> = { active: 0, open: 1, done: 2 };
+
+/**
+ * Compare two tasks for sorting:
+ * 1. Status (active > open > done)
+ * 2. If active/open: overdue > priority (1-4, 0) > due date > created_at
+ * 3. If done: completed_at (newest first)
+ */
+export function compareTasks(a: Task, b: Task): number {
+  const sA = STATUS_ORDER[a.status] ?? 99;
+  const sB = STATUS_ORDER[b.status] ?? 99;
+  if (sA !== sB) return sA - sB;
+
+  if (a.status !== "done") {
+    // Overdue hoist
+    const overdueA = isTaskOverdue(a.due_date, a.status) ? 0 : 1;
+    const overdueB = isTaskOverdue(b.due_date, b.status) ? 0 : 1;
+    if (overdueA !== overdueB) return overdueA - overdueB;
+
+    // Priority (1-4, then 0/none)
+    const pA = a.priority === 0 ? 5 : a.priority;
+    const pB = b.priority === 0 ? 5 : b.priority;
+    if (pA !== pB) return pA - pB;
+
+    // Due date (soonest first, nulls last)
+    if (a.due_date !== b.due_date) {
+      if (!a.due_date) return 1;
+      if (!b.due_date) return -1;
+      return a.due_date.localeCompare(b.due_date);
+    }
+
+    // Created at (newest first)
+    return new Date(b.created_at).getTime() - new Date(a.created_at).getTime();
+  }
+
+  // Done tasks: newest completion first
+  const timeA = a.completed_at ? new Date(a.completed_at).getTime() : 0;
+  const timeB = b.completed_at ? new Date(b.completed_at).getTime() : 0;
+  return timeB - timeA;
 }
 
 // --- Config Operations ---
@@ -82,7 +128,7 @@ export function getConfig(): Config {
 export function saveConfig(config: Config): void {
   const tasksDir = ensureTasksDir();
   const configPath = getConfigPath(tasksDir);
-  writeFileSync(configPath, JSON.stringify(config, null, 2));
+  atomicWrite(configPath, JSON.stringify(config, null, 2));
 }
 
 export function updateConfig(updates: Partial<Config>): Config {
@@ -112,7 +158,7 @@ export function renameProject(oldProject: string, newProject: string): RenameRes
   // Find tasks to rename
   const toRename = allTasks.filter((t) => t.project === oldProject);
   if (toRename.length === 0) {
-    throw new Error(`No tasks found with project "${oldProject}"`);
+    throw new Error(`No tasks found with project "${oldProject}". Run 'tk ls' to see projects.`);
   }
 
   // Check for collisions
@@ -120,7 +166,7 @@ export function renameProject(oldProject: string, newProject: string): RenameRes
   for (const task of toRename) {
     const newId = `${newProject}-${task.ref}`;
     if (existingIds.has(newId)) {
-      throw new Error(`Cannot rename: "${newId}" already exists`);
+      throw new Error(`Cannot rename: "${newId}" already exists. Choose a different project name.`);
     }
   }
 
@@ -167,12 +213,12 @@ export function renameProject(oldProject: string, newProject: string): RenameRes
       const newPath = getTaskPath(tasksDir, taskId(task));
 
       // Write to new path, delete old
-      writeFileSync(newPath, JSON.stringify(task, null, 2));
+      atomicWrite(newPath, JSON.stringify(task, null, 2));
       unlinkSync(oldPath);
     } else if (modified) {
       // Just update references in non-renamed task
       const path = getTaskPath(tasksDir, taskId(task));
-      writeFileSync(path, JSON.stringify(task, null, 2));
+      atomicWrite(path, JSON.stringify(task, null, 2));
     }
   }
 
@@ -221,7 +267,7 @@ function readTaskFile(path: string, tasksDir?: string): Task | null {
 }
 
 function writeTaskFile(path: string, task: Task): void {
-  writeFileSync(path, JSON.stringify(task, null, 2));
+  atomicWrite(path, JSON.stringify(task, null, 2));
 }
 
 /**
@@ -323,7 +369,7 @@ function cleanTaskOrphans(
   // Write back if modified
   if (modified) {
     task.updated_at = new Date().toISOString();
-    writeTaskFile(path, task);
+    atomicWrite(path, JSON.stringify(task, null, 2));
   }
 
   return cleanup;
@@ -440,6 +486,36 @@ export function validateParent(
   return { ok: true };
 }
 
+// --- Task Enrichment ---
+
+/**
+ * Enriches a Task with computed metadata.
+ * Can optionally take a status map for efficient bulk processing of blockers.
+ */
+export function enrichTask(task: Task, statusMap?: Map<string, Status>): TaskWithMeta {
+  const tasksDir = getTasksDir();
+  let blockedByIncomplete = false;
+
+  for (const blockerId of task.blocked_by) {
+    let status = statusMap?.get(blockerId);
+    if (status === undefined) {
+      status = readTaskFile(getTaskPath(tasksDir, blockerId), tasksDir)?.status;
+    }
+
+    if (status && status !== "done") {
+      blockedByIncomplete = true;
+      break;
+    }
+  }
+
+  return {
+    ...task,
+    id: taskId(task),
+    is_overdue: isTaskOverdue(task.due_date, task.status),
+    blocked_by_incomplete: blockedByIncomplete,
+  };
+}
+
 // --- Task CRUD ---
 
 export interface CreateTaskOptions {
@@ -488,7 +564,7 @@ export function createTask(options: CreateTaskOptions): Task & { id: string } {
 
     const path = getTaskPath(tasksDir, id);
     if (writeTaskFileExclusive(path, task)) {
-      return { ...task, id };
+      return enrichTask(task);
     }
     // Collision (extremely rare with 4 chars) - retry with new ref
   }
@@ -497,7 +573,7 @@ export function createTask(options: CreateTaskOptions): Task & { id: string } {
 }
 
 export interface TaskResult {
-  task: Task & { id: string };
+  task: TaskWithMeta;
   cleanup: CleanupInfo | null;
 }
 
@@ -513,48 +589,13 @@ export function getTask(id: string): TaskResult | null {
   const cleanup = cleanTaskOrphans(task, path, id, tasksDir);
 
   return {
-    task: { ...task, id: taskId(task) },
+    task: enrichTask(task),
     cleanup: hasCleanup(cleanup) ? cleanup : null,
   };
 }
 
-export interface TaskWithMetaResult {
-  task: TaskWithMeta;
-  cleanup: CleanupInfo | null;
-}
-
-export function getTaskWithMeta(id: string): TaskWithMetaResult | null {
-  const tasksDir = getTasksDir();
-  if (!existsSync(tasksDir)) return null;
-
-  const path = getTaskPath(tasksDir, id);
-  const task = readTaskFile(path, tasksDir);
-  if (!task) return null;
-
-  // Auto-clean orphaned references
-  const cleanup = cleanTaskOrphans(task, path, id, tasksDir);
-
-  // Check if any blockers are incomplete (after cleanup, all blockers exist)
-  let blockedByIncomplete = false;
-  for (const blockerId of task.blocked_by) {
-    const blockerTask = readTaskFile(getTaskPath(tasksDir, blockerId), tasksDir);
-    if (!blockerTask) continue;
-    if (blockerTask.status !== "done") {
-      blockedByIncomplete = true;
-      break;
-    }
-  }
-
-  return {
-    task: {
-      ...task,
-      id: taskId(task),
-      blocked_by_incomplete: blockedByIncomplete,
-      is_overdue: isTaskOverdue(task.due_date, task.status),
-    },
-    cleanup: hasCleanup(cleanup) ? cleanup : null,
-  };
-}
+// Deprecated alias for getTask
+export const getTaskWithMeta = getTask;
 
 export interface ListOptions {
   status?: Status;
@@ -568,82 +609,63 @@ export interface ListOptions {
   limit?: number;
 }
 
-export function listTasks(options?: ListOptions): (Task & { id: string })[] {
+export function listTasks(options?: ListOptions): TaskWithMeta[] {
   const tasksDir = getTasksDir();
   if (!existsSync(tasksDir)) return [];
 
-  let tasks = getAllTasks(tasksDir);
-
-  // Apply filters
-  if (options?.status) {
-    tasks = tasks.filter((t) => t.status === options.status);
-  }
-  if (options?.priority !== undefined) {
-    tasks = tasks.filter((t) => t.priority === options.priority);
-  }
-  if (options?.project) {
-    tasks = tasks.filter((t) => t.project === options.project);
-  }
-  if (options?.label) {
-    tasks = tasks.filter((t) => t.labels.includes(options.label!));
-  }
-  if (options?.assignee) {
-    tasks = tasks.filter((t) => t.assignees.includes(options.assignee!));
-  }
-  if (options?.parent) {
-    tasks = tasks.filter((t) => t.parent === options.parent);
-  }
-  if (options?.roots) {
-    tasks = tasks.filter((t) => t.parent === null);
-  }
-  if (options?.overdue) {
-    tasks = tasks.filter((t) => isTaskOverdue(t.due_date, t.status));
+  const allTasks = getAllTasks(tasksDir);
+  // Build status map from all tasks once for efficient blocker lookups during enrichment
+  const statusMap = new Map<string, Status>(allTasks.map((t) => [taskId(t), t.status]));
+
+  let tasks = allTasks;
+
+  // Apply filters declaratively
+  if (options) {
+    const filters: ((t: Task) => boolean)[] = [];
+
+    if (options.status) filters.push((t) => t.status === options.status);
+    if (options.priority !== undefined) filters.push((t) => t.priority === options.priority);
+    if (options.project) filters.push((t) => t.project === options.project);
+    if (options.label) filters.push((t) => t.labels.includes(options.label!));
+    if (options.assignee) filters.push((t) => t.assignees.includes(options.assignee!));
+    if (options.parent) filters.push((t) => t.parent === options.parent);
+    if (options.roots) filters.push((t) => t.parent === null);
+    if (options.overdue) filters.push((t) => isTaskOverdue(t.due_date, t.status));
+
+    if (filters.length > 0) {
+      tasks = tasks.filter((t) => filters.every((f) => f(t)));
+    }
   }
 
-  // Sort by priority (lower = more urgent), then created_at (newer first)
-  tasks.sort((a, b) => {
-    if (a.priority !== b.priority) return a.priority - b.priority;
-    return new Date(b.created_at).getTime() - new Date(a.created_at).getTime();
-  });
+  tasks.sort(compareTasks);
 
   if (options?.limit) {
     tasks = tasks.slice(0, options.limit);
   }
 
-  return tasks.map((t) => ({ ...t, id: taskId(t) }));
+  return tasks.map((t) => enrichTask(t, statusMap));
 }
 
-export function listReadyTasks(): (Task & { id: string })[] {
+export function listReadyTasks(): TaskWithMeta[] {
   const tasksDir = getTasksDir();
   if (!existsSync(tasksDir)) return [];
 
-  // Get all tasks once and build status map for O(1) blocker lookups
   const allTasks = getAllTasks(tasksDir);
-  const statusMap = new Map<string, Status>();
-  for (const task of allTasks) {
-    statusMap.set(taskId(task), task.status);
-  }
+  const statusMap = new Map<string, Status>(allTasks.map((t) => [taskId(t), t.status]));
 
-  // Filter to open tasks that have no incomplete blockers
   const readyTasks = allTasks
-    .filter((task) => task.status === "open")
+    .filter((task) => task.status === "active" || task.status === "open")
     .filter((task) => {
       for (const blockerId of task.blocked_by) {
         const blockerStatus = statusMap.get(blockerId);
-        // Missing blocker (orphaned ref) doesn't block
-        if (!blockerStatus) continue;
-        if (blockerStatus !== "done") return false;
+        if (blockerStatus && blockerStatus !== "done") return false;
       }
       return true;
     });
 
-  // Sort by priority (lower = more urgent), then created_at (newer first)
-  readyTasks.sort((a, b) => {
-    if (a.priority !== b.priority) return a.priority - b.priority;
-    return new Date(b.created_at).getTime() - new Date(a.created_at).getTime();
-  });
+  readyTasks.sort(compareTasks);
 
-  return readyTasks.map((t) => ({ ...t, id: taskId(t) }));
+  return readyTasks.map((t) => enrichTask(t, statusMap));
 }
 
 export function updateTaskStatus(id: string, status: Status): (Task & { id: string }) | null {
@@ -658,7 +680,7 @@ export function updateTaskStatus(id: string, status: Status): (Task & { id: stri
   task.completed_at = status === "done" ? now : null;
 
   writeTaskFile(path, task);
-  return { ...task, id: taskId(task) };
+  return enrichTask(task);
 }
 
 export interface UpdateTaskOptions {
@@ -690,7 +712,7 @@ export function updateTask(id: string, updates: UpdateTaskOptions): (Task & { id
   task.updated_at = now;
 
   writeTaskFile(path, task);
-  return { ...task, id: taskId(task) };
+  return enrichTask(task);
 }
 
 export function deleteTask(id: string): boolean {
@@ -705,7 +727,7 @@ export function deleteTask(id: string): boolean {
   for (const task of allTasks) {
     const modified = removeRefsFromTask(task, (ref) => ref === id);
     if (modified) {
-      writeTaskFile(getTaskPath(tasksDir, taskId(task)), task);
+      atomicWrite(getTaskPath(tasksDir, taskId(task)), JSON.stringify(task, null, 2));
     }
   }
 
@@ -749,7 +771,7 @@ export function cleanTasks(options: CleanOptions): number {
     for (const task of remaining) {
       const modified = removeRefsFromTask(task, (id) => toDeleteSet.has(id));
       if (modified) {
-        writeTaskFile(getTaskPath(tasksDir, taskId(task)), task);
+        atomicWrite(getTaskPath(tasksDir, taskId(task)), JSON.stringify(task, null, 2));
       }
     }
   }
@@ -775,7 +797,7 @@ export function addLogEntry(taskIdStr: string, message: string): LogEntry {
 
   task.logs.push(entry);
   task.updated_at = now;
-  writeTaskFile(path, task);
+  atomicWrite(path, JSON.stringify(task, null, 2));
 
   return entry;
 }
@@ -806,7 +828,7 @@ export function addBlock(taskIdStr: string, blockedBy: string): { ok: boolean; e
 
   task.blocked_by.push(blockedBy);
   task.updated_at = new Date().toISOString();
-  writeTaskFile(taskPath, task);
+  atomicWrite(taskPath, JSON.stringify(task, null, 2));
 
   return { ok: true };
 }
@@ -822,7 +844,7 @@ export function removeBlock(taskIdStr: string, blockedBy: string): boolean {
 
   task.blocked_by.splice(idx, 1);
   task.updated_at = new Date().toISOString();
-  writeTaskFile(taskPath, task);
+  atomicWrite(taskPath, JSON.stringify(task, null, 2));
 
   return true;
 }

package/src/lib/completions.ts

@@ -130,7 +130,7 @@ _tk() {
         'add:Create task'
         'ls:List tasks'
         'list:List tasks'
-        'ready:List ready tasks (open + unblocked)'
+        'ready:List ready tasks (active/open + unblocked)'
         'show:Show task details'
         'start:Start working on task'
         'done:Complete task'
@@ -164,97 +164,97 @@ _tk() {
     local -a shells
     shells=('bash' 'zsh' 'fish')
 
-    _arguments -C \\
-        \$global_opts \\
-        '1:command:->command' \\
+    _arguments -C \
+        $global_opts \
+        '1:command:->command' \
         '*::arg:->args'
 
-    case \$state in
+    case $state in
         command)
             _describe -t commands 'tk command' commands
             ;;
         args)
-            case \$words[1] in
+            case $words[1] in
                 add)
-                    _arguments \\
-                        '(-p --priority)'{-p,--priority}'[Priority]:priority:(\$priorities)' \\
-                        '(-P --project)'{-P,--project}'[Project]:project:' \\
-                        '(-d --description)'{-d,--description}'[Description]:description:' \\
-                        '(-l --labels)'{-l,--labels}'[Labels]:labels:' \\
-                        '(-A --assignees)'{-A,--assignees}'[Assignees]:assignees:' \\
-                        '--parent[Parent task]:parent:_tk_task_ids' \\
-                        '--estimate[Estimate]:estimate:' \\
-                        '--due[Due date]:due:' \\
-                        '--json[Output as JSON]' \\
+                    _arguments \
+                        '(-p --priority)'{-p,--priority}'[Priority]:priority:($priorities)' \
+                        '(-P --project)'{-P,--project}'[Project]:project:' \
+                        '(-d --description)'{-d,--description}'[Description]:description:' \
+                        '(-l --labels)'{-l,--labels}'[Labels]:labels:' \
+                        '(-A --assignees)'{-A,--assignees}'[Assignees]:assignees:' \
+                        '--parent[Parent task]:parent:_tk_task_ids' \
+                        '--estimate[Estimate]:estimate:' \
+                        '--due[Due date]:due:' \
+                        '--json[Output as JSON]' \
                         '*:title:'
                     ;;
                 ls|list)
-                    _arguments \\
-                        '(-s --status)'{-s,--status}'[Status]:status:(\$statuses)' \\
-                        '(-p --priority)'{-p,--priority}'[Priority]:priority:(\$priorities)' \\
-                        '(-P --project)'{-P,--project}'[Project]:project:' \\
-                        '(-l --label)'{-l,--label}'[Label]:label:' \\
-                        '--assignee[Assignee]:assignee:' \\
-                        '--parent[Parent]:parent:_tk_task_ids' \\
-                        '--roots[Root tasks only]' \\
-                        '--overdue[Overdue only]' \\
-                        '(-n --limit)'{-n,--limit}'[Limit]:limit:' \\
-                        '(-a --all)'{-a,--all}'[Show all]' \\
+                    _arguments \
+                        '(-s --status)'{-s,--status}'[Status]:status:($statuses)' \
+                        '(-p --priority)'{-p,--priority}'[Priority]:priority:($priorities)' \
+                        '(-P --project)'{-P,--project}'[Project]:project:' \
+                        '(-l --label)'{-l,--label}'[Label]:label:' \
+                        '--assignee[Assignee]:assignee:' \
+                        '--parent[Parent]:parent:_tk_task_ids' \
+                        '--roots[Root tasks only]' \
+                        '--overdue[Overdue only]' \
+                        '(-n --limit)'{-n,--limit}'[Limit]:limit:' \
+                        '(-a --all)'{-a,--all}'[Show all]' \
                         '--json[Output as JSON]'
                     ;;
                 show|start|done|reopen|rm|remove)
-                    _arguments \\
-                        '--json[Output as JSON]' \\
+                    _arguments \
+                        '--json[Output as JSON]' \
                         '1:task id:_tk_task_ids'
                     ;;
                 edit)
-                    _arguments \\
-                        '(-t --title)'{-t,--title}'[Title]:title:' \\
-                        '(-d --description)'{-d,--description}'[Description]:description:' \\
-                        '(-p --priority)'{-p,--priority}'[Priority]:priority:(\$priorities)' \\
-                        '(-l --labels)'{-l,--labels}'[Labels]:labels:' \\
-                        '(-A --assignees)'{-A,--assignees}'[Assignees]:assignees:' \\
-                        '--parent[Parent task]:parent:' \\
-                        '--estimate[Estimate]:estimate:' \\
-                        '--due[Due date]:due:' \\
-                        '--json[Output as JSON]' \\
+                    _arguments \
+                        '(-t --title)'{-t,--title}'[Title]:title:' \
+                        '(-d --description)'{-d,--description}'[Description]:description:' \
+                        '(-p --priority)'{-p,--priority}'[Priority]:priority:($priorities)' \
+                        '(-l --labels)'{-l,--labels}'[Labels]:labels:' \
+                        '(-A --assignees)'{-A,--assignees}'[Assignees]:assignees:' \
+                        '--parent[Parent task]:parent:' \
+                        '--estimate[Estimate]:estimate:' \
+                        '--due[Due date]:due:' \
+                        '--json[Output as JSON]' \
                         '1:task id:_tk_task_ids'
                     ;;
                 log)
-                    _arguments \\
-                        '--json[Output as JSON]' \\
-                        '1:task id:_tk_task_ids' \\
+                    _arguments \
+                        '--json[Output as JSON]' \
+                        '1:task id:_tk_task_ids' \
                         '*:message:'
                     ;;
                 block|unblock)
-                    _arguments \\
-                        '--json[Output as JSON]' \\
-                        '1:task id:_tk_task_ids' \\
+                    _arguments \
+                        '--json[Output as JSON]' \
+                        '1:task id:_tk_task_ids' \
                         '2:blocker id:_tk_task_ids'
                     ;;
                 clean)
-                    _arguments \\
-                        '--older-than[Days]:days:' \\
-                        '(-f --force)'{-f,--force}'[Force clean even if disabled]' \\
+                    _arguments \
+                        '--older-than[Days]:days:' \
+                        '(-f --force)'{-f,--force}'[Force clean even if disabled]' \
                         '--json[Output as JSON]'
                     ;;
                 check)
-                    _arguments \\
+                    _arguments \
                         '--json[Output as JSON]'
                     ;;
                 config)
-                    _arguments \\
-                        '--rm[Remove alias]' \\
+                    _arguments \
+                        '--rm[Remove alias]' \
                         '1:subcommand:(project alias)'
                     ;;
                 init)
-                    _arguments \\
-                        '(-P --project)'{-P,--project}'[Project]:project:' \\
+                    _arguments \
+                        '(-P --project)'{-P,--project}'[Project]:project:' \
                         '--json[Output as JSON]'
                     ;;
                 completions)
-                    _arguments \\
-                        '1:shell:(\$shells)'
+                    _arguments \
+                        '1:shell:($shells)'
                     ;;
                 ready|help)
                     _arguments \\
@@ -323,7 +323,7 @@ complete -c tk -n __tk_needs_command -f -a init -d 'Initialize .tasks/ directory
 complete -c tk -n __tk_needs_command -f -a add -d 'Create task'
 complete -c tk -n __tk_needs_command -f -a ls -d 'List tasks'
 complete -c tk -n __tk_needs_command -f -a list -d 'List tasks'
-complete -c tk -n __tk_needs_command -f -a ready -d 'List ready tasks (open + unblocked)'
+complete -c tk -n __tk_needs_command -f -a ready -d 'List ready tasks (active/open + unblocked)'
 complete -c tk -n __tk_needs_command -f -a show -d 'Show task details'
 complete -c tk -n __tk_needs_command -f -a start -d 'Start working on task'
 complete -c tk -n __tk_needs_command -f -a done -d 'Complete task'