syntaur 0.57.0 → 0.58.0

package/dist/dashboard/server.js

@@ -1271,6 +1271,7 @@ __export(parser_exports, {
   readLog: () => readLog,
   serializeChecklist: () => serializeChecklist,
   serializeChecklistItem: () => serializeChecklistItem,
+  serializeLog: () => serializeLog,
   serializeLogEntry: () => serializeLogEntry,
   serializeMetaToken: () => serializeMetaToken,
   writeChecklist: () => writeChecklist
@@ -1398,27 +1399,60 @@ function statusToMarker(item) {
       return item.session ? `>:${sanitizeSession(item.session)}` : ">";
   }
 }
+function escapeDescription(description) {
+  return description.replace(/\\/g, "\\\\").replace(/#/g, "\\#").replace(/\[/g, "\\[");
+}
+function unescapeDescription(escaped) {
+  let out = "";
+  for (let i = 0; i < escaped.length; i++) {
+    if (escaped[i] === "\\" && i + 1 < escaped.length) {
+      const next = escaped[i + 1];
+      if (next === "\\" || next === "#" || next === "[") {
+        out += next;
+        i++;
+        continue;
+      }
+    }
+    out += escaped[i];
+  }
+  return out;
+}
+function findStructuralCut(rest) {
+  for (let i = 0; i < rest.length; i++) {
+    const ch = rest[i];
+    if (ch !== "#" && ch !== "[") continue;
+    let backslashes = 0;
+    let j = i - 1;
+    while (j >= 0 && rest[j] === "\\") {
+      backslashes++;
+      j--;
+    }
+    if (backslashes % 2 === 1) continue;
+    if (ch === "#") {
+      if (/[a-zA-Z0-9_-]/.test(rest[i + 1] ?? "")) return i;
+    } else {
+      return i;
+    }
+  }
+  return rest.length;
+}
 function parseChecklistItem(line) {
   const match = line.match(ITEM_REGEX);
   if (!match) return null;
   const marker = match[1];
   const rest = match[2];
   const { status, session } = parseStatus2(marker);
-  const idMatch = rest.match(ID_REGEX);
+  const cut = findStructuralCut(rest);
+  const description = unescapeDescription(rest.slice(0, cut).trim());
+  const tail = rest.slice(cut);
+  const idMatch = tail.match(ID_REGEX);
   const id = idMatch ? idMatch[1] : "";
   const tags = [];
   let tagMatch;
   const tagRegex = new RegExp(TAG_REGEX.source, "g");
-  while ((tagMatch = tagRegex.exec(rest)) !== null) {
+  while ((tagMatch = tagRegex.exec(tail)) !== null) {
     tags.push(tagMatch[1]);
   }
-  let description = rest;
-  const firstTagIdx = rest.search(/#[a-zA-Z0-9_-]/);
-  const firstIdIdx = rest.search(/\[t:[a-f0-9]{4}\]/);
-  const cutPoints = [firstTagIdx, firstIdIdx].filter((i) => i >= 0);
-  if (cutPoints.length > 0) {
-    description = rest.slice(0, Math.min(...cutPoints)).trim();
-  }
   const meta = parseMetaToken(line);
   return {
     id,
@@ -1439,7 +1473,7 @@ function parseChecklistItem(line) {
 function serializeChecklistItem(item) {
   const marker = statusToMarker(item);
   const tagStr = item.tags.map((t) => `#${t}`).join(" ");
-  const parts = [`- [${marker}] ${item.description}`];
+  const parts = [`- [${marker}] ${escapeDescription(item.description)}`];
   if (tagStr) parts.push(tagStr);
   parts.push(`[t:${item.id}]`);
   const meta = serializeMetaToken(item);
@@ -1538,6 +1572,18 @@ function serializeLogEntry(entry) {
   if (entry.status) lines.push(`**Status:** ${entry.status}`);
   return lines.join("\n");
 }
+function serializeLog(log) {
+  const header = `---
+workspace: ${log.workspace}
+---
+
+# Todo Log
+`;
+  if (log.entries.length === 0) {
+    return header;
+  }
+  return header + "\n" + log.entries.map(serializeLogEntry).join("\n\n") + "\n";
+}
 function checklistPath(todosDir2, workspace) {
   return resolve2(todosDir2, `${workspace}.md`);
 }
@@ -14274,7 +14320,7 @@ ${nextBody}${nextBody.endsWith("\n") ? "" : "\n"}`;
       };
       const entry = formatCommentEntry(comment);
       let next = setTopLevelField(currentContent, "entryCount", String(currentCount + 1));
-      next = setTopLevelField(next, "updated", `"${timestamp}"`);
+      next = setTopLevelField(next, "updated", timestamp);
       if (next.includes("No comments yet.")) {
         next = next.replace("No comments yet.", entry.trimEnd());
       } else {
@@ -14334,7 +14380,7 @@ ${entry}`;
         res.status(500).json({ error: "Failed to update resolved flag" });
         return;
       }
-      const withUpdated = setTopLevelField(next, "updated", `"${nowTimestamp()}"`);
+      const withUpdated = setTopLevelField(next, "updated", nowTimestamp());
       await writeFileForce(commentsPath, withUpdated);
       const assignment = await getAssignmentDetail(projectsDir, projectSlug, assignmentSlug);
       res.json({ assignment });
@@ -15803,7 +15849,7 @@ async function appendCommentTo(assignmentDir, assignmentRef, req2, res, reloadDe
   };
   const entry = formatCommentEntry(comment);
   let next = setTopLevelField(currentContent, "entryCount", String(currentCount + 1));
-  next = setTopLevelField(next, "updated", `"${timestamp}"`);
+  next = setTopLevelField(next, "updated", timestamp);
   if (next.includes("No comments yet.")) {
     next = next.replace("No comments yet.", entry.trimEnd());
   } else {
@@ -15846,7 +15892,7 @@ async function toggleCommentResolvedAt(assignmentDir, commentId, req2, res, relo
     res.status(500).json({ error: "Failed to update resolved flag" });
     return;
   }
-  const withUpdated = setTopLevelField(next, "updated", `"${nowTimestamp()}"`);
+  const withUpdated = setTopLevelField(next, "updated", nowTimestamp());
   await writeFileForce(commentsPath, withUpdated);
   const assignment = await reloadDetail();
   res.json({ assignment });
@@ -18657,6 +18703,119 @@ async function readEvents(jobId) {
 import { createHash as createHash3 } from "crypto";
 import { open as open4, readFile as readFile21, stat as stat3, unlink as unlink6 } from "fs/promises";
 import { resolve as resolve29 } from "path";
+
+// src/schedules/triggers.ts
+import { Cron } from "croner";
+
+// src/schedules/reset-window.ts
+var FIVE_HOURS_MS = 5 * 60 * 60 * 1e3;
+var ONE_WEEK_MS = 7 * 24 * 60 * 60 * 1e3;
+function windowLengthMs(anchor) {
+  return anchor.windowKind === "weekly" ? ONE_WEEK_MS : FIVE_HOURS_MS;
+}
+function predictReset(_provider, anchor) {
+  const start = Date.parse(anchor.windowStartIso);
+  if (Number.isNaN(start)) {
+    throw new Error(`Invalid reset anchor windowStartIso: ${anchor.windowStartIso}`);
+  }
+  return new Date(start + windowLengthMs(anchor)).toISOString().replace(/\.\d{3}Z$/, "Z");
+}
+function verifyReset(provider, anchor, now) {
+  const reset = predictReset(provider, anchor);
+  if (now.getTime() >= Date.parse(reset)) return { eligible: true };
+  return { eligible: false, rescheduleToIso: reset };
+}
+
+// src/schedules/triggers.ts
+function iso(d) {
+  return d.toISOString().replace(/\.\d{3}Z$/, "Z");
+}
+function isRecurring(trigger) {
+  return trigger.kind === "cron";
+}
+var notDue = { due: false };
+function evaluateTrigger(job, ctx) {
+  const consumed = new Set(job.attempt.consumedEdges);
+  const result = evaluateKind(job.trigger, job, ctx);
+  if (result.due && result.dedupeKey && consumed.has(result.dedupeKey)) {
+    return { ...result, due: false };
+  }
+  return result;
+}
+function evaluateKind(trigger, job, ctx) {
+  const createdAtMs = Date.parse(job.createdAt);
+  switch (trigger.kind) {
+    case "at": {
+      const at = Date.parse(trigger.at);
+      const due = !Number.isNaN(at) && ctx.now.getTime() >= at;
+      return { due, dedupeKey: `at:${trigger.at}`, nextFireIso: trigger.at };
+    }
+    case "in": {
+      const anchor = Date.parse(trigger.anchorIso);
+      const fireAt = anchor + trigger.durationMs;
+      const due = !Number.isNaN(anchor) && ctx.now.getTime() >= fireAt;
+      const fireIso = Number.isNaN(anchor) ? null : iso(new Date(fireAt));
+      return { due, dedupeKey: `in:${fireAt}`, nextFireIso: fireIso };
+    }
+    case "cron":
+      return evaluateCron(trigger, ctx.now, createdAtMs);
+    case "after-reset":
+      return evaluateAfterReset(trigger, ctx.now);
+    case "when-status":
+      return evaluateWhenStatus(trigger, job, ctx, createdAtMs);
+    case "when-plan-lands":
+      return evaluateWhenPlanLands(ctx, createdAtMs);
+  }
+}
+function evaluateCron(trigger, now, createdAtMs) {
+  let cron;
+  try {
+    cron = new Cron(trigger.expr, trigger.tz ? { timezone: trigger.tz } : {});
+  } catch {
+    return notDue;
+  }
+  const prevs = cron.previousRuns(1, new Date(now.getTime() + 1e3));
+  let prev = prevs.length > 0 ? prevs[0] : null;
+  if (prev && prev.getTime() > now.getTime()) prev = null;
+  if (prev && !Number.isNaN(createdAtMs) && prev.getTime() < createdAtMs) prev = null;
+  const next = cron.nextRun(now);
+  if (!prev) return { due: false, nextFireIso: next ? iso(next) : null };
+  return { due: true, dedupeKey: `cron:${iso(prev)}`, nextFireIso: next ? iso(next) : null };
+}
+function evaluateAfterReset(trigger, now) {
+  const v = verifyReset(trigger.provider, trigger.anchor, now);
+  const predicted = predictReset(trigger.provider, trigger.anchor);
+  if (v.eligible) {
+    return { due: true, dedupeKey: `after-reset:${trigger.anchor.windowStartIso}`, nextFireIso: predicted };
+  }
+  return { due: false, nextFireIso: predicted, rescheduleToIso: v.rescheduleToIso };
+}
+function evaluateWhenStatus(trigger, job, ctx, createdAtMs) {
+  const fm = ctx.assignment;
+  if (!fm) return notDue;
+  const history = fm.statusHistory ?? [];
+  for (let i = job.attempt.cursor; i < history.length; i++) {
+    const atMs = Date.parse(history[i].at);
+    const afterCreation = Number.isNaN(createdAtMs) || Number.isNaN(atMs) || atMs >= createdAtMs;
+    if (history[i].to === trigger.status && afterCreation) {
+      return { due: true, dedupeKey: `status:${i}:${history[i].at}`, nextCursor: i + 1 };
+    }
+  }
+  return { due: false, nextCursor: history.length };
+}
+function evaluateWhenPlanLands(ctx, createdAtMs) {
+  const fm = ctx.assignment;
+  if (!fm) return notDue;
+  const approval = fm.planApproval;
+  if (!approval) return notDue;
+  const approvedMs = Date.parse(approval.at);
+  if (!Number.isNaN(createdAtMs) && !Number.isNaN(approvedMs) && approvedMs < createdAtMs) {
+    return notDue;
+  }
+  return { due: true, dedupeKey: `plan:${approval.file}:${approval.digest}` };
+}
+
+// src/schedules/attempt.ts
 init_timestamp();
 
 // src/schedules/types.ts
@@ -18855,6 +19014,15 @@ async function markLaunchFailed(job, reason) {
   await appendEvent(job.id, "launch_failed", { reason });
   return written;
 }
+async function markCompleted(job) {
+  const next = {
+    ...job,
+    attempt: { ...job.attempt, state: "completed", claim: null }
+  };
+  const written = await writeJob(next);
+  await appendEvent(job.id, "completed", { reason: "one-shot session ended" });
+  return written;
+}
 var TransitionError = class extends Error {
   constructor(message) {
     super(message);
@@ -18942,10 +19110,11 @@ function retryJob(id) {
     () => ({ claim: null, lastError: null })
   );
 }
+var ONE_SHOT_COMPLETE_GRACE_MS = 6e4;
 async function reapStale(jobs, deps) {
   const now = deps.now();
   const isLive = deps.isSessionLive ?? (() => true);
-  const out = { reaped: [], stuck: [] };
+  const out = { reaped: [], stuck: [], completed: [] };
   for (const job of jobs) {
     const a = job.attempt;
     if ((a.state === "claimed" || a.state === "launching") && a.claim && now.getTime() > a.claim.expiresAt) {
@@ -18954,7 +19123,17 @@ async function reapStale(jobs, deps) {
       out.reaped.push(job.id);
       continue;
     }
-    if (a.state === "running" && job.limits.maxRuntimeMs && a.runningSince) {
+    if (a.state !== "running") continue;
+    if (!isRecurring(job.trigger) && a.sessionId && a.runningSince) {
+      const graceMs = job.limits.maxRuntimeMs ?? ONE_SHOT_COMPLETE_GRACE_MS;
+      const pastGrace = now.getTime() - Date.parse(a.runningSince) > graceMs;
+      if (pastGrace && !isLive(a.sessionId, a.launchPid)) {
+        await markCompleted(job);
+        out.completed.push(job.id);
+        continue;
+      }
+    }
+    if (job.limits.maxRuntimeMs && a.runningSince) {
       const overrun = now.getTime() - Date.parse(a.runningSince) > job.limits.maxRuntimeMs;
       if (overrun && !isLive(a.sessionId, a.launchPid) && a.lastError !== "stuck:max-runtime") {
         await writeJob({ ...job, attempt: { ...a, lastError: "stuck:max-runtime" } });
@@ -19138,117 +19317,6 @@ init_frontmatter();
 import { readFile as readFile22 } from "fs/promises";
 import { resolve as resolve31 } from "path";
 
-// src/schedules/triggers.ts
-import { Cron } from "croner";
-
-// src/schedules/reset-window.ts
-var FIVE_HOURS_MS = 5 * 60 * 60 * 1e3;
-var ONE_WEEK_MS = 7 * 24 * 60 * 60 * 1e3;
-function windowLengthMs(anchor) {
-  return anchor.windowKind === "weekly" ? ONE_WEEK_MS : FIVE_HOURS_MS;
-}
-function predictReset(_provider, anchor) {
-  const start = Date.parse(anchor.windowStartIso);
-  if (Number.isNaN(start)) {
-    throw new Error(`Invalid reset anchor windowStartIso: ${anchor.windowStartIso}`);
-  }
-  return new Date(start + windowLengthMs(anchor)).toISOString().replace(/\.\d{3}Z$/, "Z");
-}
-function verifyReset(provider, anchor, now) {
-  const reset = predictReset(provider, anchor);
-  if (now.getTime() >= Date.parse(reset)) return { eligible: true };
-  return { eligible: false, rescheduleToIso: reset };
-}
-
-// src/schedules/triggers.ts
-function iso(d) {
-  return d.toISOString().replace(/\.\d{3}Z$/, "Z");
-}
-function isRecurring(trigger) {
-  return trigger.kind === "cron";
-}
-var notDue = { due: false };
-function evaluateTrigger(job, ctx) {
-  const consumed = new Set(job.attempt.consumedEdges);
-  const result = evaluateKind(job.trigger, job, ctx);
-  if (result.due && result.dedupeKey && consumed.has(result.dedupeKey)) {
-    return { ...result, due: false };
-  }
-  return result;
-}
-function evaluateKind(trigger, job, ctx) {
-  const createdAtMs = Date.parse(job.createdAt);
-  switch (trigger.kind) {
-    case "at": {
-      const at = Date.parse(trigger.at);
-      const due = !Number.isNaN(at) && ctx.now.getTime() >= at;
-      return { due, dedupeKey: `at:${trigger.at}`, nextFireIso: trigger.at };
-    }
-    case "in": {
-      const anchor = Date.parse(trigger.anchorIso);
-      const fireAt = anchor + trigger.durationMs;
-      const due = !Number.isNaN(anchor) && ctx.now.getTime() >= fireAt;
-      const fireIso = Number.isNaN(anchor) ? null : iso(new Date(fireAt));
-      return { due, dedupeKey: `in:${fireAt}`, nextFireIso: fireIso };
-    }
-    case "cron":
-      return evaluateCron(trigger, ctx.now, createdAtMs);
-    case "after-reset":
-      return evaluateAfterReset(trigger, ctx.now);
-    case "when-status":
-      return evaluateWhenStatus(trigger, job, ctx, createdAtMs);
-    case "when-plan-lands":
-      return evaluateWhenPlanLands(ctx, createdAtMs);
-  }
-}
-function evaluateCron(trigger, now, createdAtMs) {
-  let cron;
-  try {
-    cron = new Cron(trigger.expr, trigger.tz ? { timezone: trigger.tz } : {});
-  } catch {
-    return notDue;
-  }
-  const prevs = cron.previousRuns(1, new Date(now.getTime() + 1e3));
-  let prev = prevs.length > 0 ? prevs[0] : null;
-  if (prev && prev.getTime() > now.getTime()) prev = null;
-  if (prev && !Number.isNaN(createdAtMs) && prev.getTime() < createdAtMs) prev = null;
-  const next = cron.nextRun(now);
-  if (!prev) return { due: false, nextFireIso: next ? iso(next) : null };
-  return { due: true, dedupeKey: `cron:${iso(prev)}`, nextFireIso: next ? iso(next) : null };
-}
-function evaluateAfterReset(trigger, now) {
-  const v = verifyReset(trigger.provider, trigger.anchor, now);
-  const predicted = predictReset(trigger.provider, trigger.anchor);
-  if (v.eligible) {
-    return { due: true, dedupeKey: `after-reset:${trigger.anchor.windowStartIso}`, nextFireIso: predicted };
-  }
-  return { due: false, nextFireIso: predicted, rescheduleToIso: v.rescheduleToIso };
-}
-function evaluateWhenStatus(trigger, job, ctx, createdAtMs) {
-  const fm = ctx.assignment;
-  if (!fm) return notDue;
-  const history = fm.statusHistory ?? [];
-  for (let i = job.attempt.cursor; i < history.length; i++) {
-    const atMs = Date.parse(history[i].at);
-    const afterCreation = Number.isNaN(createdAtMs) || Number.isNaN(atMs) || atMs >= createdAtMs;
-    if (history[i].to === trigger.status && afterCreation) {
-      return { due: true, dedupeKey: `status:${i}:${history[i].at}`, nextCursor: i + 1 };
-    }
-  }
-  return { due: false, nextCursor: history.length };
-}
-function evaluateWhenPlanLands(ctx, createdAtMs) {
-  const fm = ctx.assignment;
-  if (!fm) return notDue;
-  const approval = fm.planApproval;
-  if (!approval) return notDue;
-  const approvedMs = Date.parse(approval.at);
-  if (!Number.isNaN(createdAtMs) && !Number.isNaN(approvedMs) && approvedMs < createdAtMs) {
-    return notDue;
-  }
-  return { due: true, dedupeKey: `plan:${approval.file}:${approval.digest}` };
-}
-
 // src/schedules/launch-ack.ts
 init_session_id();
 import { readdirSync } from "fs";
@@ -19330,11 +19398,12 @@ async function defaultResolvePlan(job) {
 async function runTick(deps = {}) {
   const now = deps.now ?? (() => /* @__PURE__ */ new Date());
   const attemptDeps = { now, isSessionLive: deps.isSessionLive };
-  const result = { evaluated: 0, fired: [], failed: [], skipped: 0, reaped: [], stuck: [] };
+  const result = { evaluated: 0, fired: [], failed: [], skipped: 0, reaped: [], stuck: [], completed: [] };
   if (deps.reap !== false) {
     const reap = await reapStale(await listJobs(), attemptDeps);
     result.reaped = reap.reaped;
     result.stuck = reap.stuck;
+    result.completed = reap.completed;
   }
   const jobs = await listJobs();
   for (const job of jobs) {
@@ -20999,6 +21068,9 @@ workspace: ${workspace}
         await writeFileForce2(archFile, archContent);
         checklist.items = checklist.items.filter((i) => !completedIds.has(i.id));
         await writeChecklist(todosDir2, checklist);
+        const archivedEntries = new Set(toArchive);
+        log.entries = log.entries.filter((e) => !archivedEntries.has(e));
+        await writeFileForce2(logPath(todosDir2, workspace), serializeLog(log));
         for (const id of completedIds) {
           await deleteAllAttachments(todosDir2, workspace, id);
         }
@@ -21743,6 +21815,9 @@ workspace: ${slug}
         checklist.workspace = slug;
         checklist.items = checklist.items.filter((i) => !completedIds.has(i.id));
         await writeChecklist(todosDir2, checklist);
+        const archivedEntries = new Set(toArchive);
+        log.entries = log.entries.filter((e) => !archivedEntries.has(e));
+        await writeFileForce(logPath(todosDir2, slug), serializeLog(log));
         for (const id of completedIds) {
           await deleteAllAttachments(todosDir2, slug, id);
         }
@@ -24355,9 +24430,11 @@ function createDashboardServer(options) {
       return new Promise((resolvePromise, reject) => {
         server.on("error", (err) => {
           if (err.code === "EADDRINUSE") {
-            reject(new Error(
-              `Port ${port} is already in use. Use --port <number> to specify a different port.`
-            ));
+            const inUse = new Error(
+              `Port ${port} is already in use.`
+            );
+            inUse.code = "EADDRINUSE";
+            reject(inUse);
           } else {
             reject(err);
           }