clay-server 4.8.2 → 5.0.0-beta.1

package/lib/public/modules/skills-actions.js

@@ -1,7 +1,7 @@
 import { iconHtml, refreshIcons } from './icons.js';
-import { escapeHtml, copyToClipboard, showToast } from './utils.js';
+import { escapeHtml, showToast } from './utils.js';
 import { store } from './store.js';
-import { skillState, content, basePath, getInstalledInfo, scopeLabel } from './skills-state.js';
+import { skillState, content, basePath, getInstalledInfo, scopeLabel, patchSkills } from './skills-state.js';
 import { getWs } from './ws-ref.js';
 function reloadActiveSessionSkills() { var ws = getWs(); if (ws && ws.readyState === 1) ws.send(JSON.stringify({ type: 'reload_skills' })); }
 function installSkill(source, skill, scope) {
@@ -19,11 +19,13 @@ function installSkill(source, skill, scope) {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ url: url, skill: skill, scope: scope }),
-  }).catch(function () {
+  }).then(function (res) { if (!res.ok) throw new Error('Request rejected'); }).catch(function () {
+    showToast('Could not start installation. Try again.', 'error');
     // Re-enable buttons on fetch error
     for (var j = 0; j < btns.length; j++) {
       btns[j].disabled = false;
       btns[j].classList.remove("installing");
+      btns[j].textContent = "Add to " + scopeLabel(btns[j].dataset.scope).toLowerCase();
     }
   });
 }
@@ -45,10 +47,10 @@ export function handleSkillInstalled(msg) {
     }
 
     // Invalidate skills data cache so list refreshes with updated badges
-    skillState().skillsData = {};
+    patchSkills({ skillsData: {}, searchCache: {}, inventoryLoaded: false });
 
     // If we're on the detail view for this skill, re-render it
-    if (skillState().currentView === "detail") {
+    if (skillState().currentView === "detail" && skillState().selectedSkill === skill) {
       var detailEl = content().querySelector(".skills-detail");
       if (detailEl) {
         // Re-render the install section in the sidebar
@@ -67,12 +69,13 @@ export function handleSkillInstalled(msg) {
     // Show error toast
     showToast("Failed to install " + skill + (msg.error ? ": " + msg.error : ""), "error");
     // Re-enable buttons
+    if (skillState().selectedSkill !== skill) return;
     var btns = content().querySelectorAll(".skills-install-btn.installing");
     for (var i = 0; i < btns.length; i++) {
       btns[i].disabled = false;
       btns[i].classList.remove("installing");
       // We can't easily restore the original text, so just set generic labels
-      btns[i].innerHTML = iconHtml("download") + " Install";
+      btns[i].innerHTML = iconHtml("plus") + " Add to " + scopeLabel(btns[i].dataset.scope).toLowerCase();
     }
   }
 }
@@ -90,11 +93,12 @@ export function uninstallSkill(skill, scope) {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ skill: skill, scope: scope }),
-  }).catch(function () {
+  }).then(function (res) { if (!res.ok) throw new Error('Request rejected'); }).catch(function () {
+    showToast('Could not remove this skill. Try again.', 'error');
     if (unBtn) {
       unBtn.disabled = false;
       unBtn.classList.remove("uninstalling");
-      unBtn.innerHTML = iconHtml("x");
+      unBtn.textContent = "Remove";
     }
   });
 }
@@ -118,10 +122,10 @@ export function handleSkillUninstalled(msg) {
     }
 
     // Invalidate skills data cache so list refreshes
-    skillState().skillsData = {};
+    patchSkills({ skillsData: {}, searchCache: {}, inventoryLoaded: false });
 
     // If we're on the detail view, re-render buttons
-    if (skillState().currentView === "detail") {
+    if (skillState().currentView === "detail" && skillState().selectedSkill === skill) {
       var detailEl = content().querySelector(".skills-detail");
       if (detailEl) {
         updateDetailInstallButtons(skill);
@@ -138,90 +142,45 @@ export function handleSkillUninstalled(msg) {
   } else {
     showToast("Failed to uninstall " + skill + (msg.error ? ": " + msg.error : ""), "error");
     // Re-enable the uninstall button
+    if (skillState().selectedSkill !== skill) return;
     var unBtn = content().querySelector('.skills-uninstall-btn[data-scope="' + scope + '"]');
     if (unBtn) {
       unBtn.disabled = false;
       unBtn.classList.remove("uninstalling");
-      unBtn.innerHTML = iconHtml("x");
+      unBtn.textContent = "Remove";
       refreshIcons(unBtn);
     }
   }
 }
 
 function updateDetailInstallButtons(skillId) {
+  if (skillState().selectedSkill !== skillId) return;
+  var data = skillState().detailData || {}, block = content().querySelector('[data-skill-actions]');
+  var note = content().querySelector('.skills-local-note');
+  if (note) note.hidden = !getInstalledInfo(skillId);
+  if (!block) return;
+  block.innerHTML = data._installed ? buildLocalActionsHtml(skillId) : buildInstallButtonsHtml(skillId, data._source || '', skillId);
+  refreshIcons(); attachInstallHandlers(block, data._source || '', skillId);
+}
+
+export function buildLocalActionsHtml(skillId) {
   var info = getInstalledInfo(skillId);
-  var sidebar = content().querySelector(".skills-detail-sidebar");
-  if (!sidebar) return;
-
-  // Find the install actions or installed status block (last .skills-meta-block)
-  var blocks = sidebar.querySelectorAll(".skills-meta-block");
-  var lastBlock = blocks[blocks.length - 1];
-  if (!lastBlock) return;
-
-  // Get source/skill from the current detail view data attributes
-  var sourceEl = sidebar.querySelector("[data-detail-source]");
-  if (!sourceEl) sourceEl = content().querySelector("[data-detail-source]");
-  var source = sourceEl ? sourceEl.dataset.detailSource : "";
-  var skill = sourceEl ? sourceEl.dataset.detailSkill : skillId;
-
-  lastBlock.innerHTML = buildInstallButtonsHtml(skillId, source, skill);
-  refreshIcons(lastBlock);
-  attachInstallHandlers(lastBlock, source, skill);
+  if (!info) return '<p class="skills-removed-status">Removed from your library.</p>';
+  if (info.source === 'clay-builtin') return '<div class="skills-installed-status">' + iconHtml('circle-check') + ' Built in to Clay</div>';
+  var scopes = info.scope === 'both' ? ['project', 'global'] : [info.scope];
+  return scopes.map(function (scope) { return '<div class="skills-installed-row"><span class="skills-installed-status compact">' + iconHtml('circle-check') + ' ' + scopeLabel(scope) + '</span><button type="button" class="skills-uninstall-btn" data-scope="' + scope + '" aria-label="Remove from ' + scopeLabel(scope) + '">Remove</button></div>'; }).join('');
 }
 
 export function buildInstallButtonsHtml(skillId, source, skill) {
   var info = getInstalledInfo(skillId);
-  if (info && info.source === "clay-builtin") return '<div class="skills-installed-status">' + iconHtml("circle-check") + ' Built in to Clay</div>';
-
+  if (info && info.source === 'clay-builtin') return buildLocalActionsHtml(skillId);
   var html = '<div class="skills-install-actions" data-detail-source="' + escapeHtml(source) + '" data-detail-skill="' + escapeHtml(skill) + '">';
-
-  if (info && info.scope === "both") {
-    // Both scopes installed — show status + uninstall for each
-    html += '<div class="skills-installed-row">' +
-      '<div class="skills-installed-status compact">' +
-        iconHtml("circle-check") + ' Installed (Project)' +
-      '</div>' +
-      '<button class="skills-uninstall-btn" data-scope="project" title="Uninstall (Project)">' +
-        iconHtml("x") +
-      '</button>' +
-    '</div>';
-    html += '<div class="skills-installed-row">' +
-      '<div class="skills-installed-status compact">' +
-        iconHtml("circle-check") + ' Installed (Global)' +
-      '</div>' +
-      '<button class="skills-uninstall-btn" data-scope="global" title="Uninstall (Global)">' +
-        iconHtml("x") +
-      '</button>' +
-    '</div>';
-  } else if (info) {
-    // One scope installed — show status with uninstall + install button for other scope
-    html += '<div class="skills-installed-row">' +
-      '<div class="skills-installed-status compact">' +
-        iconHtml("circle-check") + ' Installed (' + scopeLabel(info.scope) + ')' +
-      '</div>' +
-      '<button class="skills-uninstall-btn" data-scope="' + escapeHtml(info.scope) + '" title="Uninstall (' + scopeLabel(info.scope) + ')">' +
-        iconHtml("x") +
-      '</button>' +
-    '</div>';
-
-    // Show install button for the other scope
-    var otherScope = info.scope === "global" ? "project" : "global";
-    var otherLabel = info.scope === "global" ? "Project" : "Global";
-    html += '<button class="skills-install-btn secondary" data-scope="' + otherScope + '">' +
-      iconHtml("download") + ' Install (' + otherLabel + ')' +
-    '</button>';
-  } else {
-    // Not installed — show both install buttons
-    html += '<button class="skills-install-btn" data-scope="project">' +
-      iconHtml("download") + ' Install (Project)' +
-    '</button>';
-    html += '<button class="skills-install-btn secondary" data-scope="global">' +
-      iconHtml("download") + ' Install (Global)' +
-    '</button>';
-  }
-
-  html += '</div>';
-  return html;
+  if (info) html += buildLocalActionsHtml(skillId);
+  ['project', 'global'].forEach(function (scope) {
+    if (info && (info.scope === scope || info.scope === 'both')) return;
+    html += '<button type="button" class="skills-install-btn' + (scope === 'global' ? ' secondary' : '') + '" data-scope="' + scope + '">' + iconHtml('plus') + ' Add to ' + scopeLabel(scope).toLowerCase() + '</button>';
+  });
+  return html + '</div>';
 }
 
 export function attachInstallHandlers(container, source, skill) {
@@ -239,7 +198,16 @@ export function attachInstallHandlers(container, source, skill) {
     (function (btn) {
       btn.addEventListener("click", function () {
         var scope = btn.dataset.scope;
-        uninstallSkill(skill, scope);
+        if (btn.dataset.confirmed === 'true') {
+          btn.dataset.confirmed = '';
+          var existingCancel = btn.parentElement.querySelector('.skills-cancel-remove');
+          if (existingCancel) existingCancel.remove();
+          uninstallSkill(skill, scope); return;
+        }
+        btn.dataset.confirmed = 'true'; btn.textContent = 'Confirm removal';
+        var cancel = document.createElement('button'); cancel.type = 'button'; cancel.className = 'skills-cancel-remove'; cancel.textContent = 'Cancel';
+        cancel.onclick = function () { btn.dataset.confirmed = ''; btn.textContent = 'Remove'; cancel.remove(); };
+        btn.after(cancel);
       });
     })(unBtns[j]);
   }

package/lib/public/modules/skills-detail.js

@@ -1,148 +1,35 @@
 import { iconHtml, refreshIcons } from './icons.js';
-import { escapeHtml, copyToClipboard, showToast } from './utils.js';
-import { store } from './store.js';
-import { skillState, content, basePath, getInstalledInfo, scopeLabel } from './skills-state.js';
-import { buildInstallButtonsHtml, attachInstallHandlers } from './skills-actions.js';
+import { escapeHtml, copyToClipboard } from './utils.js';
+import { skillState, content, getInstalledInfo, scopeLabel, patchSkills } from './skills-state.js';
+import { buildInstallButtonsHtml, buildLocalActionsHtml, attachInstallHandlers } from './skills-actions.js';
+function text(value) { return escapeHtml(String(value || '')); }
 export function renderDetail(data) {
-  var name = data.name || data._skill || "Unknown";
-  var desc = data.description || "";
-  var cmd = data.command || "npx skills add https://github.com/" + data._source + " --skill " + data._skill;
-  var skillId = data._skill || name;
-  var info = getInstalledInfo(skillId);
-
-  // Show back button in header
-  var backBtn = document.getElementById("skills-back-btn");
-  if (backBtn) backBtn.classList.remove("hidden");
-
-  var html = '<div class="skills-detail">';
-
-  // --- Main content (left) ---
-  html += '<div class="skills-detail-main">';
-  html += '<div class="skills-detail-name">' + escapeHtml(name) + '</div>';
-
-  if (desc) {
-    html += '<div class="skills-detail-desc">' + escapeHtml(desc) + '</div>';
-  }
-
-  html += '<div class="skills-detail-cmd">' +
-    '<code>' + escapeHtml(cmd) + '</code>' +
-    '<button class="skills-copy-btn" data-cmd="' + escapeHtml(cmd) + '">' + iconHtml("copy") + '</button>' +
-  '</div>';
-
-  // SKILL.md content (already rendered HTML from skills.sh)
-  if (data.skillMd) {
-    html += '<div class="skills-detail-md-wrap">' +
-      '<div class="skills-detail-section-title">SKILL.md</div>' +
-      '<div class="skills-detail-md">' + sanitizeSkillHtml(data.skillMd) + '</div>' +
-    '</div>';
-  }
-
-  html += '</div>'; // end main
-
-  // --- Sidebar (right) ---
-  html += '<div class="skills-detail-sidebar">';
-
-  // Weekly installs
-  if (data.weeklyInstalls) {
-    html += '<div class="skills-meta-block">' +
-      '<div class="skills-meta-label">Weekly Installs</div>' +
-      '<div class="skills-meta-value">' + escapeHtml(data.weeklyInstalls) + '</div>' +
-    '</div>';
-  }
-
-  // Repository
-  if (data.repository || data._source) {
-    var repo = data.repository || data._source;
-    html += '<div class="skills-meta-block">' +
-      '<div class="skills-meta-label">Repository</div>' +
-      '<div class="skills-meta-value small">' +
-        '<div class="skills-meta-repo">' +
-          iconHtml("external-link") +
-          '<a href="https://github.com/' + escapeHtml(repo) + '" target="_blank" rel="noopener">' + escapeHtml(repo) + '</a>' +
-        '</div>' +
-      '</div>' +
-    '</div>';
-  }
-
-  // GitHub stars
-  if (data.githubStars) {
-    html += '<div class="skills-meta-block">' +
-      '<div class="skills-meta-label">GitHub Stars</div>' +
-      '<div class="skills-meta-value">' + escapeHtml(data.githubStars) + '</div>' +
-    '</div>';
-  }
-
-  // First seen
-  if (data.firstSeen) {
-    html += '<div class="skills-meta-block">' +
-      '<div class="skills-meta-label">First Seen</div>' +
-      '<div class="skills-meta-value small">' + escapeHtml(data.firstSeen) + '</div>' +
-    '</div>';
-  }
-
-  // Security audits
-  if (data.audits && data.audits.length) {
-    html += '<div class="skills-meta-block">' +
-      '<div class="skills-meta-label">Security Audits</div>' +
-      '<div class="skills-audit-list">';
-    for (var a = 0; a < data.audits.length; a++) {
-      var audit = data.audits[a];
-      html += '<div class="skills-audit-item">' +
-        '<span>' + escapeHtml(audit.name) + '</span>' +
-        '<span class="skills-audit-badge ' + escapeHtml(audit.status) + '">' + escapeHtml(audit.status.toUpperCase()) + '</span>' +
-      '</div>';
-    }
-    html += '</div></div>';
-  }
-
-  // Installed on
-  if (data.installedOn && data.installedOn.length) {
-    html += '<div class="skills-meta-block">' +
-      '<div class="skills-meta-label">Installed On</div>' +
-      '<div class="skills-platform-list">';
-    for (var p = 0; p < data.installedOn.length; p++) {
-      var plat = data.installedOn[p];
-      html += '<div class="skills-platform-item">' +
-        '<span>' + escapeHtml(plat.name) + '</span>' +
-        '<span class="skills-platform-count">' + escapeHtml(plat.installs) + '</span>' +
-      '</div>';
-    }
-    html += '</div></div>';
-  }
-
-  // Install buttons or installed status
-  html += '<div class="skills-meta-block">' +
-    buildInstallButtonsHtml(skillId, data._source, data._skill) +
-  '</div>';
-
-  html += '</div>'; // end sidebar
-  html += '</div>'; // end detail
-
-  content().innerHTML = html;
-  refreshIcons(content());
-
-  // Copy button handler
-  var copyBtn = content().querySelector(".skills-copy-btn");
-  if (copyBtn) {
-    copyBtn.addEventListener("click", function (e) {
-      e.stopPropagation();
-      var cmdText = copyBtn.dataset.cmd;
-      copyToClipboard(cmdText);
-      copyBtn.classList.add("copied");
-      setTimeout(function () { copyBtn.classList.remove("copied"); }, 1500);
-    });
-  }
-
-  // Install button handlers
-  var installActions = content().querySelector(".skills-install-actions");
-  if (installActions) {
-    attachInstallHandlers(installActions, data._source, data._skill);
-  }
-}
-
-function sanitizeSkillHtml(rawHtml) {
-  if (typeof DOMPurify !== "undefined") {
-    return DOMPurify.sanitize(rawHtml);
-  }
-  return rawHtml;
+  patchSkills({ detailData: data });
+  var name = data.name || data._skill || 'Skill', skill = data._skill || name;
+  var info = getInstalledInfo(skill), builtin = info && info.source === 'clay-builtin';
+  var source = data._source || data.repository || '';
+  var cmd = data.command || 'npx skills add https://github.com/' + source + ' --skill ' + skill;
+  var html = '<article class="skills-detail" data-local="' + !!data._installed + '"><header class="skills-detail-heading"><span class="skills-detail-icon">' + iconHtml(builtin ? 'sparkles' : 'book-open') + '</span><h2 class="skills-detail-name" tabindex="-1">' + text(name) + '</h2>';
+  if (data.description) html += '<p class="skills-detail-desc">' + text(data.description) + '</p>';
+  html += '<div class="skills-detail-byline">' + (builtin ? 'Included with Clay' : data._installed ? text(scopeLabel(info && info.scope || data.scope)) : text(source)) + (data.weeklyInstalls ? '<span>' + text(data.weeklyInstalls) + ' weekly installs</span>' : '') + '</div></header>';
+  html += '<section class="skills-placement"><div class="skills-placement-heading"><h3>' + (builtin ? 'Ready to use' : data._installed ? 'Availability' : 'Add to your workflow') + '</h3><p>' + (builtin ? 'This skill comes with Clay and is maintained with the app.' : 'Project skills stay with this workspace. Global skills are available across your projects.') + '</p></div><div data-skill-actions>' + (data._installed ? buildLocalActionsHtml(skill) : buildInstallButtonsHtml(skill, source, skill)) + '</div></section>';
+  if (data.skillMd) html += '<section class="skills-detail-md-wrap"><h3 class="skills-detail-section-title">Instructions</h3><div class="skills-detail-md">' + (typeof DOMPurify !== 'undefined' ? DOMPurify.sanitize(data.skillMd) : text(data.skillMd)) + '</div></section>';
+  if (data._installed && !data.skillMd) html += '<div class="skills-local-note">' + iconHtml('circle-check') + '<p>Your agent can discover this skill when it is relevant to a task. You can also ask for it by name.</p></div>';
+  if (source || data.path || data.version || data.audits || data.githubStars || data.firstSeen || data.installedOn) {
+    html += '<details class="skills-metadata"><summary>Skill information</summary><dl>';
+    if (source) html += '<dt>Repository</dt><dd><a href="https://github.com/' + text(source) + '" target="_blank" rel="noopener noreferrer">' + text(source) + '</a></dd>';
+    if (data.version) html += '<dt>Version</dt><dd>' + text(data.version) + '</dd>';
+    if (data.path) html += '<dt>Location</dt><dd><code>' + text(data.path) + '</code></dd>';
+    if (data.githubStars) html += '<dt>GitHub stars</dt><dd>' + text(data.githubStars) + '</dd>';
+    if (data.firstSeen) html += '<dt>First seen</dt><dd>' + text(data.firstSeen) + '</dd>';
+    (data.audits || []).forEach(function (audit) { html += '<dt>' + text(audit.name) + '</dt><dd>' + text(audit.status) + '</dd>'; });
+    (data.installedOn || []).forEach(function (platform) { html += '<dt>' + text(platform.name) + '</dt><dd>' + text(platform.installs) + ' installs</dd>'; });
+    html += '</dl></details>';
+  }
+  if (!data._installed) html += '<details class="skills-manual"><summary>Install from your terminal</summary><div class="skills-detail-cmd"><code>' + text(cmd) + '</code><button type="button" class="skills-copy-btn" aria-label="Copy installation command">' + iconHtml('copy') + '</button></div></details>';
+  html += '</article>';
+  content().innerHTML = html; refreshIcons();
+  var copy = content().querySelector('.skills-copy-btn'); if (copy) copy.onclick = function () { copyToClipboard(cmd); };
+  attachInstallHandlers(content().querySelector('[data-skill-actions]'), source, skill);
+  content().querySelector('h2').focus({ preventScroll: true });
 }

package/lib/public/modules/skills-list-view.js

@@ -0,0 +1,29 @@
+import { iconHtml, refreshIcons } from './icons.js';
+import { escapeHtml } from './utils.js';
+import { content, skillState, getInstalledInfo, scopeLabel } from './skills-state.js';
+
+function text(value) { return escapeHtml(String(value || '')); }
+function count(value) { return typeof value === 'number' ? new Intl.NumberFormat('en', { notation: 'compact', maximumFractionDigits: 1 }).format(value) : text(value || '0'); }
+export function renderSkillList(skills, openSkill, discover) {
+  var state = skillState(), installed = state.activeTab === 'installed';
+  var query = state.searchQuery.toLowerCase();
+  if (installed) skills = Object.keys(state.installedSkills).sort().map(function (name) { return Object.assign({ name: name, skillId: name }, state.installedSkills[name]); }).filter(function (row) { return (row.name + ' ' + (row.description || '')).toLowerCase().includes(query); });
+  var html = '<div class="skills-list-intro"><span>' + (installed ? 'Available to your agent' : state.searchQuery ? 'Search results' : 'Explore community skills') + '</span><span>' + skills.length + (skills.length === 1 ? ' skill' : ' skills') + '</span></div>';
+  if (!skills.length) {
+    html += '<div class="skills-library-empty">' + iconHtml(query ? 'search' : 'book-open') + '<h3>' + (query ? 'No matching skills' : 'Build your skill library') + '</h3><p>' + (query ? 'Try a different name or a shorter search.' : 'Discover reusable workflows and add the ones that fit your work.') + '</p>' + (!query && installed ? '<button type="button" class="skills-browse-btn">Discover skills ' + iconHtml('arrow-right') + '</button>' : '') + '</div>';
+  } else html += '<div class="skills-library-list">' + skills.map(function (row, index) {
+    var info = installed ? row : getInstalledInfo(row.skillId || row.name);
+    var builtin = info && info.source === 'clay-builtin';
+    return '<button type="button" class="skills-library-row" data-skill-index="' + index + '"><span class="skills-library-icon">' + iconHtml(builtin ? 'sparkles' : 'book-open') + '</span><span class="skills-library-info"><span class="skills-library-name">' + text(row.name) + '</span>' + (row.description ? '<span class="skills-library-desc">' + text(row.description) + '</span>' : '') + '<span class="skills-library-meta">' + (installed ? (builtin ? 'Included with Clay' : text(scopeLabel(row.scope))) : text(row.source)) + '</span></span><span class="skills-library-end">' + (info ? '<span class="skills-library-badge">' + (builtin ? 'Built-in' : installed ? '' : 'Installed') + '</span>' : '<span class="skills-library-installs">' + iconHtml('download') + count(row.installs) + '</span>') + iconHtml('chevron-right') + '</span></button>';
+  }).join('') + '</div>';
+  if (!installed) html += '<p class="skills-catalog-credit">Community catalog from <a href="https://skills.sh" target="_blank" rel="noopener noreferrer">skills.sh</a></p>';
+  content().innerHTML = html;
+  content().querySelectorAll('[data-skill-index]').forEach(function (button) { button.onclick = function () { openSkill(skills[Number(button.dataset.skillIndex)], installed); }; });
+  var browse = content().querySelector('.skills-browse-btn'); if (browse) browse.onclick = discover;
+  refreshIcons();
+}
+export function renderSkillFeedback(message, retry) {
+  content().innerHTML = '<div class="skills-library-empty" role="status">' + iconHtml(retry ? 'circle-alert' : 'loader-circle') + '<p>' + text(message) + '</p>' + (retry ? '<button type="button" class="skills-browse-btn">Try again</button>' : '') + '</div>';
+  var button = content().querySelector('button'); if (button) button.onclick = retry;
+  refreshIcons();
+}

package/lib/public/modules/skills-state.js

@@ -1,10 +1,12 @@
 import { store } from './store.js';
 export function skillState() {
   var value = store.get('skillsUi');
-  if (!value) { value = { activeTab: 'installed', currentView: 'list', skillsData: {}, installedSkills: {}, searchQuery: '', searchTimer: null, searchCache: {} }; store.set({ skillsUi: value }); }
+  if (!value) { value = { activeTab: 'installed', discoverySort: 'all', requestVersion: 0, currentView: 'list', skillsData: {}, installedSkills: {}, searchQuery: '', searchTimer: null, searchCache: {} }; store.set({ skillsUi: value }); }
   return value;
 }
 export function content() { return document.getElementById('skills-content'); }
 export function basePath() { return store.get('basePath') || ''; }
 export function getInstalledInfo(skillId) { return skillState().installedSkills[skillId] || null; }
-export function scopeLabel(scope) { return scope === 'both' ? 'Global + Project' : scope === 'project' ? 'Project' : 'Global'; }
+export function scopeLabel(scope) { return scope === 'both' ? 'This project + All projects' : scope === 'project' ? 'This project' : 'All projects'; }
+
+export function patchSkills(values) { store.set({ skillsUi: Object.assign({}, skillState(), values) }); }