openclacky 1.5.19 → 1.5.21

data/lib/clacky/web/settings.js

@@ -27,19 +27,33 @@ const Settings = (() => {
   let _modelSearchQuery = "";
   // Provider id selected in the model provider filter; empty = show all.
   let _modelProviderFilter = "";
+  // Last successfully activated tab. Dynamic extension tabs may be rebuilt
+  // while Settings is hidden, so the DOM alone cannot retain this state.
+  let _activeTab = "models";
 
   // ── Public API ──────────────────────────────────────────────────────────────
 
-  function open() {
-    _load();
-    _loadMedia();
+  function open(options = {}) {
+    const targetTab = options.tab || _activeTab;
+    if (!_activateTab(targetTab) && targetTab !== "models") _activateTab("models");
+
+    const loadModels = _load();
+    const loadMedia  = _loadMedia();
     _loadBrand();
     _loadBrowserStatus();
     _initNetworkSettings();
     _initSearchSettings();
     _initPlatformSourceSettings();
-    if (Clacky.Backup) Clacky.Backup.load();
     _applyAboutTabVisibility();
+
+    if (options.section) {
+      Promise.all([loadModels, loadMedia]).then(() => {
+        requestAnimationFrame(() => {
+          const section = document.getElementById(options.section);
+          if (section) section.scrollIntoView({ behavior: "smooth", block: "start" });
+        });
+      });
+    }
   }
 
   // ── Data Loading ────────────────────────────────────────────────────────────
@@ -268,8 +282,11 @@ const Settings = (() => {
           </button>` : ""}
         </div>
         <div class="model-card-grid-provider">${_esc(providerName)}</div>
-        ${remark ? `<div class="model-card-grid-remark" title="${_esc(remark)}">${_esc(remark)}</div>` : ""}
         ${model.api_key_masked ? `<div class="model-card-grid-model">${_esc(model.api_key_masked)}</div>` : ""}
+        ${remark ? `<div class="model-card-grid-remark" title="${_esc(remark)}">
+          <span class="model-card-grid-remark-label">${I18n.t("settings.models.field.remark")}</span>
+          <span class="model-card-grid-remark-text">${_esc(remark)}</span>
+        </div>` : ""}
         <div class="model-card-grid-status">
           <span class="model-test-result" data-index="${index}"></span>
         </div>
@@ -1582,12 +1599,14 @@ const Settings = (() => {
       const btn         = document.getElementById("btn-browser-setup");
       const toggleWrap  = document.getElementById("browser-toggle-wrap");
       const toggleInput = document.getElementById("browser-toggle-input");
+      const shotWrap    = document.getElementById("browser-screenshot-settings");
 
       // File doesn't exist → not set up yet
       if (data.enabled === undefined || data.enabled === null) {
         desc.textContent = I18n.t("settings.browser.desc");
         btn.textContent  = I18n.t("settings.browser.btn");
         toggleWrap.style.display = "none";
+        shotWrap.style.display   = "none";
         return;
       }
 
@@ -1603,9 +1622,51 @@ const Settings = (() => {
         toggleInput.dataset.bound = "1";
         toggleInput.addEventListener("change", _toggleBrowser);
       }
+
+      _renderScreenshotSettings(data);
     } catch (_) { /* non-critical */ }
   }
 
+  function _renderScreenshotSettings(data) {
+    const wrap    = document.getElementById("browser-screenshot-settings");
+    const quality = document.getElementById("browser-screenshot-quality");
+
+    wrap.style.display = "flex";
+
+    const limit = data.screenshot_max_base64_bytes;
+    quality.querySelectorAll(".settings-segmented-btn").forEach((btn) => {
+      btn.classList.toggle("active", Number(btn.dataset.bytes) === limit);
+    });
+
+    if (!quality.dataset.bound) {
+      quality.dataset.bound = "1";
+      quality.addEventListener("click", _onScreenshotQualityClick);
+    }
+  }
+
+  async function _onScreenshotQualityClick(event) {
+    const btn = event.target.closest(".settings-segmented-btn");
+    if (!btn || btn.classList.contains("active")) return;
+    await _saveScreenshotSettings({ screenshot_max_base64_bytes: Number(btn.dataset.bytes) });
+  }
+
+  async function _saveScreenshotSettings(payload) {
+    try {
+      const res  = await fetch("/api/browser/settings", {
+        method:  "POST",
+        headers: { "Content-Type": "application/json" },
+        body:    JSON.stringify(payload)
+      });
+      const data = await res.json();
+      if (!data.ok) throw new Error(data.error || "save failed");
+      _renderScreenshotSettings(data);
+      Modal.toast(I18n.t("settings.browser.screenshot.saved"), "success");
+    } catch (_) {
+      Modal.toast(I18n.t("settings.browser.screenshot.saveFailed"), "error");
+      await _loadBrowserStatus();
+    }
+  }
+
   async function _toggleBrowser() {
     const toggleInput = document.getElementById("browser-toggle-input");
     toggleInput.disabled = true;
@@ -1674,14 +1735,14 @@ const Settings = (() => {
         const data = await res.json();
         if (data.ok) {
           status.textContent = I18n.t(successKey);
-          status.className   = "model-test-result success";
+          status.className   = "model-test-result result-ok";
         } else {
           status.textContent = data.error || I18n.t("settings.network.invalidUrl");
-          status.className   = "model-test-result error";
+          status.className   = "model-test-result result-fail";
         }
       } catch (e) {
         status.textContent = e.message || I18n.t("settings.network.invalidUrl");
-        status.className   = "model-test-result error";
+        status.className   = "model-test-result result-fail";
       }
     }
 
@@ -1711,8 +1772,17 @@ const Settings = (() => {
     const saveBtn = document.getElementById("btn-save-search");
     const testBtn = document.getElementById("btn-test-search");
     const status  = document.getElementById("settings-search-status");
+    const dsHint  = document.getElementById("search-deepseek-hint");
+    const builtinNote = document.getElementById("search-builtin-note");
+    const customBtn = document.getElementById("btn-custom-searcher");
     if (!dropdown || !saveBtn) return;
 
+    const DS_WEB = "deepseek_web";
+    // Per-call billing for hosted web tools starts 2026-11-01 00:00 Beijing
+    // time (UTC+8); before that the platform records calls at cost 0.
+    const DS_BILLING_START_MS = Date.parse("2026-10-31T16:00:00Z");
+    const defaultKeyPlaceholder = keyInput ? keyInput.placeholder : "";
+
     let select = dropdown.__customSelect;
     if (!select && trigger) {
       select = CustomSelect.init({
@@ -1723,7 +1793,60 @@ const Settings = (() => {
     }
 
     function _syncKeyVisibility() {
-      keyWrap.style.display = (select && select.value) ? "" : "none";
+      const value = select ? select.value : "";
+      keyWrap.style.display = value ? "" : "none";
+
+      // Keep the trigger's i18n key in step with the selection, so a language
+      // switch does not relabel the closed dropdown with another provider's name.
+      const valueSpan = document.getElementById("settings-search-provider-value");
+      if (valueSpan) {
+        if (value === DS_WEB) {
+          valueSpan.setAttribute("data-i18n", "settings.search.deepseek");
+        } else if (value) {
+          valueSpan.removeAttribute("data-i18n");
+        } else {
+          valueSpan.setAttribute("data-i18n", "settings.search.builtin");
+        }
+      }
+
+      const isDeepSeek = value === DS_WEB;
+      if (dsHint) {
+        dsHint.style.display = isDeepSeek ? "" : "none";
+        if (isDeepSeek) {
+          const hintKey = Date.now() < DS_BILLING_START_MS
+            ? "settings.search.deepseekHintFree"
+            : "settings.search.deepseekHint";
+          dsHint.setAttribute("data-i18n", hintKey);
+          dsHint.textContent = I18n.t(hintKey);
+        }
+      }
+      if (builtinNote) builtinNote.style.display = value ? "none" : "";
+      if (keyInput) {
+        keyInput.placeholder = isDeepSeek
+          ? I18n.t("settings.search.deepseekKeyPlaceholder")
+          : defaultKeyPlaceholder;
+      }
+      // Anything already shown refers to the provider the user just left.
+      if (status) {
+        status.textContent = "";
+        status.className = "model-test-result";
+      }
+    }
+
+    // Assigning onclick (not addEventListener) keeps re-opening Settings from
+    // stacking duplicate handlers, since open() re-runs this initializer.
+    if (customBtn) {
+      customBtn.onclick = async () => {
+        customBtn.disabled = true;
+        try {
+          Router.navigate("chat");
+          await Sessions.startWith(I18n.t("settings.search.customPrompt"), {
+            name: I18n.t("settings.search.customSessionName"),
+          });
+        } finally {
+          customBtn.disabled = false;
+        }
+      };
     }
 
     try {
@@ -1732,8 +1855,12 @@ const Settings = (() => {
       if (data.ok) {
         const rows = (data.available || []).map(name =>
           `<div class="custom-select-option" data-value="${_esc(name)}">${_esc(name)}</div>`).join("");
+        const deepseekRow =
+          `<div class="custom-select-option" data-value="${DS_WEB}">${_esc(I18n.t("settings.search.deepseek"))}</div>`;
         dropdown.innerHTML =
-          `<div class="custom-select-option" data-value="">${I18n.t("settings.search.builtin")}</div>` + rows;
+          `<div class="custom-select-option" data-value="">${I18n.t("settings.search.builtin")}</div>` +
+          deepseekRow +
+          rows;
         if (select) select.setValue(data.provider || "");
         keyInput.value = data.key_masked || "";
       }
@@ -1742,7 +1869,7 @@ const Settings = (() => {
 
     function _showStatus(message, ok) {
       status.textContent = message;
-      status.className   = `model-test-result ${ok ? "success" : "error"}`;
+      status.className   = `model-test-result ${ok ? "result-ok" : "result-fail"}`;
     }
 
     if (!saveBtn.dataset.bound) {
@@ -1750,15 +1877,26 @@ const Settings = (() => {
       saveBtn.addEventListener("click", async () => {
         status.textContent = "";
         status.className   = "model-test-result";
+
+        const provider = select.value;
+        const key = keyInput.value.trim();
+        // DeepSeek falls back to the configured model key, so an empty field is
+        // valid there. Every other searcher is a script that reads the key from
+        // CLACKY_SEARCH_KEY and cannot run without one.
+        if (provider && provider !== DS_WEB && !key) {
+          _showStatus(I18n.t("settings.search.keyRequired"), false);
+          return;
+        }
+
         try {
           const res = await fetch("/api/config/search", {
             method:  "PATCH",
             headers: { "Content-Type": "application/json" },
-            body:    JSON.stringify({ provider: select.value, key: keyInput.value })
+            body:    JSON.stringify({ provider: select.value, key: key })
           });
           const data = await res.json();
           if (data.ok) {
-            _showStatus(I18n.t("settings.search.saved"), true);
+            Modal.toast(I18n.t("settings.search.saved"), "success");
           } else {
             _showStatus(data.error || I18n.t("settings.search.failed"), false);
           }
@@ -1970,6 +2108,20 @@ const Settings = (() => {
         badge.className    = "brand-status-value badge-active";
       }
 
+      // Only "unreachable" is ambiguous on its own: it means heartbeats have
+      // been failing past the grace period, not that the license is invalid.
+      const hint = document.getElementById("brand-status-hint");
+      if (hint) {
+        if (data.warning && data.warning_type === "unreachable") {
+          // CJK copy reads best with full-width brackets; latin locales don't.
+          const note = I18n.t("settings.brand.hint.unreachable");
+          hint.textContent   = I18n.lang() === "zh" ? `（${note}）` : `(${note})`;
+          hint.style.display = "";
+        } else {
+          hint.style.display = "none";
+        }
+      }
+
       // Fetch full brand info for expiry date and support QR code
       fetch("/api/brand").then(r => r.json()).then(info => {
         const expiresEl = document.getElementById("brand-status-expires");
@@ -2134,6 +2286,25 @@ const Settings = (() => {
 
   // ── Init ──────────────────────────────────────────────────────────────────────
 
+  function _activateTab(targetTab) {
+    const tab = Array.from(document.querySelectorAll("#settings-tabs .settings-tab"))
+      .find(candidate => candidate.dataset.tab === targetTab);
+    const panel = Array.from(document.querySelectorAll("#settings-body .settings-tab-content"))
+      .find(candidate => candidate.dataset.tabContent === targetTab);
+    if (!tab || !panel) return false;
+
+    document.querySelectorAll("#settings-tabs .settings-tab").forEach(candidate =>
+      candidate.classList.toggle("active", candidate === tab));
+
+    document.querySelectorAll("#settings-body .settings-tab-content").forEach(content => {
+      const isActive = content.dataset.tabContent === targetTab;
+      content.classList.toggle("active", isActive);
+      content.style.display = isActive ? "" : "none";
+    });
+    _activeTab = targetTab;
+    return true;
+  }
+
   function _initTabs() {
     const bar = document.getElementById("settings-tabs");
     if (!bar) return;
@@ -2145,15 +2316,7 @@ const Settings = (() => {
       if (!tab || !bar.contains(tab)) return;
       const targetTab = tab.dataset.tab;
       if (!targetTab) return;
-
-      document.querySelectorAll("#settings-tabs .settings-tab").forEach(t =>
-        t.classList.toggle("active", t.dataset.tab === targetTab));
-
-      document.querySelectorAll("#settings-body .settings-tab-content").forEach(c => {
-        const isActive = c.dataset.tabContent === targetTab;
-        c.classList.toggle("active", isActive);
-        c.style.display = isActive ? "" : "none";
-      });
+      _activateTab(targetTab);
     });
   }
 
@@ -2166,16 +2329,7 @@ const Settings = (() => {
     if (branded) {
       tabBtn.style.display = "none";
       if (tabBtn.classList.contains("active")) {
-        tabBtn.classList.remove("active");
-        tabPanel.classList.remove("active");
-        tabPanel.style.display = "none";
-        const fallback = document.querySelector('#settings-tabs .settings-tab[data-tab="models"]');
-        const fallbackPanel = document.querySelector('#settings-body .settings-tab-content[data-tab-content="models"]');
-        if (fallback) fallback.classList.add("active");
-        if (fallbackPanel) {
-          fallbackPanel.classList.add("active");
-          fallbackPanel.style.display = "";
-        }
+        _activateTab("models");
       }
     } else {
       tabBtn.style.display = "";

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

@@ -289,7 +289,7 @@ function _dispatchEvent(ev) {
 
     // ── Session list ───────────────────────────────────────────────────
     case "session_list": {
-      Sessions.setAll(ev.sessions || [], !!ev.has_more, ev.groups || {});
+      Sessions.setAll(ev.sessions || [], !!ev.has_more, ev.groups || {}, ev.next_cursor || null);
       Projects.setAll(ev.projects || []);
       Sessions.renderList();
       Projects.renderSection();
@@ -369,18 +369,11 @@ function _dispatchEvent(ev) {
       }
       if (!sid) break;
       // A creation update is emitted only after the session's initial metadata
-      // has been persisted. Promote it into the canonical list; ordinary full
-      // snapshots remain patches so reconnects and old-session updates cannot
-      // disturb the pagination boundary.
-      //
-      // Exception: the session the user is currently viewing. It may have been
-      // opened from search / a deep link and live only in the `_extraSessions`
-      // cache (outside the loaded page), which the sidebar does not render —
-      // patching it would leave the list without a row until a reload. A full
-      // snapshot carries every column the list needs, and its fresh
-      // `updated_at` sorts it to the top, exactly where a reload would put it.
+      // has been persisted. Other full snapshots join the canonical list only
+      // when they sort inside the loaded pages — exactly where a reload would
+      // put them — so stale snapshots cannot disturb the pagination boundary.
       const listed = Sessions.all.some(s => s.id === sid);
-      if (ev.session && (ev.created || (sid === Sessions.activeId && !listed))) {
+      if (ev.session && (ev.created || (!listed && Sessions.belongsToLoadedPage(ev.session)))) {
         Sessions.add(ev.session);
       } else {
         Sessions.patch(sid, patch);
@@ -418,7 +411,6 @@ function _dispatchEvent(ev) {
       Sessions.patch(ev.session_id, { name: ev.name });
       Sessions.renderList();
       Projects.renderSection();
-      // Title is now shown only in the sidebar; chat-header element was removed.
       break;
     }
 
@@ -672,6 +664,10 @@ function _dispatchEvent(ev) {
       if (typeof Share !== "undefined") Share.maybePromptOnComplete();
       break;
 
+    case "feedback_countdown":
+      Sessions.updateFeedbackCountdown(ev);
+      break;
+
     case "request_feedback":
       if (ev.session_id !== Sessions.activeId) break;
       Sessions.showFeedbackRequest(ev.question, ev.context, ev.options, ev.questions);
@@ -777,20 +773,36 @@ function _transformRetryWarning(message) {
 
 // ── Error rendering ────────────────────────────────────────────────────────
 
-function renderErrorEvent(ev) {
-  const topUp = ev.top_up_url
-    ? `<a class="error-action-btn" href="${escapeHtml(ev.top_up_url)}" target="_blank" rel="noopener noreferrer">${escapeHtml(I18n.t("error.insufficient_credit.action"))}</a>`
-    : "";
+// Credit / allow-list failures lead to the top-up page; any other error that
+// carries a console URL (e.g. a network failure the user may resolve by
+// checking their key or balance) reuses it under a neutral label.
+function _errorActionBtn(ev) {
+  if (!ev.top_up_url) return "";
+  const labelKey = ev.code === "insufficient_credit" || ev.code === "model_not_allowed"
+    ? "error.insufficient_credit.action"
+    : "error.check_account.action";
+  return `<a class="error-action-btn" href="${escapeHtml(ev.top_up_url)}" target="_blank" rel="noopener noreferrer">${escapeHtml(I18n.t(labelKey))}</a>`;
+}
+
+function renderErrorEvent(ev, container = null) {
+  const append = html => {
+    if (!container) return Sessions.appendMsg("error", html);
+    const el = document.createElement("div");
+    el.className = "msg msg-error msg-history-error";
+    el.innerHTML = html;
+    container.appendChild(el);
+  };
+  const action = container ? "" : _errorActionBtn(ev);
   if (ev.code === "insufficient_credit") {
-    const body = escapeHtml(I18n.t("error.insufficient_credit"));
-    Sessions.appendMsg("error", `<span>${body}</span>${topUp}${_buildRawDetail(ev.raw_message)}`);
+    const body = escapeHtml(I18n.t(container ? "error.insufficient_credit.history" : "error.insufficient_credit"));
+    append(`<span class="error-credit-message">${body}</span>${action}${_buildRawDetail(ev.raw_message)}`);
     return;
   }
   if (ev.code === "model_not_allowed") {
-    Sessions.appendMsg("error", `<span>${escapeHtml(ev.message)}</span>${topUp}${_buildRawDetail(ev.raw_message)}`);
+    append(`<span>${escapeHtml(ev.message)}</span>${action}${_buildRawDetail(ev.raw_message)}`);
     return;
   }
-  Sessions.appendMsg("error", escapeHtml(ev.message) + _buildRawDetail(ev.raw_message));
+  append(escapeHtml(ev.message) + action + _buildRawDetail(ev.raw_message));
 }
 
 function _buildRawDetail(raw) {

data/lib/clacky.rb

@@ -111,6 +111,7 @@ require_relative "clacky/utils/browser_detector"
 require_relative "clacky/utils/scripts_manager"
 require_relative "clacky/utils/searcher_manager"
 require_relative "clacky/search_config"
+require_relative "clacky/deepseek_web_tools"
 require_relative "clacky/utils/model_pricing"
 require_relative "clacky/utils/gitignore_parser"
 require_relative "clacky/utils/limit_stack"
@@ -179,11 +180,12 @@ Clacky::ExtensionHookLoader.load_all
 module Clacky
   class AgentInterrupted < Exception; end  # Inherit from Exception to bypass rescue StandardError
   class AgentError < StandardError
-    attr_reader :raw_message
+    attr_reader :raw_message, :action_url
 
-    def initialize(message, raw_message: nil)
+    def initialize(message, raw_message: nil, action_url: nil)
       super(message)
       @raw_message = raw_message
+      @action_url = action_url
     end
   end
   class BadRequestError < AgentError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openclacky
 version: !ruby/object:Gem::Version
-  version: 1.5.19
+  version: 1.5.21
 platform: ruby
 authors:
 - windy
@@ -346,6 +346,7 @@ files:
 - lib/clacky/agent/chunk_index.rb
 - lib/clacky/agent/cost_tracker.rb
 - lib/clacky/agent/fake_tool_call_detector.rb
+- lib/clacky/agent/feedback.rb
 - lib/clacky/agent/goal_manager.rb
 - lib/clacky/agent/goal_state.rb
 - lib/clacky/agent/history_navigation.rb
@@ -377,6 +378,7 @@ files:
 - lib/clacky/cli.rb
 - lib/clacky/cli_guidance.rb
 - lib/clacky/client.rb
+- lib/clacky/deepseek_web_tools.rb
 - lib/clacky/default_extensions/advisor/advisors/general.md
 - lib/clacky/default_extensions/advisor/api/handler.rb
 - lib/clacky/default_extensions/advisor/ext.yml
@@ -590,6 +592,7 @@ files:
 - lib/clacky/server/git_panel.rb
 - lib/clacky/server/http_server.rb
 - lib/clacky/server/model_prices.rb
+- lib/clacky/server/pid_files.rb
 - lib/clacky/server/preview.rb
 - lib/clacky/server/project_manager.rb
 - lib/clacky/server/scheduler.rb
@@ -697,6 +700,8 @@ files:
 - lib/clacky/web/design-sample.html
 - lib/clacky/web/favicon.ico
 - lib/clacky/web/favicon.svg
+- lib/clacky/web/features/archive/store.js
+- lib/clacky/web/features/archive/view.js
 - lib/clacky/web/features/backup/store.js
 - lib/clacky/web/features/backup/view.js
 - lib/clacky/web/features/billing/store.js