openclacky 1.5.21 → 1.5.22

data/lib/clacky/web/settings.js

@@ -30,6 +30,9 @@ const Settings = (() => {
   // 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";
+  // Masked web-search keys per provider. Module-level because the provider
+  // select and save handlers outlive the initializer that first bound them.
+  let _searchKeysMasked = {};
 
   // ── Public API ──────────────────────────────────────────────────────────────
 
@@ -272,16 +275,20 @@ const Settings = (() => {
 
     card.innerHTML = `
       <div class="model-card-grid-info">
-        <div class="model-card-grid-name-row">
-          <span class="model-card-grid-name">${_esc(displayName)}</span>
-          ${isDefault ? `<span class="badge badge-default">${I18n.t("settings.models.badge.default")}</span>` : ""}
-          ${isLite ? `<span class="badge badge-lite">${I18n.t("settings.models.badge.lite")}</span>` : ""}
-          ${!isDefault ? `<button class="btn-card-grid-action btn-card-grid-action-primary" data-index="${index}" data-action="default" style="margin-left:auto">
+        <div class="model-card-grid-head">
+          <div class="model-card-grid-head-text">
+            <div class="model-card-grid-name-row">
+              <span class="model-card-grid-name">${_esc(displayName)}</span>
+              ${isDefault ? `<span class="badge badge-default">${I18n.t("settings.models.badge.default")}</span>` : ""}
+              ${isLite ? `<span class="badge badge-lite">${I18n.t("settings.models.badge.lite")}</span>` : ""}
+            </div>
+            <div class="model-card-grid-provider">${_esc(providerName)}</div>
+          </div>
+          ${!isDefault ? `<button class="btn-card-grid-action btn-card-grid-action-primary" data-index="${index}" data-action="default">
             <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 2l3.09 6.26L22 9.27l-5 4.87 1.18 6.88L12 17.77l-6.18 3.25L7 14.14 2 9.27l6.91-1.01L12 2z"/></svg>
             <span>${I18n.t("settings.models.btn.setDefault")}</span>
           </button>` : ""}
         </div>
-        <div class="model-card-grid-provider">${_esc(providerName)}</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>
@@ -320,6 +327,7 @@ const Settings = (() => {
       </div>
     `;
 
+    card.querySelector(".model-card-grid-head").prepend(ModelPicker.vendorBadge(displayName));
     container.appendChild(card);
     _bindCompactCardEvents(card, index);
   }
@@ -1788,7 +1796,10 @@ const Settings = (() => {
       select = CustomSelect.init({
         trigger: trigger,
         dropdown: dropdown,
-        onSelect: function () { _syncKeyVisibility(); }
+        onSelect: function (value) {
+          if (keyInput) keyInput.value = _searchKeysMasked[value] || "";
+          _syncKeyVisibility();
+        }
       });
     }
 
@@ -1861,8 +1872,9 @@ const Settings = (() => {
           `<div class="custom-select-option" data-value="">${I18n.t("settings.search.builtin")}</div>` +
           deepseekRow +
           rows;
+        _searchKeysMasked = data.keys_masked || {};
         if (select) select.setValue(data.provider || "");
-        keyInput.value = data.key_masked || "";
+        keyInput.value = _searchKeysMasked[data.provider] || "";
       }
     } catch (_) { /* non-critical */ }
     _syncKeyVisibility();
@@ -1896,6 +1908,7 @@ const Settings = (() => {
           });
           const data = await res.json();
           if (data.ok) {
+            _searchKeysMasked = data.keys_masked || {};
             Modal.toast(I18n.t("settings.search.saved"), "success");
           } else {
             _showStatus(data.error || I18n.t("settings.search.failed"), false);
@@ -2342,6 +2355,11 @@ const Settings = (() => {
       btn.classList.toggle("active", btn.dataset.lang === I18n.lang());
       btn.addEventListener("click", () => {
         I18n.setLang(btn.dataset.lang);
+        // applyAll only rewrites static attributes; the info bar composes its
+        // tooltips in JS, so refresh them once for the new language.
+        if (typeof Sessions !== "undefined" && Sessions._lastSession) {
+          Sessions.updateInfoBar(Sessions._lastSession);
+        }
         document.querySelectorAll("#language-section .settings-lang-btn").forEach(b =>
           b.classList.toggle("active", b.dataset.lang === I18n.lang())
         );

data/lib/clacky/web/skills.js

@@ -18,8 +18,8 @@
 // Depends on: Sessions (sendMessage), Skills (createInSession, toggleImportBar),
 //             I18n, global $ helper.
 // ─────────────────────────────────────────────────────────────────────────
-const SKILL_AC_SHOW_SYSTEM_KEY = "skill-ac-show-system";
-const SKILL_AC_MRU_KEY         = "skill-ac-mru";
+const SKILL_AC_SHOW_SYSTEM_KEY = "clacky-skill-ac-show-system";
+const SKILL_AC_MRU_KEY         = "clacky-skill-ac-mru";
 
 const SkillAC = (() => {
   let _initialized    = false;

data/lib/clacky/web/theme.js

@@ -28,6 +28,21 @@ const Theme = (() => {
     window.dispatchEvent(new CustomEvent("clacky-theme-change", { detail: { theme } }));
   }
 
+  // Per-element transitions have different durations, so a live switch would
+  // repaint regions out of step; freeze them and cross-fade the page as one.
+  function _switchTo(theme) {
+    const root = document.documentElement;
+    const swap = () => {
+      root.classList.add("theme-switching");
+      _applyAttr(theme);
+      void root.offsetWidth;
+      requestAnimationFrame(() => root.classList.remove("theme-switching"));
+    };
+    const reduceMotion = window.matchMedia && window.matchMedia("(prefers-reduced-motion: reduce)").matches;
+    if (document.startViewTransition && !reduceMotion) document.startViewTransition(swap);
+    else swap();
+  }
+
   // Update active state on all .settings-bg-theme-card buttons.
   function _syncBgCards() {
     const effective = current();
@@ -45,7 +60,7 @@ const Theme = (() => {
       const mq = window.matchMedia("(prefers-color-scheme: dark)");
       const onChange = () => {
         if (!localStorage.getItem(STORAGE_KEY)) {
-          _applyAttr(_systemTheme());
+          _switchTo(_systemTheme());
         }
       };
       if (mq.addEventListener) mq.addEventListener("change", onChange);
@@ -61,7 +76,7 @@ const Theme = (() => {
     } else {
       localStorage.setItem(STORAGE_KEY, theme);
     }
-    _applyAttr(theme);
+    _switchTo(theme);
   }
 
   // Keep applyBg as alias for backward compat (settings.js calls it)

data/lib/clacky/web/utils.js

@@ -133,6 +133,10 @@ const Tooltip = (() => {
     tip.textContent = text;
     tip.setAttribute("data-pos", pos);
     tip.style.display = "block";
+    // Measure from the left edge: leaving the previous anchor's `left` in place
+    // shrinks the available width, so a tip next to the right edge wraps early.
+    tip.style.left = "0px";
+    tip.style.top = "0px";
 
     const r = anchor.getBoundingClientRect();
     const tw = tip.offsetWidth;
@@ -168,16 +172,27 @@ const Tooltip = (() => {
     _hideTimer = setTimeout(() => { tip.style.display = "none"; }, 120);
   }
 
+  // Anchor that was clicked; stays silent until the pointer leaves it so the
+  // tip does not cover the menu or popover the click just opened.
+  let _suppressed = null;
+
   function init() {
     document.addEventListener("mouseover", (e) => {
       const anchor = e.target.closest("[data-tooltip]");
-      if (anchor) show(anchor);
+      if (anchor && anchor !== _suppressed) show(anchor);
     });
     document.addEventListener("mouseout", (e) => {
       const anchor = e.target.closest("[data-tooltip]");
       if (!anchor) return;
-      if (!anchor.contains(e.relatedTarget)) hide();
+      if (anchor.contains(e.relatedTarget)) return;
+      if (anchor === _suppressed) _suppressed = null;
+      hide();
     });
+    document.addEventListener("pointerdown", (e) => {
+      const anchor = e.target.closest && e.target.closest("[data-tooltip]");
+      _suppressed = anchor || null;
+      hide();
+    }, true);
   }
 
   return { init, show, hide };

data/lib/clacky/web/weixin-qr.html

@@ -1,8 +1,9 @@
 <!DOCTYPE html>
-<html lang="zh">
+<html lang="zh" translate="no">
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="google" content="notranslate">
   <title>微信扫码登录</title>
   <style>
     * { box-sizing: border-box; margin: 0; padding: 0; }

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

@@ -393,7 +393,6 @@ function _dispatchEvent(ev) {
         Skills.load();
         // Clear progress state for this session (even if not currently active)
         Sessions.clearProgress(sid);
-        if (patch.status === "idle") Sessions.markDone(sid);
         Sessions.renderList();
       }
       break;
@@ -405,6 +404,13 @@ function _dispatchEvent(ev) {
     // module decides whether the user is looking at that session.
     case "task_finished":
       if (typeof Notify !== "undefined") Notify.onTaskFinished(ev.session_id, ev.awaiting_feedback);
+      // Only a real finish lights the done dot; idle snapshots (moves, renames, compression) must not.
+      if (!ev.awaiting_feedback) {
+        Sessions.markDone(ev.session_id);
+        Sessions.renderList();
+        Projects.renderSection();
+      }
+      if (ev.complete) Sessions.markDoneSummary(ev.session_id, ev.complete);
       break;
 
     case "session_renamed": {
@@ -633,34 +639,7 @@ function _dispatchEvent(ev) {
       Sessions.clearProgress();
       Sessions.collapseToolGroup();
       _closeAllPhases("incomplete"); // safety net: missed phase_end
-      {
-        const costSource = ev.cost_source;
-        const symbol = typeof Billing !== "undefined" ? Billing.getCurrencySymbol() : "$";
-        const rawCost = ev.cost || 0;
-        const cost = typeof Billing !== "undefined" ? Billing.convertCost(rawCost) : rawCost;
-        const costDisplay = (!costSource || costSource === "estimated")
-          ? "N/A"
-          : `${symbol}${cost.toFixed(4)}`;
-        let mainLine = I18n.t("chat.done", { n: ev.iterations, cost: costDisplay });
-        if (typeof ev.duration === "number" && ev.duration > 0) {
-          mainLine += I18n.t("chat.done.duration", { duration: ev.duration.toFixed(1) });
-        }
-        let cacheLine = null;
-        const cs = ev.cache_stats;
-        const total = cs && (cs.total_requests || cs["total_requests"]);
-        const hits = cs && (cs.cache_hit_requests || cs["cache_hit_requests"]);
-        const cachedTokens = cs && (cs.cache_read_input_tokens || cs["cache_read_input_tokens"]);
-        if (total && total > 0 && cachedTokens && cachedTokens > 0) {
-          const rate = ((hits / total) * 100).toFixed(1);
-          const tokensFmt = cachedTokens >= 1000
-            ? `${(cachedTokens / 1000).toFixed(1)}k`
-            : `${cachedTokens}`;
-          cacheLine = I18n.t("chat.done.cache", {
-            rate, hits, total: total, tokens: tokensFmt
-          });
-        }
-        Sessions.appendInfo(`✓ ${mainLine}`, cacheLine);
-      }
+      Sessions.appendCompleteSummary(ev);
       if (typeof Share !== "undefined") Share.maybePromptOnComplete();
       break;
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openclacky
 version: !ruby/object:Gem::Version
-  version: 1.5.21
+  version: 1.5.22
 platform: ruby
 authors:
 - windy
@@ -688,6 +688,7 @@ files:
 - lib/clacky/web/components/composer.js
 - lib/clacky/web/components/custom-select.js
 - lib/clacky/web/components/datepicker.js
+- lib/clacky/web/components/image-zoom.js
 - lib/clacky/web/components/mentions.js
 - lib/clacky/web/components/model-picker.js
 - lib/clacky/web/components/notify.js