@clipboard-health/groundcrew 4.33.0 → 4.34.1

package/dist/commands/resumeWorkspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resumeWorkspace.d.ts","sourceRoot":"","sources":["../../src/commands/resumeWorkspace.ts"],"names":[],"mappings":"AAGA,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAanE,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;CACd;AAuID,wBAAsB,eAAe,CACnC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC,CA2Ef;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAGtE"}
+{"version":3,"file":"resumeWorkspace.d.ts","sourceRoot":"","sources":["../../src/commands/resumeWorkspace.ts"],"names":[],"mappings":"AAGA,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAcnE,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;CACd;AAuID,wBAAsB,eAAe,CACnC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC,CA2Ef;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAGtE"}

package/dist/commands/resumeWorkspace.js

@@ -5,6 +5,7 @@ import { loadConfig } from "../lib/config.js";
 import { composeAgentLaunch, openAgentWorkspace, prepareAgentLaunch } from "../lib/agentLaunch.js";
 import { readRunState, recordRunState } from "../lib/runState.js";
 import { removeStagedPrompt, stageBuildSecrets, stagePromptText, stageWorkspaceLaunchCommand, } from "../lib/stagedLaunch.js";
+import { naturalIdFromCanonical } from "../lib/taskSource.js";
 import { errorMessage, log } from "../lib/util.js";
 import { workspaces } from "../lib/workspaces.js";
 import { resolveLaunchDir, worktrees } from "../lib/worktrees.js";
@@ -13,7 +14,7 @@ function parseArguments(argv) {
     if (task === undefined || task.length === 0 || extras.length > 0 || task.startsWith("-")) {
         throw new Error("Usage: crew resume <task>");
     }
-    return { task: task.toLowerCase() };
+    return { task: naturalIdFromCanonical(task).toLowerCase() };
 }
 async function fetchTaskDetails(task) {
     try {

package/dist/lib/adapters/todo-txt/source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"source.d.ts","sourceRoot":"","sources":["../../../../src/lib/adapters/todo-txt/source.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EAKL,KAAK,UAAU,EAEhB,MAAM,qBAAqB,CAAC;AAI7B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AA+SxD,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,cAAc,GACtB,UAAU,CAsJZ"}
+{"version":3,"file":"source.d.ts","sourceRoot":"","sources":["../../../../src/lib/adapters/todo-txt/source.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EAKL,KAAK,UAAU,EAEhB,MAAM,qBAAqB,CAAC;AAI7B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AA+SxD,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,cAAc,GACtB,UAAU,CAyJZ"}

package/dist/lib/adapters/todo-txt/source.js

@@ -7,7 +7,7 @@ import { readEnvironmentVariable } from "../../util.js";
 import { isActiveForFetch, normalizeToIssue } from "./normalizer.js";
 import { DATE_RE, getMetadataFirst, parseAllLines } from "./parser.js";
 import { copyPromptFile, updateTaskStatus, validateTodoFile, withLock } from "./writeback.js";
-const RECURRENCE_RE = /^\+?\d+[dwmy]$/;
+const RECURRENCE_RE = /^\+?\d+[dwmyh]$/;
 function readPromptFile(promptPath) {
     try {
         return readFileSync(promptPath, "utf8");
@@ -197,7 +197,7 @@ function buildTodoLine(id, input) {
     }
     if (input.recurrence !== undefined) {
         if (!RECURRENCE_RE.test(input.recurrence)) {
-            throw new Error("todo-txt: recurrence must look like 1d, 1w, 1m, 1y, or +1m");
+            throw new Error("todo-txt: recurrence must look like 1d, 1w, 1m, 1y, 2h, or +1m");
         }
         tokens.push(metadataToken("rec", input.recurrence));
     }
@@ -380,7 +380,7 @@ export function createTodoTxtTaskSource(config, context) {
         async markDone(issue) {
             // oxlint-disable-next-line typescript/no-unsafe-type-assertion -- TodoTxtTaskSource always writes TodoTxtSourceRef
             const ref = issue.sourceRef;
-            const recurResult = await updateTaskStatus({ todoPath, ref }, "done");
+            const recurResult = await updateTaskStatus({ todoPath, ref, timezone: config.timezone }, "done");
             if (recurResult !== undefined) {
                 copyPromptFile(recurResult.oldPromptPath, recurResult.newPromptPath);
             }

package/dist/lib/adapters/todo-txt/writeback.d.ts

@@ -9,6 +9,8 @@ export interface UpdateOptions {
     todoPath: string;
     ref: TodoTxtSourceRef;
     now?: Date;
+    /** Source timezone for hour-unit recurrence wall-clock math. Defaults to UTC. */
+    timezone?: string;
 }
 export declare function withLock<T>(lockPath: string, fn: () => T | Promise<T>): Promise<T>;
 type StatusMutation = "in-progress" | "in-review" | "done";

package/dist/lib/adapters/todo-txt/writeback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"writeback.d.ts","sourceRoot":"","sources":["../../../../src/lib/adapters/todo-txt/writeback.ts"],"names":[],"mappings":"AAYA,OAAO,EAAyB,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAE/E,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACvB;AA2KD,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,gBAAgB,CAAC;IACtB,GAAG,CAAC,EAAE,IAAI,CAAC;CACZ;AAED,wBAAsB,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAQxF;AAED,KAAK,cAAc,GAAG,aAAa,GAAG,WAAW,GAAG,MAAM,CAAC;AAiF3D,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,aAAa,EACtB,SAAS,EAAE,cAAc,GACxB,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAsElC;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAQrE;AAwGD,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,GAChC,MAAM,EAAE,CA0CV"}
+{"version":3,"file":"writeback.d.ts","sourceRoot":"","sources":["../../../../src/lib/adapters/todo-txt/writeback.ts"],"names":[],"mappings":"AAYA,OAAO,EAAyB,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAE/E,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACvB;AAqOD,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,gBAAgB,CAAC;IACtB,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,iFAAiF;IACjF,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,wBAAsB,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAQxF;AAED,KAAK,cAAc,GAAG,aAAa,GAAG,WAAW,GAAG,MAAM,CAAC;AAwF3D,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,aAAa,EACtB,SAAS,EAAE,cAAc,GACxB,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CA+ElC;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAQrE;AA8GD,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,GAChC,MAAM,EAAE,CA0CV"}

package/dist/lib/adapters/todo-txt/writeback.js

@@ -23,15 +23,15 @@ function addMonths(dateStr, months) {
     const d = new Date(Date.UTC(year, month - 1 + months, day));
     return isoDate(d);
 }
-const REC_RE = /^(?<strict>\+?)(?<amount>\d+)(?<unit>[dwmy])$/;
+const REC_RE = /^(?<strict>\+?)(?<amount>\d+)(?<unit>[dwmyh])$/;
 function parseRecurrence(rec) {
     const m = REC_RE.exec(rec);
     if (m === null) {
         return undefined;
     }
     const [, strictStr, amountStr, unit] = m;
-    /* v8 ignore next @preserve -- regex [dwmy] guarantees unit is always one of d/w/m/y */
-    if (unit !== "d" && unit !== "w" && unit !== "m" && unit !== "y") {
+    /* v8 ignore next @preserve -- regex [dwmyh] guarantees unit is always one of d/w/m/y/h */
+    if (unit !== "d" && unit !== "w" && unit !== "m" && unit !== "y" && unit !== "h") {
         return undefined;
     }
     return {
@@ -54,19 +54,73 @@ function advanceDate(dateStr, rec) {
     }
     return addMonths(dateStr, amount * 12);
 }
+// Add hours to a (timezone-naive wall-clock) datetime, minute precision.
+function addHours(dateTime, hours) {
+    const padded = dateTime.length === 16 ? `${dateTime}:00` : dateTime;
+    const ms = Date.parse(`${padded}Z`);
+    return new Date(ms + hours * 60 * 60 * 1000).toISOString().slice(0, 16);
+}
 // t: may carry a datetime threshold; advance its date part and keep the time
 // component so a recurring task stays scheduled at the same instant of day.
-function advanceThreshold(threshold, rec) {
+//
+// Hour units advance differently: non-strict rec:Nh advances from the
+// completion instant (the source-timezone wall clock), so a task that sat
+// through daemon downtime re-arms N hours from now instead of stampeding
+// through every missed slot. Strict rec:+Nh keeps schedule-aligned
+// advancement from the previous threshold, matching due:'s strict semantics.
+function advanceThreshold(threshold, rec, completionWall) {
+    if (rec.unit === "h") {
+        let base = completionWall;
+        if (rec.strict) {
+            base = threshold.length === 10 ? `${threshold}T00:00` : threshold;
+        }
+        return addHours(base, rec.amount);
+    }
     const [datePart, timePart] = threshold.split("T");
     /* v8 ignore next @preserve -- split always yields a first element */
     const nextDate = advanceDate(datePart ?? threshold, rec);
     return timePart === undefined ? nextDate : `${nextDate}T${timePart}`;
 }
+// "YYYY-MM-DDTHH:MM" wall-clock time for `now` in the given timezone.
+function wallClockDateTime(timeZone, now) {
+    const parts = new Intl.DateTimeFormat("en-CA", {
+        timeZone,
+        year: "numeric",
+        month: "2-digit",
+        day: "2-digit",
+        hour: "2-digit",
+        minute: "2-digit",
+        hourCycle: "h23",
+    }).formatToParts(now);
+    const get = (type) => parts.find((part) => part.type === type)?.value;
+    const year = get("year");
+    const month = get("month");
+    const day = get("day");
+    const hour = get("hour");
+    const minute = get("minute");
+    /* v8 ignore next 3 @preserve -- Intl.DateTimeFormat with these options always returns the parts */
+    if (year === undefined ||
+        month === undefined ||
+        day === undefined ||
+        hour === undefined ||
+        minute === undefined) {
+        throw new Error(`todo-txt: could not format datetime in timezone "${timeZone}"`);
+    }
+    return `${year}-${month}-${day}T${hour}:${minute}`;
+}
 function advanceId(id, newDate) {
     const dateCompact = compactDate(newDate);
     // Replace the first 8-digit run (compact date) in the id
     const replaced = id.replace(/\d{8}/, dateCompact);
-    return replaced === id ? `${id}-${dateCompact}` : replaced;
+    if (replaced !== id) {
+        return replaced;
+    }
+    // Unchanged: either the id has no date run (append one), or the date run
+    // already equals the new date — same-day hourly recurrence. For the latter,
+    // strip any prior collision suffixes and let buildUniqueId number this
+    // cycle (-002, -003, …) instead of growing a suffix chain.
+    const base = id.replace(/(?:-\d{3})+$/, "");
+    return base.includes(dateCompact) ? base : `${id}-${dateCompact}`;
 }
 function buildUniqueId(baseNewId, existingIds) {
     if (existingIds.has(baseNewId.toLowerCase())) {
@@ -166,7 +220,7 @@ function assertValidTransition(newStatus, currentStatus, id) {
         throw new Error(`todo-txt: cannot mark done: task "${id}" has status "${s}"`);
     }
 }
-function buildRecurResult(parsed, parsedAll, originalLine, ref, completionDateStr, now) {
+function buildRecurResult(parsed, parsedAll, originalLine, ref, completionDateStr, completionWallStr, now) {
     const recStr = parsed.metadata["rec"]?.[0];
     if (recStr === undefined) {
         return undefined;
@@ -182,13 +236,19 @@ function buildRecurResult(parsed, parsedAll, originalLine, ref, completionDateSt
         .filter((id) => id !== undefined));
     const oldDue = parsed.metadata["due"]?.[0];
     const oldT = parsed.metadata["t"]?.[0];
-    // due: advances from old due (strict) or completion date (normal)
+    // due: advances from old due (strict) or completion date (normal). Hour
+    // units never advance due: — validate() rejects the combination, and a line
+    // that bypassed verify carries its due forward unchanged rather than
+    // feeding an hour recurrence into date-only math.
     /* v8 ignore next @preserve -- oldDue undefined with rec: is unusual; callers typically pair rec: with due: */
     const dueBase = rec.strict ? (oldDue ?? completionDateStr) : completionDateStr;
-    /* v8 ignore next @preserve -- oldDue undefined means skip due advancement */
-    const newDue = oldDue === undefined ? undefined : advanceDate(dueBase, rec);
-    // t: always advances from its own current value by the same period
-    const newT = oldT === undefined ? undefined : advanceThreshold(oldT, rec);
+    let newDue;
+    if (oldDue !== undefined) {
+        newDue = rec.unit === "h" ? oldDue : advanceDate(dueBase, rec);
+    }
+    // t: advances from its own current value by the same period (hour units:
+    // see advanceThreshold for strict vs non-strict base)
+    const newT = oldT === undefined ? undefined : advanceThreshold(oldT, rec, completionWallStr);
     // Compute new date for id advancement: prefer due:, then t:, so ids stay
     // schedule-aligned for t:-only recurring tasks. Slice to the date part —
     // t: may carry a datetime.
@@ -247,8 +307,9 @@ export async function updateTaskStatus(options, newStatus) {
         let updatedLine;
         if (newStatus === "done") {
             const completionDateStr = isoDate(now);
+            const completionWallStr = wallClockDateTime(options.timezone ?? "UTC", now);
             updatedLine = buildDoneLine(originalLine, completionDateStr);
-            recurResult = buildRecurResult(parsed, parsedAll, originalLine, ref, completionDateStr, now);
+            recurResult = buildRecurResult(parsed, parsedAll, originalLine, ref, completionDateStr, completionWallStr, now);
         }
         else {
             updatedLine = replaceStatusToken(originalLine, newStatus);
@@ -308,8 +369,12 @@ function validateDepsAndDates(parsed, parsedAll, id, prefix, errors) {
         errors.push(`${prefix}: malformed t: date "${tVal}" for task "${id}" (expected YYYY-MM-DD or YYYY-MM-DDTHH:MM[:SS])`);
     }
     const recVal = parsed.metadata["rec"]?.[0];
-    if (recVal !== undefined && parseRecurrence(recVal) === undefined) {
-        errors.push(`${prefix}: malformed rec: "${recVal}" for task "${id}" (expected e.g. 1d, 1w, +1m)`);
+    const recParsed = recVal === undefined ? undefined : parseRecurrence(recVal);
+    if (recParsed?.unit === "h" && (tVal === undefined || dueVal !== undefined)) {
+        errors.push(`${prefix}: hourly rec: "${recVal}" for task "${id}" requires a t: threshold and is incompatible with due:`);
+    }
+    if (recVal !== undefined && recParsed === undefined) {
+        errors.push(`${prefix}: malformed rec: "${recVal}" for task "${id}" (expected e.g. 1d, 1w, +1m, 2h)`);
     }
 }
 function validateActiveTaskLine(parsed, parsedAll, tasksDir, id, prefix, errors, knownAgents) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clipboard-health/groundcrew",
-  "version": "4.33.0",
+  "version": "4.34.1",
   "description": "Linear-driven orchestrator that launches AI coding agents in git worktrees, with workspace lifecycle and usage tracking.",
   "keywords": [
     "agent",
@@ -76,7 +76,7 @@
     "zod": "4.4.3"
   },
   "devDependencies": {
-    "@clipboard-health/ai-rules": "2.24.2",
+    "@clipboard-health/ai-rules": "2.27.0",
     "@clipboard-health/oxlint-config": "1.10.14",
     "@nx/js": "22.7.5",
     "@tsconfig/node24": "24.0.4",