openclacky 1.3.5 → 1.3.7

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

@@ -16,58 +16,119 @@ 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-N-hours on specific days  e.g. 0 */3 * * 1-5 ────────────
+    if (isAny(dom) && isAny(month) && !isAny(dow) && hour.startsWith("*/")) {
+      const dl = dowLabel(dow);
+      const ev = isZh ? `每 ${hour.slice(2)} 小时` : `Every ${hour.slice(2)} hr`;
+      if (dl) return `${dl} ${ev}`;
     }
+    // ── 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}`;
+    // ── hourly at :MM on specific days  e.g. 30 * * * 1-5 ─────────────
+    if (isInt(min) && isAny(hour) && isAny(dom) && isAny(month) && !isAny(dow)) {
+      const dl = dowLabel(dow);
+      const tm = isZh ? `每小时 :${pad(min)}` : `Hourly at :${pad(min)}`;
+      if (dl) return `${dl} ${tm}`;
     }
-    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/features/trash/store.js

@@ -13,10 +13,13 @@
 // ───────────────────────────────────────────────────────────────────────────
 
 const TrashStore = (() => {
+  const SOURCES = Object.freeze({ ALL: "all", CRON: "cron", MANUAL: "manual" });
+
   let _files          = [];
   let _totals         = { count: 0, size: 0 };
   let _sessions       = [];
   let _sessionTotals  = { count: 0, size: 0 };
+  let _filterSource   = SOURCES.ALL;
   let _loading        = false;
 
   const _listeners = {};
@@ -44,8 +47,20 @@ const TrashStore = (() => {
   const state = {
     get files()         { return _files; },
     get totals()        { return _totals; },
-    get sessions()      { return _sessions; },
-    get sessionTotals() { return _sessionTotals; },
+    get sessions()      {
+      if (_filterSource === SOURCES.ALL) return _sessions;
+      return _filterSource === SOURCES.CRON
+        ? _sessions.filter(s => s.source === SOURCES.CRON)
+        : _sessions.filter(s => s.source !== SOURCES.CRON);
+    },
+    get sessionTotals() {
+      const filtered = _filterSource === SOURCES.ALL ? _sessions
+        : _filterSource === SOURCES.CRON
+          ? _sessions.filter(s => s.source === SOURCES.CRON)
+          : _sessions.filter(s => s.source !== SOURCES.CRON);
+      return { count: filtered.length, size: filtered.reduce((sum, s) => sum + (s.file_size || 0), 0) };
+    },
+    get filterSource()  { return _filterSource; },
     orphanCount() { return _files.filter(f => _isOrphanRoot(f.project_root)).length; },
     isOrphan(file) { return _isOrphanRoot(file.project_root); },
   };
@@ -53,6 +68,13 @@ const TrashStore = (() => {
   const Trash = {
     on: _on,
     state,
+    SOURCES,
+
+    setFilterSource(source) {
+      if (source === _filterSource) return;
+      _filterSource = source;
+      _emit("trash:sessionsChanged");
+    },
 
     async loadFiles() {
       if (_loading) return;
@@ -230,10 +252,6 @@ const TrashStore = (() => {
 
   function _removeSessionLocal(session) {
     _sessions = _sessions.filter(s => s.session_id !== session.session_id);
-    _sessionTotals = {
-      count: Math.max(0, _sessionTotals.count - 1),
-      size:  Math.max(0, _sessionTotals.size - (session.file_size || 0))
-    };
   }
 
   return Trash;

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

@@ -61,8 +61,13 @@ const TrashView = (() => {
 
     const filePane    = $("trash-tab-file");
     const sessionPane = $("trash-tab-session");
+    const filterBar   = $("trash-filter-bar");
     if (filePane)    filePane.style.display    = tab === "file-trash" ? "" : "none";
     if (sessionPane) sessionPane.style.display = tab === "session-trash" ? "" : "none";
+    if (filterBar)   filterBar.style.display   = tab === "session-trash" ? "" : "none";
+
+    const hint = $("trash-session-hint");
+    if (hint) hint.style.display = tab === "session-trash" ? "" : "none";
 
     const btnOrphans = $("btn-trash-empty-orphans");
     if (btnOrphans) btnOrphans.style.display = tab === "file-trash" ? "" : "none";
@@ -73,7 +78,7 @@ const TrashView = (() => {
   function _load() {
     if (_activeTab === "file-trash") {
       const list = $("trash-list");
-      if (list) list.innerHTML = `<div class="creator-loading">${_t("trash.loading")}</div>`;
+      if (list) list.innerHTML = `<div class="trash-loading">${_t("trash.loading")}</div>`;
       Trash.loadFiles();
     } else {
       const list = $("trash-session-list");
@@ -109,7 +114,7 @@ const TrashView = (() => {
     if (btnAll)     btnAll.disabled     = files.length === 0;
 
     if (files.length === 0) {
-      list.innerHTML = `<div class="creator-empty">${_t("trash.empty")}</div>`;
+      list.innerHTML = `<div class="trash-empty">${_t("trash.empty")}</div>`;
       return;
     }
 
@@ -176,11 +181,33 @@ const TrashView = (() => {
 
   // ── Session trash rendering ──────────────────────────────────────────
 
+  function _renderSkeleton() {
+    const list = $("trash-session-list");
+    if (!list) return;
+    let html = "";
+    for (let i = 0; i < 3; i++) {
+      html += `
+        <div class="trash-session-skeleton">
+          <div class="trash-session-skeleton-info">
+            <div class="skel skel-title"></div>
+            <div class="skel skel-subtitle"></div>
+            <div class="skel skel-text-sm"></div>
+          </div>
+          <div class="trash-skeleton-actions">
+            <div class="skel trash-skeleton-btn"></div>
+            <div class="skel trash-skeleton-btn"></div>
+          </div>
+        </div>`;
+    }
+    list.innerHTML = html;
+  }
+
   function _renderSessions() {
-    const list     = $("trash-session-list");
-    const summary  = $("trash-summary");
-    const btnOld   = $("btn-trash-empty-old");
-    const btnAll   = $("btn-trash-empty-all");
+    const list       = $("trash-session-list");
+    const summary    = $("trash-summary");
+    const btnOld     = $("btn-trash-empty-old");
+    const btnAll     = $("btn-trash-empty-all");
+    const filterBar  = $("trash-filter-bar");
     if (!list) return;
 
     const sessions = Trash.state.sessions;
@@ -196,9 +223,10 @@ const TrashView = (() => {
     }
     if (btnOld) btnOld.disabled = sessions.length === 0;
     if (btnAll) btnAll.disabled = sessions.length === 0;
+    if (filterBar) filterBar.style.display = "";
 
     if (sessions.length === 0) {
-      list.innerHTML = `<div class="creator-empty">${_t("trash.noSessionTrash")}</div>`;
+      list.innerHTML = `<div class="trash-empty">${_t("trash.noSessionTrash")}</div>`;
       return;
     }
 
@@ -385,6 +413,15 @@ const TrashView = (() => {
     if (btnAll)     btnAll.addEventListener("click",
       () => _emptyBulk(0, _activeTab === "session-trash"
         ? "trash.confirmEmptySessionAll" : "trash.confirmEmptyAll"));
+
+    // Filter chips
+    document.querySelectorAll(".trash-filter-chip").forEach(chip => {
+      chip.addEventListener("click", () => {
+        const val = chip.dataset.filter;
+        Trash.setFilterSource(val);
+        document.querySelectorAll(".trash-filter-chip").forEach(c => c.classList.toggle("active", c.dataset.filter === val));
+      });
+    });
   }
 
   function _subscribe() {
@@ -392,11 +429,11 @@ const TrashView = (() => {
     Trash.on("trash:sessionsChanged", _renderSessions);
     Trash.on("trash:filesError", (e) => {
       const list = $("trash-list");
-      if (list) list.innerHTML = `<div class="creator-empty creator-error">${escapeHtml(e.message)}</div>`;
+      if (list) list.innerHTML = `<div class="trash-empty trash-error">${escapeHtml(e.message)}</div>`;
     });
     Trash.on("trash:sessionsError", (e) => {
       const list = $("trash-session-list");
-      if (list) list.innerHTML = `<div class="creator-empty creator-error">${escapeHtml(e.message)}</div>`;
+      if (list) list.innerHTML = `<div class="trash-empty trash-error">${escapeHtml(e.message)}</div>`;
     });
   }
 

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

@@ -97,3 +97,5 @@ const WorkspaceStore = (() => {
 })();
 
 const Workspace = WorkspaceStore;
+Clacky.Workspace = Workspace;
+Clacky.WorkspaceStore = WorkspaceStore;

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

@@ -302,4 +302,3 @@ if (window.Clacky && Clacky.ext) {
 // Workspace.onSession on every session switch). Rendering is driven by the
 // slot re-render, so this only updates state.
 Workspace.onSession = (session) => { Workspace.setSession(session); };
-window.Workspace = Workspace;