openclacky 1.1.6 → 1.2.0

data/lib/clacky/web/sidebar.js

@@ -24,8 +24,10 @@ const Sidebar = (() => {
     document.getElementById("tasks-sidebar-item").addEventListener("click", () => Router.navigate("tasks"));
     document.getElementById("skills-sidebar-item").addEventListener("click", () => Router.navigate("skills"));
     document.getElementById("channels-sidebar-item").addEventListener("click", () => Router.navigate("channels"));
+    document.getElementById("mcp-sidebar-item").addEventListener("click", () => Router.navigate("mcp"));
     document.getElementById("trash-sidebar-item").addEventListener("click", () => Router.navigate("trash"));
     document.getElementById("profile-sidebar-item").addEventListener("click", () => Router.navigate("profile"));
+    document.getElementById("billing-sidebar-item").addEventListener("click", () => Router.navigate("billing"));
 
     // memories-sidebar-item is retained as a hidden legacy placeholder — no click handler.
 

data/lib/clacky/web/trash.js

@@ -1,20 +1,23 @@
-// trash.js — Recently Deleted panel
+// trash.js — File Recall & Session Recycle Bin
 //
-// Top-level sidebar panel that lists files moved to trash by the agent
-// across every project-scoped trash dir under ~/.clacky/trash/.
+// Two-tab panel under the "File Recall" sidebar item:
+//   Tab 1 (文件回收 / Agent Files): AI-deleted files from all projects
+//   Tab 2 (会话回收 / Sessions):     soft-deleted sessions that can be restored
 //
-// Each card shows the original path, project, size and deleted-at,
-// plus Restore / Delete buttons. Bulk actions at the top:
-// refresh, empty files older than 7 days, empty everything.
+// Each tab has its own toolbar actions (refresh, empty by age, empty all).
+// The "Clean orphans" button is file-trash-only and hidden on the session tab.
 //
 // Load order: after app.js modules (I18n, Modal), before app.js boot.
 
 const Trash = (() => {
   // ── Private state ────────────────────────────────────────────────────
-  let _files      = [];
-  let _totals     = { count: 0, size: 0 };
-  let _loading    = false;
-  let _wired      = false;
+  let _files       = [];
+  let _totals      = { count: 0, size: 0 };
+  let _sessions    = [];
+  let _sessionTotals = { count: 0, size: 0 };
+  let _activeTab   = null;  // null = no tab shown yet; set on first _switchTab
+  let _loading     = false;
+  let _wired       = false;
 
   // ── Helpers ──────────────────────────────────────────────────────────
 
@@ -47,19 +50,54 @@ const Trash = (() => {
     const mins  = Math.floor(ms / 60000);
     const hours = Math.floor(ms / 3600000);
     const days  = Math.floor(ms / 86400000);
-    const zh    = I18n.lang() === "zh";
-    if (mins < 1)   return zh ? "刚刚"        : "just now";
-    if (mins < 60)  return zh ? `${mins} 分钟前`  : `${mins}m ago`;
-    if (hours < 24) return zh ? `${hours} 小时前` : `${hours}h ago`;
-    if (days < 7)   return zh ? `${days} 天前`    : `${days}d ago`;
+    if (mins < 1)   return I18n.t("time.justNow");
+    if (mins < 60)  return I18n.t("time.minsAgo",  { n: mins });
+    if (hours < 24) return I18n.t("time.hoursAgo", { n: hours });
+    if (days < 7)   return I18n.t("time.daysAgo",  { n: days });
     return d.toLocaleDateString();
   }
 
+  // ── Tab switching ────────────────────────────────────────────────────
+
+  function _switchTab(tab) {
+    if (_activeTab === tab) return;
+    _activeTab = tab;
+
+    // Update tab button active states
+    document.querySelectorAll(".trash-tab").forEach(btn => {
+      btn.classList.toggle("active", btn.dataset.tab === tab);
+    });
+
+    // Show/hide tab content panels
+    const filePane    = $("trash-tab-file");
+    const sessionPane = $("trash-tab-session");
+    if (filePane)    filePane.style.display    = tab === "file-trash" ? "" : "none";
+    if (sessionPane) sessionPane.style.display = tab === "session-trash" ? "" : "none";
+
+    // Show/hide "Clean orphans" button — only relevant for file trash
+    const btnOrphans = $("btn-trash-empty-orphans");
+    if (btnOrphans) btnOrphans.style.display = tab === "file-trash" ? "" : "none";
+
+    // Reload the active tab's data
+    _load();
+  }
+
   // ── Data loading ─────────────────────────────────────────────────────
 
   async function _load() {
     if (_loading) return;
     _loading = true;
+
+    if (_activeTab === "file-trash") {
+      await _loadFiles();
+    } else {
+      await _loadSessions();
+    }
+
+    _loading = false;
+  }
+
+  async function _loadFiles() {
     const list = $("trash-list");
     if (list) list.innerHTML =
       `<div class="creator-loading">${_t("trash.loading")}</div>`;
@@ -69,17 +107,35 @@ const Trash = (() => {
       if (!res.ok) throw new Error(data.error || "Load failed");
       _files  = data.files  || [];
       _totals = { count: data.total_count || 0, size: data.total_size || 0 };
-      _render();
+      _renderFiles();
     } catch (e) {
-      console.error("[Trash] load failed", e);
+      console.error("[Trash] load files failed", e);
+      if (list) list.innerHTML =
+        `<div class="creator-empty creator-error">${escapeHtml(e.message)}</div>`;
+    }
+  }
+
+  async function _loadSessions() {
+    const list = $("trash-session-list");
+    if (list) list.innerHTML =
+      `<div class="creator-loading">${_t("trash.loading")}</div>`;
+    try {
+      const res  = await fetch("/api/trash/sessions");
+      const data = await res.json();
+      if (!res.ok) throw new Error(data.error || "Load failed");
+      _sessions      = data.sessions || [];
+      _sessionTotals = { count: data.count || 0, size: data.total_size || 0 };
+      _renderSessions();
+    } catch (e) {
+      console.error("[Trash] load sessions failed", e);
       if (list) list.innerHTML =
         `<div class="creator-empty creator-error">${escapeHtml(e.message)}</div>`;
-    } finally {
-      _loading = false;
     }
   }
 
-  function _render() {
+  // ── File trash rendering ─────────────────────────────────────────────
+
+  function _renderFiles() {
     const list        = $("trash-list");
     const summary     = $("trash-summary");
     const btnOld      = $("btn-trash-empty-old");
@@ -111,10 +167,10 @@ const Trash = (() => {
     }
 
     list.innerHTML = "";
-    _files.forEach(f => list.appendChild(_buildCard(f)));
+    _files.forEach(f => list.appendChild(_buildFileCard(f)));
   }
 
-  function _buildCard(file) {
+  function _buildFileCard(file) {
     const card = document.createElement("div");
     card.className = "trash-card";
     card.dataset.project = file.project_root;
@@ -122,17 +178,17 @@ const Trash = (() => {
 
     const original = file.original_path || "";
     const basename = original.split("/").pop() || original;
-    // Show last two path segments after basename to give agents context when
-    // many files share the same basename (very common: "package.json", "index.js").
     const parts    = original.split("/").filter(Boolean);
+    // Show last three path segments so same-named files (index.js, package.json, …)
+    // are still distinguishable in the card title area.
     const shortPath = parts.length > 3
       ? ".../" + parts.slice(-3).join("/")
       : original;
     const sizeStr  = _humanBytes(file.file_size || 0);
     const whenStr  = _humanTime(file.deleted_at);
-    // Heuristic: if project_root starts with /var/folders or /tmp, or contains
-    // a tempdir-style name (d20260502-...), the original project is gone.
-    // We still show it, but mark it so the user can clean it up confidently.
+    // Heuristic: if project_root lives under a temp-dir prefix or matches the
+    // Ruby Tempdir pattern (dYYYYMMDD-PID-random), the original project is gone.
+    // We mark it as an orphan so the user can bulk-clean it confidently.
     const orphan = /^\/(?:var\/folders|tmp|private\/var\/folders)\b/.test(file.project_root || "") ||
                    /\/d\d{8}-\d+-[a-z0-9]+(?:\/|$)/.test(file.project_root || "");
 
@@ -170,14 +226,92 @@ const Trash = (() => {
       </div>`;
 
     card.querySelector(".btn-trash-restore").addEventListener("click", () =>
-      _restoreOne(file, card));
+      _restoreFile(file, card));
     card.querySelector(".btn-trash-delete").addEventListener("click", () =>
-      _deleteOne(file, card));
+      _deleteFile(file, card));
 
     return card;
   }
 
-  async function _restoreOne(file, card) {
+  // ── Session trash rendering ──────────────────────────────────────────
+
+  function _renderSessions() {
+    const list     = $("trash-session-list");
+    const summary  = $("trash-summary");
+    const btnOld   = $("btn-trash-empty-old");
+    const btnAll   = $("btn-trash-empty-all");
+    if (!list) return;
+
+    if (summary) {
+      summary.textContent = _sessions.length
+        ? I18n.t("trash.summarySessions", {
+            count: _sessionTotals.count,
+            size:  _humanBytes(_sessionTotals.size)
+          })
+        : "";
+    }
+    if (btnOld) btnOld.disabled = _sessions.length === 0;
+    if (btnAll) btnAll.disabled = _sessions.length === 0;
+
+    if (_sessions.length === 0) {
+      list.innerHTML = `<div class="creator-empty">${_t("trash.noSessionTrash")}</div>`;
+      return;
+    }
+
+    list.innerHTML = "";
+    _sessions.forEach(s => list.appendChild(_buildSessionCard(s)));
+  }
+
+  function _buildSessionCard(session) {
+    const card = document.createElement("div");
+    card.className = "trash-session-card";
+    card.dataset.sessionId = session.session_id;
+
+    const name      = session.name || session.session_id || "";
+    const shortId   = (session.session_id || "").slice(0, 8);
+    const taskCount = session.total_tasks || 0;
+    const sizeStr   = _humanBytes(session.file_size || 0);
+    const whenStr   = _humanTime(session.deleted_at || session.created_at);
+    const taskLabel = I18n.t("trash.sessionTasks", { n: taskCount });
+
+    card.innerHTML = `
+      <div class="trash-session-card-info">
+        <div class="trash-session-card-name" title="${escapeHtml(name)}">${escapeHtml(name)}</div>
+        <div class="trash-session-card-id" title="${escapeHtml(session.session_id || '')}">${escapeHtml(session.session_id || '')}</div>
+        <div class="trash-session-card-meta">
+          <span>${escapeHtml(taskLabel)}</span>
+          <span>${sizeStr}</span>
+          <span title="${escapeHtml(session.deleted_at || session.created_at || '')}">${escapeHtml(whenStr)}</span>
+        </div>
+      </div>
+      <div class="trash-session-card-actions">
+        <button class="btn-trash-session-restore" title="${_t("trash.restoreSession")}">
+          <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+            <polyline points="1 4 1 10 7 10"/>
+            <path d="M3.51 15a9 9 0 1 0 2.13-9.36L1 10"/>
+          </svg>
+          ${_t("trash.restoreSession")}
+        </button>
+        <button class="btn-trash-session-delete" title="${_t("trash.deleteSession")}">
+          <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+            <polyline points="3 6 5 6 21 6"/>
+            <path d="M19 6l-1 14a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2L5 6"/>
+            <path d="M10 11v6"/><path d="M14 11v6"/>
+          </svg>
+        </button>
+      </div>`;
+
+    card.querySelector(".btn-trash-session-restore").addEventListener("click", () =>
+      _restoreSession(session, card));
+    card.querySelector(".btn-trash-session-delete").addEventListener("click", () =>
+      _deleteSession(session, card));
+
+    return card;
+  }
+
+  // ── File actions ─────────────────────────────────────────────────────
+
+  async function _restoreFile(file, card) {
     const btn = card.querySelector(".btn-trash-restore");
     btn.disabled = true;
     try {
@@ -191,27 +325,31 @@ const Trash = (() => {
       });
       const data = await res.json();
       if (!res.ok || !data.ok) {
-        alert(I18n.t("trash.restoreFail", {
+        Modal.toast(I18n.t("trash.restoreFail", {
           msg: data.error || res.statusText
-        }));
+        }), "error");
       } else {
-        // Remove card, update totals locally for instant feedback.
+        // Optimistic update — remove from local state and re-render immediately
+        // so the UI feels instant without waiting for a full reload.
         _files = _files.filter(f =>
           !(f.project_root === file.project_root && f.original_path === file.original_path));
         _totals = {
           count: Math.max(0, _totals.count - 1),
           size:  Math.max(0, _totals.size - (file.file_size || 0))
         };
-        _render();
+        _renderFiles();
+        Modal.toast(I18n.t("trash.restoreOk", {
+          path: (file.original_path || "").split("/").pop()
+        }), "success");
       }
     } catch (e) {
-      alert(I18n.t("trash.restoreFail", { msg: e.message }));
+      Modal.toast(I18n.t("trash.restoreFail", { msg: e.message }), "error");
     } finally {
       btn.disabled = false;
     }
   }
 
-  async function _deleteOne(file, card) {
+  async function _deleteFile(file, card) {
     const basename = (file.original_path || "").split("/").pop() || file.original_path;
     const confirmed = await Modal.confirm(
       I18n.t("trash.confirmDeleteOne", { name: basename })
@@ -227,25 +365,121 @@ const Trash = (() => {
       const res  = await fetch(url, { method: "DELETE" });
       const data = await res.json();
       if (!res.ok || !data.ok) {
-        alert(data.error || res.statusText);
+        Modal.toast(I18n.t("trash.deleteFail", { msg: data.error || res.statusText }), "error");
         return;
       }
+      // Optimistic update — same pattern as _restoreFile.
       _files = _files.filter(f =>
         !(f.project_root === file.project_root && f.original_path === file.original_path));
       _totals = {
         count: Math.max(0, _totals.count - 1),
         size:  Math.max(0, _totals.size - (file.file_size || 0))
       };
-      _render();
+      _renderFiles();
+    } catch (e) {
+      Modal.toast(I18n.t("trash.deleteFail", { msg: e.message }), "error");
+    }
+  }
+
+  // ── Session actions ──────────────────────────────────────────────────
+
+  async function _restoreSession(session, card) {
+    const btn = card.querySelector(".btn-trash-session-restore");
+    btn.disabled = true;
+    try {
+      const res = await fetch("/api/trash/sessions/restore", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ session_id: session.session_id })
+      });
+      const data = await res.json();
+      if (!res.ok || !data.ok) {
+        Modal.toast(I18n.t("trash.sessionRestoreFail", {
+          msg: data.error || res.statusText
+        }), "error");
+      } else {
+        _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))
+        };
+        _renderSessions();
+        // Optimistically add the restored session to the sidebar — same pattern
+        // as the WS session_restored handler, but covers the case where the WS
+        // event is lost (offline tab, slow reconnect). Sessions.add is idempotent.
+        const restored = data.session;
+        if (restored && typeof Sessions !== "undefined") {
+          Sessions.add(restored);
+          Sessions.renderList();
+        }
+        Modal.toast(I18n.t("trash.sessionRestoreOk"), "success", restored && restored.id ? {
+          action: {
+            label:   I18n.t("trash.sessionRestoreOkAction"),
+            onClick: () => Sessions.select(restored.id)
+          }
+        } : {});
+      }
+    } catch (e) {
+      Modal.toast(I18n.t("trash.sessionRestoreFail", { msg: e.message }), "error");
+    } finally {
+      btn.disabled = false;
+    }
+  }
+
+  async function _deleteSession(session, card) {
+    const name = session.name || (session.session_id || "").slice(0, 8);
+    const confirmed = await Modal.confirm(
+      I18n.t("trash.confirmDeleteSession", { name: name })
+    );
+    if (!confirmed) return;
+
+    try {
+      const res  = await fetch(`/api/trash/sessions/${encodeURIComponent(session.session_id)}`, {
+        method: "DELETE"
+      });
+      const data = await res.json();
+      if (!res.ok || !data.ok) {
+        Modal.toast(I18n.t("trash.deleteFail", { msg: data.error || res.statusText }), "error");
+        return;
+      }
+      _sessions = _sessions.filter(s => s.session_id !== session.session_id);
+      _renderSessions();
     } catch (e) {
-      alert(e.message);
+      Modal.toast(I18n.t("trash.deleteFail", { msg: e.message }), "error");
     }
   }
 
+  // ── Bulk actions ─────────────────────────────────────────────────────
+
+  // Count locally how many entries would be wiped by a bulk operation,
+  // so the confirmation dialog can show "delete N items" instead of a vague
+  // "all eligible". daysOld=0 means "everything", otherwise filter by deleted_at.
+  function _countMatching(items, daysOld) {
+    if (!Array.isArray(items)) return 0;
+    if (!daysOld || daysOld <= 0) return items.length;
+    const cutoff = Date.now() - daysOld * 86400000;
+    return items.filter(it => {
+      const t = Date.parse(it.deleted_at || "");
+      return !isNaN(t) && t < cutoff;
+    }).length;
+  }
+
   async function _emptyBulk(daysOld, confirmKey) {
-    const confirmed = await Modal.confirm(_t(confirmKey));
+    const isSession = _activeTab === "session-trash";
+    const matchCount = _countMatching(isSession ? _sessions : _files, daysOld);
+
+    if (matchCount === 0) {
+      Modal.toast(_t(daysOld > 0 ? "trash.nothingOld" : "trash.empty"), "info");
+      return;
+    }
+
+    const confirmed = await Modal.confirm(
+      I18n.t(confirmKey, { count: matchCount })
+    );
     if (!confirmed) return;
 
+    if (isSession) return _emptySessionsBulk(daysOld);
+
     const qs  = new URLSearchParams();
     qs.set("days_old", String(daysOld));
     const url = "/api/trash?" + qs.toString();
@@ -254,34 +488,49 @@ const Trash = (() => {
       const res  = await fetch(url, { method: "DELETE" });
       const data = await res.json();
       if (!res.ok || !data.ok) {
-        alert(data.error || res.statusText);
+        Modal.toast(I18n.t("trash.cleanFail", { msg: data.error || res.statusText }), "error");
         return;
       }
-      if (data.deleted_count === 0 && daysOld > 0) {
-        alert(_t("trash.nothingOld"));
-      } else {
-        alert(I18n.t("trash.emptied", {
-          count: data.deleted_count || 0,
-          size:  _humanBytes(data.freed_size || 0)
-        }));
+      Modal.toast(I18n.t("trash.emptied", {
+        count: data.deleted_count || 0,
+        size:  _humanBytes(data.freed_size || 0)
+      }), "success");
+      await _loadFiles();
+    } catch (e) {
+      Modal.toast(I18n.t("trash.cleanFail", { msg: e.message }), "error");
+    }
+  }
+
+  async function _emptySessionsBulk(daysOld) {
+    const qs  = new URLSearchParams();
+    qs.set("days_old", String(daysOld));
+    const url = "/api/trash/sessions?" + qs.toString();
+
+    try {
+      const res  = await fetch(url, { method: "DELETE" });
+      const data = await res.json();
+      if (!res.ok || !data.ok) {
+        Modal.toast(I18n.t("trash.cleanFail", { msg: data.error || res.statusText }), "error");
+        return;
       }
-      await _load();
+      Modal.toast(I18n.t("trash.sessionsCleaned", {
+        count: data.deleted_count || 0
+      }), "success");
+      await _loadSessions();
     } catch (e) {
-      alert(e.message);
+      Modal.toast(I18n.t("trash.cleanFail", { msg: e.message }), "error");
     }
   }
 
-  // Detects trash entries whose original project_root clearly no longer
-  // exists (test temp dirs under /var/folders, /tmp, or dir-format "dYYYYMMDD-...").
-  // The delete API does permanent deletion on a per-file basis.
   async function _emptyOrphans() {
+    // Same heuristic as in _buildFileCard — keep both in sync if you ever change it.
     const orphans = _files.filter(f => {
       const root = f.project_root || "";
       return /^\/(?:var\/folders|tmp|private\/var\/folders)\b/.test(root) ||
              /\/d\d{8}-\d+-[a-z0-9]+(?:\/|$)/.test(root);
     });
     if (orphans.length === 0) {
-      alert(_t("trash.noOrphans"));
+      Modal.toast(_t("trash.noOrphans"), "info");
       return;
     }
     const confirmed = await Modal.confirm(
@@ -308,27 +557,39 @@ const Trash = (() => {
         failed += 1;
       }
     }
-    alert(I18n.t("trash.orphansCleaned", {
+    Modal.toast(I18n.t("trash.orphansCleaned", {
       count:  deleted,
       size:   _humanBytes(freed),
       failed: failed
-    }));
-    await _load();
+    }), failed > 0 ? "warning" : "success");
+    await _loadFiles();
   }
 
+  // ── Event wiring ─────────────────────────────────────────────────────
+
   function _wire() {
     if (_wired) return;
     _wired = true;
+
+    // Tab switches
+    const tabFile    = $("tab-file-trash");
+    const tabSession = $("tab-session-trash");
+    if (tabFile)    tabFile.addEventListener("click",    () => _switchTab("file-trash"));
+    if (tabSession) tabSession.addEventListener("click", () => _switchTab("session-trash"));
+
+    // Toolbar buttons
     const btnRefresh = $("btn-trash-refresh");
     const btnOld     = $("btn-trash-empty-old");
     const btnOrphans = $("btn-trash-empty-orphans");
     const btnAll     = $("btn-trash-empty-all");
     if (btnRefresh) btnRefresh.addEventListener("click", () => _load());
     if (btnOld)     btnOld.addEventListener("click",
-      () => _emptyBulk(7, "trash.confirmEmptyOld"));
+      () => _emptyBulk(7, _activeTab === "session-trash"
+        ? "trash.confirmEmptySessionOld" : "trash.confirmEmptyOld"));
     if (btnOrphans) btnOrphans.addEventListener("click", () => _emptyOrphans());
     if (btnAll)     btnAll.addEventListener("click",
-      () => _emptyBulk(0, "trash.confirmEmptyAll"));
+      () => _emptyBulk(0, _activeTab === "session-trash"
+        ? "trash.confirmEmptySessionAll" : "trash.confirmEmptyAll"));
   }
 
   // ── Public API ────────────────────────────────────────────────────────
@@ -337,7 +598,9 @@ const Trash = (() => {
     /** Called by Router when the trash panel becomes active. */
     onPanelShow() {
       _wire();
-      _load();
+      // Reset to file-trash tab on each panel show so the user always
+      // starts on the familiar "agent files" view.
+      _switchTab("file-trash");
     },
   };
 })();

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

@@ -145,6 +145,16 @@ WS.onEvent(ev => {
       Sessions.renderList();
       break;
 
+    case "session_restored":
+      // A soft-deleted session was restored from the session trash.
+      // Insert it back into the local list (idempotent — Sessions.add no-ops
+      // if the id already exists) and re-render the sidebar.
+      if (ev.session) {
+        Sessions.add(ev.session);
+        Sessions.renderList();
+      }
+      break;
+
     // ── Chat messages ──────────────────────────────────────────────────
     case "history_user_message":
       // Emitted only during history replay — never from live WS.
@@ -200,9 +210,12 @@ WS.onEvent(ev => {
       Sessions.collapseToolGroup();
       {
         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"
-          : `$${(ev.cost || 0).toFixed(4)}`;
+          : `${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) });

data/lib/clacky.rb

@@ -123,6 +123,10 @@ require_relative "clacky/tools/redo_task"
 require_relative "clacky/tools/list_tasks"
 require_relative "clacky/tools/browser"
 require_relative "clacky/tools/terminal"
+require_relative "clacky/mcp/client"
+require_relative "clacky/mcp/virtual_skill"
+require_relative "clacky/mcp/registry"
+require_relative "clacky/mcp/skill_provider"
 require_relative "clacky/telemetry"
 require_relative "clacky/agent"
 

data/scripts/install.ps1

@@ -33,6 +33,8 @@ $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"
+$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"
 $UBUNTU_WSL_AMD64_URL        = "$CLACKY_CDN_BASE_URL/ubuntu-jammy-wsl-amd64-ubuntu22.04lts.rootfs.tar.gz"
@@ -72,18 +74,24 @@ function Get-SafeTempDir {
 # Invoke-WebRequest. Returns $true on success, $false on failure.
 function Invoke-Download {
     param([string]$Url, [string]$OutFile)
-    $ok = $false
+    $urls = @($Url)
     try {
-        curl.exe -L --fail --progress-bar $Url -o $OutFile
-        $ok = ($LASTEXITCODE -eq 0)
+        if (([Uri]$Url).Host -eq $CLACKY_CDN_PRIMARY_HOST) {
+            $urls += ([Uri]$Url).AbsoluteUri.Replace($CLACKY_CDN_PRIMARY_HOST, $CLACKY_CDN_BACKUP_HOST)
+        }
     } catch {}
-    if (-not $ok) {
+    foreach ($u in $urls) {
+        if ($u -ne $Url) { Write-Warn "Primary download failed, retrying with backup mirror." }
+        try {
+            curl.exe -L --fail --progress-bar $u -o $OutFile
+            if ($LASTEXITCODE -eq 0) { return $true }
+        } catch {}
         try {
-            Invoke-WebRequest -Uri $Url -OutFile $OutFile -UseBasicParsing
-            $ok = $true
-        } catch { $ok = $false }
+            Invoke-WebRequest -Uri $u -OutFile $OutFile -UseBasicParsing -TimeoutSec 60
+            return $true
+        } catch {}
     }
-    return $ok
+    return $false
 }
 
 # Verify SHA256 of a local file against a remote .sha256 file.
@@ -143,14 +151,18 @@ function Invoke-WslStatusExitCode {
 }
 
 # Returns $true if a distro named exactly "Ubuntu" is registered.
-# wsl --list outputs UTF-16LE; switch OutputEncoding to decode correctly.
+# wsl --list outputs UTF-16LE regardless of WSL_UTF8; temporarily clear it and switch
+# OutputEncoding to Unicode so the output decodes correctly.
 function Test-UbuntuInstalled {
-    $prev = [Console]::OutputEncoding
+    $prevEnc = [Console]::OutputEncoding
+    $prevUtf8 = $env:WSL_UTF8
     [Console]::OutputEncoding = [System.Text.Encoding]::Unicode
+    $env:WSL_UTF8 = $null
     try {
         $out = (wsl.exe --list --quiet 2>$null) -join "`n"
     } finally {
-        [Console]::OutputEncoding = $prev
+        [Console]::OutputEncoding = $prevEnc
+        $env:WSL_UTF8 = $prevUtf8
     }
     # Whole-line match to avoid false positives from Ubuntu-22.04, Ubuntu-24.04, etc.
     return ($out -match '(?im)^Ubuntu\s*$')