openclacky 1.5.20 → 1.5.21

data/lib/clacky/web/components/chat-navigator.js

@@ -306,18 +306,24 @@
   function syncMessages() {
     if (!messages || sessionId !== Sessions.activeId) return;
     const byId = new Map(items.map((item, index) => [item.id, index]));
+    const byTask = new Map();
     const liveByTime = new Map();
     items.forEach((item, index) => {
+      if (item.taskId) byTask.set(String(item.taskId), index);
       if (!item.archived && item.created_at) liveByTime.set(String(item.created_at), index);
     });
     loaded = [];
     messages.querySelectorAll(".msg-user-wrap").forEach(el => {
       const bubble = el.querySelector(".msg-user");
       let index = byId.get(bubble?.dataset.roundId);
+      // Compression re-keys rounds without re-rendering bubbles; task ids survive it.
+      if (index === undefined) index = byTask.get(bubble?.dataset.taskId);
       // Only optimistic live bubbles need a timestamp fallback. Archived
       // targets always use source locators, never synthetic timestamps.
       if (index === undefined && bubble?.dataset.editable !== "false") index = liveByTime.get(bubble?.dataset.createdAt);
-      if (index !== undefined) loaded.push({ index, el });
+      if (index === undefined) return;
+      if (items[index].taskId) bubble.dataset.taskId = String(items[index].taskId);
+      loaded.push({ index, el });
     });
     _updateActive();
   }
@@ -379,6 +385,7 @@
         const identity = source.identities?.[offset] || null;
         return { id: JSON.stringify([source.key, offset, source.version, identity]),
           bookmarkKey: _bookmarkKey(source, offset, identity),
+          taskId: source.task_ids?.[offset] || identity?.[1] || null,
           archived: !source.identities, created_at: identity?.[0] };
       }));
       const validBookmarks = new Set(items.map(item => item.bookmarkKey));

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

@@ -67,7 +67,7 @@ const MentionAC = (() => {
   async function _fetchSessions(before) {
     // Cron/scheduled-task sessions are noise here — exclude them from references.
     const params = new URLSearchParams({ limit: "20", exclude_type: "cron" });
-    if (before) params.set("before", before);
+    if (before) { params.set("before", before.before); params.set("before_id", before.before_id); }
     const url = `/api/sessions?${params}`;
     const res = await fetch(url);
     if (!res.ok) throw new Error(`HTTP ${res.status}`);
@@ -303,18 +303,7 @@ const MentionAC = (() => {
       const sessions = data.sessions || [];
       _chatsHasMore = !!data.has_more;
       _items = _items.concat(sessions.map((s) => ({ kind: "session", id: s.id, name: s.name || s.id })));
-      if (sessions.length) {
-        // Cursor must come from a non-pinned session: pinned sessions sit at
-        // the top regardless of age, so an old pinned row would otherwise push
-        // the cursor too far back and leave the next page empty.
-        const oldest = sessions.reduce((min, s) => {
-          if (s.pinned) return min;
-          const t = s.updated_at || s.created_at;
-          if (!t) return min;
-          return (!min || t < min) ? t : min;
-        }, null);
-        if (oldest) _chatsCursor = oldest;
-      }
+      if (data.next_cursor) _chatsCursor = data.next_cursor;
       _renderChatItems(listWrap, reset);
     } catch (err) {
       if (_mode !== "chats" || req !== _chatsReq) return;

data/lib/clacky/web/components/model-picker.js

@@ -182,7 +182,9 @@ const ModelPicker = (() => {
     ratio.textContent = price.label;
     el.appendChild(ratio);
     const vars = { in: price.in, out: price.out };
-    let tipKey = "sib.price.tip";
+    // Bedrock GPT carries a 20% markup over list, so the standard-price claim
+    // would be wrong for these rows.
+    let tipKey = name.startsWith("abs-gpt-") ? "sib.price.tip.abs" : "sib.price.tip";
     if (price.discount) {
       const badge = document.createElement("span");
       badge.className = "sib-model-discount";

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

@@ -414,8 +414,18 @@ const Onboard = (() => {
     el.className   = "setup-test-result" + (msg ? " result-fail" : "");
   }
 
+  // Platform returns raw RFC 8628 codes (access_denied / expired_token); never
+  // surface those to users — map the status to a translated sentence instead.
+  function _deviceErrorText(status) {
+    switch (status) {
+      case "denied":   return I18n.t("onboard.device.error.denied");
+      case "expired":
+      case "consumed": return I18n.t("onboard.device.error.expired");
+      default:         return I18n.t("onboard.device.error.failed");
+    }
+  }
+
   async function _startDeviceLogin() {
-    const zh = _selectedLang === "zh";
     _setDeviceError("");
 
     const w = window.open("about:blank", "_blank");
@@ -430,13 +440,11 @@ const Onboard = (() => {
 
     if (!data || !data.ok) {
       if (w && !w.closed) w.close();
-      _setDeviceError((data && data.error) || (zh ? "无法发起登录，请稍后重试。" : "Could not start login. Please try again."));
+      _setDeviceError(I18n.t("onboard.device.error.startFailed"));
       return;
     }
 
     const url = data.verification_uri_complete || data.verification_uri;
-    const codeEl = $("setup-device-usercode");
-    if (codeEl) codeEl.textContent = data.user_code || "—";
     const link = $("setup-device-link");
     if (link && url) link.href = url;
 
@@ -452,8 +460,6 @@ const Onboard = (() => {
   }
 
   async function _pollDevice(deviceCode, intervalMs) {
-    const zh = _selectedLang === "zh";
-
     while (_devicePolling) {
       await new Promise(r => setTimeout(r, intervalMs));
       if (!_devicePolling) return;
@@ -480,10 +486,7 @@ const Onboard = (() => {
       // denied / expired / consumed / error
       _devicePolling = false;
       _showDevicePending(false);
-      const msg = data.status === "denied"
-        ? (zh ? "授权已被拒绝。" : "Authorization was denied.")
-        : (zh ? "授权已过期，请重新登录。" : "Authorization expired. Please try again.");
-      _setDeviceError(data.error || msg);
+      _setDeviceError(_deviceErrorText(data.status));
       return;
     }
   }

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

@@ -14,6 +14,7 @@ const ArchiveStore = (() => {
 
   let _items   = [];
   let _hasMore = false;
+  let _cursor  = null;      // server-issued sort key of the last loaded row
   let _loading = false;
   let _archivedTotal = 0;   // whole archive, not just the loaded page
 
@@ -72,12 +73,9 @@ const ArchiveStore = (() => {
 
       try {
         const params = new URLSearchParams({ archived: "1", limit: String(PAGE_SIZE) });
-        if (!opts.reset && _items.length) {
-          // Cursor field must match the registry's sort key (updated_at, with
-          // created_at as the legacy fallback) — archived_at is unrelated.
-          const oldest = _items[_items.length - 1];
-          const cursor = oldest.updated_at || oldest.created_at;
-          if (cursor) params.set("before", cursor);
+        if (!opts.reset && _cursor) {
+          params.set("before", _cursor.before);
+          params.set("before_id", _cursor.before_id);
         }
 
         const res  = await fetch(`/api/sessions?${params.toString()}`);
@@ -87,6 +85,7 @@ const ArchiveStore = (() => {
         const rows = data.sessions || [];
         _items   = opts.reset === false ? _items.concat(rows) : rows;
         _hasMore = !!data.has_more;
+        _cursor  = data.next_cursor || (opts.reset === false ? _cursor : null);
         if (typeof data.archived_count === "number") _archivedTotal = data.archived_count;
         _emit("archive:changed");
       } catch (e) {
@@ -110,6 +109,7 @@ const ArchiveStore = (() => {
           Sessions.renderList();
         }
         if (typeof Projects !== "undefined") Projects.renderSection();
+        Archive.refreshIfShown();
         return { ok: true };
       } catch (e) {
         return { ok: false, error: e.message };
@@ -155,21 +155,35 @@ const ArchiveStore = (() => {
     },
 
     /**
-     * Delete every archived chat (soft delete, same as remove).
-     * Filter- and search-agnostic on purpose: the button reads "delete all",
-     * and the confirmation is worded with `state.archivedTotal` so the number
-     * the user agrees to is the number this call takes out.
+     * Delete archived chats (soft delete, same as remove).
+     * `sessions` is the visible selection when search or filters narrow the
+     * page; null means the whole archive, which is paged, so only the server
+     * can enumerate it. Either way the caller words its confirmation with the
+     * number this call takes out.
      */
-    async emptyAll() {
+    async deleteMany(sessions) {
+      const ids  = sessions ? sessions.map(s => s.id || s.session_id) : null;
+      const opts = { method: "POST" };
+      if (ids) {
+        opts.headers = { "Content-Type": "application/json" };
+        opts.body    = JSON.stringify({ session_ids: ids });
+      }
       try {
-        const res  = await fetch("/api/archive/sessions", { method: "DELETE" });
+        const res  = await fetch("/api/archive/sessions/delete", opts);
         const data = await res.json();
         if (!res.ok || !data.ok) return { ok: false, error: data.error || res.statusText };
-        _items         = [];
-        _hasMore       = false;
-        _archivedTotal = 0;
+        const deleted = data.deleted_count || 0;
+        if (ids) {
+          _items         = _items.filter(s => !ids.includes(s.id || s.session_id));
+          _archivedTotal = Math.max(0, _archivedTotal - deleted);
+        } else {
+          _items         = [];
+          _hasMore       = false;
+          _cursor        = null;
+          _archivedTotal = 0;
+        }
         _emit("archive:changed");
-        return { ok: true, deleted_count: data.deleted_count || 0 };
+        return { ok: true, deleted_count: deleted };
       } catch (e) {
         return { ok: false, error: e.message };
       }

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

@@ -86,6 +86,10 @@ const ArchiveView = (() => {
       .map(k => byId.get(k));
   }
 
+  function _isNarrowed() {
+    return _query.trim() !== "" || _filterProject !== null || _filterType !== "";
+  }
+
   // ── Rendering ────────────────────────────────────────────────────────
 
   function _renderSkeleton() {
@@ -158,15 +162,15 @@ const ArchiveView = (() => {
     _refreshProjectOptions();
 
     const items = _visibleItems();
+    const narrowed = _isNarrowed();
     if (summary) {
       // With a filter or a search on, the number describes what the toolbar is
       // showing. Without one it describes the whole archive, which can be
       // bigger than the loaded page.
-      const narrowed = _query.trim() !== "" || _filterProject !== null || _filterType !== "";
       const n = narrowed ? items.length : (Archive.state.archivedTotal || items.length);
       summary.textContent = n ? I18n.t("archive.summary", { n }) : "";
     }
-    if (btnAll)  btnAll.disabled = Archive.state.archivedTotal === 0;
+    if (btnAll)  btnAll.disabled = (narrowed ? items.length : Archive.state.archivedTotal) === 0;
     if (btnMore) {
       btnMore.style.display = Archive.state.hasMore ? "" : "none";
       _setMoreLoading(false);
@@ -290,17 +294,18 @@ const ArchiveView = (() => {
   }
 
   async function _deleteAll() {
-    // The whole archive, filters included: the confirmation has to say how many
-    // chats actually leave, which is exactly what `Archive.state.count` (one
-    // page of rows) cannot tell us.
-    const total = Archive.state.archivedTotal;
-    if (total === 0) {
-      Modal.toast(_t("archive.empty"), "info");
+    // What the toolbar shows is what goes: the visible rows when search or a
+    // filter is on, otherwise the whole archive, whose size only the server
+    // knows (`archivedTotal`) because the list is paged.
+    const selection = _isNarrowed() ? _visibleItems() : null;
+    const count     = selection ? selection.length : Archive.state.archivedTotal;
+    if (count === 0) {
+      Modal.toast(_t(selection ? "archive.noMatch" : "archive.empty"), "info");
       return;
     }
-    const confirmed = await Modal.confirm(I18n.t("archive.confirmDeleteAll", { count: total }));
+    const confirmed = await Modal.confirm(I18n.t("archive.confirmDeleteAll", { count }));
     if (!confirmed) return;
-    const res = await Archive.emptyAll();
+    const res = await Archive.deleteMany(selection);
     if (!res.ok) Modal.toast(I18n.t("archive.deleteFail", { msg: res.error }), "error");
     else         Modal.toast(I18n.t("archive.deletedAll", { count: res.deleted_count }), "success");
   }
@@ -390,6 +395,11 @@ const ArchiveView = (() => {
       _wire();
       Archive.load({ reset: true });
     },
+
+    // Sidebar actions change the archive while this page may be open behind them.
+    refreshIfShown() {
+      if (Router.current === "archive") Archive.load({ reset: true });
+    },
   };
 
   return { init: _subscribe, api: viewApi };

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

@@ -35,10 +35,10 @@ const BackupView = (() => {
     if (!cfg.last_run_at) { el.textContent = ""; el.className = "model-test-result"; return; }
     if (cfg.last_status === "error") {
       el.textContent = I18n.t("settings.backup.lastError", { msg: cfg.last_error || "" });
-      el.className = "model-test-result error";
+      el.className = "model-test-result result-fail";
     } else {
       el.textContent = I18n.t("settings.backup.lastOk", { time: _fmtDate(cfg.last_run_at) });
-      el.className = "model-test-result success";
+      el.className = "model-test-result result-ok";
     }
   }
 
@@ -62,7 +62,7 @@ const BackupView = (() => {
       Modal.toast(I18n.t("settings.backup.downloaded"), "success");
     } else if (statusEl) {
       statusEl.textContent = I18n.t("settings.backup.lastError", { msg: res.error });
-      statusEl.className = "model-test-result error";
+      statusEl.className = "model-test-result result-fail";
     }
     if (btn) btn.disabled = false;
   }
@@ -78,10 +78,10 @@ const BackupView = (() => {
     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"; }
+      if (statusEl) { statusEl.textContent = I18n.t("settings.backup.restoreOk"); statusEl.className = "model-test-result result-ok"; }
       _restoreStatusEl = statusEl;
     } else {
-      if (statusEl) { statusEl.textContent = res.error || "Restore failed"; statusEl.className = "model-test-result error"; }
+      if (statusEl) { statusEl.textContent = res.error || "Restore failed"; statusEl.className = "model-test-result result-fail"; }
     }
   }
 

data/lib/clacky/web/features/new-session/store.js

@@ -152,11 +152,11 @@ const NewSessionStore = (() => {
     _emit("newSession:creating", { creating: true });
 
     try {
-      // useDefaults=true: quick-create from sidebar — use the default agent and
-      // skip advanced options (model / dir) so the session always starts clean.
+      // useDefaults=true: quick-create from sidebar — ignore the /#new draft
+      // (agent / name / model / dir / project) so the session always starts clean.
       const agentId = useDefaults ? "general" : (_state.selectedAgentId || "general");
       const adv = _state.advanced;
-      const name = adv.name.trim() || _autoName(existingSessions);
+      const name = (!useDefaults && adv.name.trim()) || _autoName(existingSessions);
 
       const payload = { name, agent_profile: agentId, source: "manual" };
       if (!useDefaults) {

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

@@ -200,14 +200,14 @@ const TrashStore = (() => {
       }
     },
 
-    countMatching(items, daysOld) {
-      if (!Array.isArray(items)) return 0;
-      if (!daysOld || daysOld <= 0) return items.length;
+    matching(items, daysOld) {
+      if (!Array.isArray(items)) return [];
+      if (!daysOld || daysOld <= 0) return items;
       const cutoff = Date.now() - daysOld * 86400000;
       return items.filter(it => {
         const t = Date.parse(it.deleted_at || "");
         return !isNaN(t) && t < cutoff;
-      }).length;
+      });
     },
 
     async emptyFilesBulk(daysOld) {
@@ -223,10 +223,13 @@ const TrashStore = (() => {
       }
     },
 
-    async emptySessionsBulk(daysOld) {
-      const url = "/api/trash/sessions?" + new URLSearchParams({ days_old: String(daysOld) }).toString();
+    async deleteSessions(sessions) {
       try {
-        const res  = await fetch(url, { method: "DELETE" });
+        const res  = await fetch("/api/trash/sessions/delete", {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ session_ids: sessions.map(s => s.session_id) })
+        });
         const data = await res.json();
         if (!res.ok || !data.ok) return { ok: false, error: data.error || res.statusText };
         await Trash.loadSessions();

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

@@ -426,18 +426,18 @@ const TrashView = (() => {
   async function _emptyBulk(daysOld, confirmKey) {
     const isSession  = _activeTab === "session-trash";
     const items      = isSession ? Trash.state.sessions : Trash.state.files;
-    const matchCount = Trash.countMatching(items, daysOld);
+    const matches    = Trash.matching(items, daysOld);
 
-    if (matchCount === 0) {
+    if (matches.length === 0) {
       Modal.toast(_t(daysOld > 0 ? "trash.nothingOld" : "trash.empty"), "info");
       return;
     }
 
-    const confirmed = await Modal.confirm(I18n.t(confirmKey, { count: matchCount }));
+    const confirmed = await Modal.confirm(I18n.t(confirmKey, { count: matches.length }));
     if (!confirmed) return;
 
     if (isSession) {
-      const res = await Trash.emptySessionsBulk(daysOld);
+      const res = await Trash.deleteSessions(matches);
       if (!res.ok) { Modal.toast(I18n.t("trash.cleanFail", { msg: res.error }), "error"); return; }
       Modal.toast(I18n.t("trash.sessionsCleaned", { count: res.deleted_count }), "success");
     } else {
@@ -550,6 +550,11 @@ const TrashView = (() => {
       _activeTab = null;
       // Sessions are what people come here for; the file trash is the side trip.
       _switchTab("session-trash");
+    },
+
+    // Sidebar deletes land in the session trash while this page may be open behind them.
+    refreshIfShown() {
+      if (Router.current === "trash" && _activeTab === "session-trash") Trash.loadSessions();
     }
   };