openclacky 1.4.0 → 1.5.0

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

@@ -17,6 +17,7 @@
 const Onboard = (() => {
   let _providers   = [];
   let _selectedLang = I18n.lang();  // language chosen during setup
+  let _branded      = false;        // true when running under a brand license
 
   // ── Public API ──────────────────────────────────────────────────────────────
 
@@ -27,6 +28,7 @@ const Onboard = (() => {
       if (!data.needs_onboard) return { needsOnboard: false, phase: null };
 
       const phase = data.phase;
+      _branded = !!data.branded;
 
       if (phase === "key_setup") {
         // Mandatory: show full-screen setup panel, block boot.
@@ -111,9 +113,16 @@ const Onboard = (() => {
     $("setup-dot-1").className = "setup-step" + (step === "lang" ? " active" : " done");
     $("setup-dot-2").className = "setup-step" + (step === "key"  ? " active" : "");
     if (step === "key") {
-      $("setup-device-block").style.display   = "";
-      $("setup-manual-toggle").style.display  = "";
-      $("setup-manual-section").style.display = "none";
+      if (_branded) {
+        // Brand mode: skip the OpenClacky AI Keys card, go straight to manual config
+        $("setup-device-block").style.display   = "none";
+        $("setup-manual-toggle").style.display  = "none";
+        $("setup-manual-section").style.display = "";
+      } else {
+        $("setup-device-block").style.display   = "";
+        $("setup-manual-toggle").style.display  = "";
+        $("setup-manual-section").style.display = "none";
+      }
     }
   }
 
@@ -153,16 +162,20 @@ const Onboard = (() => {
     dropdown.appendChild(placeholder);
 
     _providers.forEach(p => {
+      // Prefer i18n key (localised); fall back to shipped English `name`.
+      const translated  = p.name_key ? I18n.t(p.name_key) : null;
+      const displayName = (translated && translated !== p.name_key) ? translated : p.name;
+
       const opt = document.createElement("div");
       opt.className     = "custom-select-option";
       opt.dataset.value = p.id;
-      opt.dataset.label = p.name;
+      opt.dataset.label = displayName;
       if (p.id === "openclacky") {
         const nameSpan = document.createElement("span");
-        nameSpan.textContent = p.name;
+        nameSpan.textContent = displayName;
         opt.innerHTML = nameSpan.outerHTML + ` <span class="provider-badge-recommended">${I18n.t("provider.recommended")}</span>`;
       } else {
-        opt.textContent = p.name;
+        opt.textContent = displayName;
       }
       dropdown.appendChild(opt);
     });
@@ -379,7 +392,8 @@ const Onboard = (() => {
     });
 
     $("setup-btn-back").addEventListener("click", () => {
-      if ($("setup-manual-section").style.display !== "none") {
+      if (!_branded && $("setup-manual-section").style.display !== "none") {
+        // Non-brand: collapse manual section back to device card
         $("setup-device-block").style.display  = "";
         $("setup-manual-toggle").style.display = "";
         $("setup-manual-section").style.display = "none";

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

@@ -58,7 +58,8 @@ const BackupView = (() => {
       a.click();
       a.remove();
       URL.revokeObjectURL(url);
-      if (statusEl) { statusEl.textContent = I18n.t("settings.backup.downloaded"); statusEl.className = "model-test-result success"; }
+      if (statusEl) { statusEl.textContent = ""; statusEl.className = "model-test-result"; }
+      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";
@@ -108,8 +109,8 @@ const BackupView = (() => {
       if (ev.type !== "_ws_connected" || !_restoreStatusEl) return;
       const el = _restoreStatusEl;
       _restoreStatusEl = null;
-      el.textContent = I18n.t("settings.backup.restartOk");
-      el.className = "model-test-result success";
+      if (el) { el.textContent = ""; el.className = "model-test-result"; }
+      Modal.toast(I18n.t("settings.backup.restartOk"), "success");
       if (typeof Settings !== "undefined") Settings.open();
     });
   }

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

@@ -22,8 +22,9 @@ const ExtensionsStore = (() => {
   let _extensions      = [];        // [{ id, name, name_zh, description, ..., units }]
   let _allExtensions   = [];        // unfiltered result from server
   let _query           = "";        // current search text
-  let _sort            = "newest";  // "newest" | "updated" | "downloads"
+  let _sort            = "downloads";  // "newest" | "updated" | "downloads"
   let _filterInstalled = false;     // when true, show only installed extensions
+  let _filterBrand     = false;     // when true, show only brand-private extensions
   let _loading    = false;
   let _error      = null;      // soft warning when the store is unreachable
   let _detail     = null;      // currently opened extension detail, or null
@@ -53,6 +54,7 @@ const ExtensionsStore = (() => {
     get query()      { return _query; },
     get sort()       { return _sort; },
     get filterInstalled() { return _filterInstalled; },
+    get filterBrand()     { return _filterBrand; },
     get loading()    { return _loading; },
     get error()      { return _error; },
     get detail()        { return _detail; },
@@ -67,6 +69,7 @@ const ExtensionsStore = (() => {
     /** Fetch the catalog from the server for the current query + sort. */
     async load() {
       if (_filterInstalled) return;
+      if (_filterBrand) return Extensions.loadBrandExtensions();
       _loading = true;
       _error   = null;
       _emit("extensions:loading");
@@ -97,18 +100,22 @@ const ExtensionsStore = (() => {
     setQuery(query) {
       _query = (query || "").trim();
       if (_filterInstalled) return Extensions.setFilterInstalled(true);
+      if (_filterBrand) return Extensions.loadBrandExtensions();
       return Extensions.load();
     },
 
     /** Set the sort order and reload. */
     setSort(sort) {
-      _sort = sort || "newest";
+      _sort = sort || "downloads";
+      if (_filterBrand) return Extensions.loadBrandExtensions();
+      if (_filterInstalled) return Extensions.setFilterInstalled(true);
       return Extensions.load();
     },
 
     /** Toggle the "installed only" filter — fetches from local store when enabled. */
     async setFilterInstalled(onlyInstalled) {
       _filterInstalled = !!onlyInstalled;
+      _filterBrand     = false;
       if (_filterInstalled) {
         _loading = true;
         _emit("extensions:loading");
@@ -132,6 +139,40 @@ const ExtensionsStore = (() => {
       }
     },
 
+    /** Toggle the "brand only" filter — fetches brand-private extensions. */
+    async setFilterBrand(onlyBrand) {
+      _filterBrand     = !!onlyBrand;
+      _filterInstalled = false;
+      if (_filterBrand) {
+        return Extensions.loadBrandExtensions();
+      } else {
+        return Extensions.load();
+      }
+    },
+
+    /** Fetch brand-private extensions from /api/store/extensions/brand. */
+    async loadBrandExtensions() {
+      _loading = true;
+      _error   = null;
+      _emit("extensions:loading");
+      try {
+        const res  = await fetch("/api/store/extensions/brand");
+        const data = await res.json();
+        _extensions = data.extensions || [];
+        _error      = data.warning || null;
+        _loading    = false;
+        _emit("extensions:changed", { extensions: _extensions, warning: _error });
+      } catch (e) {
+        console.error("[Extensions] loadBrandExtensions failed", e);
+        _extensions = [];
+        _error      = I18n.t("extensions.loadFailed");
+        _loading    = false;
+        _emit("extensions:error", { network: true });
+      } finally {
+        _loading = false;
+      }
+    },
+
     /** Open the detail view for one extension (fetches contributes + versions). */
     async loadDetail(id) {
       if (!id) return;
@@ -159,6 +200,17 @@ const ExtensionsStore = (() => {
       }
     },
 
+    /** Fetch /api/brand/status and return { branded: bool }. */
+    async fetchBrandStatus() {
+      try {
+        const res  = await fetch("/api/brand/status");
+        const data = await res.json();
+        return data;
+      } catch (_e) {
+        return { branded: false };
+      }
+    },
+
     /** Close the detail view. */
     closeDetail() {
       _detail        = null;
@@ -218,13 +270,13 @@ const ExtensionsStore = (() => {
     },
 
     /** Remove an installed extension, then return to the list. */
-    async uninstall(id) {
+    async uninstall(id, purgeData = false) {
       if (!id) return;
       try {
         const res = await fetch("/api/store/extension", {
           method:  "DELETE",
           headers: { "Content-Type": "application/json" },
-          body:    JSON.stringify({ id }),
+          body:    JSON.stringify({ id, purge_data: purgeData }),
         });
         const data = await res.json();
         if (!res.ok || !data.ok) throw new Error(data.error || "uninstall failed");

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

@@ -209,8 +209,11 @@ const ExtensionsView = (() => {
     if (remove) {
       remove.addEventListener("click", async () => {
         const id = remove.getAttribute("data-ext-remove");
-        const ok = await Modal.confirm(I18n.t("extensions.action.removeConfirm"));
-        if (ok) Extensions.uninstall(id);
+        const { ok, checked } = await Modal.confirmWithCheckbox(
+          I18n.t("extensions.action.removeConfirm"),
+          I18n.t("extensions.action.removePurgeData")
+        );
+        if (ok) Extensions.uninstall(id, checked);
       });
     }
 
@@ -291,16 +294,31 @@ const ExtensionsView = (() => {
           ${_renderActions(ext)}
         </div>
       </div>
-      ${_renderEntryPoints(ext.contributes)}
+      ${_renderReadme(ext.readme)}
       ${_renderVersions(ext.versions)}`;
   }
 
+  // Renders Markdown readme content. Uses marked.js if available, falls back to plain text.
+  function _renderReadme(readme) {
+    if (!readme || !readme.trim()) return "";
+    const html = typeof marked !== "undefined"
+      ? marked.parse(readme, { breaks: true, gfm: true })
+      : `<pre style="white-space:pre-wrap">${escapeHtml(readme)}</pre>`;
+    return `
+      <div class="extension-detail-block extension-readme">
+        <h3 class="extension-detail-block-title">${escapeHtml(I18n.t("extensions.detail.readme"))}</h3>
+        <div class="extension-readme-body">${html}</div>
+      </div>`;
+  }
+
   // Manage buttons for a locally installed extension: enable/disable toggle
   // (always available when installed) plus remove (installed layer only).
   function _renderActions(ext) {
     const id = ext.id != null ? String(ext.id) : (ext.name || ext.slug || "");
     if (!ext.installed) {
-      if (ext.origin === "marketplace" && ext.download_url) {
+      // Show install button for both marketplace and brand-private (origin=self) extensions,
+      // as long as a download_url is available.
+      if (ext.download_url) {
         return `
       <div class="extension-detail-actions">
         <button type="button" class="extension-action extension-action-install" data-ext-install="${escapeHtml(id)}">${escapeHtml(I18n.t("extensions.action.install"))}</button>
@@ -374,24 +392,6 @@ const ExtensionsView = (() => {
       </div>`;
   }
 
-  function _renderEntryPoints(contributes) {
-    if (!contributes || !Array.isArray(contributes.panels)) return "";
-    const eps = contributes.panels.flatMap((p) => Array.isArray(p.entry_points) ? p.entry_points : []);
-    if (eps.length === 0) return "";
-    const rows = eps.map((ep) => {
-      const slotKey = "extensions.slot." + ep.slot;
-      const label = I18n.t(slotKey) !== slotKey ? I18n.t(slotKey) : ep.slot;
-      return `<li class="extension-contrib-item"><span class="extension-contrib-title">${escapeHtml(label)}</span></li>`;
-    }).join("");
-    return `
-      <div class="extension-detail-block">
-        <h3 class="extension-detail-block-title">${escapeHtml(I18n.t("extensions.detail.entry_points"))}</h3>
-        <div class="extension-detail-section">
-          <ul class="extension-contrib-list">${rows}</ul>
-        </div>
-      </div>`;
-  }
-
   function _renderVersions(versions) {
     if (!Array.isArray(versions) || versions.length === 0) return "";
     const rows = versions.map((v) => {
@@ -412,6 +412,17 @@ const ExtensionsView = (() => {
       </div>`;
   }
 
+  // Show/hide the brand filter tab based on brand status from the store.
+  async function _applyBrandTab() {
+    try {
+      const data = await Extensions.fetchBrandStatus();
+      const brandTab = $("tab-extensions-brand");
+      if (brandTab) brandTab.style.display = data.branded ? "" : "none";
+    } catch (_e) {
+      // On error, keep tab hidden.
+    }
+  }
+
   function _wireDom() {
     if (_domWired) return;
 
@@ -437,10 +448,25 @@ const ExtensionsView = (() => {
       btn.addEventListener("click", () => {
         document.querySelectorAll(".extensions-filter-tab").forEach(b => b.classList.remove("extensions-filter-tab-active"));
         btn.classList.add("extensions-filter-tab-active");
-        Extensions.setFilterInstalled(btn.dataset.filter === "installed");
+        const filter = btn.dataset.filter;
+        if (filter === "installed") {
+          Extensions.setFilterInstalled(true);
+        } else if (filter === "brand") {
+          Extensions.setFilterBrand(true);
+        } else {
+          Extensions.setFilterInstalled(false);
+        }
       });
     });
 
+    // Subscribe to brand status changes to show/hide the brand tab.
+    if (window.Skills && Skills.on) {
+      Skills.on("brandStatus:changed", (p) => {
+        const brandTab = $("tab-extensions-brand");
+        if (brandTab) brandTab.style.display = p.branded ? "" : "none";
+      });
+    }
+
     const list = $("extensions-list");
     if (list) {
       list.addEventListener("click", (e) => {
@@ -471,8 +497,12 @@ const ExtensionsView = (() => {
   }
 
   const viewApi = {
-    onPanelShow(opts) {
+    async onPanelShow(opts) {
       _wireDom();
+      // Apply brand tab visibility based on current status (fast path),
+      // then also refresh in background so it stays up-to-date.
+      _applyBrandTab();
+      if (window.Skills && Skills.refreshBrandStatus) Skills.refreshBrandStatus();
       const detailId = opts && opts.detailId;
       if (detailId) {
         Extensions.load();

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

@@ -84,6 +84,11 @@ const McpView = (() => {
 
     data.servers.forEach(server => {
       list.appendChild(_renderCard(server));
+      // _renderTools uses getElementById which requires the card to already be
+      // in the DOM, so we call it after appendChild (not inside _renderCard).
+      if (McpStore.state.isExpanded(server.name) && !server.disabled) {
+        _renderTools(server.name);
+      }
     });
   }
 
@@ -170,8 +175,6 @@ const McpView = (() => {
     card.querySelector(`#toggle-mcp-${CSS.escape(server.name)}`)
       ?.addEventListener("change", (ev) => _toggle(server.name, ev.target.checked));
 
-    if (isExpanded && !server.disabled) _renderTools(server.name);
-
     return card;
   }
 

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

@@ -122,19 +122,23 @@ const NewSessionStore = (() => {
     return "Session " + (maxN + 1);
   }
 
-  async function createSession({ existingSessions } = {}) {
+  async function createSession({ existingSessions, useDefaults = false } = {}) {
     if (_state.creating) return null;
     _state.creating = true;
     _emit("newSession:creating", { creating: true });
 
     try {
-      const agentId = _state.selectedAgentId || "general";
+      // useDefaults=true: quick-create from sidebar — use the default agent and
+      // skip advanced options (model / dir) 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 payload = { name, agent_profile: agentId, source: "manual" };
-      if (adv.workingDir.trim()) payload.working_dir = adv.workingDir.trim();
-      if (adv.modelId) payload.model_id = adv.modelId;
+      if (!useDefaults) {
+        if (adv.workingDir.trim()) payload.working_dir = adv.workingDir.trim();
+        if (adv.modelId) payload.model_id = adv.modelId;
+      }
 
       const res = await fetch("/api/sessions", {
         method: "POST",

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

@@ -237,7 +237,11 @@ const VersionView = (() => {
       _closePopover();
       if (!_autoReloaded) {
         _autoReloaded = true;
-        setTimeout(() => window.location.reload(), 800);
+        // Delay reload to ensure the server is fully ready after restart.
+        // /api/version responding OK does not guarantee the full server stack
+        // (static assets, routes) is ready; a short extra wait avoids a blank
+        // page caused by the browser hitting a not-yet-ready server.
+        setTimeout(() => window.location.reload(), 3000);
       }
       return;
     }

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

@@ -72,6 +72,17 @@ const WorkspaceStore = (() => {
       if (!resp.ok) throw new Error(`HTTP ${resp.status}`);
     },
 
+    async displayPath(entry) {
+      const resp = await fetch("/api/file-action", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ path: _absPath(entry.path), action: "display-path" })
+      });
+      if (!resp.ok) throw new Error(`HTTP ${resp.status}`);
+      const data = await resp.json();
+      return data.path;
+    },
+
     async fetchFileBlob(entry) {
       const resp = await fetch("/api/file-action", {
         method: "POST",

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

@@ -156,10 +156,16 @@ const WorkspaceView = (() => {
     if (existing) existing.remove();
   }
 
-  function copyPath(entry) {
-    const absPath = Workspace.state.workingDir.replace(/\/+$/, "") + "/" + entry.path.replace(/^\/+/, "");
-    navigator.clipboard.writeText(absPath).then(() => {
-      Modal.toast(absPath, "info");
+  async function copyPath(entry) {
+    const fallback = Workspace.state.workingDir.replace(/\/+$/, "") + "/" + entry.path.replace(/^\/+/, "");
+    let target = fallback;
+    try {
+      target = await Workspace.displayPath(entry);
+    } catch (err) {
+      target = fallback;
+    }
+    navigator.clipboard.writeText(target).then(() => {
+      Modal.toast(target, "info");
     });
   }