@nijaru/tk 0.0.3 → 0.0.5

package/src/db/storage.ts

@@ -11,7 +11,7 @@ import {
 } from "fs";
 import { join, resolve, basename } from "path";
 import { getTasksDir, getWorkingDir } from "../lib/root";
-import { isTaskOverdue } from "../lib/time";
+import { isTaskOverdue, daysUntilDue } from "../lib/time";
 import type { Task, Config, Status, Priority, TaskWithMeta, LogEntry } from "../types";
 import { DEFAULT_CONFIG, taskId, parseId, generateRef } from "../types";
 
@@ -77,8 +77,8 @@ const STATUS_ORDER: Record<Status, number> = { active: 0, open: 1, done: 2 };
  * 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;
+  const sA = STATUS_ORDER[a.status];
+  const sB = STATUS_ORDER[b.status];
   if (sA !== sB) return sA - sB;
 
   if (a.status !== "done") {
@@ -119,7 +119,12 @@ export function getConfig(): Config {
   }
   try {
     const text = readFileSync(configPath, "utf-8");
-    return { ...DEFAULT_CONFIG, ...JSON.parse(text) };
+    const parsed = JSON.parse(text);
+    return {
+      ...DEFAULT_CONFIG,
+      ...parsed,
+      defaults: { ...DEFAULT_CONFIG.defaults, ...parsed.defaults },
+    };
   } catch {
     return { ...DEFAULT_CONFIG };
   }
@@ -158,7 +163,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
@@ -166,7 +171,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.`);
     }
   }
 
@@ -234,18 +239,75 @@ export function renameProject(oldProject: string, newProject: string): RenameRes
   };
 }
 
-export function setAlias(alias: string, path: string): Config {
-  const config = getConfig();
-  config.aliases[alias] = path;
-  saveConfig(config);
-  return config;
+export interface MoveResult {
+  old_id: string;
+  new_id: string;
+  referencesUpdated: number;
 }
 
-export function removeAlias(alias: string): Config {
-  const config = getConfig();
-  delete config.aliases[alias];
-  saveConfig(config);
-  return config;
+export function moveTask(oldId: string, newProject: string): MoveResult {
+  const tasksDir = getTasksDir();
+  if (!existsSync(tasksDir)) {
+    throw new Error("No .tasks/ directory found");
+  }
+
+  const parsed = parseId(oldId);
+  if (!parsed) {
+    throw new Error(`Invalid task ID: ${oldId}`);
+  }
+
+  if (parsed.project === newProject) {
+    throw new Error(`Task ${oldId} is already in project "${newProject}"`);
+  }
+
+  const oldPath = getTaskPath(tasksDir, oldId);
+  if (!existsSync(oldPath)) {
+    throw new Error(`Task not found: ${oldId}`);
+  }
+
+  const newId = `${newProject}-${parsed.ref}`;
+  const newPath = getTaskPath(tasksDir, newId);
+  if (existsSync(newPath)) {
+    throw new Error(
+      `Cannot move: "${newId}" already exists. The ref conflicts with an existing task.`,
+    );
+  }
+
+  const task = readTaskFile(oldPath, tasksDir);
+  if (!task) {
+    throw new Error(`Failed to read task: ${oldId}`);
+  }
+
+  // Write new file with updated project
+  task.project = newProject;
+  task.updated_at = new Date().toISOString();
+  atomicWrite(newPath, JSON.stringify(task, null, 2));
+  unlinkSync(oldPath);
+
+  // Update all blocked_by and parent refs in other tasks
+  let referencesUpdated = 0;
+  const allTasks = getAllTasks(tasksDir);
+  for (const other of allTasks) {
+    let modified = false;
+
+    if (other.blocked_by.includes(oldId)) {
+      other.blocked_by = other.blocked_by.map((id) => (id === oldId ? newId : id));
+      referencesUpdated++;
+      modified = true;
+    }
+
+    if (other.parent === oldId) {
+      other.parent = newId;
+      referencesUpdated++;
+      modified = true;
+    }
+
+    if (modified) {
+      atomicWrite(getTaskPath(tasksDir, taskId(other)), JSON.stringify(other, null, 2));
+    }
+  }
+
+  return { old_id: oldId, new_id: newId, referencesUpdated };
 }
 
 // --- Task File Operations ---
@@ -282,7 +344,8 @@ function isValidTaskStructure(obj: unknown): obj is Task {
     typeof t.ref === "string" &&
     typeof t.title === "string" &&
     typeof t.status === "string" &&
-    Array.isArray(t.blocked_by)
+    Array.isArray(t.blocked_by) &&
+    Array.isArray(t.logs)
   );
 }
 
@@ -513,6 +576,7 @@ export function enrichTask(task: Task, statusMap?: Map<string, Status>): TaskWit
     id: taskId(task),
     is_overdue: isTaskOverdue(task.due_date, task.status),
     blocked_by_incomplete: blockedByIncomplete,
+    days_until_due: daysUntilDue(task.due_date, task.status),
   };
 }
 
@@ -594,9 +658,6 @@ export function getTask(id: string): TaskResult | null {
   };
 }
 
-// Deprecated alias for getTask
-export const getTaskWithMeta = getTask;
-
 export interface ListOptions {
   status?: Status;
   priority?: Priority;
@@ -685,7 +746,7 @@ export function updateTaskStatus(id: string, status: Status): (Task & { id: stri
 
 export interface UpdateTaskOptions {
   title?: string;
-  description?: string;
+  description?: string | null;
   priority?: Priority;
   labels?: string[];
   assignees?: string[];
@@ -884,38 +945,13 @@ export function resolveId(input: string): string | null {
   const tasksDir = getTasksDir();
   if (!existsSync(tasksDir)) return null;
 
-  // If it's already a full valid ID, check if task exists
-  if (parseId(input)) {
-    if (existsSync(getTaskPath(tasksDir, input))) {
-      return input;
-    }
-  }
-
-  const inputLower = input.toLowerCase();
-
-  // Read filenames only (no file content parsing)
-  const files = readdirSync(tasksDir);
-  const matches: string[] = [];
-
-  for (const file of files) {
-    if (!file.endsWith(".json") || file === "config.json") continue;
-
-    // Extract ID from filename: "project-ref.json" -> "project-ref"
-    const id = file.slice(0, -5);
-    if (!parseId(id)) continue;
-
-    // Match by full ID prefix or just ref prefix
-    const ref = id.split("-")[1] ?? "";
-    if (id.startsWith(inputLower) || ref.startsWith(inputLower)) {
-      matches.push(id);
-    }
-  }
-
-  if (matches.length === 1 && matches[0]) {
-    return matches[0];
+  // Fast path: full valid ID that exists
+  if (parseId(input) && existsSync(getTaskPath(tasksDir, input))) {
+    return input;
   }
 
-  return null;
+  const matches = findMatchingIds(input);
+  return matches.length === 1 ? (matches[0] ?? null) : null;
 }
 
 export function findMatchingIds(input: string): string[] {

package/src/lib/completions.ts

@@ -12,7 +12,7 @@ _tk() {
     local cur prev words cword
     _init_completion || return
 
-    local commands="init add ls list ready show start done reopen edit log block unblock rm remove clean check config completions help"
+    local commands="init add ls list ready show start done reopen edit log block unblock mv move rm remove clean check config completions help"
     local global_opts="--json --help -h --version -V"
 
     # Find the command (first non-option word after 'tk')
@@ -60,6 +60,13 @@ _tk() {
                 COMPREPLY=($(compgen -W "$(_tk_task_ids)" -- "$cur"))
             fi
             ;;
+        mv|move)
+            if [[ "$cur" == -* ]]; then
+                COMPREPLY=($(compgen -W "--json" -- "$cur"))
+            else
+                COMPREPLY=($(compgen -W "$(_tk_task_ids)" -- "$cur"))
+            fi
+            ;;
         edit)
             if [[ "$cur" == -* ]]; then
                 COMPREPLY=($(compgen -W "-t --title -d --description -p --priority -l --labels -A --assignees --parent --estimate --due --json" -- "$cur"))
@@ -90,9 +97,7 @@ _tk() {
             ;;
         config)
             if [[ "$prev" == "config" ]]; then
-                COMPREPLY=($(compgen -W "project alias --rm" -- "$cur"))
-            elif [[ "$prev" == "alias" ]]; then
-                COMPREPLY=($(compgen -W "--rm" -- "$cur"))
+                COMPREPLY=($(compgen -W "project" -- "$cur"))
             fi
             ;;
         init)
@@ -139,6 +144,8 @@ _tk() {
         'log:Add log entry'
         'block:Add blocker'
         'unblock:Remove blocker'
+        'mv:Move task to different project'
+        'move:Move task to different project'
         'rm:Delete task'
         'remove:Delete task'
         'clean:Remove old done tasks'
@@ -207,6 +214,12 @@ _tk() {
                         '--json[Output as JSON]' \
                         '1:task id:_tk_task_ids'
                     ;;
+                mv|move)
+                    _arguments \
+                        '--json[Output as JSON]' \
+                        '1:task id:_tk_task_ids' \
+                        '2:project:'
+                    ;;
                 edit)
                     _arguments \
                         '(-t --title)'{-t,--title}'[Title]:title:' \
@@ -244,8 +257,7 @@ _tk() {
                     ;;
                 config)
                     _arguments \
-                        '--rm[Remove alias]' \
-                        '1:subcommand:(project alias)'
+                        '1:subcommand:(project)'
                     ;;
                 init)
                     _arguments \
@@ -332,6 +344,8 @@ complete -c tk -n __tk_needs_command -f -a edit -d 'Edit task'
 complete -c tk -n __tk_needs_command -f -a log -d 'Add log entry'
 complete -c tk -n __tk_needs_command -f -a block -d 'Add blocker'
 complete -c tk -n __tk_needs_command -f -a unblock -d 'Remove blocker'
+complete -c tk -n __tk_needs_command -f -a mv -d 'Move task to different project'
+complete -c tk -n __tk_needs_command -f -a move -d 'Move task to different project'
 complete -c tk -n __tk_needs_command -f -a rm -d 'Delete task'
 complete -c tk -n __tk_needs_command -f -a remove -d 'Delete task'
 complete -c tk -n __tk_needs_command -f -a clean -d 'Remove old done tasks'
@@ -380,6 +394,8 @@ complete -c tk -n '__tk_using_command show' -f -a '(__tk_task_ids)' -d 'Task ID'
 complete -c tk -n '__tk_using_command start' -f -a '(__tk_task_ids)' -d 'Task ID'
 complete -c tk -n '__tk_using_command done' -f -a '(__tk_task_ids)' -d 'Task ID'
 complete -c tk -n '__tk_using_command reopen' -f -a '(__tk_task_ids)' -d 'Task ID'
+complete -c tk -n '__tk_using_command mv' -f -a '(__tk_task_ids)' -d 'Task ID'
+complete -c tk -n '__tk_using_command move' -f -a '(__tk_task_ids)' -d 'Task ID'
 complete -c tk -n '__tk_using_command rm' -f -a '(__tk_task_ids)' -d 'Task ID'
 complete -c tk -n '__tk_using_command remove' -f -a '(__tk_task_ids)' -d 'Task ID'
 complete -c tk -n '__tk_using_command log' -f -a '(__tk_task_ids)' -d 'Task ID'
@@ -414,8 +430,7 @@ complete -c tk -n '__tk_using_command clean' -l json -d 'Output as JSON'
 complete -c tk -n '__tk_using_command check' -l json -d 'Output as JSON'
 
 # config command
-complete -c tk -n '__tk_using_command config' -f -a 'project alias' -d 'Config option'
-complete -c tk -n '__tk_using_command config' -l rm -d 'Remove alias'
+complete -c tk -n '__tk_using_command config' -f -a 'project' -d 'Config option'
 
 # init command
 complete -c tk -n '__tk_using_command init' -s P -l project -d 'Project'

package/src/lib/format.test.ts

@@ -33,7 +33,8 @@ describe("shouldUseColor", () => {
 
   test("respects NO_COLOR empty string as color enabled", () => {
     process.env.NO_COLOR = "";
-    // When NO_COLOR is empty, color is allowed (depends on TTY)
+    // NO_COLOR="" is treated as unset — color depends on TTY (always false in tests)
+    expect(shouldUseColor()).toBe(false);
   });
 });
 
@@ -59,6 +60,7 @@ describe("formatTaskRow", () => {
     external: {},
     blocked_by_incomplete: false,
     is_overdue: false,
+    days_until_due: null,
   };
 
   test("formats task without color", () => {
@@ -92,13 +94,13 @@ describe("formatTaskRow", () => {
     expect(parts.length).toBe(4); // ID | PRIO | STATUS | TITLE
   });
 
-  test("truncates long project names to 6 chars", () => {
+  test("truncates long project names with ellipsis", () => {
     const longProjectTask: TaskWithMeta = {
       ...task,
       id: "mylongproject-a1b2",
     };
     const result = formatTaskRow(longProjectTask, false);
-    expect(result).toContain("mylong-a1b2");
+    expect(result).toContain("mylon…-a1b2");
     expect(result).not.toContain("mylongproject");
   });
 
@@ -127,11 +129,81 @@ describe("formatTaskRow", () => {
     const result = formatTaskRow(todayTask, false);
     expect(result).not.toContain("[OVERDUE]");
   });
+
+  test("shows [due today] for tasks due today", () => {
+    const today = new Date().toISOString().split("T")[0] ?? null;
+    const todayTask: TaskWithMeta = {
+      ...task,
+      due_date: today,
+      is_overdue: false,
+      days_until_due: 0,
+    };
+    const result = formatTaskRow(todayTask, false);
+    expect(result).toContain("[due today]");
+    expect(result).not.toContain("[OVERDUE]");
+  });
+
+  test("shows [due Nd] for tasks due in N days within threshold", () => {
+    const future = new Date();
+    future.setDate(future.getDate() + 3);
+    const dateStr = future.toISOString().split("T")[0] ?? null;
+    const soonTask: TaskWithMeta = {
+      ...task,
+      due_date: dateStr,
+      is_overdue: false,
+      days_until_due: 3,
+    };
+    const result = formatTaskRow(soonTask, false);
+    expect(result).toContain("[due 3d]");
+  });
+
+  test("shows no due-soon marker at 8 days", () => {
+    const future = new Date();
+    future.setDate(future.getDate() + 8);
+    const dateStr = future.toISOString().split("T")[0] ?? null;
+    const notSoonTask: TaskWithMeta = {
+      ...task,
+      due_date: dateStr,
+      is_overdue: false,
+      days_until_due: 8,
+    };
+    const result = formatTaskRow(notSoonTask, false);
+    expect(result).not.toContain("[due");
+    expect(result).not.toContain("[OVERDUE]");
+  });
+
+  test("shows no due-soon marker when overdue", () => {
+    const overdueWithSoon: TaskWithMeta = {
+      ...task,
+      due_date: "2020-01-01",
+      is_overdue: true,
+      days_until_due: null,
+    };
+    const result = formatTaskRow(overdueWithSoon, false);
+    expect(result).toContain("[OVERDUE]");
+    expect(result).not.toContain("[due today]");
+    expect(result).not.toContain("[due ");
+  });
+
+  test("shows no due-soon marker for done tasks", () => {
+    const doneTask: TaskWithMeta = {
+      ...task,
+      status: "done",
+      days_until_due: null,
+      completed_at: new Date().toISOString(),
+    };
+    const result = formatTaskRow(doneTask, false);
+    expect(result).not.toContain("[due");
+  });
 });
 
 describe("formatTaskList", () => {
-  test("returns message for empty list", () => {
-    expect(formatTaskList([])).toBe("No tasks found.");
+  test("returns helpful message for empty list", () => {
+    expect(formatTaskList([])).toBe("No tasks found. Run 'tk add \"title\"' to create one.");
+  });
+
+  test("allows custom empty hint", () => {
+    expect(formatTaskList([], undefined, "Custom hint")).toBe("Custom hint");
   });
 
   test("includes header and divider", () => {
@@ -157,6 +229,7 @@ describe("formatTaskList", () => {
         external: {},
         blocked_by_incomplete: false,
         is_overdue: false,
+        days_until_due: null,
       },
     ];
     const result = formatTaskList(tasks, false);
@@ -190,6 +263,7 @@ describe("formatTaskList", () => {
         external: {},
         blocked_by_incomplete: false,
         is_overdue: false,
+        days_until_due: null,
       },
       {
         id: "tk-c3d4",
@@ -212,6 +286,7 @@ describe("formatTaskList", () => {
         external: {},
         blocked_by_incomplete: false,
         is_overdue: false,
+        days_until_due: null,
       },
     ];
     const result = formatTaskList(tasks, false);
@@ -244,6 +319,7 @@ describe("formatTaskDetail", () => {
     external: {},
     blocked_by_incomplete: true,
     is_overdue: false,
+    days_until_due: null,
   };
 
   test("includes all task fields", () => {

package/src/lib/format.ts

@@ -1,7 +1,9 @@
 import type { TaskWithMeta, LogEntry } from "../types";
 import { PRIORITY_COLORS, STATUS_COLORS, OVERDUE_COLOR, RESET } from "../types";
 import { formatPriority } from "./priority";
-import { formatDate, formatRelativeTime } from "./time";
+import { formatDate, formatRelativeTime, DUE_SOON_THRESHOLD } from "./time";
+
+const DUE_SOON_COLOR = "\x1b[33m"; // yellow
 
 // Message colors
 const GREEN = "\x1b[32m";
@@ -10,17 +12,14 @@ const YELLOW = "\x1b[33m";
 const DIM = "\x1b[2m";
 
 /**
- * Determines if color output should be used.
+ * Determines if color output should be used for the given stream.
  * Respects NO_COLOR env var (https://no-color.org/) and TTY detection.
  */
-export function shouldUseColor(): boolean {
+export function shouldUseColor(stream: NodeJS.WriteStream = process.stdout): boolean {
   if (process.env.NO_COLOR !== undefined && process.env.NO_COLOR !== "") {
     return false;
   }
-  if (!process.stdout.isTTY) {
-    return false;
-  }
-  return true;
+  return stream.isTTY ?? false;
 }
 
 /** Format text green (success) */
@@ -28,9 +27,9 @@ export function green(msg: string): string {
   return shouldUseColor() ? `${GREEN}${msg}${RESET}` : msg;
 }
 
-/** Format text red (error) */
+/** Format text red (error) — checks stderr since errors are written there */
 export function red(msg: string): string {
-  return shouldUseColor() ? `${RED}${msg}${RESET}` : msg;
+  return shouldUseColor(process.stderr) ? `${RED}${msg}${RESET}` : msg;
 }
 
 /** Format text yellow (warning) */
@@ -43,23 +42,30 @@ export function dim(msg: string): string {
   return shouldUseColor() ? `${DIM}${msg}${RESET}` : msg;
 }
 
-function formatId(id: string): string {
-  // Truncate project prefix to 6 chars, keep full 4-char ref
-  // "myproject-a1b2" -> "myproj-a1b2"
+function truncate(text: string, maxLen: number): string {
+  return text.length <= maxLen ? text : text.slice(0, maxLen - 1) + "…";
+}
+
+function formatId(id: string, maxLen = 11): string {
+  // Truncate project prefix to fit maxLen, keep full 4-char ref
+  // "myproject-a1b2" -> "mypr…-a1b2"
   const dash = id.lastIndexOf("-");
-  if (dash === -1) return id.slice(0, 11);
+  if (dash === -1) return truncate(id, maxLen);
   const project = id.slice(0, dash);
   const ref = id.slice(dash + 1);
-  const truncatedProject = project.length > 6 ? project.slice(0, 6) : project;
-  return `${truncatedProject}-${ref}`;
+  const maxProjectLen = maxLen - ref.length - 1; // -1 for dash
+  return project.length > maxProjectLen
+    ? `${truncate(project, maxProjectLen)}-${ref}`
+    : `${project}-${ref}`;
 }
 
 export function formatTaskRow(task: TaskWithMeta, useColor?: boolean): string {
   const color = useColor ?? shouldUseColor();
   const id = formatId(task.id).padEnd(11);
   const priority = formatPriority(task.priority).padEnd(4);
-  const title = task.title.slice(0, 50);
   const isOverdue = task.is_overdue;
+  const dueSoon =
+    !isOverdue && task.days_until_due !== null && task.days_until_due <= DUE_SOON_THRESHOLD;
 
   let statusText: string = task.status;
   if (task.status === "done" && task.completed_at) {
@@ -69,17 +75,29 @@ export function formatTaskRow(task: TaskWithMeta, useColor?: boolean): string {
 
   if (color) {
     const pc = PRIORITY_COLORS[task.priority];
-    const sc = isOverdue ? OVERDUE_COLOR : STATUS_COLORS[task.status];
+    const sc = isOverdue ? OVERDUE_COLOR : dueSoon ? DUE_SOON_COLOR : STATUS_COLORS[task.status];
     const tc = task.status === "done" ? DIM : "";
+    const title = truncate(task.title, 50);
     return `${id} | ${pc}${priority}${RESET} | ${sc}${status}${RESET} | ${tc}${title}${RESET}`;
   }
 
+  let dueSoonMarker = "";
+  if (dueSoon) {
+    dueSoonMarker = task.days_until_due === 0 ? " [due today]" : ` [due ${task.days_until_due}d]`;
+  }
   const overdueMarker = isOverdue ? " [OVERDUE]" : "";
-  return `${id} | ${priority} | ${status} | ${title}${overdueMarker}`;
+  const title = truncate(task.title, 50);
+  return `${id} | ${priority} | ${status} | ${title}${overdueMarker}${dueSoonMarker}`;
 }
 
-export function formatTaskList(tasks: TaskWithMeta[], useColor?: boolean): string {
-  if (tasks.length === 0) return "No tasks found.";
+export function formatTaskList(
+  tasks: TaskWithMeta[],
+  useColor?: boolean,
+  emptyHint?: string,
+): string {
+  if (tasks.length === 0) {
+    return emptyHint ?? "No tasks found. Run 'tk add \"title\"' to create one.";
+  }
   const color = useColor ?? shouldUseColor();
 
   const header = "ID          | PRIO | STATUS       | TITLE";
@@ -124,8 +142,16 @@ export function formatTaskDetail(task: TaskWithMeta, logs: LogEntry[], useColor?
   }
 
   if (task.due_date) {
+    const yc = color ? DUE_SOON_COLOR : "";
+    const dueSoon =
+      !task.is_overdue && task.days_until_due !== null && task.days_until_due <= DUE_SOON_THRESHOLD;
+    let dueSoonStr = "";
+    if (dueSoon) {
+      const marker = task.days_until_due === 0 ? "[due today]" : `[due ${task.days_until_due}d]`;
+      dueSoonStr = ` ${yc}${marker}${r}`;
+    }
     const overdueStr = task.is_overdue ? ` ${oc}[OVERDUE]${r}` : "";
-    lines.push(`Due:         ${task.due_date}${overdueStr}`);
+    lines.push(`Due:         ${task.due_date}${overdueStr}${dueSoonStr}`);
   }
 
   lines.push(`Created:     ${formatDate(task.created_at)}`);
@@ -155,22 +181,9 @@ export function formatJson(data: unknown): string {
   return JSON.stringify(data, null, 2);
 }
 
-export function formatConfig(config: {
-  version: number;
-  project: string;
-  aliases: Record<string, string>;
-}): string {
+export function formatConfig(config: { version: number; project: string }): string {
   const lines: string[] = [];
   lines.push(`Version:  ${config.version}`);
   lines.push(`Project:  ${config.project}`);
-
-  if (Object.keys(config.aliases).length > 0) {
-    lines.push("");
-    lines.push("Aliases:");
-    for (const [alias, path] of Object.entries(config.aliases)) {
-      lines.push(`  ${alias} → ${path}`);
-    }
-  }
-
   return lines.join("\n");
 }