clay-server 2.27.0-beta.8 → 2.27.0

package/lib/public/modules/app-skills-install.js

@@ -0,0 +1,234 @@
+// app-skills-install.js - Skill install dialog, requireSkills, requireClayMateInterview
+// Extracted from app.js (PR-33)
+
+import { refreshIcons, iconHtml } from './icons.js';
+import { escapeHtml } from './utils.js';
+import { store } from './store.js';
+
+// --- Module-owned state (not in store) ---
+var skillInstallModal = null;
+var skillInstallTitle = null;
+var skillInstallReason = null;
+var skillInstallList = null;
+var skillInstallOk = null;
+var skillInstallCancel = null;
+var skillInstallStatus = null;
+
+var pendingSkillInstalls = [];
+var skillInstallCallback = null;
+var skillInstalling = false;
+var skillInstallDone = false;
+
+export function initSkillInstall() {
+  skillInstallModal = document.getElementById("skill-install-modal");
+  skillInstallTitle = document.getElementById("skill-install-title");
+  skillInstallReason = document.getElementById("skill-install-reason");
+  skillInstallList = document.getElementById("skill-install-list");
+  skillInstallOk = document.getElementById("skill-install-ok");
+  skillInstallCancel = document.getElementById("skill-install-cancel");
+  skillInstallStatus = document.getElementById("skill-install-status");
+
+  skillInstallCancel.addEventListener("click", hideSkillInstallModal);
+  skillInstallModal.querySelector(".confirm-backdrop").addEventListener("click", hideSkillInstallModal);
+
+  skillInstallOk.addEventListener("click", function () {
+    if (skillInstallDone) {
+      var proceedCb = skillInstallCallback;
+      skillInstallCallback = null;
+      hideSkillInstallModal();
+      if (proceedCb) proceedCb();
+      return;
+    }
+    if (skillInstalling) return;
+    skillInstalling = true;
+    skillInstallOk.disabled = true;
+    skillInstallOk.textContent = "Installing...";
+
+    var total = 0;
+    for (var i = 0; i < pendingSkillInstalls.length; i++) {
+      if (!pendingSkillInstalls[i].installed) total++;
+    }
+    skillInstallStatus.classList.remove("hidden");
+    updateSkillInstallProgress(0, total);
+
+    for (var j = 0; j < pendingSkillInstalls.length; j++) {
+      var s = pendingSkillInstalls[j];
+      if (s.installed) continue;
+      fetch(store.getState().basePath + "api/install-skill", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ url: s.url, skill: s.name, scope: s.scope || "global" }),
+      }).catch(function () {});
+    }
+  });
+}
+
+// --- Functions ---
+
+function renderSkillInstallDialog(opts, missing) {
+  var hasOutdated = false;
+  var hasMissing = false;
+  for (var c = 0; c < missing.length; c++) {
+    if (missing[c].status === "outdated") hasOutdated = true;
+    else hasMissing = true;
+  }
+  var defaultTitle = hasMissing ? "Skill Installation Required" : "Skill Update Available";
+  var defaultReason = hasMissing
+    ? "This feature requires the following skill(s) to be installed."
+    : "Newer versions of the following skill(s) are available.";
+  if (hasMissing && hasOutdated) {
+    defaultTitle = "Skill Installation / Update Required";
+    defaultReason = "Some skills need to be installed or updated.";
+  }
+  skillInstallTitle.textContent = opts.title || defaultTitle;
+  skillInstallReason.textContent = opts.reason || defaultReason;
+  skillInstallList.innerHTML = "";
+  for (var i = 0; i < missing.length; i++) {
+    var s = missing[i];
+    var badge = s.status === "outdated"
+      ? '<span class="skill-badge skill-badge-update">Update ' + escapeHtml(s.installedVersion || "") + ' \u2192 ' + escapeHtml(s.remoteVersion || "") + '</span>'
+      : '<span class="skill-badge skill-badge-new">New</span>';
+    var item = document.createElement("div");
+    item.className = "skill-install-item";
+    item.setAttribute("data-skill", s.name);
+    item.innerHTML = '<span class="skill-icon">&#x1f9e9;</span>' +
+      '<div class="skill-info">' +
+        '<span class="skill-name">' + escapeHtml(s.name) + '</span>' +
+        badge +
+      '</div>' +
+      '<span class="skill-status"></span>';
+    skillInstallList.appendChild(item);
+  }
+  skillInstallStatus.classList.add("hidden");
+  skillInstallStatus.innerHTML = "";
+  skillInstallOk.disabled = false;
+  var btnLabel = hasMissing ? "Install" : "Update";
+  if (hasMissing && hasOutdated) btnLabel = "Install / Update";
+  skillInstallOk.textContent = btnLabel;
+  skillInstallOk.className = "confirm-btn confirm-delete";
+  skillInstallModal.classList.remove("hidden");
+}
+
+function hideSkillInstallModal() {
+  skillInstallModal.classList.add("hidden");
+  skillInstallCallback = null;
+  pendingSkillInstalls = [];
+  skillInstalling = false;
+  skillInstallDone = false;
+}
+
+function updateSkillInstallProgress(done, total) {
+  var hasUpdates = false;
+  for (var u = 0; u < pendingSkillInstalls.length; u++) {
+    if (pendingSkillInstalls[u].status === "outdated") { hasUpdates = true; break; }
+  }
+  var label = hasUpdates ? "Updating" : "Installing";
+  skillInstallStatus.innerHTML = '<div class="skills-spinner small"></div> ' + label + ' skills... (' + done + '/' + total + ')';
+}
+
+function updateSkillListItems() {
+  var items = skillInstallList.querySelectorAll(".skill-install-item");
+  for (var i = 0; i < items.length; i++) {
+    var name = items[i].getAttribute("data-skill");
+    for (var j = 0; j < pendingSkillInstalls.length; j++) {
+      if (pendingSkillInstalls[j].name === name) {
+        var statusEl = items[i].querySelector(".skill-status");
+        if (pendingSkillInstalls[j].installed) {
+          if (statusEl) {
+            statusEl.innerHTML = '<span class="skill-status-ok">' + iconHtml("circle-check") + '</span>';
+            refreshIcons();
+          }
+        }
+        break;
+      }
+    }
+  }
+}
+
+export function handleSkillInstallWs(msg) {
+  if (!skillInstalling || pendingSkillInstalls.length === 0) return;
+  for (var i = 0; i < pendingSkillInstalls.length; i++) {
+    if (pendingSkillInstalls[i].name === msg.skill) {
+      if (msg.success) {
+        pendingSkillInstalls[i].installed = true;
+        var _kis = Object.assign({}, store.getState().knownInstalledSkills);
+        _kis[msg.skill] = true;
+        store.setState({ knownInstalledSkills: _kis });
+      } else {
+        skillInstalling = false;
+        skillInstallOk.disabled = false;
+        skillInstallOk.textContent = "Install";
+        skillInstallStatus.innerHTML = "Failed to install " + escapeHtml(msg.skill) + ". Try again.";
+        updateSkillListItems();
+        return;
+      }
+    }
+  }
+
+  var doneCount = 0;
+  var totalCount = pendingSkillInstalls.length;
+  for (var k = 0; k < pendingSkillInstalls.length; k++) {
+    if (pendingSkillInstalls[k].installed) doneCount++;
+  }
+  updateSkillListItems();
+  updateSkillInstallProgress(doneCount, totalCount);
+
+  if (doneCount === totalCount) {
+    skillInstallDone = true;
+    var hasUpdates = false;
+    for (var u = 0; u < pendingSkillInstalls.length; u++) {
+      if (pendingSkillInstalls[u].status === "outdated") { hasUpdates = true; break; }
+    }
+    var doneMsg = hasUpdates ? "All skills updated successfully." : "All skills installed successfully.";
+    skillInstallStatus.innerHTML = '<span class="skill-status-ok">' + iconHtml("circle-check") + '</span> ' + doneMsg;
+    refreshIcons();
+    skillInstallOk.disabled = false;
+    skillInstallOk.textContent = "Proceed";
+    skillInstallOk.className = "confirm-btn confirm-proceed";
+  }
+}
+
+export function requireSkills(opts, cb) {
+  fetch(store.getState().basePath + "api/check-skill-updates", {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ skills: opts.skills }),
+  })
+    .then(function (res) { return res.json(); })
+    .then(function (data) {
+      var results = data.results || [];
+      var actionable = [];
+      for (var i = 0; i < results.length; i++) {
+        var r = results[i];
+        if (r.status === "missing" || r.status === "outdated") {
+          var orig = null;
+          for (var j = 0; j < opts.skills.length; j++) {
+            if (opts.skills[j].name === r.name) { orig = opts.skills[j]; break; }
+          }
+          if (!orig) continue;
+          actionable.push({
+            name: r.name,
+            url: orig.url,
+            scope: orig.scope || "global",
+            installed: false,
+            status: r.status,
+            installedVersion: r.installedVersion,
+            remoteVersion: r.remoteVersion,
+          });
+        }
+      }
+      if (actionable.length === 0) { cb(); return; }
+      pendingSkillInstalls = actionable;
+      skillInstallCallback = cb;
+      renderSkillInstallDialog(opts, actionable);
+    })
+    .catch(function () { cb(); });
+}
+
+export function requireClayMateInterview(cb) {
+  requireSkills({
+    title: "Skill Installation Required",
+    reason: "The Mate Interview skill is required to create a new Mate.",
+    skills: [{ name: "clay-mate-interview", url: "https://github.com/chadbyte/clay-mate-interview", scope: "global" }]
+  }, cb);
+}

package/lib/public/modules/command-palette.js

@@ -3,6 +3,25 @@ import { escapeHtml } from './utils.js';
 import { refreshIcons } from './icons.js';
 import { openSearch as openSessionSearch } from './session-search.js';
 
+function formatRelativeDate(ts) {
+  if (!ts) return "";
+  var now = Date.now();
+  var diff = now - ts;
+  if (diff < 0) diff = 0;
+  var sec = Math.floor(diff / 1000);
+  if (sec < 60) return "just now";
+  var min = Math.floor(sec / 60);
+  if (min < 60) return min + "m ago";
+  var hr = Math.floor(min / 60);
+  if (hr < 24) return hr + "h ago";
+  var days = Math.floor(hr / 24);
+  if (days < 7) return days + "d ago";
+  if (days < 30) return Math.floor(days / 7) + "w ago";
+  var d = new Date(ts);
+  var months = ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];
+  return months[d.getMonth()] + " " + d.getDate() + ", " + d.getFullYear();
+}
+
 var ctx;
 var paletteEl = null;
 var inputEl = null;
@@ -260,7 +279,7 @@ function renderHome(filter) {
         iconHtml = s.projectIcon || '<i data-lucide="message-square"></i>';
       }
       var projLabel = (s.projectIcon || "") + " " + escapeHtml(s.projectTitle || s.projectSlug);
-      html += renderItem(flatIndex, iconHtml, escapeHtml(s.sessionTitle || "New Session"), projLabel.trim(), null);
+      html += renderItem(flatIndex, iconHtml, escapeHtml(s.sessionTitle || "New Session"), projLabel.trim(), null, s.lastActivity);
       flatIndex++;
     }
   }
@@ -418,7 +437,7 @@ function appendHomeSearchResults(results, query) {
     }
     var projLabel = (r.projectIcon || "") + " " + escapeHtml(r.projectTitle || r.projectSlug);
     var snippet = r.snippet ? escapeHtml(r.snippet) : "";
-    html += renderItem(flatIndex, srIconHtml, escapeHtml(r.sessionTitle || "New Session"), projLabel.trim(), snippet);
+    html += renderItem(flatIndex, srIconHtml, escapeHtml(r.sessionTitle || "New Session"), projLabel.trim(), snippet, r.lastActivity);
     flatIndex++;
   }
 
@@ -436,11 +455,15 @@ function appendHomeSearchResults(results, query) {
 // Shared rendering / interaction helpers
 // ==========================================
 
-function renderItem(index, iconContent, title, desc, snippet) {
+function renderItem(index, iconContent, title, desc, snippet, timestamp) {
+  var dateStr = formatRelativeDate(timestamp);
   return '<div class="cmd-palette-item" data-index="' + index + '">' +
     '<div class="cmd-palette-item-icon">' + iconContent + '</div>' +
     '<div class="cmd-palette-item-body">' +
-      '<div class="cmd-palette-item-title">' + title + '</div>' +
+      '<div class="cmd-palette-item-title-row">' +
+        '<span class="cmd-palette-item-title">' + title + '</span>' +
+        (dateStr ? '<span class="cmd-palette-item-date">' + dateStr + '</span>' : '') +
+      '</div>' +
       (desc || snippet ?
         '<div class="cmd-palette-item-meta">' +
           (desc ? '<span class="cmd-palette-item-project">' + desc + '</span>' : '') +

package/lib/public/modules/input.js

@@ -150,29 +150,39 @@ export function sendMessage() {
   }
 
   // Check for @mention: if a mate was selected, route to mention handler
+  // Exception: if we're in a DM with the same mate, send as regular message instead
   var mention = parseMentionFromInput(text);
   if (mention) {
-    hideMentionMenu();
-    if (ctx.hideSuggestionChips) ctx.hideSuggestionChips();
-    var mentionImages = pendingImages.slice();
-    var mentionPastes = pendingPastes.map(function (p) { return p.text; });
-    // Prepend file paths to mention text (same pattern as regular messages)
-    var mentionFiles = pendingFiles.slice();
-    var mentionText = mention.text;
-    if (mentionFiles.length > 0) {
-      var mFilePaths = mentionFiles.map(function (f) { return "[Uploaded file: " + f.path + "]"; }).join("\n");
-      mentionText = mentionText ? mFilePaths + "\n\n" + mentionText : mFilePaths;
+    var dmMateId = ctx.getDmMateId ? ctx.getDmMateId() : null;
+    if (dmMateId && dmMateId === mention.mateId) {
+      // In DM with this mate — strip mention chip and send as normal message
+      hideMentionMenu();
+      removeMentionChip();
+      text = mention.text;
+      // Fall through to normal message send below
+    } else {
+      hideMentionMenu();
+      if (ctx.hideSuggestionChips) ctx.hideSuggestionChips();
+      var mentionImages = pendingImages.slice();
+      var mentionPastes = pendingPastes.map(function (p) { return p.text; });
+      // Prepend file paths to mention text (same pattern as regular messages)
+      var mentionFiles = pendingFiles.slice();
+      var mentionText = mention.text;
+      if (mentionFiles.length > 0) {
+        var mFilePaths = mentionFiles.map(function (f) { return "[Uploaded file: " + f.path + "]"; }).join("\n");
+        mentionText = mentionText ? mFilePaths + "\n\n" + mentionText : mFilePaths;
+      }
+      // Render user message with mention chip (same as history replay)
+      renderMentionUser({ mateName: mention.mateName, text: mentionText, images: mentionImages.length > 0 ? mentionImages : null, pastes: mentionPastes.length > 0 ? mentionPastes : null });
+      sendMention(mention.mateId, mentionText, mentionPastes, mentionImages);
+      ctx.inputEl.value = "";
+      stickyReapplyMention();
+      sendInputSync();
+      clearPendingImages();
+      autoResize();
+      ctx.inputEl.focus();
+      return;
     }
-    // Render user message with mention chip (same as history replay)
-    renderMentionUser({ mateName: mention.mateName, text: mentionText, images: mentionImages.length > 0 ? mentionImages : null, pastes: mentionPastes.length > 0 ? mentionPastes : null });
-    sendMention(mention.mateId, mentionText, mentionPastes, mentionImages);
-    ctx.inputEl.value = "";
-    stickyReapplyMention();
-    sendInputSync();
-    clearPendingImages();
-    autoResize();
-    ctx.inputEl.focus();
-    return;
   }
 
   // Prepend file paths to text
@@ -197,6 +207,7 @@ export function sendMessage() {
     return;
   }
 
+  ctx.currentMsgTs = Date.now();
   ctx.addUserMessage(text, images.length > 0 ? images : null, pastes.length > 0 ? pastes : null);
 
   var payload = { type: "message", text: text || "" };