@estruyf/worklog-cli 0.2.0 → 0.2.1

package/README.md

@@ -34,11 +34,25 @@ Each command refuses options it doesn't have, so a to-do's due date can never en
 | `--id` | Log on this exact task id instead. |
 | `--note` | Progress note added under the task's `### Notes`. |
 | `--date` | The day worked, `YYYY-MM-DD`. Defaults to today. |
+| `--time` | Time spent on the task that day: `1h`, `45m`, `1h30m`, or `none` to clear it. Sets the day's time, the same as the app's Time field. |
+
+`--time` is a record on the task only. The hours you bill a client for stay with [`hours`](#hours--time-worked).
 
 The task is matched by `--id`, then `--link`, then an **open task of the same title** for that
 client — so a task you typed into the app yourself is picked up rather than duplicated. With no match
 it is created.
 
+## `unlog` — take a log back off
+
+For a log that went on the wrong task or day. Name the task like `update`, then pass what to remove:
+
+| Option | Meaning |
+| --- | --- |
+| `--date` | Take this day worked off the task, with its time. |
+| `--note` | Remove the note with exactly this text. |
+
+Each option removes only what it names. The task itself and its status stay as they are.
+
 ## `add` — a to-do
 
 Creates an **open task**: nothing is marked worked and no note is written.
@@ -52,6 +66,7 @@ Creates an **open task**: nothing is marked worked and no note is written.
 | `--description` | What the task is about, written under its fields. |
 | `--tag` | A tag. Repeat it for several. |
 | `--parent` | A task id, making the new task its subtask. |
+| `--repeat` | A repeat rule, as the app's `- repeat:` line takes it: `weekly on mon`, `monthly on last`, … Without `--due`, the first occurrence is the due date. |
 | `--link` | Issue or ticket url. |
 
 An open task with the same link or title is left as it is rather than duplicated.
@@ -70,6 +85,7 @@ several clients have one), then pass only what changes:
 | `--status` | A status id from `.worklog/config.json`. A closing one closes the task. |
 | `--tag` / `--untag` | Add or remove a tag. Repeatable. |
 | `--parent` | Move it under this task id, or `none` to make it top-level. |
+| `--repeat` | A new repeat rule, or `none` to stop it repeating. Its `repeatFrom` and `repeatUntil` are kept. |
 
 A title that matches open tasks of several clients is refused, with their ids, rather than guessed.
 
@@ -87,8 +103,8 @@ due, priority, client, status, title), soonest due first.
 | --- | --- |
 | `--client` | Only this client's tasks; `todos` for the general to-do list. |
 | `--due-by` | Only tasks due on or before this day. |
-| `--tag` | Only tasks with this tag. |
-| `--json` | Print JSON instead, with descriptions, tags and links. |
+| `--tag` | Only tasks with this tag. Repeat it for tasks with all of them. |
+| `--json` | Print JSON instead, with descriptions, tags, links, the days worked and the minutes per day. |
 
 ## `hours` — time worked
 

package/dist/worklog.js

@@ -101,6 +101,216 @@ function isTaskHeading(lines, index) {
   return false;
 }
 
+// src/parser/blocks.ts
+var ID_META2 = /^-\s+id\s*:\s*(.+?)\s*$/;
+function findBlockRange(content, taskId) {
+  const lines = content.split(/\r?\n/);
+  let blockStart = -1;
+  let matched = false;
+  const ranges = [];
+  for (let i = 0; i < lines.length; i++) {
+    if (isTaskHeading(lines, i)) {
+      if (blockStart !== -1) {
+        ranges.push({ start: blockStart, end: i, matched });
+      }
+      blockStart = i;
+      matched = false;
+    } else if (blockStart !== -1) {
+      const m = ID_META2.exec(lines[i]);
+      if (m && m[1] === taskId) {
+        matched = true;
+      }
+    }
+  }
+  if (blockStart !== -1) {
+    ranges.push({ start: blockStart, end: lines.length, matched });
+  }
+  const hit = ranges.find((r) => r.matched);
+  return hit ? { start: hit.start, end: hit.end } : void 0;
+}
+function replaceBlock(content, taskId, newBlock) {
+  const range = findBlockRange(content, taskId);
+  if (!range) {
+    return void 0;
+  }
+  const lines = content.split(/\r?\n/);
+  const original = lines.slice(range.start, range.end);
+  const hadTrailingBlank = original.length > 0 && original[original.length - 1].trim() === "";
+  const replacement = newBlock.split(/\r?\n/);
+  if (hadTrailingBlank) {
+    replacement.push("");
+  }
+  const next = [...lines.slice(0, range.start), ...replacement, ...lines.slice(range.end)];
+  return next.join("\n").replace(/\n{3,}/g, "\n\n");
+}
+function extractBlock(content, taskId) {
+  const range = findBlockRange(content, taskId);
+  if (!range) {
+    return void 0;
+  }
+  const lines = content.split(/\r?\n/);
+  const blockLines = lines.slice(range.start, range.end);
+  while (blockLines.length && blockLines[blockLines.length - 1].trim() === "") {
+    blockLines.pop();
+  }
+  const before = lines.slice(0, range.start);
+  const after = lines.slice(range.end);
+  while (before.length && before[before.length - 1].trim() === "") {
+    before.pop();
+  }
+  const remainderLines = [...before];
+  if (before.length && after.some((l) => l.trim() !== "")) {
+    remainderLines.push("");
+  }
+  remainderLines.push(...after);
+  let remainder = remainderLines.join("\n").replace(/\n{3,}/g, "\n\n").replace(/\s+$/, "");
+  if (remainder) {
+    remainder += "\n";
+  }
+  return { block: blockLines.join("\n"), remainder, startLine: range.start };
+}
+
+// src/parser/meetingParser.ts
+var H22 = /^##\s+(.*)$/;
+var META2 = /^-\s+([A-Za-z][\w-]*)\s*:\s*(.*)$/;
+var ACTIONS_HEADING = /^###\s+Action items\s*$/i;
+var ACTION_ENTRY = /^-\s+\[([ xX])\]\s*(.*)$/;
+var ACTION_TASK = /^(.*?)\s+→\s+(t_[A-Za-z0-9]+)$/;
+var TIME = /^(\d{1,2}):(\d{2})$/;
+var DURATION = /^(?:(\d+(?:\.\d+)?)\s*h)?\s*(?:(\d+)\s*m(?:in)?)?$/i;
+function parseDuration(value) {
+  const text = value.trim();
+  if (/^\d+$/.test(text)) {
+    const n = Number(text);
+    return n > 0 ? n : void 0;
+  }
+  const m = DURATION.exec(text);
+  if (!m || !m[1] && !m[2]) {
+    return void 0;
+  }
+  const minutes = Math.round(Number(m[1] ?? 0) * 60 + Number(m[2] ?? 0));
+  return minutes > 0 ? minutes : void 0;
+}
+function formatDuration(minutes) {
+  const h = Math.floor(minutes / 60);
+  const m = minutes % 60;
+  if (h === 0) {
+    return `${m}m`;
+  }
+  return m === 0 ? `${h}h` : `${h}h${m}m`;
+}
+function normalizeTime(value) {
+  const m = TIME.exec(value.trim());
+  if (!m || Number(m[1]) > 23 || Number(m[2]) > 59) {
+    return void 0;
+  }
+  return `${m[1].padStart(2, "0")}:${m[2]}`;
+}
+function parseMeetingFile(content, sourceFile) {
+  const lines = content.split(/\r?\n/);
+  const starts = [];
+  for (let i = 0; i < lines.length; i++) {
+    if (isTaskHeading(lines, i)) {
+      starts.push(i);
+    }
+  }
+  const meetings = [];
+  for (let b = 0; b < starts.length; b++) {
+    const end = b + 1 < starts.length ? starts[b + 1] : lines.length;
+    const meeting = parseBlock(lines.slice(starts[b], end), sourceFile, starts[b]);
+    if (meeting.id) {
+      meetings.push(meeting);
+    }
+  }
+  return meetings;
+}
+function parseBlock(lines, sourceFile, line) {
+  const meeting = {
+    id: "",
+    title: (H22.exec(lines[0])?.[1] ?? "").trim(),
+    date: "",
+    people: [],
+    notes: "",
+    actions: [],
+    sourceFile,
+    sourceLine: line
+  };
+  let i = 1;
+  for (; i < lines.length; i++) {
+    const meta = META2.exec(lines[i]);
+    if (!meta) {
+      break;
+    }
+    const value = meta[2].trim();
+    switch (meta[1].toLowerCase()) {
+      case "id":
+        meeting.id = value;
+        break;
+      case "date":
+        meeting.date = value;
+        break;
+      case "time":
+        meeting.time = normalizeTime(value) ?? meeting.time;
+        break;
+      case "duration":
+        meeting.duration = parseDuration(value) ?? meeting.duration;
+        break;
+      case "client":
+        meeting.clientId = value || void 0;
+        break;
+      case "people":
+        meeting.people = splitPeople(value);
+        break;
+    }
+  }
+  const body = trimBlank(lines.slice(i));
+  const at = actionsStart(body);
+  if (at < 0) {
+    meeting.notes = body.join("\n");
+  } else {
+    meeting.notes = trimBlank(body.slice(0, at)).join("\n");
+    meeting.actions = body.slice(at + 1).filter((l) => l.trim() !== "").map(parseAction);
+  }
+  return meeting;
+}
+function actionsStart(body) {
+  for (let i = body.length - 1; i >= 0; i--) {
+    if (ACTIONS_HEADING.test(body[i])) {
+      return body.slice(i + 1).every((l) => l.trim() === "" || ACTION_ENTRY.test(l)) ? i : -1;
+    }
+  }
+  return -1;
+}
+function parseAction(line) {
+  const m = ACTION_ENTRY.exec(line);
+  const done = m[1] !== " ";
+  const linked = ACTION_TASK.exec(m[2].trim());
+  return linked ? { text: linked[1].trim(), done, taskId: linked[2] } : { text: m[2].trim(), done };
+}
+function splitPeople(value) {
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const raw of value.split(",")) {
+    const name = raw.trim();
+    if (name && !seen.has(name.toLowerCase())) {
+      seen.add(name.toLowerCase());
+      out.push(name);
+    }
+  }
+  return out;
+}
+function trimBlank(lines) {
+  let start = 0;
+  let end = lines.length;
+  while (start < end && lines[start].trim() === "") {
+    start++;
+  }
+  while (end > start && lines[end - 1].trim() === "") {
+    end--;
+  }
+  return lines.slice(start, end);
+}
+
 // src/util/date.ts
 function today() {
   return toISODate(/* @__PURE__ */ new Date());
@@ -481,8 +691,8 @@ function rollToWeekday(iso, weekdays) {
 
 // src/parser/taskParser.ts
 var H1 = /^#\s+(.*)$/;
-var H22 = /^##\s+(.*)$/;
-var META2 = /^-\s+([A-Za-z][\w-]*)\s*:\s*(.*)$/;
+var H23 = /^##\s+(.*)$/;
+var META3 = /^-\s+([A-Za-z][\w-]*)\s*:\s*(.*)$/;
 var NOTES_HEADING = /^###\s+Notes\s*$/;
 var NOTE_ENTRY = /^-\s+(\d{4}-\d{2}-\d{2}(?:[ T]\d{2}:\d{2})?)\s+—\s+(.*)$/;
 var PROMPTS_HEADING = /^###\s+Prompts\s*$/;
@@ -518,6 +728,7 @@ function parseTaskFile(content, sourceFile, clientId) {
       lastDone: t.lastDone,
       repeatOf: t.repeatOf,
       workedOn: t.workedOn,
+      workedTime: t.workedTime,
       tags: t.tags,
       checklist,
       prompts,
@@ -529,7 +740,7 @@ function parseTaskFile(content, sourceFile, clientId) {
   };
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i];
-    const h2 = isTaskHeading(lines, i) ? H22.exec(line) : null;
+    const h2 = isTaskHeading(lines, i) ? H23.exec(line) : null;
     if (h2) {
       flush();
       current = {
@@ -548,7 +759,7 @@ function parseTaskFile(content, sourceFile, clientId) {
       continue;
     }
     if (inMeta) {
-      const meta = META2.exec(line);
+      const meta = META3.exec(line);
       if (meta) {
         applyMeta(current.task, meta[1].toLowerCase(), meta[2].trim());
         continue;
@@ -655,7 +866,16 @@ function applyMeta(task, key, value) {
       if (!value) {
         break;
       }
-      const dates = value.split(/[\s,]+/).map((d) => d.trim()).filter(Boolean);
+      const dates = [];
+      for (const token of value.split(/[\s,]+/).filter(Boolean)) {
+        const minutes = /[hm]/i.test(token) ? parseDuration(token) : void 0;
+        const date = dates[dates.length - 1];
+        if (minutes !== void 0 && date) {
+          task.workedTime = { ...task.workedTime, [date]: minutes };
+        } else {
+          dates.push(token);
+        }
+      }
       if (dates.length === 0) {
         break;
       }
@@ -851,7 +1071,8 @@ function serializeTask(task, clientId) {
     out.push(`- repeatOf: ${task.repeatOf}`);
   }
   for (const worked of task.workedOn ?? []) {
-    out.push(`- worked: ${worked}`);
+    const minutes = task.workedTime?.[worked];
+    out.push(`- worked: ${worked}${minutes ? ` ${formatDuration(minutes)}` : ""}`);
   }
   if (task.tags && task.tags.length) {
     out.push(`- tags: ${task.tags.join(", ")}`);
@@ -950,7 +1171,7 @@ function bodyOf(lines) {
 // src/parser/checklistParser.ts
 var ITEM = /^(\s*)([-*+])\s+\[([ xX])\]\s?(.*)$/;
 var H12 = /^#[ \t]+(.*)$/;
-var H23 = /^##[ \t]+(.*)$/;
+var H24 = /^##[ \t]+(.*)$/;
 var LAST_RUN = /^-[ \t]+last run:[ \t]*(\d{4}-\d{2}-\d{2})[ \t]*$/;
 function parseChecklistFile(content, sourceFile, id) {
   const lines = content.split(/\r?\n/);
@@ -968,7 +1189,7 @@ function parseChecklistFile(content, sourceFile, id) {
       });
       continue;
     }
-    const h2 = H23.exec(line);
+    const h2 = H24.exec(line);
     if (h2) {
       sections.push({ title: h2[1].trim(), line: i, items: [] });
       continue;
@@ -993,208 +1214,6 @@ function parseChecklistFile(content, sourceFile, id) {
   };
 }
 
-// src/parser/blocks.ts
-var ID_META2 = /^-\s+id\s*:\s*(.+?)\s*$/;
-function findBlockRange(content, taskId) {
-  const lines = content.split(/\r?\n/);
-  let blockStart = -1;
-  let matched = false;
-  const ranges = [];
-  for (let i = 0; i < lines.length; i++) {
-    if (isTaskHeading(lines, i)) {
-      if (blockStart !== -1) {
-        ranges.push({ start: blockStart, end: i, matched });
-      }
-      blockStart = i;
-      matched = false;
-    } else if (blockStart !== -1) {
-      const m = ID_META2.exec(lines[i]);
-      if (m && m[1] === taskId) {
-        matched = true;
-      }
-    }
-  }
-  if (blockStart !== -1) {
-    ranges.push({ start: blockStart, end: lines.length, matched });
-  }
-  const hit = ranges.find((r) => r.matched);
-  return hit ? { start: hit.start, end: hit.end } : void 0;
-}
-function replaceBlock(content, taskId, newBlock) {
-  const range = findBlockRange(content, taskId);
-  if (!range) {
-    return void 0;
-  }
-  const lines = content.split(/\r?\n/);
-  const original = lines.slice(range.start, range.end);
-  const hadTrailingBlank = original.length > 0 && original[original.length - 1].trim() === "";
-  const replacement = newBlock.split(/\r?\n/);
-  if (hadTrailingBlank) {
-    replacement.push("");
-  }
-  const next = [...lines.slice(0, range.start), ...replacement, ...lines.slice(range.end)];
-  return next.join("\n").replace(/\n{3,}/g, "\n\n");
-}
-function extractBlock(content, taskId) {
-  const range = findBlockRange(content, taskId);
-  if (!range) {
-    return void 0;
-  }
-  const lines = content.split(/\r?\n/);
-  const blockLines = lines.slice(range.start, range.end);
-  while (blockLines.length && blockLines[blockLines.length - 1].trim() === "") {
-    blockLines.pop();
-  }
-  const before = lines.slice(0, range.start);
-  const after = lines.slice(range.end);
-  while (before.length && before[before.length - 1].trim() === "") {
-    before.pop();
-  }
-  const remainderLines = [...before];
-  if (before.length && after.some((l) => l.trim() !== "")) {
-    remainderLines.push("");
-  }
-  remainderLines.push(...after);
-  let remainder = remainderLines.join("\n").replace(/\n{3,}/g, "\n\n").replace(/\s+$/, "");
-  if (remainder) {
-    remainder += "\n";
-  }
-  return { block: blockLines.join("\n"), remainder, startLine: range.start };
-}
-
-// src/parser/meetingParser.ts
-var H24 = /^##\s+(.*)$/;
-var META3 = /^-\s+([A-Za-z][\w-]*)\s*:\s*(.*)$/;
-var ACTIONS_HEADING = /^###\s+Action items\s*$/i;
-var ACTION_ENTRY = /^-\s+\[([ xX])\]\s*(.*)$/;
-var ACTION_TASK = /^(.*?)\s+→\s+(t_[A-Za-z0-9]+)$/;
-var TIME = /^(\d{1,2}):(\d{2})$/;
-var DURATION = /^(?:(\d+(?:\.\d+)?)\s*h)?\s*(?:(\d+)\s*m(?:in)?)?$/i;
-function parseDuration(value) {
-  const text = value.trim();
-  if (/^\d+$/.test(text)) {
-    const n = Number(text);
-    return n > 0 ? n : void 0;
-  }
-  const m = DURATION.exec(text);
-  if (!m || !m[1] && !m[2]) {
-    return void 0;
-  }
-  const minutes = Math.round(Number(m[1] ?? 0) * 60 + Number(m[2] ?? 0));
-  return minutes > 0 ? minutes : void 0;
-}
-function normalizeTime(value) {
-  const m = TIME.exec(value.trim());
-  if (!m || Number(m[1]) > 23 || Number(m[2]) > 59) {
-    return void 0;
-  }
-  return `${m[1].padStart(2, "0")}:${m[2]}`;
-}
-function parseMeetingFile(content, sourceFile) {
-  const lines = content.split(/\r?\n/);
-  const starts = [];
-  for (let i = 0; i < lines.length; i++) {
-    if (isTaskHeading(lines, i)) {
-      starts.push(i);
-    }
-  }
-  const meetings = [];
-  for (let b = 0; b < starts.length; b++) {
-    const end = b + 1 < starts.length ? starts[b + 1] : lines.length;
-    const meeting = parseBlock(lines.slice(starts[b], end), sourceFile, starts[b]);
-    if (meeting.id) {
-      meetings.push(meeting);
-    }
-  }
-  return meetings;
-}
-function parseBlock(lines, sourceFile, line) {
-  const meeting = {
-    id: "",
-    title: (H24.exec(lines[0])?.[1] ?? "").trim(),
-    date: "",
-    people: [],
-    notes: "",
-    actions: [],
-    sourceFile,
-    sourceLine: line
-  };
-  let i = 1;
-  for (; i < lines.length; i++) {
-    const meta = META3.exec(lines[i]);
-    if (!meta) {
-      break;
-    }
-    const value = meta[2].trim();
-    switch (meta[1].toLowerCase()) {
-      case "id":
-        meeting.id = value;
-        break;
-      case "date":
-        meeting.date = value;
-        break;
-      case "time":
-        meeting.time = normalizeTime(value) ?? meeting.time;
-        break;
-      case "duration":
-        meeting.duration = parseDuration(value) ?? meeting.duration;
-        break;
-      case "client":
-        meeting.clientId = value || void 0;
-        break;
-      case "people":
-        meeting.people = splitPeople(value);
-        break;
-    }
-  }
-  const body = trimBlank(lines.slice(i));
-  const at = actionsStart(body);
-  if (at < 0) {
-    meeting.notes = body.join("\n");
-  } else {
-    meeting.notes = trimBlank(body.slice(0, at)).join("\n");
-    meeting.actions = body.slice(at + 1).filter((l) => l.trim() !== "").map(parseAction);
-  }
-  return meeting;
-}
-function actionsStart(body) {
-  for (let i = body.length - 1; i >= 0; i--) {
-    if (ACTIONS_HEADING.test(body[i])) {
-      return body.slice(i + 1).every((l) => l.trim() === "" || ACTION_ENTRY.test(l)) ? i : -1;
-    }
-  }
-  return -1;
-}
-function parseAction(line) {
-  const m = ACTION_ENTRY.exec(line);
-  const done = m[1] !== " ";
-  const linked = ACTION_TASK.exec(m[2].trim());
-  return linked ? { text: linked[1].trim(), done, taskId: linked[2] } : { text: m[2].trim(), done };
-}
-function splitPeople(value) {
-  const seen = /* @__PURE__ */ new Set();
-  const out = [];
-  for (const raw of value.split(",")) {
-    const name = raw.trim();
-    if (name && !seen.has(name.toLowerCase())) {
-      seen.add(name.toLowerCase());
-      out.push(name);
-    }
-  }
-  return out;
-}
-function trimBlank(lines) {
-  let start = 0;
-  let end = lines.length;
-  while (start < end && lines[start].trim() === "") {
-    start++;
-  }
-  while (end > start && lines[end - 1].trim() === "") {
-    end--;
-  }
-  return lines.slice(start, end);
-}
-
 // src/model/status.ts
 var DEFAULT_STATUSES = [
   { id: "open", label: "Open" },
@@ -1905,14 +1924,36 @@ async function toggleTaskWorkedOn(store, taskId, date) {
     existing.delete(date);
   }
   const workedOn = [...existing].sort();
+  const workedTime = marking ? task.workedTime : withoutDay(task.workedTime, date);
   const wip = marking && !isClosed(task) ? inProgressStatusId(store.getConfig().statuses) : void 0;
   await updateInPlace(store, task, (t) => ({
     ...t,
     workedOn,
+    workedTime,
     status: wip ?? t.status
   }));
   await store.rebuild("toggleWorked");
-  return { ...task, workedOn, status: wip ?? task.status };
+  return { ...task, workedOn, workedTime, status: wip ?? task.status };
+}
+async function setTaskWorkedTime(store, taskId, date, minutes) {
+  let task = store.db.getTask(taskId);
+  if (!task) {
+    throw new Error(`Task ${taskId} not found.`);
+  }
+  if (minutes && !(task.workedOn ?? []).includes(date)) {
+    task = await toggleTaskWorkedOn(store, taskId, date);
+  }
+  const workedTime = minutes ? { ...task.workedTime, [date]: minutes } : withoutDay(task.workedTime, date);
+  await updateInPlace(store, task, (t) => ({ ...t, workedTime }));
+  await store.rebuild("setWorkedTime");
+  return { ...task, workedTime };
+}
+function withoutDay(time, date) {
+  if (!time || !(date in time)) {
+    return time;
+  }
+  const { [date]: _gone, ...rest } = time;
+  return Object.keys(rest).length ? rest : void 0;
 }
 async function addTaskNote(store, taskId, text) {
   const task = store.db.getTask(taskId);
@@ -1931,6 +1972,21 @@ async function addTaskNote(store, taskId, text) {
   await store.rebuild("addNote");
   return store.db.getTask(taskId) ?? task;
 }
+async function deleteTaskNote(store, taskId, index) {
+  const task = store.db.getTask(taskId);
+  if (!task) {
+    throw new Error(`Task ${taskId} not found.`);
+  }
+  await updateInPlace(store, task, (t) => {
+    const notes = [...t.notes ?? []];
+    if (index >= 0 && index < notes.length) {
+      notes.splice(index, 1);
+    }
+    return { ...t, notes };
+  });
+  await store.rebuild("deleteNote");
+  return store.db.getTask(taskId) ?? task;
+}
 async function closeTaskById(store, taskId, completedDate = today()) {
   const terminal = terminalStatusId(store.getConfig().statuses);
   return closeCascade(store, taskId, terminal, completedDate);
@@ -2025,7 +2081,8 @@ async function rollOccurrence(store, args) {
     // come along, but unticked — the ticks belong to the occurrence that earned
     // them and stay on its snapshot.
     checklist: untickedChecklist(source.checklist),
-    workedOn: void 0
+    workedOn: void 0,
+    workedTime: void 0
   };
   const replaced = replaceBlock(
     content,
@@ -2109,11 +2166,32 @@ async function undoOccurrence(store, snapshot, template, statusId) {
     notes: snapshot.notes,
     prompts: snapshot.prompts,
     checklist: snapshot.checklist,
-    workedOn: snapshot.workedOn
+    workedOn: snapshot.workedOn,
+    workedTime: snapshot.workedTime
   }));
   await store.rebuild("undoOccurrence");
   return store.db.getTask(template.id) ?? template;
 }
+async function setTaskRecurrence(store, taskId, repeat) {
+  const task = store.db.getTask(taskId);
+  if (!task) {
+    throw new Error(`Task ${taskId} not found.`);
+  }
+  if (task.completed) {
+    throw new Error("Only open tasks can repeat.");
+  }
+  await updateInPlace(
+    store,
+    task,
+    (t) => withSeededDue({
+      ...t,
+      repeat,
+      lastDone: repeat ? t.lastDone : void 0
+    })
+  );
+  await store.rebuild("setRecurrence");
+  return store.db.getTask(taskId) ?? task;
+}
 async function updateTask(store, taskId, fields) {
   const task = store.db.getTask(taskId);
   if (!task) {
@@ -2248,12 +2326,16 @@ async function logWork(store, input) {
   if (markedWorked) {
     task = await toggleTaskWorkedOn(store, task.id, date);
   }
+  const timeSet = input.minutes === null ? !!task.workedTime?.[date] : !!input.minutes && task.workedTime?.[date] !== input.minutes;
+  if (timeSet) {
+    task = await setTaskWorkedTime(store, task.id, date, input.minutes ?? void 0);
+  }
   const note = input.note?.trim();
   const noteAdded = !!note && !(task.notes ?? []).some((n) => n.timestamp.startsWith(today()) && n.text === note);
   if (noteAdded) {
     task = await addTaskNote(store, task.id, note);
   }
-  return { task: store.db.getTask(task.id) ?? task, created, markedWorked, noteAdded };
+  return { task: store.db.getTask(task.id) ?? task, created, markedWorked, timeSet, noteAdded };
 }
 function findTask(store, input) {
   if (input.taskId) {
@@ -2348,6 +2430,13 @@ async function editTask(store, ref, edit) {
   if (Object.keys(fields).length > 0) {
     task = await updateTask(store, task.id, fields);
   }
+  if (edit.repeat !== void 0) {
+    const next = edit.repeat === null ? void 0 : { ...readRecurrence(edit.repeat), anchor: task.repeat?.anchor ?? "schedule", until: task.repeat?.until };
+    if ((next && formatRecurrence(next)) !== (task.repeat && formatRecurrence(task.repeat))) {
+      task = await setTaskRecurrence(store, task.id, next);
+      changed.push("repeat");
+    }
+  }
   if (edit.status !== void 0 && edit.status !== task.status) {
     const statuses = store.getConfig().statuses;
     if (!statuses.some((s) => s.id === edit.status)) {
@@ -2366,6 +2455,28 @@ async function closeTask(store, ref) {
   const closed = await closeTaskById(store, task.id);
   return { task: store.db.getTask(task.id) ?? closed, closed: true };
 }
+async function unlogWork(store, ref, input) {
+  let task = requireTask(store, ref, { includeClosed: true });
+  const unmarked = !!input.date && (task.workedOn ?? []).includes(input.date);
+  if (input.date && unmarked) {
+    task = await toggleTaskWorkedOn(store, task.id, input.date);
+  }
+  const note = input.note?.trim();
+  const index = note ? (task.notes ?? []).map((n) => n.text).lastIndexOf(note) : -1;
+  if (index >= 0) {
+    task = await deleteTaskNote(store, task.id, index);
+  }
+  return { task: store.db.getTask(task.id) ?? task, unmarked, noteRemoved: index >= 0 };
+}
+function readRecurrence(text) {
+  const rule = parseRecurrence(text);
+  if (!rule) {
+    throw new Error(
+      `Can't read the repeat "${text}". Use daily, weekdays, every 3 days, weekly on mon,thu, monthly on 15, monthly on last or yearly on 03-14.`
+    );
+  }
+  return rule;
+}
 function requireParent(store, parentId, childId) {
   const parent = store.db.getTask(parentId);
   if (!parent) {
@@ -2388,6 +2499,7 @@ async function addTask(store, input) {
   if (input.parentId) {
     requireParent(store, input.parentId);
   }
+  const repeat = input.repeat ? readRecurrence(input.repeat) : void 0;
   const task = await createTask(store, {
     clientId: input.clientId,
     title: input.title,
@@ -2396,15 +2508,16 @@ async function addTask(store, input) {
     priority: input.priority,
     description: input.description,
     tags: input.tags,
-    parentId: input.parentId
+    parentId: input.parentId,
+    repeat
   });
   return { task: store.db.getTask(task.id) ?? task, created: true };
 }
 
 // src/services/listTasks.ts
 function listTasks(store, filter = {}) {
-  const tag = filter.tag?.trim().toLowerCase();
-  return store.db.getAllTasks().filter((t) => !t.completed).filter((t) => !filter.clientId || t.clientIds.includes(filter.clientId)).filter((t) => !filter.dueBy || !!t.due && t.due <= filter.dueBy).filter((t) => !tag || (t.tags ?? []).some((x) => x.toLowerCase() === tag)).sort(
+  const tags = (filter.tags ?? []).map((t) => t.trim().toLowerCase()).filter(Boolean);
+  return store.db.getAllTasks().filter((t) => !t.completed).filter((t) => !filter.clientId || t.clientIds.includes(filter.clientId)).filter((t) => !filter.dueBy || !!t.due && t.due <= filter.dueBy).filter((t) => tags.every((tag) => (t.tags ?? []).some((x) => x.toLowerCase() === tag))).sort(
     (a, b) => (a.due ?? "\uFFFF").localeCompare(b.due ?? "\uFFFF") || priorityRank(a.priority) - priorityRank(b.priority) || (a.created ?? "").localeCompare(b.created ?? "")
   );
 }
@@ -2512,7 +2625,8 @@ var NONE = "none";
 var USAGE = `Usage: worklog <command> [options]
 
   log     Work that was done: marks the day worked on a task (creating the task
-          when it's new) and adds the note.
+          when it's new), records the time spent and adds the note.
+  unlog   Undoes a log: takes a day worked off a task, removes a note.
   add     Something still to do: creates an open task. No day is marked worked.
           Without --client it goes on the general to-do list.
   update  Changes an existing task: due date, priority, description, ...
@@ -2528,7 +2642,7 @@ Every command:
   --client <id>         client id from .worklog/config.json; "todos" is the
                         general to-do list
 
-Naming a task (log, update, done):
+Naming a task (log, unlog, update, done):
   --id <t_xxxxxx>       this exact task
   --link <url>          the task linked to this issue/ticket url
   --title <title>       the open task with this title
@@ -2536,6 +2650,13 @@ Naming a task (log, update, done):
 log --client <id> --title <title>:
   --note <text>         progress note added to the task
   --date <date>         day worked, YYYY-MM-DD (default: today)
+  --time <duration>     time spent on the task that day: 1h, 45m, 1h30m, or
+                        none to clear it. Sets the day's time, it doesn't add.
+                        A record only: billed hours stay with "hours"
+
+unlog (at least one of):
+  --date <date>         take this day worked off the task, with its time
+  --note <text>         remove the note with exactly this text
 
 add --title <title>:
   --link <url>          issue/ticket url
@@ -2544,6 +2665,8 @@ add --title <title>:
   --description <text>  what the task is about
   --tag <tag>           repeat for several tags
   --parent <t_xxxxxx>   make it a subtask of this task
+  --repeat <rule>       daily, weekdays, every 3 days, weekly on mon,thu,
+                        monthly on 15, monthly on last, yearly on 03-14
 
 update:
   --rename <title>      new title
@@ -2554,6 +2677,7 @@ update:
   --tag <tag>           add a tag (repeatable)
   --untag <tag>         remove a tag (repeatable)
   --parent <id|none>    move it under this task, or none to make it top-level
+  --repeat <rule|none>  a new repeat rule (as for add), or none to stop it
 
 hours --client <id> | --event <type>:
   --hours <amount>      full, half, or a number of hours; 0 removes the entry.
@@ -2564,14 +2688,16 @@ hours --client <id> | --event <type>:
 
 list:
   --due-by <date>       only tasks due on or before this day
-  --tag <tag>           only tasks with this tag
-  --json                print JSON instead of one line per task
+  --tag <tag>           only tasks with this tag; repeat it for tasks with all
+  --json                print JSON instead of one line per task, with the
+                        days worked and the minutes per day
 
-log, add, update, done, hours:
+log, unlog, add, update, done, hours:
   --dry-run             show the change, commit nothing`;
 var OPTIONS = {
-  log: ["client", "id", "link", "title", "note", "date", "dry-run"],
-  add: ["client", "link", "title", "due", "priority", "description", "tag", "parent", "dry-run"],
+  log: ["client", "id", "link", "title", "note", "date", "time", "dry-run"],
+  unlog: ["client", "id", "link", "title", "date", "note", "dry-run"],
+  add: ["client", "link", "title", "due", "priority", "description", "tag", "parent", "repeat", "dry-run"],
   update: [
     "client",
     "id",
@@ -2585,6 +2711,7 @@ var OPTIONS = {
     "tag",
     "untag",
     "parent",
+    "repeat",
     "dry-run"
   ],
   done: ["client", "id", "link", "title", "dry-run"],
@@ -2593,6 +2720,7 @@ var OPTIONS = {
 };
 var HINTS = {
   date: `A to-do's date is --due; --date is the day worked, for "worklog log" and "worklog hours".`,
+  time: `Time on a task is "worklog log --time"; a client's hours for the day are "worklog hours --hours".`,
   due: "The day worked is --date; --due is when a to-do is due."
 };
 async function main() {
@@ -2605,6 +2733,7 @@ async function main() {
       id: { type: "string" },
       note: { type: "string" },
       date: { type: "string" },
+      time: { type: "string" },
       due: { type: "string" },
       "due-by": { type: "string" },
       priority: { type: "string" },
@@ -2614,6 +2743,7 @@ async function main() {
       tag: { type: "string", multiple: true },
       untag: { type: "string", multiple: true },
       parent: { type: "string" },
+      repeat: { type: "string" },
       event: { type: "string" },
       hours: { type: "string" },
       json: { type: "boolean" },
@@ -2660,6 +2790,10 @@ function validate(values) {
       throw new Error(`--${option} must be YYYY-MM-DD, got "${value}".`);
     }
   }
+  const time = values.time;
+  if (typeof time === "string" && time !== NONE && !(/[hm]/i.test(time) && parseDuration(time))) {
+    throw new Error(`--time must be a duration like 1h, 45m or 1h30m, or none, got "${time}".`);
+  }
   const priority = values.priority;
   if (typeof priority === "string" && !PRIORITIES.some((p) => p.id === priority.trim().toLowerCase())) {
     throw new Error(`--priority must be one of ${PRIORITIES.map((p) => p.id).join(", ")}, got "${priority}".`);
@@ -2679,9 +2813,26 @@ function toEdit(command, values) {
 
 ${USAGE}`);
       }
-      const input = { clientId, title, taskId: ref.taskId, link: ref.link, note: str("note"), date: str("date") };
+      const time = str("time");
+      const input = {
+        clientId,
+        title,
+        taskId: ref.taskId,
+        link: ref.link,
+        note: str("note"),
+        date: str("date"),
+        minutes: time === NONE ? null : time ? parseDuration(time) : void 0
+      };
       return async (store) => describeLog(await logWork(store, input), input);
     }
+    case "unlog": {
+      requireRef(ref);
+      const input = { date: str("date"), note: str("note") };
+      if (!input.date && !input.note) {
+        throw new Error("Nothing to take off: pass --date, --note or both.");
+      }
+      return async (store) => describeUnlog(await unlogWork(store, ref, input), input);
+    }
     case "add": {
       const title = str("title");
       if (!title) {
@@ -2697,7 +2848,8 @@ ${USAGE}`);
         priority: str("priority"),
         description: str("description"),
         tags: list2("tag"),
-        parentId: str("parent")
+        parentId: str("parent"),
+        repeat: str("repeat")
       };
       return async (store) => describeAdd(await addTask(store, input));
     }
@@ -2711,10 +2863,11 @@ ${USAGE}`);
         status: str("status"),
         addTags: list2("tag"),
         removeTags: list2("untag"),
-        parentId: orNull(str("parent"))
+        parentId: orNull(str("parent")),
+        repeat: orNull(str("repeat"))
       };
       if (Object.values(edit).every((v) => v === void 0)) {
-        throw new Error(`Nothing to change: pass at least one of --rename, --due, --priority, --description, --status, --tag, --untag, --parent.`);
+        throw new Error(`Nothing to change: pass at least one of --rename, --due, --priority, --description, --status, --tag, --untag, --parent, --repeat.`);
       }
       return async (store) => describeUpdate(await editTask(store, ref, edit));
     }
@@ -2797,7 +2950,7 @@ async function list(repo, values) {
   const tasks = listTasks(store, {
     clientId: values.client,
     dueBy: values["due-by"],
-    tag: values.tag?.[0]
+    tags: values.tag
   });
   if (values.json) {
     console.log(JSON.stringify(tasks.map(toJson), null, 2));
@@ -2835,6 +2988,8 @@ function toJson(t) {
     links: t.links.map((l) => l.url),
     parent: t.parentId ?? null,
     repeats: !!t.repeat,
+    worked: t.workedOn ?? [],
+    minutes: t.workedTime ?? {},
     created: t.created ?? null,
     description: t.description ?? null,
     file: t.sourceFile
@@ -2873,19 +3028,28 @@ function listFiles(repo) {
 function label(task) {
   return `${task.id} "${task.title}" (${task.sourceFile})`;
 }
-function describeLog({ task, created, markedWorked, noteAdded }, input) {
+function describeLog({ task, created, markedWorked, timeSet, noteAdded }, input) {
   const what = [
     created ? "created" : "found",
     markedWorked ? `marked worked ${input.date ?? today()}` : void 0,
+    timeSet ? input.minutes ? `time ${formatDuration(input.minutes)}` : "time cleared" : void 0,
     noteAdded ? "note added" : void 0
   ].filter(Boolean);
   return `${label(task)}: ${what.join(", ")}`;
 }
+function describeUnlog({ task, unmarked, noteRemoved }, input) {
+  const what = [
+    input.date ? unmarked ? `took ${input.date} off` : `${input.date} wasn't marked worked` : void 0,
+    input.note ? noteRemoved ? "note removed" : "no note with that text" : void 0
+  ].filter(Boolean);
+  return `${label(task)}: ${what.join(", ")}`;
+}
 function describeAdd({ task, created }) {
   const what = [
     created ? "created" : "already exists, left as is",
     task.due ? `due ${task.due}` : void 0,
-    task.priority ? `priority ${task.priority}` : void 0
+    task.priority ? `priority ${task.priority}` : void 0,
+    task.repeat ? `repeats ${formatRecurrence(task.repeat)}` : void 0
   ].filter(Boolean);
   return `${label(task)}: ${what.join(", ")}`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@estruyf/worklog-cli",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Log work on a task, or add a to-do, in your Worklog timesheet repo from the command line or an AI agent.",
   "license": "MIT",
   "author": "Elio Struyf",