clay-server 2.18.0-beta.9 → 2.18.0

package/lib/public/modules/scheduler.js

@@ -7,6 +7,7 @@
 
 import { renderMarkdown } from './markdown.js';
 import { iconHtml } from './icons.js';
+import { showToast } from './utils.js';
 
 var ctx = null;
 var records = []; // all loop registry records
@@ -33,7 +34,6 @@ var panel = null;    // #scheduler-panel
 var bodyEl = null;
 var monthLabel = null;
 var calHeader = null;
-var editModal = null;
 var popoverEl = null;
 var panelOpen = false;
 
@@ -46,7 +46,6 @@ var messagesOrigParent = null;    // for reparenting
 var inputOrigNextSibling = null;  // anchor for restoring input-area position
 
 // Edit state
-var editingId = null;
 
 // Create popover state
 var createEditingRecId = null;     // non-null when editing existing schedule
@@ -56,6 +55,9 @@ var createRecurrence = "none";    // current recurrence selection
 var createCustomConfirmed = false; // whether custom repeat was confirmed via OK
 var createInterval = "none";      // current interval selection: "none", "1", "5", "15", "30", "60", "custom"
 var createIntervalCustom = null;  // { value: N, unit: "minute"|"hour" } for custom interval
+var createIntervalEnd = "allday"; // "allday" | "after" | "until"
+var createIntervalEndAfter = 5;   // occurrence count for "after" end type
+var createIntervalEndTime = "";   // HH:MM string for "until" end type
 var createColor = "#ffb86c";       // selected event color (default: accent)
 var createEndType = "never";       // "never" | "until" | "after"
 var createEndDate = null;          // Date for "until" end type
@@ -77,7 +79,6 @@ var MONTH_NAMES = [
 export function initScheduler(_ctx) {
   ctx = _ctx;
   currentProjectSlug = ctx.currentSlug || null;
-  editModal = document.getElementById("schedule-edit-modal");
   createPopover = document.getElementById("schedule-create-popover");
   popoverEl = document.getElementById("schedule-popover");
 
@@ -95,9 +96,6 @@ export function initScheduler(_ctx) {
     });
   }
 
-  // Edit modal
-  setupEditModal();
-
   // Create modal
   setupCreateModal();
 
@@ -751,6 +749,10 @@ function renderDetailBody(tab, rec) {
     html += '<span class="scheduler-detail-meta-value">' + esc(createdStr) + '</span>';
     html += '<span class="scheduler-detail-meta-label">Last Run</span>';
     html += '<span class="scheduler-detail-meta-value">' + esc(lastRunStr) + '</span>';
+    if (isScheduled && rec.nextRunAt) {
+      html += '<span class="scheduler-detail-meta-label">Next Run</span>';
+      html += '<span class="scheduler-detail-meta-value">' + esc(formatDateTime(new Date(rec.nextRunAt))) + '</span>';
+    }
     html += '</div>';
     bodyEl2.innerHTML = html;
   } else {
@@ -874,8 +876,9 @@ function renderMonthView() {
       var dateStr = cursor.getFullYear() + "-" + pad(cursor.getMonth() + 1) + "-" + pad(cursor.getDate());
       var isOther = cursor.getMonth() !== month;
       var isToday = dateStr === todayStr;
+      var isPast = dateStr < todayStr;
       var isWeekend = d === 0 || d === 6;
-      var cls = "scheduler-cell" + (isOther ? " other-month" : "") + (isToday ? " today" : "") + (isWeekend ? " weekend" : "");
+      var cls = "scheduler-cell" + (isOther ? " other-month" : "") + (isToday ? " today" : "") + (isPast ? " past" : "") + (isWeekend ? " weekend" : "");
       html += '<div class="' + cls + '" data-date="' + dateStr + '">';
       var dayLabel = cursor.getDate() === 1
         ? MONTH_NAMES[cursor.getMonth()].substring(0, 3) + ", " + cursor.getDate()
@@ -884,7 +887,8 @@ function renderMonthView() {
       var events = getEventsForDate(cursor);
       for (var e = 0; e < events.length && e < 3; e++) {
         var ev = events[e];
-        html += '<div class="scheduler-event ' + (ev.enabled ? "enabled" : "disabled") + '" data-rec-id="' + ev.id + '">';
+        var evFullText = ev.timeStr + " " + ev.name;
+        html += '<div class="scheduler-event ' + (ev.enabled ? "enabled" : "disabled") + '" data-rec-id="' + ev.id + '" data-tip="' + esc(evFullText) + '">';
         html += '<span class="scheduler-event-time">' + ev.timeStr + '</span> ' + esc(ev.name);
         html += '</div>';
       }
@@ -1010,9 +1014,10 @@ function renderWeekView() {
       if (ev.intervalBadge) {
         var badgeStyle = "";
         if (ev.color) badgeStyle = "background:" + ev.color;
-        html += '<div class="scheduler-week-event interval-badge ' + (ev.enabled ? "enabled" : "disabled") + '" data-rec-id="' + ev.id + '" style="position:relative;top:0;left:0;width:85%;height:auto;' + badgeStyle + '">';
-        html += '<span class="scheduler-week-event-title">' + esc(ev.name) + '</span>';
+        var weekIntFullText = ev.timeStr + " " + ev.name;
+        html += '<div class="scheduler-week-event interval-badge ' + (ev.enabled ? "enabled" : "disabled") + '" data-rec-id="' + ev.id + '" data-tip="' + esc(weekIntFullText) + '" style="position:relative;top:0;left:0;width:85%;height:auto;' + badgeStyle + '">';
         html += '<span class="scheduler-week-event-time">' + esc(ev.timeStr) + '</span>';
+        html += '<span class="scheduler-week-event-title">' + esc(ev.name) + '</span>';
         html += '</div>';
         continue;
       }
@@ -1026,7 +1031,8 @@ function renderWeekView() {
       var evStyle = "top:" + topPct + "%;height:calc(160vh / 48)";
       evStyle += ";left:" + leftPct + "%;width:" + (colWidth - 1) + "%";
       if (evColor) evStyle += ";background:" + evColor;
-      html += '<div class="scheduler-week-event ' + (ev.enabled ? "enabled" : "disabled") + '" data-rec-id="' + ev.id + '" style="' + evStyle + '">';
+      var weekEvFullText = ev.timeStr + " " + ev.name;
+      html += '<div class="scheduler-week-event ' + (ev.enabled ? "enabled" : "disabled") + '" data-rec-id="' + ev.id + '" data-tip="' + esc(weekEvFullText) + '" style="' + evStyle + '">';
       html += '<span class="scheduler-week-event-title">' + esc(ev.name) + '</span>';
       html += '<span class="scheduler-week-event-time">' + ev.timeStr + '</span>';
       html += '</div>';
@@ -1208,7 +1214,7 @@ function getEventsForDate(date) {
       results.push({
         id: r.id, name: r.name, enabled: r.enabled,
         hour: 0, minute: 0,
-        timeStr: cronToHuman(r.cron) || "Interval",
+        timeStr: (r.time || "00:00") + " " + (cronToHuman(r.cron) || "Interval"),
         allDay: true,
         intervalBadge: true,
         color: r.color || null,
@@ -1277,7 +1283,13 @@ function showPopover(recId, anchorEl) {
         var action = btn.dataset.action;
         var id = btn.dataset.id;
         popoverEl.classList.add("hidden");
-        if (action === "edit") openEditModal(id);
+        if (action === "edit") {
+          var rec = null;
+          for (var ri = 0; ri < records.length; ri++) {
+            if (records[ri].id === id) { rec = records[ri]; break; }
+          }
+          if (rec) openCreateModalWithRecord(rec, btn);
+        }
         else if (action === "toggle") send({ type: "loop_registry_toggle", id: id });
         else if (action === "rerun") send({ type: "loop_registry_rerun", id: id });
         else if (action === "move") showMovePopover(id, btn);
@@ -1390,148 +1402,6 @@ function attachEventClicks(container, selector) {
   }
 }
 
-// --- Edit Modal (for changing cron/name on existing records) ---
-
-function setupEditModal() {
-  if (!editModal) return;
-  document.getElementById("schedule-edit-close").addEventListener("click", function () { closeEditModal(); });
-  document.getElementById("sched-cancel").addEventListener("click", function () { closeEditModal(); });
-  editModal.querySelector(".confirm-backdrop").addEventListener("click", function () { closeEditModal(); });
-
-  // Presets
-  var presetBtns = document.querySelectorAll("#sched-presets .sched-preset-btn");
-  for (var i = 0; i < presetBtns.length; i++) {
-    (function (btn) {
-      btn.addEventListener("click", function () { selectPreset(btn.dataset.preset); });
-    })(presetBtns[i]);
-  }
-
-  // DOW
-  var dowBtns = document.querySelectorAll("#sched-dow-row .sched-dow-btn");
-  for (var i = 0; i < dowBtns.length; i++) {
-    (function (btn) {
-      btn.addEventListener("click", function () { btn.classList.toggle("active"); updateEditCronPreview(); });
-    })(dowBtns[i]);
-  }
-
-  document.getElementById("sched-time").addEventListener("change", function () { updateEditCronPreview(); });
-  document.getElementById("sched-save").addEventListener("click", function () { saveEdit(); });
-  document.getElementById("sched-delete").addEventListener("click", function () {
-    if (editingId && confirm("Delete this job?")) {
-      send({ type: "loop_registry_remove", id: editingId });
-      closeEditModal();
-    }
-  });
-}
-
-var editPreset = "daily";
-
-function selectPreset(preset) {
-  editPreset = preset;
-  var btns = document.querySelectorAll("#sched-presets .sched-preset-btn");
-  for (var i = 0; i < btns.length; i++) btns[i].classList.toggle("active", btns[i].dataset.preset === preset);
-  var dowField = document.getElementById("sched-dow-field");
-  if (dowField) dowField.style.display = (preset === "custom" || preset === "weekly") ? "" : "none";
-  updateEditCronPreview();
-}
-
-function buildEditCron() {
-  var timeVal = document.getElementById("sched-time").value || "09:00";
-  var parts = timeVal.split(":");
-  var h = parseInt(parts[0], 10);
-  var m = parseInt(parts[1], 10);
-  var dow = "*";
-  if (editPreset === "weekdays") dow = "1-5";
-  else if (editPreset === "weekly" || editPreset === "custom") {
-    var days = [];
-    var btns = document.querySelectorAll("#sched-dow-row .sched-dow-btn.active");
-    for (var i = 0; i < btns.length; i++) days.push(btns[i].dataset.dow);
-    if (days.length > 0 && days.length < 7) dow = days.sort().join(",");
-  } else if (editPreset === "monthly") {
-    return m + " " + h + " " + new Date().getDate() + " * *";
-  }
-  return m + " " + h + " * * " + dow;
-}
-
-function updateEditCronPreview() {
-  var cron = buildEditCron();
-  var humanEl = document.getElementById("sched-human-text");
-  var cronEl = document.getElementById("sched-cron-text");
-  if (humanEl) humanEl.textContent = cronToHuman(cron);
-  if (cronEl) cronEl.textContent = cron;
-}
-
-function openEditModal(recId) {
-  if (!editModal) return;
-  editingId = recId;
-  var rec = null;
-  for (var i = 0; i < records.length; i++) {
-    if (records[i].id === recId) { rec = records[i]; break; }
-  }
-  if (!rec) return;
-
-  document.getElementById("schedule-edit-title").textContent = "Edit Schedule";
-  document.getElementById("sched-name").value = rec.name || "";
-  document.getElementById("sched-enabled").checked = rec.enabled;
-  document.getElementById("sched-delete").style.display = "";
-
-  // Show job name
-  var jobNameEl = document.getElementById("sched-job-name");
-  if (jobNameEl) jobNameEl.textContent = rec.task ? rec.task.substring(0, 80) : rec.id;
-
-  // History
-  var historyField = document.getElementById("sched-history-field");
-  if (rec.runs && rec.runs.length > 0) {
-    if (historyField) historyField.style.display = "";
-    renderHistory(rec.runs);
-  } else {
-    if (historyField) historyField.style.display = "none";
-  }
-
-  // Parse cron
-  if (rec.cron) {
-    var parsed = parseCronSimple(rec.cron);
-    if (parsed) {
-      document.getElementById("sched-time").value = pad(parsed.hours[0] || 9) + ":" + pad(parsed.minutes[0] || 0);
-      var dowArr = parsed.daysOfWeek;
-      if (dowArr.length === 7) selectPreset("daily");
-      else if (dowArr.length === 5 && dowArr[0] === 1 && dowArr[4] === 5) selectPreset("weekdays");
-      else {
-        selectPreset("custom");
-        var dowBtns = document.querySelectorAll("#sched-dow-row .sched-dow-btn");
-        for (var j = 0; j < dowBtns.length; j++) {
-          dowBtns[j].classList.toggle("active", dowArr.indexOf(parseInt(dowBtns[j].dataset.dow)) !== -1);
-        }
-      }
-    }
-  } else {
-    document.getElementById("sched-time").value = "09:00";
-    selectPreset("daily");
-  }
-
-  updateEditCronPreview();
-  editModal.classList.remove("hidden");
-}
-
-function closeEditModal() {
-  if (editModal) editModal.classList.add("hidden");
-  editingId = null;
-}
-
-function saveEdit() {
-  var name = document.getElementById("sched-name").value.trim();
-  var enabled = document.getElementById("sched-enabled").checked;
-  var cron = buildEditCron();
-  if (!name) { alert("Please enter a name."); return; }
-
-  send({
-    type: "loop_registry_update",
-    id: editingId,
-    data: { name: name, cron: cron, enabled: enabled },
-  });
-  closeEditModal();
-}
-
 function renderHistory(runs) {
   var el = document.getElementById("sched-history");
   if (!el || !runs || runs.length === 0) { if (el) el.innerHTML = '<div class="sched-history-empty">No runs yet</div>'; return; }
@@ -1615,9 +1485,9 @@ export function handleLoopRegistryFiles(msg) {
   // Disable "Run now" if PROMPT.md or JUDGE.md is missing
   var runBtn = contentDetailEl ? contentDetailEl.querySelector('[data-action="run"]') : null;
   if (runBtn) {
-    var filesReady = !!msg.prompt && !!msg.judge;
+    var filesReady = !!msg.prompt;
     runBtn.disabled = !filesReady;
-    runBtn.title = filesReady ? "Run now" : "PROMPT.md and JUDGE.md are required to run";
+    runBtn.title = filesReady ? "Run now" : "PROMPT.md is required to run";
   }
 }
 
@@ -1662,6 +1532,13 @@ function attachCellClicks(container) {
         if (e.target.closest(".scheduler-event")) return;
         var parts = cell.dataset.date.split("-");
         var d = new Date(parseInt(parts[0], 10), parseInt(parts[1], 10) - 1, parseInt(parts[2], 10));
+        // Block creating tasks on past dates
+        var now = new Date();
+        var todayStart = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+        if (d < todayStart) {
+          showToast("Cannot schedule a task in the past", "error");
+          return;
+        }
         openCreateModal(d, null, cell);
       });
       cell.addEventListener("dragover", function (e) {
@@ -1683,6 +1560,12 @@ function attachCellClicks(container) {
         removePreview();
         var parts = cell.dataset.date.split("-");
         var d = new Date(parseInt(parts[0], 10), parseInt(parts[1], 10) - 1, parseInt(parts[2], 10));
+        var now = new Date();
+        var todayStart = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+        if (d < todayStart) {
+          showToast("Cannot schedule a task in the past", "error");
+          return;
+        }
         openCreateModal(d, null, cell);
         applyDraggedTask();
       });
@@ -1701,6 +1584,11 @@ function attachWeekSlotClicks(container) {
         var quarter = parseInt(slot.dataset.quarter || "0", 10);
         var minute = quarter * 15;
         var d = new Date(parseInt(parts[0], 10), parseInt(parts[1], 10) - 1, parseInt(parts[2], 10), hour, minute, 0);
+        // Block creating tasks in the past
+        if (d < new Date()) {
+          showToast("Cannot schedule a task in the past", "error");
+          return;
+        }
         openCreateModal(d, hour, slot);
       });
       slot.addEventListener("dragover", function (e) {
@@ -1725,6 +1613,10 @@ function attachWeekSlotClicks(container) {
         var quarter = parseInt(slot.dataset.quarter || "0", 10);
         var minute = quarter * 15;
         var d = new Date(parseInt(parts[0], 10), parseInt(parts[1], 10) - 1, parseInt(parts[2], 10), hour, minute, 0);
+        if (d < new Date()) {
+          showToast("Cannot schedule a task in the past", "error");
+          return;
+        }
         openCreateModal(d, hour, slot);
         applyDraggedTask();
       });
@@ -1775,10 +1667,19 @@ function setupCreateModal() {
         createSelectedDate = new Date(parseInt(parts[0], 10), parseInt(parts[1], 10) - 1, parseInt(parts[2], 10));
         document.getElementById("sched-create-date").value = this.value;
         updateRecurrenceLabels(createSelectedDate);
+        enforceMinTime();
       }
     });
   }
 
+  // Time input change — enforce min time when today is selected
+  var timeInputEl = document.getElementById("sched-create-time");
+  if (timeInputEl) {
+    timeInputEl.addEventListener("blur", function () {
+      enforceMinTime();
+    });
+  }
+
   // Task dropdown
   var taskBtn = document.getElementById("sched-create-task-btn");
   var taskList = document.getElementById("sched-create-task-list");
@@ -1809,8 +1710,6 @@ function setupCreateModal() {
     if (dd) {
       var wasHidden = dd.classList.contains("hidden");
       dd.classList.toggle("hidden");
-      document.getElementById("sched-custom-repeat-panel").classList.add("hidden");
-      document.getElementById("sched-create-recurrence-list").style.display = "";
       if (wasHidden && btn) {
         var bRect = btn.getBoundingClientRect();
         var ddW = 280;
@@ -1823,31 +1722,8 @@ function setupCreateModal() {
     }
   });
 
-  // Recurrence option clicks
-  var recOptions = createPopover.querySelectorAll(".sched-recurrence-option");
-  for (var i = 0; i < recOptions.length; i++) {
-    (function (opt) {
-      opt.addEventListener("click", function (e) {
-        e.stopPropagation();
-        var rec = opt.dataset.recurrence;
-        if (rec === "custom") {
-          document.getElementById("sched-create-recurrence-list").style.display = "none";
-          document.getElementById("sched-custom-repeat-panel").classList.remove("hidden");
-          return;
-        }
-        for (var j = 0; j < recOptions.length; j++) {
-          recOptions[j].classList.toggle("active", recOptions[j] === opt);
-        }
-        createRecurrence = rec;
-        createCustomConfirmed = false;
-        // Close dropdown
-        document.getElementById("sched-create-recurrence-dropdown").classList.add("hidden");
-        updateRecurrenceBtn();
-      });
-    })(recOptions[i]);
-  }
-
   // --- Interval button + dropdown ---
+  var intervalSnapshot = null;
   document.getElementById("sched-create-interval-btn").addEventListener("click", function (e) {
     e.stopPropagation();
     var dd = document.getElementById("sched-create-interval-dropdown");
@@ -1858,6 +1734,14 @@ function setupCreateModal() {
       var wasHidden = dd.classList.contains("hidden");
       dd.classList.toggle("hidden");
       if (wasHidden && btn) {
+        // Save snapshot for cancel
+        intervalSnapshot = {
+          interval: createInterval,
+          custom: createIntervalCustom ? { value: createIntervalCustom.value, unit: createIntervalCustom.unit } : null,
+          end: createIntervalEnd,
+          endAfter: createIntervalEndAfter,
+          endTime: createIntervalEndTime
+        };
         var bRect = btn.getBoundingClientRect();
         var ddW = 220;
         var ddLeft = bRect.left;
@@ -1865,29 +1749,36 @@ function setupCreateModal() {
         if (ddLeft < 10) ddLeft = 10;
         dd.style.left = ddLeft + "px";
         dd.style.top = (bRect.bottom + 4) + "px";
+        // Auto-apply custom interval when opening
+        if (createInterval === "none") {
+          applyInlineInterval();
+        }
       }
     }
   });
 
-  // Interval option clicks
-  var intOptions = document.querySelectorAll(".sched-interval-option");
-  for (var ii = 0; ii < intOptions.length; ii++) {
-    (function (opt) {
-      opt.addEventListener("click", function (e) {
-        e.stopPropagation();
-        var val = opt.dataset.interval;
-        for (var j = 0; j < intOptions.length; j++) {
-          intOptions[j].classList.toggle("active", intOptions[j] === opt);
-        }
-        createInterval = val;
-        createIntervalCustom = null;
-        document.getElementById("sched-create-interval-dropdown").classList.add("hidden");
-        updateIntervalBtn();
-      });
-    })(intOptions[ii]);
-  }
+  // Interval Cancel button - revert to snapshot
+  document.getElementById("sched-interval-cancel").addEventListener("click", function (e) {
+    e.stopPropagation();
+    if (intervalSnapshot) {
+      createInterval = intervalSnapshot.interval;
+      createIntervalCustom = intervalSnapshot.custom;
+      createIntervalEnd = intervalSnapshot.end;
+      createIntervalEndAfter = intervalSnapshot.endAfter;
+      createIntervalEndTime = intervalSnapshot.endTime;
+      updateIntervalBtn();
+    }
+    document.getElementById("sched-create-interval-dropdown").classList.add("hidden");
+  });
 
-  // Interval inline custom input
+  // Interval OK button - accept and close
+  document.getElementById("sched-interval-ok").addEventListener("click", function (e) {
+    e.stopPropagation();
+    applyInlineInterval();
+    document.getElementById("sched-create-interval-dropdown").classList.add("hidden");
+  });
+
+  // Interval custom input
   var intCustomValue = document.getElementById("sched-interval-custom-value");
   var intUnitSegs = document.querySelectorAll(".sched-interval-seg");
   function getIntervalUnit() {
@@ -1901,15 +1792,9 @@ function setupCreateModal() {
     var u = getIntervalUnit();
     createInterval = "custom";
     createIntervalCustom = { value: v, unit: u };
-    for (var j = 0; j < intOptions.length; j++) {
-      intOptions[j].classList.remove("active");
-    }
     updateIntervalBtn();
   }
   intCustomValue.addEventListener("change", applyInlineInterval);
-  intCustomValue.addEventListener("keydown", function (e) { e.stopPropagation(); });
-  intCustomValue.addEventListener("keyup", function (e) { e.stopPropagation(); });
-  intCustomValue.addEventListener("keypress", function (e) { e.stopPropagation(); });
   for (var si = 0; si < intUnitSegs.length; si++) {
     (function (seg) {
       seg.addEventListener("click", function (e) {
@@ -1922,18 +1807,44 @@ function setupCreateModal() {
     })(intUnitSegs[si]);
   }
 
-  // Custom repeat: back
-  document.getElementById("sched-custom-back").addEventListener("click", function (e) {
-    e.stopPropagation();
-    document.getElementById("sched-custom-repeat-panel").classList.add("hidden");
-    document.getElementById("sched-create-recurrence-list").style.display = "";
-  });
+  // Interval end condition options
+  var iendOpts = document.querySelectorAll(".sched-interval-end-opt");
+  for (var ie = 0; ie < iendOpts.length; ie++) {
+    (function (opt) {
+      opt.addEventListener("click", function (e) {
+        e.stopPropagation();
+        var val = opt.dataset.iend;
+        for (var j = 0; j < iendOpts.length; j++) {
+          iendOpts[j].classList.toggle("active", iendOpts[j] === opt);
+        }
+        createIntervalEnd = val;
+        var afterRow = document.getElementById("sched-interval-end-after-row");
+        var untilRow = document.getElementById("sched-interval-end-until-row");
+        if (afterRow) afterRow.classList.toggle("hidden", val !== "after");
+        if (untilRow) untilRow.classList.toggle("hidden", val !== "until");
+      });
+    })(iendOpts[ie]);
+  }
+
+  var iendAfterInput = document.getElementById("sched-interval-end-after");
+  if (iendAfterInput) {
+    iendAfterInput.addEventListener("change", function () {
+      createIntervalEndAfter = parseInt(this.value, 10) || 5;
+      if (createIntervalEndAfter < 1) createIntervalEndAfter = 1;
+    });
+  }
+
+  var iendTimeInput = document.getElementById("sched-interval-end-time");
+  if (iendTimeInput) {
+    iendTimeInput.addEventListener("change", function () {
+      createIntervalEndTime = this.value;
+    });
+  }
 
   // Custom repeat: cancel
   document.getElementById("sched-custom-cancel").addEventListener("click", function (e) {
     e.stopPropagation();
-    document.getElementById("sched-custom-repeat-panel").classList.add("hidden");
-    document.getElementById("sched-create-recurrence-list").style.display = "";
+    document.getElementById("sched-create-recurrence-dropdown").classList.add("hidden");
   });
 
   // Custom repeat: unit change
@@ -2057,10 +1968,6 @@ function setupCreateModal() {
     e.stopPropagation();
     createRecurrence = "custom";
     createCustomConfirmed = true;
-    var recOptions = createPopover.querySelectorAll(".sched-recurrence-option");
-    for (var j = 0; j < recOptions.length; j++) {
-      recOptions[j].classList.toggle("active", recOptions[j].dataset.recurrence === "custom");
-    }
     document.getElementById("sched-create-recurrence-dropdown").classList.add("hidden");
     updateRecurrenceBtn();
   });
@@ -2184,9 +2091,36 @@ function updateRecurrenceBtn() {
   if (btn) {
     btn.classList.toggle("has-recurrence", createRecurrence !== "none");
   }
-  var skipRow = document.getElementById("sched-skip-running-row");
-  if (skipRow) {
-    skipRow.classList.toggle("hidden", createInterval === "none");
+}
+
+/**
+ * When today is selected, set min on the time input so past times appear disabled.
+ * If the current time value is before now, bump it to the next quarter-hour.
+ */
+function enforceMinTime() {
+  var timeInput = document.getElementById("sched-create-time");
+  var datePicker = document.getElementById("sched-create-date-picker");
+  if (!timeInput || !datePicker) return;
+
+  var now = new Date();
+  var todayStr = now.getFullYear() + "-" + pad(now.getMonth() + 1) + "-" + pad(now.getDate());
+  var isToday = datePicker.value === todayStr;
+
+  if (isToday) {
+    // Round up to the next minute for min
+    var minMinutes = now.getHours() * 60 + now.getMinutes() + 1;
+    var minH = Math.floor(minMinutes / 60);
+    var minM = minMinutes % 60;
+    if (minH >= 24) { minH = 23; minM = 59; }
+    var minVal = pad(minH) + ":" + pad(minM);
+    timeInput.min = minVal;
+
+    // If current value is before min, bump it
+    if (timeInput.value < minVal) {
+      timeInput.value = minVal;
+    }
+  } else {
+    timeInput.removeAttribute("min");
   }
 }
 
@@ -2195,11 +2129,12 @@ function updateIntervalBtn() {
   if (btn) {
     btn.classList.toggle("has-recurrence", createInterval !== "none");
   }
-  // Hide time picker when interval is set
-  var timeInput = document.getElementById("sched-create-time");
-  if (timeInput) {
-    timeInput.style.display = createInterval !== "none" ? "none" : "";
+  // Show/hide interval end conditions section
+  var endSection = document.getElementById("sched-interval-end-section");
+  if (endSection) {
+    endSection.classList.toggle("hidden", createInterval === "none");
   }
+  // Always show time picker (start time is needed even with interval)
   // Update skip-if-running visibility
   updateRecurrenceBtn();
 }
@@ -2383,6 +2318,104 @@ function openCreateModalWithRecord(rec, anchorEl) {
     }
   }
 
+  // Restore interval from cron
+  if (rec.cron) {
+    var cronParts = rec.cron.trim().split(/\s+/);
+    if (cronParts.length === 5) {
+      var detectedMinInterval = null;
+      var detectedHrInterval = null;
+      // Detect minute-level interval: e.g. "0,5,10,... * * * *" or "*/5 * * * *"
+      if (cronParts[1] === "*" && cronParts[2] === "*") {
+        detectedMinInterval = detectInterval(cronParts[0], 60);
+      }
+      // Detect hour-level interval: e.g. "0 1,3,5,... * * *"
+      if (!detectedMinInterval && cronParts[2] === "*") {
+        detectedHrInterval = detectInterval(cronParts[1], 24);
+      }
+
+      if (detectedMinInterval) {
+        createInterval = "custom";
+        createIntervalCustom = { value: detectedMinInterval, unit: "minute" };
+        var intValEl = document.getElementById("sched-interval-custom-value");
+        if (intValEl) intValEl.value = detectedMinInterval;
+        var intUnitBtns = document.querySelectorAll("#sched-interval-custom-unit .sched-interval-seg");
+        for (var iu = 0; iu < intUnitBtns.length; iu++) {
+          intUnitBtns[iu].classList.toggle("active", intUnitBtns[iu].dataset.unit === "minute");
+        }
+        updateIntervalBtn();
+      } else if (detectedHrInterval) {
+        createInterval = "custom";
+        createIntervalCustom = { value: detectedHrInterval, unit: "hour" };
+        var intValEl2 = document.getElementById("sched-interval-custom-value");
+        if (intValEl2) intValEl2.value = detectedHrInterval;
+        var intUnitBtns2 = document.querySelectorAll("#sched-interval-custom-unit .sched-interval-seg");
+        for (var iu2 = 0; iu2 < intUnitBtns2.length; iu2++) {
+          intUnitBtns2[iu2].classList.toggle("active", intUnitBtns2[iu2].dataset.unit === "hour");
+        }
+        updateIntervalBtn();
+      }
+
+      // Restore recurrence from cron (if no interval detected, or combined with interval)
+      if (!detectedMinInterval && !detectedHrInterval) {
+        var cronDow = cronParts[4];
+        var cronDom = cronParts[2];
+        var cronMonth = cronParts[3];
+        if (cronDow === "*" && cronDom === "*" && cronMonth === "*") {
+          createRecurrence = "daily";
+        } else if (cronDow === "1-5" && cronDom === "*") {
+          createRecurrence = "weekdays";
+        } else if (cronDom !== "*" && cronMonth !== "*") {
+          createRecurrence = "yearly";
+        } else if (cronDom !== "*" && cronDow === "*") {
+          createRecurrence = "monthly";
+        } else if (cronDow !== "*" && cronDom === "*") {
+          // Check if it matches a single day (weekly)
+          var dowVals = cronDow.split(",");
+          if (dowVals.length === 1) {
+            createRecurrence = "weekly";
+          } else if (dowVals.length === 7) {
+            createRecurrence = "daily";
+          } else {
+            createRecurrence = "custom";
+            createCustomConfirmed = true;
+            // Set custom panel values
+            document.getElementById("sched-custom-interval").value = "1";
+            document.getElementById("sched-custom-unit").value = "week";
+            var customDowBtns = document.querySelectorAll("#sched-custom-dow-row .sched-dow-btn");
+            for (var cd = 0; cd < customDowBtns.length; cd++) {
+              customDowBtns[cd].classList.toggle("active", dowVals.indexOf(customDowBtns[cd].dataset.dow) !== -1);
+            }
+          }
+        }
+        updateRecurrenceBtn();
+      }
+    }
+  }
+
+  // Restore interval end conditions
+  if (rec.intervalEnd) {
+    createIntervalEnd = rec.intervalEnd.type || "allday";
+    var editIendOpts = document.querySelectorAll(".sched-interval-end-opt");
+    for (var ei = 0; ei < editIendOpts.length; ei++) {
+      editIendOpts[ei].classList.toggle("active", editIendOpts[ei].dataset.iend === createIntervalEnd);
+    }
+    var editAfterRow = document.getElementById("sched-interval-end-after-row");
+    var editUntilRow = document.getElementById("sched-interval-end-until-row");
+    if (createIntervalEnd === "after") {
+      createIntervalEndAfter = rec.intervalEnd.count || 5;
+      if (editAfterRow) editAfterRow.classList.remove("hidden");
+      if (editUntilRow) editUntilRow.classList.add("hidden");
+      var editAfterInput = document.getElementById("sched-interval-end-after");
+      if (editAfterInput) editAfterInput.value = createIntervalEndAfter;
+    } else if (createIntervalEnd === "until") {
+      createIntervalEndTime = rec.intervalEnd.time || "18:00";
+      if (editAfterRow) editAfterRow.classList.add("hidden");
+      if (editUntilRow) editUntilRow.classList.remove("hidden");
+      var editTimeInput = document.getElementById("sched-interval-end-time");
+      if (editTimeInput) editTimeInput.value = createIntervalEndTime;
+    }
+  }
+
   // Update preview to show record name
   if (previewEl) {
     var previewText = rec.name || "(No title)";
@@ -2405,6 +2438,9 @@ function openCreateModal(date, hour, anchorEl) {
   createCustomConfirmed = false;
   createInterval = "none";
   createIntervalCustom = null;
+  createIntervalEnd = "allday";
+  createIntervalEndAfter = 5;
+  createIntervalEndTime = "";
   createColor = "#ffb86c";
 
   // Reset form
@@ -2476,40 +2512,62 @@ function openCreateModal(date, hour, anchorEl) {
   var dateStr = createSelectedDate.getFullYear() + "-" + pad(createSelectedDate.getMonth() + 1) + "-" + pad(createSelectedDate.getDate());
   document.getElementById("sched-create-date").value = dateStr;
   var datePicker = document.getElementById("sched-create-date-picker");
-  if (datePicker) datePicker.value = dateStr;
+  if (datePicker) {
+    datePicker.value = dateStr;
+    var todayNow = new Date();
+    var todayMin = todayNow.getFullYear() + "-" + pad(todayNow.getMonth() + 1) + "-" + pad(todayNow.getDate());
+    datePicker.min = todayMin;
+  }
 
   // Time (use minutes from createSelectedDate for 15-min snapping)
   if (hour !== null && hour !== undefined) {
     var mins = createSelectedDate.getMinutes ? createSelectedDate.getMinutes() : 0;
     document.getElementById("sched-create-time").value = pad(hour) + ":" + pad(mins);
   } else {
-    document.getElementById("sched-create-time").value = "09:00";
+    // Default to current time (next quarter-hour)
+    var nowT = new Date();
+    var nowMins = nowT.getHours() * 60 + nowT.getMinutes();
+    var nextQ = Math.ceil(nowMins / 15) * 15;
+    var defH = Math.floor(nextQ / 60);
+    var defM = nextQ % 60;
+    if (defH >= 24) { defH = 23; defM = 45; }
+    document.getElementById("sched-create-time").value = pad(defH) + ":" + pad(defM);
   }
 
   // Update recurrence labels
   updateRecurrenceLabels(createSelectedDate);
 
+  // Enforce min time for today
+  enforceMinTime();
+
   // Reset recurrence
-  var recOptions = createPopover.querySelectorAll(".sched-recurrence-option");
-  for (var i = 0; i < recOptions.length; i++) {
-    recOptions[i].classList.toggle("active", recOptions[i].dataset.recurrence === "none");
-  }
+  createRecurrence = "none";
+  createCustomConfirmed = false;
   updateRecurrenceBtn();
 
   // Reset interval
-  var intOpts = document.querySelectorAll(".sched-interval-option");
-  for (var io = 0; io < intOpts.length; io++) {
-    intOpts[io].classList.toggle("active", intOpts[io].dataset.interval === "none");
-  }
   document.getElementById("sched-create-interval-dropdown").classList.add("hidden");
   var timeInput = document.getElementById("sched-create-time");
   if (timeInput) timeInput.style.display = "";
+
+  // Reset interval end conditions
+  var iendOpts = document.querySelectorAll(".sched-interval-end-opt");
+  for (var ie = 0; ie < iendOpts.length; ie++) {
+    iendOpts[ie].classList.toggle("active", iendOpts[ie].dataset.iend === "allday");
+  }
+  var iendAfterRow = document.getElementById("sched-interval-end-after-row");
+  if (iendAfterRow) iendAfterRow.classList.add("hidden");
+  var iendUntilRow = document.getElementById("sched-interval-end-until-row");
+  if (iendUntilRow) iendUntilRow.classList.add("hidden");
+  var iendAfterInput = document.getElementById("sched-interval-end-after");
+  if (iendAfterInput) iendAfterInput.value = "5";
+  var iendTimeInput = document.getElementById("sched-interval-end-time");
+  if (iendTimeInput) iendTimeInput.value = "18:00";
+
   updateIntervalBtn();
 
   // Reset custom panel
   document.getElementById("sched-create-recurrence-dropdown").classList.add("hidden");
-  document.getElementById("sched-custom-repeat-panel").classList.add("hidden");
-  document.getElementById("sched-create-recurrence-list").style.display = "";
   document.getElementById("sched-custom-interval").value = "1";
   document.getElementById("sched-custom-unit").value = "week";
   document.getElementById("sched-custom-dow-section").style.display = "";
@@ -2681,6 +2739,18 @@ function closeDeleteDialog() {
   }
 }
 
+// Build an explicit list of values offset from a start value with a given step, wrapping at max
+function buildOffsetList(start, step, max) {
+  var vals = [];
+  var v = start % max;
+  for (var i = 0; i < max; i += step) {
+    vals.push(v);
+    v = (v + step) % max;
+  }
+  vals.sort(function (a, b) { return a - b; });
+  return vals.join(",");
+}
+
 function buildCreateCron() {
   if (!createSelectedDate) return null;
 
@@ -2707,9 +2777,9 @@ function buildCreateCron() {
 
   // Interval only (no recurrence) = interval every day
   if (intervalMins > 0 && createRecurrence === "none") {
-    if (intervalMins < 60) return "*/" + intervalMins + " * * * *";
+    if (intervalMins < 60) return buildOffsetList(m, intervalMins, 60) + " * * * *";
     var intHrs = Math.floor(intervalMins / 60);
-    return "0 */" + intHrs + " * * *";
+    return String(m) + " " + buildOffsetList(h, intHrs, 24) + " * * *";
   }
 
   if (createRecurrence === "none" && intervalMins === 0) return null;
@@ -2718,12 +2788,12 @@ function buildCreateCron() {
   var minField = String(m);
   var hourField = String(h);
   if (intervalMins > 0 && intervalMins < 60) {
-    minField = "*/" + intervalMins;
+    minField = buildOffsetList(m, intervalMins, 60);
     hourField = "*";
   } else if (intervalMins >= 60) {
     var intHrs2 = Math.floor(intervalMins / 60);
     minField = String(m);
-    hourField = "*/" + intHrs2;
+    hourField = buildOffsetList(h, intHrs2, 24);
   }
 
   if (createRecurrence === "daily") return minField + " " + hourField + " * * *";
@@ -2837,10 +2907,10 @@ function buildCustomCron(h, m) {
   var unit = document.getElementById("sched-custom-unit").value;
 
   if (unit === "minute") {
-    return interval === 1 ? "*/1 * * * *" : "*/" + interval + " * * * *";
+    return interval === 1 ? "*/1 * * * *" : buildOffsetList(m, interval, 60) + " * * * *";
   }
   if (unit === "hour") {
-    return interval === 1 ? "0 */1 * * *" : "0 */" + interval + " * * *";
+    return interval === 1 ? m + " */1 * * *" : m + " " + buildOffsetList(h, interval, 24) + " * * *";
   }
   if (unit === "day") {
     if (interval === 1) return m + " " + h + " * * *";
@@ -2886,10 +2956,31 @@ function submitCreateSchedule() {
     var datePicker = document.getElementById("sched-create-date-picker");
     var dateVal = datePicker ? datePicker.value : document.getElementById("sched-create-date").value;
     var timeVal = document.getElementById("sched-create-time").value || "09:00";
+
+    // Reject scheduling in the past
+    if (dateVal && timeVal) {
+      var dp = dateVal.split("-");
+      var tp = timeVal.split(":");
+      if (dp.length === 3 && tp.length >= 2) {
+        var schedDate = new Date(
+          parseInt(dp[0], 10), parseInt(dp[1], 10) - 1, parseInt(dp[2], 10),
+          parseInt(tp[0], 10), parseInt(tp[1], 10), 0
+        );
+        if (schedDate < new Date()) {
+          showToast("Cannot schedule a task in the past", "error");
+          return;
+        }
+      }
+    }
+
     var cron = buildCreateCron();
 
     // Build recurrence end info
     var recurrenceEnd = null;
+    // Interval-only (no recurrence): limit to the scheduled date only
+    if (cron && createRecurrence === "none" && createInterval !== "none" && dateVal) {
+      recurrenceEnd = { type: "until", date: dateVal };
+    }
     if (cron && createRecurrence === "custom" && createCustomConfirmed) {
       if (createEndType === "until" && createEndDate) {
         var ey = createEndDate.getFullYear();
@@ -2901,6 +2992,17 @@ function submitCreateSchedule() {
       }
     }
 
+    // Build interval end info
+    var intervalEnd = null;
+    if (createInterval !== "none") {
+      if (createIntervalEnd === "after" && createIntervalEndAfter > 0) {
+        intervalEnd = { type: "after", count: createIntervalEndAfter };
+      } else if (createIntervalEnd === "until" && createIntervalEndTime) {
+        intervalEnd = { type: "until", time: createIntervalEndTime };
+      }
+      // "allday" = null (no limit)
+    }
+
     var skipRunningEl = document.getElementById("sched-skip-running");
     var skipIfRunning = skipRunningEl ? skipRunningEl.checked : true;
 
@@ -2928,6 +3030,7 @@ function submitCreateSchedule() {
           enabled: cron ? true : false,
           color: createColor,
           recurrenceEnd: recurrenceEnd,
+          intervalEnd: intervalEnd,
           maxIterations: maxIterations,
           skipIfRunning: skipIfRunning,
         },
@@ -2946,6 +3049,7 @@ function submitCreateSchedule() {
           enabled: cron ? true : false,
           color: createColor,
           recurrenceEnd: recurrenceEnd,
+          intervalEnd: intervalEnd,
           maxIterations: maxIterations,
           skipIfRunning: skipIfRunning,
         },
@@ -3022,15 +3126,15 @@ function cronToHuman(cron) {
   if (!cron) return "";
   var parts = cron.trim().split(/\s+/);
   if (parts.length !== 5) return cron;
-  // Minute interval patterns (e.g. */5 * * * *)
-  if (parts[0].indexOf("/") !== -1 && parts[1] === "*" && parts[2] === "*") {
-    var minStep = parseInt(parts[0].split("/")[1], 10);
-    return minStep === 1 ? "Every minute" : "Every " + minStep + " minutes";
+  // Minute interval patterns (e.g. */5 * * * * or 0,15,30,45 * * * *)
+  if (parts[1] === "*" && parts[2] === "*") {
+    var minStep = detectInterval(parts[0], 60);
+    if (minStep) return minStep === 1 ? "Every minute" : "Every " + minStep + " minutes";
   }
-  // Hour interval patterns (e.g. 0 */2 * * *)
-  if (parts[1].indexOf("/") !== -1 && parts[2] === "*") {
-    var hrStep = parseInt(parts[1].split("/")[1], 10);
-    return hrStep === 1 ? "Every hour" : "Every " + hrStep + " hours";
+  // Hour interval patterns (e.g. 0 */2 * * * or 0 1,5,9,13,17,21 * * *)
+  if (parts[2] === "*") {
+    var hrStep = detectInterval(parts[1], 24);
+    if (hrStep) return hrStep === 1 ? "Every hour" : "Every " + hrStep + " hours";
   }
   var t = pad(parseInt(parts[1], 10)) + ":" + pad(parseInt(parts[0], 10));
   var dow = parts[4], dom = parts[2];
@@ -3043,3 +3147,20 @@ function cronToHuman(cron) {
   }
   return cron;
 }
+
+// Detect if a cron field represents an evenly-spaced interval (*/N or comma-separated offset list)
+function detectInterval(field, max) {
+  if (field.indexOf("/") !== -1) return parseInt(field.split("/")[1], 10) || null;
+  if (field.indexOf(",") === -1) return null;
+  var vals = field.split(",").map(function (v) { return parseInt(v, 10); }).sort(function (a, b) { return a - b; });
+  if (vals.length < 2) return null;
+  var step = vals[1] - vals[0];
+  if (step <= 0) return null;
+  // Verify all values are evenly spaced (wrapping around max)
+  for (var i = 1; i < vals.length; i++) {
+    if (vals[i] - vals[i - 1] !== step) return null;
+  }
+  // Check the wrap-around gap matches too
+  if ((max - vals[vals.length - 1] + vals[0]) !== step) return null;
+  return step;
+}