openclacky 1.2.10 → 1.2.12

data/lib/clacky/server/session_registry.rb

@@ -99,16 +99,15 @@ module Clacky
         @sessions.key?(session_id)
       end
 
-      # Restore all sessions from disk (up to n per source type) into the registry.
-      # Used at startup. Already-registered sessions are skipped.
-      def restore_from_disk(n: 5)
+      # Restore at most n sessions per source as a hot cache at startup.
+      # Everything else is loaded on demand via ensure(id).
+      def restore_from_disk(n: 2)
         return unless @session_manager && @session_restorer
 
         all = @session_manager.all_sessions
           .sort_by { |s| s[:created_at] || "" }
           .reverse
 
-        # Take up to n per source type
         counts = Hash.new(0)
         all.each do |session_data|
           src = (session_data[:source] || "manual").to_s
@@ -291,6 +290,7 @@ module Clacky
           latest_latency: ls&.dig(:latest_latency),
           reasoning_effort: ls&.dig(:reasoning_effort) || s.dig(:config, :reasoning_effort),
           pinned:        s[:pinned] || false,
+          channel_info:  s[:channel_info],
         }
       end
 
@@ -375,8 +375,6 @@ module Clacky
         count_by_status(:running) >= max_running_agents
       end
 
-      # Evict oldest idle agents beyond MAX_IDLE_AGENTS.
-      # Persists session data to disk before releasing the agent from memory.
       def evict_excess_idle!
         to_evict = []
 

data/lib/clacky/tools/trash_manager.rb

@@ -514,7 +514,7 @@ module Clacky
           end
 
           session.merge(file_size: total)
-        end.sort_by { |s| s[:created_at] || "" }.reverse
+        end.sort_by { |s| s[:deleted_at] || s[:created_at] || "" }.reverse
       end
       private_class_method :_trash_sessions
     end

data/lib/clacky/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Clacky
-  VERSION = "1.2.10"
+  VERSION = "1.2.12"
 end

data/lib/clacky/web/app.css

@@ -256,8 +256,7 @@ body {
   letter-spacing: 0;
 }
 .header-logo-img {
-  height: 1.375rem;
-  max-width: 6.875rem;
+  height: 2.5rem;
   object-fit: contain;
   display: block;
   flex-shrink: 0;
@@ -2172,7 +2171,26 @@ body {
   gap: 0.375rem;
 }
 .tool-item-name { color: var(--color-warning); font-weight: 600; }
-.tool-item-arg  { color: var(--color-text-secondary); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; max-width: 25rem; }
+.tool-item-arg  { color: var(--color-text-secondary); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; min-width: 0; flex: 1 1 auto; }
+.tool-item-header.tool-item-expandable { cursor: pointer; user-select: none; }
+.tool-item-header.tool-item-expandable:hover .tool-item-name,
+.tool-item-header.tool-item-expandable:hover .tool-item-arg { color: var(--color-text-primary); }
+.tool-item.expanded .tool-item-arg { white-space: normal; overflow: visible; text-overflow: clip; word-break: break-all; }
+.tool-item-details {
+  margin: 0.25rem 0 2px 0;
+  padding: 0.5rem;
+  background: var(--color-bg-secondary);
+  border: 1px solid var(--color-border-secondary);
+  border-radius: 4px;
+  font-size: 0.6875rem;
+  font-family: monospace;
+  color: var(--color-text-primary);
+  white-space: pre-wrap;
+  word-break: break-all;
+  line-height: 1.5;
+  max-height: 18rem;
+  overflow-y: auto;
+}
 .tool-item-status { margin-left: auto; font-size: 0.6875rem; flex-shrink: 0; }
 .tool-item-status.ok     { color: var(--color-success); }
 .tool-item-status.err    { color: var(--color-error); }

data/lib/clacky/web/brand.js

@@ -329,13 +329,16 @@ const Brand = (() => {
           };
           img.src = info.logo_url;
         }
-      } else {
-        // No logo configured — hide logo image and remove has-logo class
+      } else if (info.product_name) {
+        // Brand configured but no logo — hide the image, brand name text is enough
         if (logoImg) {
           logoImg.style.display = "none";
           logoImg.src           = "";
         }
         if (brandWrap) brandWrap.classList.remove("has-logo");
+      } else {
+        // No brand at all — show default OpenClacky logo
+        _applyDefaultLogo();
       }
 
       // Always show brand name text; hide it only when no brand name is set
@@ -355,6 +358,18 @@ const Brand = (() => {
     });
   }
 
+  // Apply the default OpenClacky logo based on current theme.
+  function _applyDefaultLogo() {
+    const logoImg   = document.getElementById("header-logo-img");
+    const brandWrap = document.getElementById("header-brand");
+    if (!logoImg) return;
+
+    logoImg.src           = "/logo_nav_dark.png";
+    logoImg.alt           = "OpenClacky";
+    logoImg.style.display = "";
+    if (brandWrap) brandWrap.classList.add("has-logo");
+  }
+
   // Replace the browser tab favicon with the given URL.
   // Works for both image URLs and SVG data URIs.
   function _applyFavicon(url) {
@@ -510,5 +525,10 @@ const Brand = (() => {
     }
   }
 
+  // Both themes use the same transparent A版 logo via CSS, no swap needed.
+  window.addEventListener("clacky-theme-change", e => {
+    // No-op
+  });
+
   return { check, refresh, applyBrandName: _applyBrandName, applyHeaderLogo: _applyHeaderLogo, applyOwnerBadge: _applyOwnerBadge, applyGetSerialLink: _applyGetSerialLink, clearBrandCache: _clearBrandCache, goToLicenseInput: _goToLicenseInput, get userLicensed() { return _userLicensed; }, get branded() { return _branded; } };
 })();

data/lib/clacky/web/i18n.js

@@ -99,6 +99,8 @@ const I18n = (() => {
       "workspace.downloadFailed": "Download failed",
       "sib.model.tooltip":       "Click to switch model",
       "sib.model.tooltip.busy":  "Model switching is disabled while the agent is responding",
+      "sib.variant.header":      "Quick switch",
+      "sib.variant.default":     "default",
       "sib.signal.tooltip":      "Recent LLM latency",
       "sib.reasoning.tooltip":   "Click to change reasoning effort",
       "sib.reasoning.label":     "Reasoning",
@@ -831,6 +833,8 @@ const I18n = (() => {
       "workspace.downloadFailed": "下载失败",
       "sib.model.tooltip":       "点击切换模型",
       "sib.model.tooltip.busy":  "Agent 回复中，暂时无法切换模型",
+      "sib.variant.header":      "快速切换",
+      "sib.variant.default":     "默认",
       "sib.signal.tooltip":      "最近一次 LLM 响应延迟",
       "sib.reasoning.tooltip":   "点击调整思考等级",
       "sib.reasoning.label":     "思考",

data/lib/clacky/web/index.html

@@ -4,7 +4,8 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title id="page-title">{{BRAND_NAME}}</title>
-  <link rel="icon" type="image/svg+xml" href="/icon.svg">
+  <link rel="icon" href="/favicon.ico">
+  <link rel="apple-touch-icon" href="/apple-touch-icon-180.png">
   <link rel="stylesheet" href="/vendor/katex/katex.min.css">
   <link rel="stylesheet" href="/vendor/hljs/hljs-theme.css">
   <link rel="stylesheet" href="/app.css">
@@ -30,8 +31,8 @@
           <path d="M9 3v18"/>
         </svg>
       </button>
-      <div id="header-brand" style="cursor:pointer" onclick="Router.navigate('chat')">
-        <img class="header-logo-img" id="header-logo-img" src="" alt="" style="display:none">
+      <div id="header-brand" class="has-logo" style="cursor:pointer" onclick="Router.navigate('chat')">
+        <img class="header-logo-img" id="header-logo-img" src="/logo_nav_dark.png" alt="OpenClacky">
         <span class="header-logo-divider"></span>
         <span class="header-logo" id="header-logo">{{BRAND_NAME}}</span>
         <!-- Owner badge: visible only for creator-tier licenses (user_licensed=true).

data/lib/clacky/web/model-tester.js

@@ -23,7 +23,14 @@ window.ModelTester = (function () {
       return { ok: false, message: e.message };
     }
 
-    if (!data.ok) return { ok: false, message: data.message || "" };
+    if (!data.ok) {
+      const msg = data.message || "";
+      const code = data.error_code || "";
+      if (code === "insufficient_credit") {
+        return { ok: false, message: I18n.t("error.insufficient_credit"), error_code: code };
+      }
+      return { ok: false, message: msg, error_code: code };
+    }
 
     if (data.effective_base_url && data.effective_base_url !== base_url) {
       return { ok: true, base_url: data.effective_base_url, message: data.message || "", rewrote: true };

data/lib/clacky/web/sessions.js

@@ -27,6 +27,16 @@ const Sessions = (() => {
   let   _searchOpen        = false;   // is the search panel visible?
   let   _cronView          = false;  // are we in the cron sub-view?
   let   _cronCount         = 0;      // total cron sessions from server
+  // ── 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
+  // all cron sessions can be loaded even when they're sparse across the mixed
+  // outer pages. Cron rows fetched here are pushed into the shared `_sessions`
+  // array (with dedup), so WS updates / patch / remove keep working unchanged;
+  // we only track a separate cursor + hasMore/loading flags for the sub-view.
+  let   _cronBefore        = null;   // cursor: oldest cron created_at loaded into the sub-view
+  let   _cronHasMore       = false;  // are there older cron sessions to load?
+  let   _cronLoadingMore   = false;
   let   _pendingRunTaskId  = null;  // session_id waiting to send "run_task" after subscribe
   let   _pendingMessage    = null;  // { session_id, content } — slash command to send after subscribe
   // Buffer for tool_stdout lines that arrive before history has finished rendering.
@@ -933,25 +943,57 @@ const Sessions = (() => {
     const item = document.createElement("div");
     item.className = "tool-item";
 
-    // Use backend-provided summary when available, fall back to client-side summarise
+    const argsJson = _formatToolArgs(args);
+    if (argsJson) item.dataset.argsJson = argsJson;
+    if (name) item.dataset.toolName = String(name);
+
     const argSummary = summary || _summariseArgs(name, args);
 
-    // When a structured summary is available, show it as the primary label (no redundant tool name).
-    // Otherwise show the raw tool name + arg summary as before.
     const label = summary
       ? `<span class="tool-item-name">⚙ ${escapeHtml(summary)}</span>`
       : `<span class="tool-item-name">⚙ ${escapeHtml(name)}</span>` +
         (argSummary ? `<span class="tool-item-arg">${escapeHtml(argSummary)}</span>` : "");
 
+    const expandable = !!argsJson;
+    const headerCls = expandable ? "tool-item-header tool-item-expandable" : "tool-item-header";
+
     item.innerHTML =
-      `<div class="tool-item-header">` +
+      `<div class="${headerCls}">` +
         label +
         `<span class="tool-item-status running">…</span>` +
       `</div>` +
+      `<div class="tool-item-details" style="display:none"></div>` +
       `<pre class="tool-item-stdout" style="display:none"></pre>`;
+    _ensureCopyDelegation();
     return item;
   }
 
+  function _toggleToolItemDetails(item) {
+    if (!item) return;
+    const details = item.querySelector(".tool-item-details");
+    if (!details) return;
+    const isHidden = details.style.display === "none";
+    if (isHidden) {
+      if (!details.dataset.filled) {
+        const json = item.dataset.argsJson || "";
+        details.textContent = json;
+        details.dataset.filled = "1";
+      }
+      details.style.display = "";
+      item.classList.add("expanded");
+    } else {
+      details.style.display = "none";
+      item.classList.remove("expanded");
+    }
+  }
+
+  // Pretty-print tool args as a JSON string, or empty string if unavailable.
+  function _formatToolArgs(args) {
+    if (args == null) return "";
+    if (typeof args === "string") return args;
+    try { return JSON.stringify(args, null, 2); } catch (_) { return ""; }
+  }
+
   // Convert ANSI escape codes to HTML spans with color classes.
   // Handles the common SGR codes used by shell scripts (colors + reset).
   function _ansiToHtml(text) {
@@ -1503,6 +1545,14 @@ const Sessions = (() => {
     const messages = $("messages");
     if (!messages) return;
     messages.addEventListener("click", (e) => {
+      // ── Tool item: click header to expand/collapse args details ──
+      const toolHeader = e.target.closest(".tool-item-header.tool-item-expandable");
+      if (toolHeader) {
+        e.preventDefault();
+        e.stopPropagation();
+        _toggleToolItemDetails(toolHeader.closest(".tool-item"));
+        return;
+      }
       // ── Code block copy button ──
       const codeBtn = e.target.closest(".code-block-copy");
       if (codeBtn) {
@@ -1584,12 +1634,13 @@ const Sessions = (() => {
   }
 
   // Build the unified load-more button.
-  function _makeLoadMoreBtn() {
+  function _makeLoadMoreBtn(cron = false) {
     const btn = document.createElement("button");
     btn.className   = "btn-load-more-sessions";
-    btn.disabled    = _loadingMore;
-    btn.textContent = _loadingMore ? I18n.t("sessions.loadingMore") : I18n.t("sessions.loadMore");
-    btn.onclick = () => Sessions.loadMore();
+    const loading   = cron ? _cronLoadingMore : _loadingMore;
+    btn.disabled    = loading;
+    btn.textContent = loading ? I18n.t("sessions.loadingMore") : I18n.t("sessions.loadMore");
+    btn.onclick = () => cron ? Sessions.loadMoreCron() : Sessions.loadMore();
     return btn;
   }
 
@@ -1679,13 +1730,17 @@ const Sessions = (() => {
   }
 
   // ── Cron group entry (renders the folded "Scheduled Tasks" entry) ─────
-  function _renderCronGroupItem(container, count) {
+  // `hasRunning` mirrors a normal session's status dot: show the green
+  // (running) dot only when any folded cron session is currently running,
+  // and render no dot at all when the group is idle.
+  function _renderCronGroupItem(container, count, hasRunning = false) {
     const el = document.createElement("div");
     el.className = "session-item cron-group-item";
+    const dotHtml = hasRunning ? `<span class="session-dot dot-running"></span>` : "";
     el.innerHTML = `
       <div class="session-body">
         <div class="session-name">
-          <span class="session-dot dot-idle" style="display:inline-block;opacity:0.6"></span>
+          ${dotHtml}
           <span class="session-name__text">📋 ${I18n.t("sessions.cronGroup")} (${count})</span>
         </div>
         <div class="session-meta">${I18n.t("sessions.cronGroupMeta", { n: count })}</div>
@@ -1694,6 +1749,10 @@ const Sessions = (() => {
     el.onclick = () => {
       _cronView = true;
       Sessions.renderList();
+      // Method A: always (re-)load the freshest first page of cron sessions
+      // on entering the sub-view. Independent cursor — never touches the
+      // outer list's pagination.
+      Sessions.loadMoreCron({ reset: true });
     };
     container.appendChild(el);
   }
@@ -1881,6 +1940,53 @@ const Sessions = (() => {
       }
     },
 
+    /** Cron sub-view pagination — independent cursor, does NOT touch the outer
+     *  list's `_hasMore` / `loadMore` cursor. Fetches the next page of cron
+     *  sessions (type=cron) and pushes them into the shared `_sessions` array
+     *  (deduped), so WS patch/remove/add keep working unchanged. Only the
+     *  sub-view's own cursor + flags advance. Pass `reset:true` to start over
+     *  from the newest cron page (used on entering the sub-view). */
+    async loadMoreCron({ reset = false } = {}) {
+      if (_cronLoadingMore) return;
+      if (!reset && !_cronHasMore) return;
+      _cronLoadingMore = true;
+      if (reset) { _cronBefore = null; _cronHasMore = false; }
+
+      const sidebarList = document.getElementById("sidebar-list");
+      const savedScrollTop = sidebarList ? sidebarList.scrollTop : 0;
+      Sessions.renderList({ skipScrollToActive: true });
+
+      try {
+        const params = new URLSearchParams({ limit: "20", type: "cron" });
+        if (_cronBefore) params.set("before", _cronBefore);
+
+        const res  = await fetch(`/api/sessions?${params}`);
+        if (!res.ok) return;
+        const data = await res.json();
+
+        const rows = data.sessions || [];
+        rows.forEach(s => {
+          if (!_sessions.find(x => x.id === s.id)) _sessions.push(s);
+        });
+        // Advance cursor to the oldest cron created_at in THIS batch (exclude
+        // pinned — backend returns all pinned on the first page, bypassing
+        // pagination, so their created_at must not drag the cursor back).
+        const oldest = rows.reduce((min, s) => {
+          if (s.pinned || !s.created_at) return min;
+          return (!min || s.created_at < min) ? s.created_at : min;
+        }, null);
+        if (oldest) _cronBefore = oldest;
+        _cronHasMore = !!data.has_more;
+        if (data.cron_count != null) _cronCount = data.cron_count;
+      } catch (e) {
+        console.error("loadMoreCron error:", e);
+      } finally {
+        _cronLoadingMore = false;
+        Sessions.renderList({ skipScrollToActive: true });
+        if (sidebarList) sidebarList.scrollTop = savedScrollTop;
+      }
+    },
+
     /** Commit current filter values and re-fetch from server. Called by Enter / Go button. */
     async commitSearch() {
       // Read live input values into _filter
@@ -2097,7 +2203,6 @@ const Sessions = (() => {
       const hasActiveFilter = !!(_filter.q || _filter.type || _filter.date);
       const isCronView      = _cronView && !hasActiveFilter;
       const cronSessions    = visible.filter(s => s.source === "cron");
-      const nonCronSessions = visible.filter(s => s.source !== "cron");
 
       // Update chat-section header based on view mode
       _updateChatHeader(isCronView);
@@ -2109,27 +2214,46 @@ const Sessions = (() => {
         // Filter active: show all matching results flat, no group entry
         visible.forEach(s => _renderSessionItem(list, s));
       } else if (isCronView) {
-        // Cron sub-view: show only cron sessions.
-        // If none are loaded yet, auto-load more pages until we find them.
-        if (cronSessions.length === 0) {
-          if (_hasMore && !_loadingMore) {
-            list.innerHTML = `<div class="session-empty">${I18n.t("sessions.cronLoading")}</div>`;
-            Sessions.loadMore();  // async — will call renderList() again when done
-            return;               // skip empty-state / load-more button for now
-          }
-          if (_loadingMore) {
-            // A loadMore() call is already in flight (its own renderList call
-            // reached us).  Keep the loading indicator so the user never sees
-            // the "no sessions" empty state during the gap.
-            list.innerHTML = `<div class="session-empty">${I18n.t("sessions.cronLoading")}</div>`;
-            return;
-          }
+        // Cron sub-view: show only cron sessions, paginated independently via
+        // loadMoreCron() (the first page is fetched on entering the view).
+        // We never call the outer loadMore() here, so the outer list's cursor
+        // is left untouched. While the first page is in flight and nothing is
+        // loaded yet, show a loading placeholder instead of the empty state.
+        if (cronSessions.length === 0 && _cronLoadingMore) {
+          list.innerHTML = `<div class="session-empty">${I18n.t("sessions.cronLoading")}</div>`;
+          return;
         }
         cronSessions.forEach(s => _renderSessionItem(list, s));
       } else if (_cronCount > 0) {
-        // Normal list view: group entry (uses total count, not just loaded) + non-cron sessions
-        _renderCronGroupItem(list, _cronCount);
-        nonCronSessions.forEach(s => _renderSessionItem(list, s));
+        // 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");
+        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) {
+              _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).
       } else {
         // Normal list view, no cron sessions
         visible.forEach(s => _renderSessionItem(list, s));
@@ -2140,7 +2264,11 @@ const Sessions = (() => {
         list.innerHTML = `<div class="session-empty">${I18n.t("sessions.empty")}</div>`;
       }
 
-      if (_hasMore) list.appendChild(_makeLoadMoreBtn());
+      if (isCronView) {
+        if (_cronHasMore) list.appendChild(_makeLoadMoreBtn(true));
+      } else if (_hasMore) {
+        list.appendChild(_makeLoadMoreBtn());
+      }
 
       // Scroll active session into view so the sidebar always shows the current session.
       if (!skipScrollToActive) {
@@ -3452,16 +3580,16 @@ const Sessions = (() => {
 
         const nameLine = document.createElement("span");
         nameLine.className = "sib-model-name-main";
-        nameLine.textContent = m.model;
+        // When a non-default quick-switch model is active for the current row,
+        // show only that model's name (avoid the long "main → quick-switch"
+        // string that gets truncated).
+        const hasActiveOverride =
+          m.id === currentModelId &&
+          subInfo.current &&
+          subInfo.current !== subInfo.cardModel;
+        nameLine.textContent = hasActiveOverride ? subInfo.current : m.model;
         left.appendChild(nameLine);
 
-        if (m.id === currentModelId && subInfo.current && subInfo.current !== subInfo.cardModel) {
-          const overrideLine = document.createElement("span");
-          overrideLine.className = "sib-model-name-override";
-          overrideLine.textContent = `→ ${subInfo.current}`;
-          left.appendChild(overrideLine);
-        }
-
         if (_nameCounts[m.model] > 1) {
           left.classList.add("has-sub");
           const host = (() => {
@@ -3503,7 +3631,7 @@ const Sessions = (() => {
           const toggleBtn = document.createElement("button");
           toggleBtn.type = "button";
           toggleBtn.className = "sib-submodel-toggle";
-          toggleBtn.title = "Switch sub-model";
+          toggleBtn.title = I18n.t("sib.variant.header");
           toggleBtn.setAttribute("aria-expanded", "false");
           toggleBtn.innerHTML =
             '<svg viewBox="0 0 16 16" width="11" height="11" aria-hidden="true">' +
@@ -3766,7 +3894,7 @@ const Sessions = (() => {
 
     const header = document.createElement("div");
     header.className = "sib-submodel-panel-header";
-    header.textContent = "Sub-model";
+    header.textContent = I18n.t("sib.variant.header");
     panel.appendChild(header);
 
     const cardDefault = subInfo.cardModel;
@@ -3788,7 +3916,7 @@ const Sessions = (() => {
       if (name === cardDefault) {
         const tag = document.createElement("span");
         tag.className = "sib-submodel-default-tag";
-        tag.textContent = "default";
+        tag.textContent = I18n.t("sib.variant.default");
         row.appendChild(tag);
       }
 

data/lib/clacky/web/theme.js

@@ -21,6 +21,7 @@ const Theme = (() => {
   function _applyAttr(theme) {
     document.documentElement.setAttribute(ATTR_NAME, theme);
     _updateToggleIcon(theme);
+    window.dispatchEvent(new CustomEvent("clacky-theme-change", { detail: { theme } }));
   }
 
   function _updateToggleIcon(theme) {

data/scripts/build/lib/gem.sh

@@ -59,7 +59,12 @@ restore_gemrc() {
 setup_gem_home() {
     local gem_dir
     gem_dir=$(gem environment gemdir 2>/dev/null || true)
-    [ -w "$gem_dir" ] && return 0
+
+    # gemdir writable → no workaround needed, clean up old RC entries
+    if [ -w "$gem_dir" ]; then
+        restore_gem_home
+        return 0
+    fi
 
     local ruby_api
     ruby_api=$(ruby -e 'puts RbConfig::CONFIG["ruby_version"]' 2>/dev/null)
@@ -68,7 +73,9 @@ setup_gem_home() {
     export PATH="$HOME/.gem/ruby/${ruby_api}/bin:$PATH"
     print_info "System Ruby detected — gems will install to ~/.gem/ruby/${ruby_api}"
 
-    if [ -n "$SHELL_RC" ] && ! grep -q "GEM_HOME" "$SHELL_RC" 2>/dev/null; then
+    # Clean old RC entries (could be from a different Ruby version), then write new ones
+    restore_gem_home
+    if [ -n "$SHELL_RC" ]; then
         {
             echo ""
             echo "# Ruby user gem dir (added by openclacky installer)"

data/scripts/build/src/install_full.sh.cc

@@ -153,6 +153,8 @@ install_via_gem() {
     local ver; ver=$(ruby -e 'puts RUBY_VERSION' 2>/dev/null)
     version_ge "$ver" "3.1.0" || { print_error "Ruby $ver too old (>= 3.1.0 required)"; return 1; }
 
+    setup_gem_home
+
     print_info "Installing ${DISPLAY_NAME}..."
     if gem install openclacky --no-document; then
         print_success "${DISPLAY_NAME} installed!"

data/scripts/build/src/uninstall.sh.cc

@@ -21,7 +21,7 @@ load_brand() {
     [ -f "$brand_file" ] || return 0
     BRAND_NAME=$(awk -F': ' '/^product_name:/{gsub(/^"|"$/, "", $2); gsub(/^ +| +$/, "", $2); print $2}' "$brand_file") || true
     BRAND_COMMAND=$(awk -F': ' '/^package_name:/{gsub(/^"|"$/, "", $2); gsub(/^ +| +$/, "", $2); print $2}' "$brand_file") || true
-    [ -n "$BRAND_NAME" ] && DISPLAY_NAME="$BRAND_NAME"
+    if [ -n "$BRAND_NAME" ]; then DISPLAY_NAME="$BRAND_NAME"; fi
 }
 
 check_installation() {

data/scripts/install.ps1

@@ -10,6 +10,7 @@
 #   Parameters:
 #     -BrandName    Display name shown in prompts    (default: OpenClacky)
 #     -CommandName  CLI command name after install   (default: openclacky)
+#     -Region       CDN region: china (default) or global  (use global for non-China networks)
 #
 # WSL1 is preferred (shares Windows network stack — no mirrored networking needed).
 # If WSL1 import fails, the script falls back to WSL2 with mirrored networking.
@@ -22,7 +23,9 @@
 param(
     [switch]$Local,
     [string]$BrandName   = "",
-    [string]$CommandName = ""
+    [string]$CommandName = "",
+    [ValidateSet("china", "global")]
+    [string]$Region = "china"
 )
 
 Set-StrictMode -Version Latest
@@ -32,11 +35,19 @@ $env:WSL_UTF8 = "1"
 $global:DisplayName = if ($BrandName)   { $BrandName }   else { "OpenClacky" }
 $global:DisplayCmd  = if ($CommandName) { $CommandName } else { "openclacky" }
 
-$CLACKY_CDN_BASE_URL   = "https://oss.1024code.com"
-$CLACKY_CDN_PRIMARY_HOST = "oss.1024code.com"
+Write-Host "==> Region: $Region"
+
+$CLACKY_CDN_BASE_URL   = if ($Region -eq "global") { "https://sg.oss.1024code.com" } else { "https://oss.1024code.com" }
+$CLACKY_INSTALL_SCRIPT_BASE_URL = if ($Region -eq "global") { "https://raw.githubusercontent.com" } else { "https://oss.1024code.com" }
+$CLACKY_CDN_PRIMARY_HOST = if ($Region -eq "global") { "sg.oss.1024code.com" } else { "oss.1024code.com" }
+
+Write-Host "==> CDN_BASE_URL: $CLACKY_CDN_BASE_URL"
+Write-Host "==> INSTALL_SCRIPT_BASE_URL: $CLACKY_INSTALL_SCRIPT_BASE_URL"
+Write-Host "==> CDN_PRIMARY_HOST: $CLACKY_CDN_PRIMARY_HOST"
+
 $CLACKY_CDN_BACKUP_HOST  = "clackyai-1258723534.cos.ap-guangzhou.myqcloud.com"
-$INSTALL_PS1_COMMAND   = "powershell -c `"irm $CLACKY_CDN_BASE_URL/clacky-ai/openclacky/main/scripts/install.ps1 | iex`""
-$INSTALL_SCRIPT_URL    = "$CLACKY_CDN_BASE_URL/clacky-ai/openclacky/main/scripts/install.sh"
+$INSTALL_PS1_COMMAND   = "powershell -c `"irm $CLACKY_INSTALL_SCRIPT_BASE_URL/clacky-ai/openclacky/main/scripts/install.ps1 | iex`""
+$INSTALL_SCRIPT_URL    = "$CLACKY_INSTALL_SCRIPT_BASE_URL/clacky-ai/openclacky/main/scripts/install.sh"
 $UBUNTU_WSL_AMD64_URL        = "$CLACKY_CDN_BASE_URL/ubuntu-jammy-wsl-amd64-ubuntu22.04lts.rootfs.tar.gz"
 $UBUNTU_WSL_AMD64_SHA256_URL = "$CLACKY_CDN_BASE_URL/ubuntu-jammy-wsl-amd64-ubuntu22.04lts.rootfs.tar.gz.sha256"
 $UBUNTU_WSL_ARM64_URL        = "$CLACKY_CDN_BASE_URL/ubuntu-jammy-wsl-arm64-ubuntu22.04lts.rootfs.tar.gz"
@@ -303,6 +314,9 @@ function Run-InstallInWsl {
         wsl.exe -d Ubuntu -u root -- bash -c "cd ~ && curl -fsSL $INSTALL_SCRIPT_URL | bash -s -- --brand-name=$BrandName --command=$CommandName"
     }
 
+    if ($LASTEXITCODE -eq 2) {
+        exit 2
+    }
     if ($LASTEXITCODE -ne 0) {
         Write-Fail "Installation failed inside WSL (exit $LASTEXITCODE)."
         Write-Fail "You can retry manually:"