openclacky 1.3.5 → 1.3.6

data/lib/clacky/web/components/sidebar.js

@@ -13,9 +13,7 @@ const Sidebar = (() => {
   function init() {
     // Settings button toggles between "settings" and "welcome" view.
     document.getElementById("btn-settings").addEventListener("click", () => {
-      if (Router.current === "settings") {
-        Router.navigate("welcome");
-      } else {
+      if (Router.current !== "settings") {
         Router.navigate("settings");
       }
     });

data/lib/clacky/web/features/backup/store.js

@@ -66,6 +66,29 @@ const BackupStore = (() => {
       }
     },
 
+    async openFolder() {
+      try {
+        await fetch("/api/backup/open-folder", { method: "POST" });
+      } catch (e) {
+        // Non-critical, fail quietly.
+      }
+    },
+
+    /** Upload a tar.gz archive to restore ~/.clacky. Returns { ok, error }. */
+    async restore(arrayBuffer) {
+      try {
+        const res = await fetch("/api/backup/restore", {
+          method: "POST",
+          headers: { "Content-Type": "application/octet-stream" },
+          body: arrayBuffer
+        });
+        const data = await res.json().catch(() => ({}));
+        return res.ok ? { ok: true } : { ok: false, error: data.error || "Restore failed" };
+      } catch (e) {
+        return { ok: false, error: e.message };
+      }
+    },
+
     /** Fetch a one-off archive. Returns { ok, blob, filename, error }. */
     async fetchArchive() {
       try {

data/lib/clacky/web/features/backup/view.js

@@ -1,17 +1,8 @@
-// ── Backup · view — settings rendering, toggles, download UI ──────────────
-//
-// Renders the backup settings panel, wires the toggles + download button, and
-// drives the file download from a blob. Reads through BackupStore.state; all
-// I/O goes through store actions. Re-renders on store change events.
-//
-// Augments the `Backup` facade with load (re-exposing the store action so the
-// existing Settings caller keeps working).
-//
-// Depends on: BackupStore, I18n.
-// ───────────────────────────────────────────────────────────────────────────
+// ── Backup · view — settings rendering, toggles, download/restore UI ──────
 
 const BackupView = (() => {
   const $ = (id) => document.getElementById(id);
+  let _restoreStatusEl = null;
 
   function _fmtDate(iso) {
     if (!iso) return "";
@@ -19,8 +10,12 @@ const BackupView = (() => {
   }
 
   function _render() {
-    const cfg = Backup.state.config;
-    if (!Backup.state.status) return;
+    const cfg    = Backup.state.config;
+    const status = Backup.state.status;
+    if (!status) return;
+
+    const autoToggle = $("backup-auto-toggle");
+    if (autoToggle) autoToggle.checked = !!cfg.enabled;
 
     const incl = $("backup-include-sessions");
     if (incl) {
@@ -28,8 +23,8 @@ const BackupView = (() => {
       incl.disabled = !cfg.enabled;
     }
 
-    const autoToggle = $("backup-auto-toggle");
-    if (autoToggle) autoToggle.checked = !!cfg.enabled;
+    const destPath = $("backup-dest-path");
+    if (destPath) destPath.textContent = status.dest_dir || "—";
 
     _renderLastRun(cfg);
   }
@@ -48,10 +43,10 @@ const BackupView = (() => {
   }
 
   async function _downloadNow() {
-    const btn = $("btn-backup-now");
-    const el = $("backup-status");
+    const btn      = $("btn-backup-now");
+    const statusEl = $("backup-manual-status");
     if (btn) btn.disabled = true;
-    if (el) { el.textContent = I18n.t("settings.backup.running"); el.className = "model-test-result"; }
+    if (statusEl) { statusEl.textContent = I18n.t("settings.backup.downloading"); statusEl.className = "model-test-result"; }
 
     const res = await Backup.fetchArchive();
     if (res.ok) {
@@ -63,14 +58,32 @@ const BackupView = (() => {
       a.click();
       a.remove();
       URL.revokeObjectURL(url);
-      if (el) { el.textContent = I18n.t("settings.backup.downloaded"); el.className = "model-test-result success"; }
-    } else if (el) {
-      el.textContent = I18n.t("settings.backup.lastError", { msg: res.error });
-      el.className = "model-test-result error";
+      if (statusEl) { statusEl.textContent = I18n.t("settings.backup.downloaded"); statusEl.className = "model-test-result success"; }
+    } else if (statusEl) {
+      statusEl.textContent = I18n.t("settings.backup.lastError", { msg: res.error });
+      statusEl.className = "model-test-result error";
     }
     if (btn) btn.disabled = false;
   }
 
+  async function _restoreBackup(e) {
+    const file = e.target.files[0];
+    if (!file) return;
+    e.target.value = "";
+
+    const statusEl = $("backup-manual-status");
+    if (statusEl) { statusEl.textContent = I18n.t("settings.backup.restoring"); statusEl.className = "model-test-result"; }
+
+    const buf = await file.arrayBuffer();
+    const res = await Backup.restore(buf);
+    if (res.ok) {
+      if (statusEl) { statusEl.textContent = I18n.t("settings.backup.restoreOk"); statusEl.className = "model-test-result success"; }
+      _restoreStatusEl = statusEl;
+    } else {
+      if (statusEl) { statusEl.textContent = res.error || "Restore failed"; statusEl.className = "model-test-result error"; }
+    }
+  }
+
   function _bind() {
     const btn = $("btn-backup-now");
     if (btn) btn.addEventListener("click", _downloadNow);
@@ -80,11 +93,25 @@ const BackupView = (() => {
 
     const incl = $("backup-include-sessions");
     if (incl) incl.addEventListener("change", () => Backup.saveConfig({ include_sessions: incl.checked }));
+
+    const openBtn = $("btn-backup-open-folder");
+    if (openBtn) openBtn.addEventListener("click", () => Backup.openFolder());
+
+    const restoreInput = $("input-backup-restore");
+    if (restoreInput) restoreInput.addEventListener("change", _restoreBackup);
   }
 
   function _subscribe() {
     Backup.on("backup:changed", _render);
     document.addEventListener("DOMContentLoaded", _bind);
+    WS.onEvent(ev => {
+      if (ev.type !== "_ws_connected" || !_restoreStatusEl) return;
+      const el = _restoreStatusEl;
+      _restoreStatusEl = null;
+      el.textContent = I18n.t("settings.backup.restartOk");
+      el.className = "model-test-result success";
+      if (typeof Settings !== "undefined") Settings.open();
+    });
   }
 
   return { init: _subscribe };

data/lib/clacky/web/features/tasks/view.js

@@ -16,58 +16,107 @@ const TasksView = (() => {
     if (!cron) return cron;
     const parts = cron.trim().split(/\s+/);
     if (parts.length !== 5) return cron;
-    const [min, hour, dom, month, dow] = parts;
+    let [min, hour, dom, month, dow] = parts;
+
+    // normalize */1 → *
+    if (min === "*/1")   min   = "*";
+    if (hour === "*/1")  hour  = "*";
+    if (dom === "*/1")   dom   = "*";
+    if (month === "*/1") month = "*";
+    if (dow === "*/1")   dow   = "*";
 
     const isAny = v => v === "*";
-    const isNum = v => /^\d+$/.test(v);
+    const isInt = v => /^\d+$/.test(v);
     const pad   = n => String(n).padStart(2, "0");
 
     const lang = (typeof I18n !== "undefined" && I18n.lang()) || "zh";
     const isZh = lang === "zh";
 
-    const dowNames = isZh
-      ? ["周日","周一","周二","周三","周四","周五","周六"]
-      : ["Sun","Mon","Tue","Wed","Thu","Fri","Sat"];
+    const DOW_ZH = ["周日","周一","周二","周三","周四","周五","周六"];
+    const DOW_EN = ["Sun","Mon","Tue","Wed","Thu","Fri","Sat"];
+    const MON_ZH = ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"];
+    const MON_EN = ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];
 
-    const monthNames = isZh
-      ? ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"]
-      : ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];
+    // dow → label, e.g. "1-5"→"工作日", "1,3,5"→"周一、周三、周五", "1"→"每周一"
+    function dowLabel(d) {
+      if (isAny(d)) return null;
+      if (d === "1-5") return isZh ? "工作日" : "Weekdays";
+      if (d === "0,6" || d === "6,0") return isZh ? "周末" : "Weekends";
+      if (isInt(d)) {
+        const name = (isZh ? DOW_ZH : DOW_EN)[parseInt(d, 10)] || d;
+        return isZh ? `每${name}` : name;
+      }
+      if (/^[\d,]+$/.test(d)) {
+        const names = d.split(",").map(n => (isZh ? DOW_ZH : DOW_EN)[parseInt(n, 10)] || n);
+        return isZh ? names.join("、") : names.join("/");
+      }
+      return d;
+    }
 
-    const timeStr = (isNum(hour) && isNum(min)) ? `${pad(hour)}:${pad(min)}` : null;
+    // build HH:MM string; supports single hour or comma-list like "10,14"
+    function timeStr() {
+      if (!isInt(min)) return null;
+      if (isInt(hour)) return `${pad(hour)}:${pad(min)}`;
+      if (/^[\d,]+$/.test(hour))
+        return hour.split(",").map(h => `${pad(h)}:${pad(min)}`).join(isZh ? "、" : "/");
+      return null;
+    }
 
+    // ── every-N-minutes ───────────────────────────────────────────────────
     if (min.startsWith("*/") && isAny(hour) && isAny(dom) && isAny(month) && isAny(dow)) {
       const n = min.slice(2);
       return isZh ? `每 ${n} 分钟` : `Every ${n} min`;
     }
-    if ((isAny(min) || isNum(min)) && hour.startsWith("*/") && isAny(dom) && isAny(month) && isAny(dow)) {
-      const n = hour.slice(2);
-      return isZh ? `每 ${n} 小时` : `Every ${n} hr`;
+    // ── every-N-hours ─────────────────────────────────────────────────────
+    if (isAny(dom) && isAny(month) && isAny(dow)) {
+      if (isAny(min) && hour.startsWith("*/")) {
+        return isZh ? `每 ${hour.slice(2)} 小时` : `Every ${hour.slice(2)} hr`;
+      }
+      if (isInt(min) && hour.startsWith("*/")) {
+        return isZh ? `每 ${hour.slice(2)} 小时` : `Every ${hour.slice(2)} hr`;
+      }
     }
+    // ── every minute ──────────────────────────────────────────────────────
     if (isAny(min) && isAny(hour) && isAny(dom) && isAny(month) && isAny(dow)) {
       return isZh ? "每分钟" : "Every minute";
     }
-    if (isNum(min) && isAny(hour) && isAny(dom) && isAny(month) && isAny(dow)) {
+    // ── hourly at :MM ─────────────────────────────────────────────────────
+    if (isInt(min) && isAny(hour) && isAny(dom) && isAny(month) && isAny(dow)) {
       return isZh ? `每小时 :${pad(min)}` : `Hourly at :${pad(min)}`;
     }
-    if (timeStr && isAny(dom) && isAny(month) && isNum(dow)) {
-      const d = dowNames[parseInt(dow, 10)] || dow;
-      return isZh ? `每${d} ${timeStr}` : `${d} ${timeStr}`;
-    }
-    if (timeStr && isAny(dom) && isAny(month) && dow === "1-5") {
-      return isZh ? `工作日 ${timeStr}` : `Weekdays ${timeStr}`;
+
+    // ── every-N-min within hour range on certain days  e.g. */1 9-14 * * 1-5
+    if (min.startsWith("*/") && /^\d+-\d+$/.test(hour) && isAny(dom) && isAny(month)) {
+      const n   = min.slice(2);
+      const dl  = dowLabel(dow);
+      const hr  = isZh ? `${hour}时` : `${hour}h`;
+      const ev  = isZh ? `每 ${n} 分钟` : `Every ${n} min`;
+      return dl ? `${dl} ${hr} ${ev}` : `${hr} ${ev}`;
     }
-    if (timeStr && isAny(dom) && isAny(month) && (dow === "0,6" || dow === "6,0")) {
-      return isZh ? `周末 ${timeStr}` : `Weekends ${timeStr}`;
+    // ── every minute within hour range  e.g. * 9-14 * * 1-5
+    if (isAny(min) && /^\d+-\d+$/.test(hour) && isAny(dom) && isAny(month)) {
+      const dl = dowLabel(dow);
+      const hr = isZh ? `${hour}时` : `${hour}h`;
+      const ev = isZh ? "每分钟" : "Every minute";
+      return dl ? `${dl} ${hr} ${ev}` : `${hr} ${ev}`;
     }
-    if (timeStr && isAny(dom) && isAny(month) && isAny(dow)) {
-      return isZh ? `每天 ${timeStr}` : `Daily ${timeStr}`;
+
+    const ts  = timeStr();
+    const dl  = dowLabel(dow);
+
+    // ── fixed time, variable days ─────────────────────────────────────────
+    if (ts && isAny(dom) && isAny(month)) {
+      if (dl) return `${dl} ${ts}`;
+      return isZh ? `每天 ${ts}` : `Daily ${ts}`;
     }
-    if (timeStr && isNum(dom) && isAny(month) && isAny(dow)) {
-      return isZh ? `每月 ${dom} 日 ${timeStr}` : `Monthly day ${dom} ${timeStr}`;
+    // ── fixed time, fixed day-of-month ────────────────────────────────────
+    if (ts && isInt(dom) && isAny(month) && isAny(dow)) {
+      return isZh ? `每月 ${dom} 日 ${ts}` : `Monthly day ${dom} ${ts}`;
     }
-    if (timeStr && isNum(dom) && isNum(month) && isAny(dow)) {
-      const m = monthNames[parseInt(month, 10) - 1] || month;
-      return isZh ? `${m}${dom}日 ${timeStr}` : `${m} ${dom} ${timeStr}`;
+    // ── fixed time, fixed date ────────────────────────────────────────────
+    if (ts && isInt(dom) && isInt(month) && isAny(dow)) {
+      const m = (isZh ? MON_ZH : MON_EN)[parseInt(month, 10) - 1] || month;
+      return isZh ? `${m}${dom}日 ${ts}` : `${m} ${dom} ${ts}`;
     }
 
     return cron;

data/lib/clacky/web/i18n.js

@@ -552,6 +552,7 @@ const I18n = (() => {
       "settings.tabs.models":     "Models",
       "settings.tabs.ui":         "UI",
       "settings.tabs.general":    "General",
+      "settings.tabs.data":       "Data Management",
       "settings.tabs.about":      "About",
       "settings.about.version":   "Version",
       "settings.about.appName":   "Application",
@@ -674,13 +675,22 @@ const I18n = (() => {
       "settings.network.cleared":          "Cleared — direct connection",
       "settings.network.invalidUrl":       "Invalid URL — use http://host:port or http://user:pass@host:port",
       "settings.backup.title":             "Backup",
+      "settings.backup.autoTitle":         "Auto Backup",
+      "settings.backup.manualTitle":       "Manual Backup",
       "settings.backup.desc":              "Back up your ~/.clacky directory (config, skills, memories, tasks, sessions). Regenerable caches and logs are excluded.",
       "settings.backup.includeSessions":   "Include session history (larger archive)",
       "settings.backup.autoLabel":         "Automatic backup",
       "settings.backup.autoHint":          "Daily at 03:00, keeps the latest 7",
-      "settings.backup.runNow":            "Download backup (full snapshot)",
+      "settings.backup.destLabel":         "Backup folder",
+      "settings.backup.openFolder":        "Open",
+      "settings.backup.runNow":            "Download backup",
+      "settings.backup.restoreBtn":        "Restore backup",
       "settings.backup.running":           "Preparing backup…",
+      "settings.backup.downloading":       "Downloading…",
       "settings.backup.downloaded":        "Backup downloaded.",
+      "settings.backup.restoring":         "Restoring… server will restart automatically.",
+      "settings.backup.restoreOk":         "Restored. Restarting…",
+      "settings.backup.restartOk":         "Restarted successfully.",
       "settings.backup.lastOk":            "Last backup: {{time}}",
       "settings.backup.lastError":         "Backup failed: {{msg}}",
       "settings.brand.title":              "Brand & License",
@@ -1477,6 +1487,7 @@ const I18n = (() => {
       "settings.tabs.models":     "模型",
       "settings.tabs.ui":         "界面",
       "settings.tabs.general":    "通用",
+      "settings.tabs.data":       "数据管理",
       "settings.tabs.about":      "关于",
       "settings.about.version":   "版本",
       "settings.about.appName":   "应用程序",
@@ -1606,13 +1617,22 @@ const I18n = (() => {
       "settings.network.cleared":          "已清除 — 直连",
       "settings.network.invalidUrl":       "地址格式不正确，请使用 http://host:port 或 http://user:pass@host:port",
       "settings.backup.title":             "备份",
+      "settings.backup.autoTitle":         "自动备份",
+      "settings.backup.manualTitle":       "手动备份",
       "settings.backup.desc":              "备份你的 ~/.clacky 目录（配置、技能、记忆、任务、会话）。可重新生成的缓存和日志会被排除。",
       "settings.backup.includeSessions":   "包含会话历史（归档更大）",
       "settings.backup.autoLabel":         "自动备份",
       "settings.backup.autoHint":          "每天 03:00 自动备份，保留最近 7 份",
-      "settings.backup.runNow":            "下载备份（完整快照）",
+      "settings.backup.destLabel":         "备份目录",
+      "settings.backup.openFolder":        "打开",
+      "settings.backup.runNow":            "下载备份",
+      "settings.backup.restoreBtn":        "恢复备份",
       "settings.backup.running":           "正在准备备份…",
+      "settings.backup.downloading":       "正在下载…",
       "settings.backup.downloaded":        "备份已下载。",
+      "settings.backup.restoring":         "正在恢复…服务将自动重启。",
+      "settings.backup.restoreOk":         "恢复成功，正在重启…",
+      "settings.backup.restartOk":         "重启成功。",
       "settings.backup.lastOk":            "上次备份：{{time}}",
       "settings.backup.lastError":         "备份失败：{{msg}}",
       "settings.brand.title":              "品牌 & 授权",

data/lib/clacky/web/index.html

@@ -805,6 +805,7 @@
         <button class="settings-tab active" data-tab="models" data-i18n="settings.tabs.models">Models</button>
         <button class="settings-tab" data-tab="ui" data-i18n="settings.tabs.ui">UI</button>
         <button class="settings-tab" data-tab="general" data-i18n="settings.tabs.general">General</button>
+        <button class="settings-tab" data-tab="data" data-i18n="settings.tabs.data">Data</button>
         <button class="settings-tab" data-tab="about" data-i18n="settings.tabs.about">About</button>
         <!-- Extension tab slot: extensions add custom settings tabs here (button needs data-tab="<id>"). -->
         <span id="ext-slot-settings-tabs" data-slot="settings.tabs"></span>
@@ -957,32 +958,7 @@
           </section>
 
           <!-- Backup section -->
-          <section class="settings-section" id="backup-section">
-            <div class="settings-section-title">
-              <span data-i18n="settings.backup.title">Backup</span>
-            </div>
-            <p class="settings-section-desc" data-i18n="settings.backup.desc">Back up your ~/.clacky directory (config, skills, memories, tasks, sessions). Regenerable caches and logs are excluded.</p>
-
-            <div class="backup-auto-card">
-              <div class="backup-auto-row">
-                <label class="toggle-switch">
-                  <input type="checkbox" id="backup-auto-toggle">
-                  <span class="toggle-slider"></span>
-                </label>
-                <span class="backup-auto-label" data-i18n="settings.backup.autoLabel">Automatic backup</span>
-                <span class="backup-auto-hint" data-i18n="settings.backup.autoHint">Daily at 03:00, keeps the latest 7</span>
-              </div>
-
-              <label class="backup-option backup-option-nested">
-                <input type="checkbox" id="backup-include-sessions">
-                <span data-i18n="settings.backup.includeSessions">Include session history (larger archive)</span>
-              </label>
-            </div>
-
-            <div class="backup-actions">
-              <button id="btn-backup-now" class="btn-settings-action" data-i18n="settings.backup.runNow">Download backup (full snapshot)</button>
-              <span id="backup-status" class="model-test-result"></span>
-            </div>
+          <section class="settings-section" id="backup-section" style="display:none">
           </section>
 
           <!-- Brand & License section -->
@@ -1073,6 +1049,56 @@
           </section>
         </div><!-- end Tab: General -->
 
+        <!-- ══ Tab: Data ══ -->
+        <div class="settings-tab-content" data-tab-content="data" style="display:none">
+
+          <!-- 自动备份 -->
+          <section class="settings-section">
+            <div class="settings-section-title">
+              <span data-i18n="settings.backup.autoTitle">Auto Backup</span>
+            </div>
+            <p class="settings-section-desc" data-i18n="settings.backup.desc">Back up your ~/.clacky directory (config, skills, memories, tasks, sessions). Regenerable caches and logs are excluded.</p>
+
+            <div class="backup-auto-card">
+              <div class="backup-auto-row">
+                <label class="toggle-switch">
+                  <input type="checkbox" id="backup-auto-toggle">
+                  <span class="toggle-slider"></span>
+                </label>
+                <span class="backup-auto-label" data-i18n="settings.backup.autoLabel">Automatic backup</span>
+                <span class="backup-auto-hint" data-i18n="settings.backup.autoHint">Daily at 03:00, keeps the latest 7</span>
+              </div>
+              <label class="backup-option backup-option-nested">
+                <input type="checkbox" id="backup-include-sessions">
+                <span data-i18n="settings.backup.includeSessions">Include session history (larger archive)</span>
+              </label>
+              <div class="backup-dest-row">
+                <span class="backup-dest-label" data-i18n="settings.backup.destLabel">Backup folder</span>
+                <span class="backup-dest-path" id="backup-dest-path">—</span>
+                <button id="btn-backup-open-folder" class="btn-settings-link" data-i18n="settings.backup.openFolder">Open</button>
+              </div>
+              <div id="backup-status" class="model-test-result"></div>
+            </div>
+          </section>
+
+          <!-- 手动备份 -->
+          <section class="settings-section">
+            <div class="settings-section-title">
+              <span data-i18n="settings.backup.manualTitle">Manual Backup</span>
+            </div>
+
+            <div class="backup-actions">
+              <button id="btn-backup-now" class="btn-settings-action" data-i18n="settings.backup.runNow">Download backup</button>
+              <label class="btn-settings-action btn-settings-action--file">
+                <span data-i18n="settings.backup.restoreBtn">Restore backup</span>
+                <input type="file" id="input-backup-restore" accept=".tar.gz,.gz" style="display:none">
+              </label>
+              <span id="backup-manual-status" class="model-test-result"></span>
+            </div>
+          </section>
+
+        </div><!-- end Tab: Data -->
+
         <!-- ══ Tab: About ══ -->
         <div class="settings-tab-content" data-tab-content="about" style="display:none">
           <!-- Version section -->

data/lib/clacky/web/sessions.js

@@ -41,6 +41,7 @@ const Sessions = (() => {
   let   _searchToken       = 0;       // monotonic counter; in-flight requests check against this
   let   _cronView          = false;  // are we in the cron sub-view?
   let   _cronCount         = 0;      // total cron sessions from server
+  let   _latestCronUpdatedAt = null; // updated_at of the newest cron session (for virtual entry sort position)
   // ── Cron sub-view independent pagination (commit 2) ──────────────────────
   // The folded cron sub-view paginates *independently* of the outer list so
   // that "Load more" inside it never advances the outer list's cursor, and so
@@ -2378,11 +2379,12 @@ const Sessions = (() => {
     // ── List management ───────────────────────────────────────────────────
 
     /** Populate list from initial session_list WS event (connect only). */
-    setAll(list, hasMore = false, cronCount = 0) {
+    setAll(list, hasMore = false, cronCount = 0, latestCronUpdatedAt = null) {
       _sessions.length = 0;
       _sessions.push(...list);
-      _hasMore   = !!hasMore;
-      _cronCount = cronCount;
+      _hasMore              = !!hasMore;
+      _cronCount            = cronCount;
+      _latestCronUpdatedAt  = latestCronUpdatedAt || null;
     },
 
     /** Insert a newly created session into the local list. */
@@ -2433,6 +2435,14 @@ const Sessions = (() => {
       } else {
         _sessions.unshift({ id, ...fields });
       }
+      // Keep _latestCronUpdatedAt current when a cron session is patched/added.
+      const updated = _sessions.find(s => s.id === id);
+      if (updated?.source === "cron") {
+        const t = updated.updated_at || updated.created_at;
+        if (t && (!_latestCronUpdatedAt || t > _latestCronUpdatedAt)) {
+          _latestCronUpdatedAt = t;
+        }
+      }
     },
 
     /** Remove a session from the list (from session_deleted event). */
@@ -2460,21 +2470,17 @@ const Sessions = (() => {
       Sessions.renderList();
 
       try {
-        // Cursor: oldest activity time (updated_at, falling back to
-        // created_at) in the current list, EXCLUDING pinned sessions. The
-        // backend always returns ALL pinned sessions on the first page (they
-        // bypass pagination), so their time is irrelevant for the cursor.
-        // Including them here would cause the cursor to jump too far back and
-        // skip sessions between the oldest pinned one and the real
-        // last-loaded non-pinned row.
+        // Cursor: oldest activity time of non-pinned, non-cron sessions.
+        // Cron sessions are excluded from the normal list pagination and have
+        // their own independent cursor (_cronBefore) in the sub-view.
         const oldest = _sessions.reduce((min, s) => {
-          if (s.pinned) return min;                       // ignore pinned
+          if (s.pinned || s.source === "cron") return min;
           const t = s.updated_at || s.created_at;
           if (!t) return min;
           return (!min || t < min) ? t : min;
         }, null);
 
-        const params = new URLSearchParams({ limit: "20" });
+        const params = new URLSearchParams({ limit: "20", exclude_type: "cron" });
         if (oldest)          params.set("before", oldest);
         if (_filter.q)       params.set("q",    _filter.q);
         if (_filter.date)    params.set("date", _filter.date);
@@ -2487,8 +2493,9 @@ const Sessions = (() => {
         (data.sessions || []).forEach(s => {
           if (!_sessions.find(x => x.id === s.id)) _sessions.push(s);
         });
-        _hasMore   = !!data.has_more;
-        _cronCount = data.cron_count || 0;
+        _hasMore             = !!data.has_more;
+        _cronCount           = data.cron_count ?? _cronCount;
+        if (data.latest_cron_updated_at) _latestCronUpdatedAt = data.latest_cron_updated_at;
       } catch (e) {
         console.error("loadMore error:", e);
       } finally {
@@ -2884,35 +2891,28 @@ const Sessions = (() => {
         }
         cronSessions.forEach(s => _renderSessionItem(list, s));
       } else if (_cronCount > 0) {
-        // Normal list view: the cron group entry is a *virtual* row that
-        // participates in the time-ordering instead of being pinned to the
-        // top. We walk the already-sorted `visible` list and drop the group
-        // entry at the position of the newest (first-encountered) cron
-        // session — so it sits exactly where the latest folded cron task
-        // would sort by created_at. Pinning is intentionally ignored for the
-        // entry itself: a pinned cron session only takes effect *inside* the
-        // folded sub-view, not on the outer entry.
-        const cronHasRunning = cronSessions.some(s => s.status === "running");
+        // Normal list view: virtual cron group entry positioned by _latestCronUpdatedAt.
+        // Walk the sorted non-cron list and insert the entry at the first row
+        // whose time is older than the newest cron session's updated_at.
+        const cronHasRunning = _sessions.some(s => s.source === "cron" && s.status === "running");
+        const nonCron = visible.filter(s => s.source !== "cron");
         let cronEntryRendered = false;
-        visible.forEach(s => {
-          if (s.source === "cron") {
-            // Render the group entry once, at the first (newest) cron slot;
-            // skip every individual cron session in the flat list.
-            if (!cronEntryRendered) {
+
+        nonCron.forEach(s => {
+          if (!cronEntryRendered && _latestCronUpdatedAt) {
+            const t = s.updated_at || s.created_at;
+            if (!t || t < _latestCronUpdatedAt) {
               _renderCronGroupItem(list, _cronCount, cronHasRunning);
               cronEntryRendered = true;
             }
-            return;
           }
           _renderSessionItem(list, s);
         });
-        // NOTE: we intentionally do NOT append a fallback entry when no cron
-        // session is loaded yet. The group entry is a virtual row that must
-        // ride along with pagination: it only appears at the sort slot of the
-        // first loaded cron session. If the newest cron lives on a later page,
-        // the entry simply shows up once that page is loaded — rather than
-        // being forced onto the bottom of page 1 (which would mislead the
-        // sort position and miss the running state of an unpaged cron).
+        // If no insertion point found (all normal sessions are newer, or list is empty),
+        // append the entry at the bottom of the loaded rows.
+        if (!cronEntryRendered) {
+          _renderCronGroupItem(list, _cronCount, cronHasRunning);
+        }
       } else {
         // Normal list view, no cron sessions
         visible.forEach(s => _renderSessionItem(list, s));

data/lib/clacky/web/ws-dispatcher.js

@@ -180,7 +180,7 @@ WS.onEvent(ev => {
 
     // ── Session list ───────────────────────────────────────────────────
     case "session_list": {
-      Sessions.setAll(ev.sessions || [], !!ev.has_more, ev.cron_count || 0);
+      Sessions.setAll(ev.sessions || [], !!ev.has_more, ev.cron_count || 0, ev.latest_cron_updated_at || null);
       Sessions.renderList();
 
       // Restore URL hash once on initial connect; ignore subsequent session_list events.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openclacky
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - windy