clay-server 2.13.0-beta.2 → 2.13.0-beta.4

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

@@ -0,0 +1,549 @@
+import { escapeHtml } from './utils.js';
+import { refreshIcons } from './icons.js';
+import { openSearch as openSessionSearch } from './session-search.js';
+
+var ctx;
+var paletteEl = null;
+var inputEl = null;
+var resultsEl = null;
+var footerEl = null;
+var activeIndex = -1;
+var items = [];
+var debounceTimer = null;
+var abortCtrl = null;
+var pendingNav = null;
+var mode = "home"; // "home" or "search"
+var cachedHomeData = null;
+var cachedVersion = null;
+
+// --- Commands registry ---
+var commands = [
+  { id: "search", label: "Search sessions", desc: "Search across all projects", icon: "search", action: "enterSearch" },
+  { id: "create-mate", label: "Create Mate", desc: "Create a new AI teammate", icon: "user-plus", action: "createMate" },
+  { id: "settings", label: "Server settings", desc: "Configure server", icon: "settings", action: "openSettings" },
+  { id: "home", label: "Home", desc: "Go to home hub", icon: "home", action: "showHome" },
+];
+
+export function initCommandPalette(_ctx) {
+  ctx = _ctx;
+  buildDOM();
+  // Top bar search bar trigger
+  var hintBtn = document.getElementById("cmd-palette-btn");
+  if (hintBtn) {
+    var isMac = navigator.platform.indexOf("Mac") !== -1;
+    var kbdEl = hintBtn.querySelector(".cmd-palette-searchbar-kbd");
+    if (kbdEl) kbdEl.textContent = isMac ? "\u2318K" : "Ctrl+K";
+    hintBtn.addEventListener("click", function () {
+      if (isCommandPaletteOpen()) {
+        closeCommandPalette();
+      } else {
+        openCommandPalette();
+      }
+    });
+  }
+  document.addEventListener("keydown", function (e) {
+    if ((e.metaKey || e.ctrlKey) && e.key === "k") {
+      e.preventDefault();
+      if (isCommandPaletteOpen()) {
+        closeCommandPalette();
+      } else {
+        openCommandPalette();
+      }
+    }
+  });
+}
+
+export function isCommandPaletteOpen() {
+  return paletteEl && !paletteEl.classList.contains("hidden");
+}
+
+export function openCommandPalette() {
+  if (!paletteEl) return;
+  mode = "home";
+  paletteEl.classList.remove("hidden");
+  var searchbar = document.getElementById("cmd-palette-btn");
+  if (searchbar) searchbar.style.visibility = "hidden";
+  inputEl.value = "";
+  inputEl.placeholder = "Type a command or search...";
+  activeIndex = -1;
+  items = [];
+  resultsEl.innerHTML = '<div class="cmd-palette-loading">Loading...</div>';
+  updateFooter();
+  inputEl.focus();
+  fetchHomeData();
+}
+
+export function closeCommandPalette() {
+  if (!paletteEl) return;
+  paletteEl.classList.add("hidden");
+  var searchbar = document.getElementById("cmd-palette-btn");
+  if (searchbar) searchbar.style.visibility = "";
+  inputEl.value = "";
+  resultsEl.innerHTML = "";
+  items = [];
+  activeIndex = -1;
+  mode = "home";
+  if (debounceTimer) { clearTimeout(debounceTimer); debounceTimer = null; }
+  if (abortCtrl) { abortCtrl.abort(); abortCtrl = null; }
+}
+
+export function setPaletteVersion(version) {
+  cachedVersion = version;
+}
+
+export function handlePaletteSessionSwitch() {
+  if (!pendingNav) return;
+  var nav = pendingNav;
+  pendingNav = null;
+  if (ctx.currentSlug && ctx.currentSlug() === nav.slug) {
+    ctx.selectSession(nav.sessionId);
+    if (nav.query) {
+      setTimeout(function () { openSessionSearch(nav.query); }, 400);
+    }
+  }
+}
+
+function buildDOM() {
+  paletteEl = document.createElement("div");
+  paletteEl.className = "cmd-palette hidden";
+  paletteEl.innerHTML =
+    '<div class="cmd-palette-backdrop"></div>' +
+    '<div class="cmd-palette-dialog">' +
+      '<div class="cmd-palette-input-row">' +
+        '<i data-lucide="search"></i>' +
+        '<input class="cmd-palette-input" type="text" placeholder="Type a command or search..." autocomplete="off" spellcheck="false" />' +
+        '<span class="cmd-palette-kbd" id="cmd-palette-close"><i data-lucide="x"></i></span>' +
+      '</div>' +
+      '<div class="cmd-palette-results"></div>' +
+      '<div class="cmd-palette-footer"></div>' +
+    '</div>';
+
+  document.body.appendChild(paletteEl);
+  refreshIcons();
+
+  inputEl = paletteEl.querySelector(".cmd-palette-input");
+  resultsEl = paletteEl.querySelector(".cmd-palette-results");
+  footerEl = paletteEl.querySelector(".cmd-palette-footer");
+
+  paletteEl.querySelector(".cmd-palette-backdrop").addEventListener("click", function () {
+    closeCommandPalette();
+  });
+
+  paletteEl.querySelector("#cmd-palette-close").addEventListener("click", function () {
+    closeCommandPalette();
+  });
+
+  inputEl.addEventListener("input", function () {
+    var q = inputEl.value;
+    if (debounceTimer) clearTimeout(debounceTimer);
+    if (mode === "search") {
+      debounceTimer = setTimeout(function () {
+        fetchSearchResults(q.trim());
+      }, 250);
+    } else {
+      renderHome(q.trim());
+    }
+  });
+
+  inputEl.addEventListener("keydown", function (e) {
+    if (e.key === "Escape") {
+      e.preventDefault();
+      if (mode === "search") {
+        // Back to home mode
+        mode = "home";
+        inputEl.value = "";
+        inputEl.placeholder = "Type a command or search...";
+        updateFooter();
+        renderHome("");
+      } else {
+        closeCommandPalette();
+      }
+      return;
+    }
+    if (e.key === "Backspace" && mode === "search" && inputEl.value === "") {
+      e.preventDefault();
+      mode = "home";
+      inputEl.placeholder = "Type a command or search...";
+      updateFooter();
+      renderHome("");
+      return;
+    }
+    if (e.key === "ArrowDown") {
+      e.preventDefault();
+      setActive(activeIndex + 1);
+      return;
+    }
+    if (e.key === "ArrowUp") {
+      e.preventDefault();
+      setActive(activeIndex - 1);
+      return;
+    }
+    if (e.key === "Enter") {
+      e.preventDefault();
+      if (activeIndex >= 0 && activeIndex < items.length) {
+        activateItem(items[activeIndex]);
+      }
+      return;
+    }
+  });
+
+  paletteEl.querySelector(".cmd-palette-dialog").addEventListener("click", function (e) {
+    e.stopPropagation();
+  });
+}
+
+function updateFooter() {
+  var shortcuts = '';
+  if (mode === "search") {
+    shortcuts =
+      '<span><kbd>&uarr;</kbd> <kbd>&darr;</kbd> navigate</span>' +
+      '<span><kbd>Enter</kbd> open</span>' +
+      '<span><kbd>Esc</kbd> back</span>';
+  } else {
+    shortcuts =
+      '<span><kbd>&uarr;</kbd> <kbd>&darr;</kbd> navigate</span>' +
+      '<span><kbd>Enter</kbd> select</span>';
+  }
+  var versionText = cachedVersion ? "v" + cachedVersion : "";
+  footerEl.innerHTML =
+    '<a href="https://github.com/chadbyte/clay" target="_blank" rel="noopener" class="cmd-palette-brand"><img src="favicon-banded.png" width="13" height="13" alt="">Clay ' + versionText + '</a>' +
+    '<span class="cmd-palette-footer-shortcuts">' + shortcuts + '</span>';
+}
+
+// ==========================================
+// HOME MODE: commands + recent sessions + projects
+// ==========================================
+
+function fetchHomeData() {
+  if (abortCtrl) { abortCtrl.abort(); abortCtrl = null; }
+  abortCtrl = new AbortController();
+  fetch("/api/palette/search", { signal: abortCtrl.signal })
+    .then(function (res) { return res.json(); })
+    .then(function (data) {
+      abortCtrl = null;
+      cachedHomeData = data.results || [];
+      renderHome("");
+    })
+    .catch(function (err) {
+      if (err.name === "AbortError") return;
+      abortCtrl = null;
+      cachedHomeData = [];
+      renderHome("");
+    });
+}
+
+function renderHome(filter) {
+  var f = (filter || "").toLowerCase();
+  items = [];
+  var html = "";
+  var flatIndex = 0;
+
+  // --- Commands ---
+  var filteredCmds = commands.filter(function (c) {
+    if (!f) return true;
+    return c.label.toLowerCase().indexOf(f) !== -1 || c.desc.toLowerCase().indexOf(f) !== -1;
+  });
+  if (filteredCmds.length > 0) {
+    html += '<div class="cmd-palette-group-label">Commands</div>';
+    for (var i = 0; i < filteredCmds.length; i++) {
+      var cmd = filteredCmds[i];
+      items.push({ type: "command", data: cmd });
+      html += renderItem(flatIndex, '<i data-lucide="' + cmd.icon + '"></i>', cmd.label, cmd.desc, null);
+      flatIndex++;
+    }
+  }
+
+  // --- Recent sessions ---
+  var recentSessions = (cachedHomeData || []);
+  if (f) {
+    recentSessions = recentSessions.filter(function (s) {
+      return (s.sessionTitle || "").toLowerCase().indexOf(f) !== -1 ||
+        (s.projectTitle || "").toLowerCase().indexOf(f) !== -1;
+    });
+  }
+  var maxRecent = f ? 10 : 5;
+  if (recentSessions.length > maxRecent) recentSessions = recentSessions.slice(0, maxRecent);
+  if (recentSessions.length > 0) {
+    html += '<div class="cmd-palette-group-label">Recent</div>';
+    for (var r = 0; r < recentSessions.length; r++) {
+      var s = recentSessions[r];
+      items.push({ type: "session", data: s });
+      var projLabel = (s.projectIcon || "") + " " + escapeHtml(s.projectTitle || s.projectSlug);
+      html += renderItem(flatIndex, s.projectIcon || '<i data-lucide="message-square"></i>', escapeHtml(s.sessionTitle || "New Session"), projLabel.trim(), null);
+      flatIndex++;
+    }
+  }
+
+  // --- Users (DM) ---
+  var allUsers = ctx.allUsers ? ctx.allUsers() : [];
+  var dmConversations = ctx.dmConversations ? ctx.dmConversations() : [];
+  var myId = ctx.myUserId ? ctx.myUserId() : null;
+  // Show recent DM conversations first, then filter all users when searching
+  var userList = [];
+  if (f) {
+    userList = allUsers.filter(function (u) {
+      if (u.id === myId) return false;
+      var name = (u.displayName || u.username || "").toLowerCase();
+      return name.indexOf(f) !== -1;
+    });
+  } else {
+    // Recent conversations only
+    for (var di = 0; di < dmConversations.length && di < 5; di++) {
+      var dmUserId = dmConversations[di];
+      for (var ai = 0; ai < allUsers.length; ai++) {
+        if (allUsers[ai].id === dmUserId && dmUserId !== myId) {
+          userList.push(allUsers[ai]);
+          break;
+        }
+      }
+    }
+  }
+  if (userList.length > 0) {
+    html += '<div class="cmd-palette-group-label">' + (f ? "Users" : "Recent conversations") + '</div>';
+    for (var ui = 0; ui < userList.length; ui++) {
+      var user = userList[ui];
+      items.push({ type: "user", data: user });
+      var userName = escapeHtml(user.displayName || user.username);
+      var userSub = user.username ? "@" + escapeHtml(user.username) : "";
+      var uAvatarStyle = user.avatarStyle || "thumbs";
+      var uAvatarSeed = user.avatarSeed || user.username || user.id;
+      var uAvatarUrl = "https://api.dicebear.com/9.x/" + uAvatarStyle + "/svg?seed=" + encodeURIComponent(uAvatarSeed) + "&size=28";
+      var uAvatarHtml = '<img src="' + uAvatarUrl + '" width="28" height="28" style="border-radius:50%;" alt="">';
+      html += renderItem(flatIndex, uAvatarHtml, userName, userSub, null);
+      flatIndex++;
+    }
+  }
+
+  // --- Mates ---
+  var matesList = ctx.matesList ? ctx.matesList() : [];
+  var filteredMates = matesList.filter(function (m) {
+    if (!f) return true;
+    var mp = m.profile || {};
+    var name = (mp.displayName || m.name || "").toLowerCase();
+    return name.indexOf(f) !== -1;
+  });
+  if (filteredMates.length > 0) {
+    html += '<div class="cmd-palette-group-label">Mates</div>';
+    for (var mi = 0; mi < filteredMates.length; mi++) {
+      var mate = filteredMates[mi];
+      var mp = mate.profile || {};
+      items.push({ type: "mate", data: mate });
+      var mateName = escapeHtml(mp.displayName || mate.name || "Mate");
+      var avatarStyle = mp.avatarStyle || "bottts";
+      var avatarSeed = mp.avatarSeed || mate.id;
+      var avatarUrl = "https://api.dicebear.com/9.x/" + avatarStyle + "/svg?seed=" + encodeURIComponent(avatarSeed) + "&size=28";
+      var avatarHtml = '<img src="' + avatarUrl + '" width="28" height="28" style="border-radius:50%;" alt="">';
+      html += renderItem(flatIndex, avatarHtml, mateName, null, null);
+      flatIndex++;
+    }
+  }
+
+  // --- Projects ---
+  var projectList = ctx.projectList ? ctx.projectList() : [];
+  var filteredProjects = projectList.filter(function (p) {
+    if (p.isMate) return false;
+    if (p.isWorktree) return false;
+    if (!f) return true;
+    var name = (p.title || p.project || p.slug || "").toLowerCase();
+    return name.indexOf(f) !== -1;
+  });
+  if (filteredProjects.length > 0) {
+    html += '<div class="cmd-palette-group-label">Projects</div>';
+    for (var j = 0; j < filteredProjects.length; j++) {
+      var proj = filteredProjects[j];
+      items.push({ type: "project", data: proj });
+      var pName = escapeHtml(proj.title || proj.project || proj.slug);
+      var sessLabel = proj.sessions ? proj.sessions + " sessions" : "";
+      html += renderItem(flatIndex, proj.icon || '<i data-lucide="box"></i>', pName, sessLabel, null);
+      flatIndex++;
+    }
+  }
+
+  if (items.length === 0) {
+    html = '<div class="cmd-palette-empty">No matching results</div>';
+  }
+
+  resultsEl.innerHTML = html;
+  activeIndex = -1;
+  refreshIcons();
+  bindItemEvents();
+}
+
+// ==========================================
+// SEARCH MODE: cross-project session content search
+// ==========================================
+
+function enterSearchMode() {
+  mode = "search";
+  inputEl.value = "";
+  inputEl.placeholder = "Search session titles and content...";
+  resultsEl.innerHTML = '<div class="cmd-palette-empty">Type to search across all projects</div>';
+  items = [];
+  activeIndex = -1;
+  updateFooter();
+  inputEl.focus();
+}
+
+function fetchSearchResults(query) {
+  if (!query) {
+    resultsEl.innerHTML = '<div class="cmd-palette-empty">Type to search across all projects</div>';
+    items = [];
+    activeIndex = -1;
+    return;
+  }
+  if (abortCtrl) { abortCtrl.abort(); abortCtrl = null; }
+  abortCtrl = new AbortController();
+  resultsEl.innerHTML = '<div class="cmd-palette-loading">Searching...</div>';
+  fetch("/api/palette/search?q=" + encodeURIComponent(query), { signal: abortCtrl.signal })
+    .then(function (res) { return res.json(); })
+    .then(function (data) {
+      abortCtrl = null;
+      renderSearchResults(data.results || [], query);
+    })
+    .catch(function (err) {
+      if (err.name === "AbortError") return;
+      abortCtrl = null;
+      resultsEl.innerHTML = '<div class="cmd-palette-empty">Search failed</div>';
+    });
+}
+
+function renderSearchResults(results, query) {
+  items = [];
+  activeIndex = -1;
+
+  if (results.length === 0) {
+    resultsEl.innerHTML = '<div class="cmd-palette-empty">No results found</div>';
+    return;
+  }
+
+  // Group by project
+  var groups = [];
+  var groupMap = {};
+  for (var i = 0; i < results.length; i++) {
+    var r = results[i];
+    if (!groupMap[r.projectSlug]) {
+      groupMap[r.projectSlug] = { slug: r.projectSlug, title: r.projectTitle, icon: r.projectIcon, items: [] };
+      groups.push(groupMap[r.projectSlug]);
+    }
+    groupMap[r.projectSlug].items.push(r);
+  }
+
+  var html = "";
+  var flatIndex = 0;
+  for (var g = 0; g < groups.length; g++) {
+    var group = groups[g];
+    var label = escapeHtml(group.icon ? group.icon + " " + (group.title || group.slug) : (group.title || group.slug));
+    html += '<div class="cmd-palette-group-label">' + label + '</div>';
+    for (var j = 0; j < group.items.length; j++) {
+      var item = group.items[j];
+      items.push({ type: "search-result", data: item, query: query });
+      var snippet = item.snippet ? escapeHtml(item.snippet) : "";
+      html += renderItem(flatIndex, group.icon || '<i data-lucide="message-square"></i>', escapeHtml(item.sessionTitle || "New Session"), null, snippet);
+      flatIndex++;
+    }
+  }
+
+  resultsEl.innerHTML = html;
+  refreshIcons();
+  bindItemEvents();
+}
+
+// ==========================================
+// Shared rendering / interaction helpers
+// ==========================================
+
+function renderItem(index, iconContent, title, desc, snippet) {
+  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>' +
+      (desc || snippet ?
+        '<div class="cmd-palette-item-meta">' +
+          (desc ? '<span class="cmd-palette-item-project">' + desc + '</span>' : '') +
+          (snippet ? '<span class="cmd-palette-item-snippet">' + snippet + '</span>' : '') +
+        '</div>'
+      : '') +
+    '</div>' +
+    '<div class="cmd-palette-item-arrow"><i data-lucide="arrow-right"></i></div>' +
+  '</div>';
+}
+
+function bindItemEvents() {
+  var itemEls = resultsEl.querySelectorAll(".cmd-palette-item");
+  for (var k = 0; k < itemEls.length; k++) {
+    (function (el) {
+      el.addEventListener("click", function () {
+        var idx = parseInt(el.getAttribute("data-index"), 10);
+        if (idx >= 0 && idx < items.length) activateItem(items[idx]);
+      });
+      el.addEventListener("mouseenter", function () {
+        var idx = parseInt(el.getAttribute("data-index"), 10);
+        setActive(idx, true);
+      });
+    })(itemEls[k]);
+  }
+}
+
+function setActive(idx, skipScroll) {
+  if (items.length === 0) return;
+  if (idx < 0) idx = items.length - 1;
+  if (idx >= items.length) idx = 0;
+  activeIndex = idx;
+
+  var els = resultsEl.querySelectorAll(".cmd-palette-item");
+  for (var i = 0; i < els.length; i++) {
+    els[i].classList.toggle("active", i === idx);
+  }
+  if (!skipScroll && els[idx]) {
+    els[idx].scrollIntoView({ block: "nearest" });
+  }
+}
+
+function activateItem(entry) {
+  if (entry.type === "command") {
+    executeCommand(entry.data);
+  } else if (entry.type === "session" || entry.type === "search-result") {
+    navigateToSession(entry.data, entry.query || null);
+  } else if (entry.type === "project") {
+    closeCommandPalette();
+    ctx.switchProject(entry.data.slug);
+  } else if (entry.type === "mate" || entry.type === "user") {
+    closeCommandPalette();
+    ctx.openDm(entry.data.id);
+  }
+}
+
+function executeCommand(cmd) {
+  if (cmd.action === "enterSearch") {
+    enterSearchMode();
+    return;
+  }
+  closeCommandPalette();
+  switch (cmd.action) {
+    case "createMate":
+      ctx.runAction("createMate");
+      break;
+    case "openSettings":
+      ctx.runAction("openSettings");
+      break;
+    case "showHome":
+      ctx.runAction("showHome");
+      break;
+  }
+}
+
+function navigateToSession(item, query) {
+  closeCommandPalette();
+  var slug = item.projectSlug;
+  var sessionId = item.sessionId;
+
+  if (ctx.currentSlug && ctx.currentSlug() === slug) {
+    ctx.selectSession(sessionId);
+    if (query) {
+      setTimeout(function () { openSessionSearch(query); }, 400);
+    }
+  } else {
+    pendingNav = { slug: slug, sessionId: sessionId, query: query };
+    ctx.switchProject(slug);
+  }
+}

package/lib/public/modules/input.js

@@ -119,6 +119,10 @@ export function sendMessage() {
 export function autoResize() {
   ctx.inputEl.style.height = "auto";
   ctx.inputEl.style.height = Math.min(ctx.inputEl.scrollHeight, 120) + "px";
+  // Defensive: sync send/stop button whenever input size changes
+  if (ctx.processing && ctx.setSendBtnMode) {
+    ctx.setSendBtnMode(ctx.inputEl.value.trim() ? "send" : "stop");
+  }
 }
 
 // --- File path extraction from clipboard ---
@@ -464,6 +468,10 @@ export function handleInputSync(text) {
   ctx.inputEl.value = text;
   autoResize();
   isRemoteInput = false;
+  // Sync send/stop button state
+  if (ctx.processing && ctx.setSendBtnMode) {
+    ctx.setSendBtnMode(text.trim() ? "send" : "stop");
+  }
 }
 
 function createFileInput(accept, capture, multiple) {
@@ -515,9 +523,9 @@ export function initInput(_ctx) {
 
   // Paste handler
   document.addEventListener("paste", function (e) {
-    // Don't intercept paste when typing in sticky notes or other non-chat textareas
+    // Don't intercept paste when typing in modals or other non-chat inputs
     var target = e.target;
-    if (target && target.closest && target.closest(".sticky-note, #notes-archive")) return;
+    if (target && target.closest && target.closest(".sticky-note, #notes-archive, #ralph-wizard, .confirm-modal, .scheduler-detail")) return;
 
     var cd = e.clipboardData;
     if (!cd) return;

package/lib/public/modules/mate-wizard.js

@@ -102,7 +102,7 @@ export function initMateWizard(sendWs, onMateCreated) {
 }
 
 export function openMateWizard() {
-  mateWizardStep = 1;
+  mateWizardStep = 0;
   mateWizardData = {
     relationship: null,
     activity: [],
@@ -165,6 +165,16 @@ function updateMateWizardStep() {
     }
   }
 
+  var progressEl = document.querySelector("#mate-wizard .mate-wizard-progress");
+  var headerSpan = document.querySelector("#mate-wizard .mate-wizard-header > span");
+  if (mateWizardStep === 0) {
+    if (progressEl) progressEl.style.display = "none";
+    if (headerSpan) headerSpan.textContent = "";
+  } else {
+    if (progressEl) progressEl.style.display = "flex";
+    if (headerSpan) headerSpan.textContent = "Create a Mate";
+  }
+
   var dots = document.querySelectorAll("#mate-wizard .mate-dot");
   for (var j = 0; j < dots.length; j++) {
     var dotStep = parseInt(dots[j].getAttribute("data-step"), 10);
@@ -175,8 +185,8 @@ function updateMateWizardStep() {
 
   var backBtn = document.getElementById("mate-wizard-back");
   var nextBtn = document.getElementById("mate-wizard-next");
-  if (backBtn) backBtn.style.visibility = mateWizardStep === 1 ? "hidden" : "visible";
-  if (nextBtn) nextBtn.textContent = mateWizardStep === 4 ? "Create Mate" : "Next";
+  if (backBtn) backBtn.style.visibility = mateWizardStep === 0 ? "hidden" : "visible";
+  if (nextBtn) nextBtn.textContent = mateWizardStep === 0 ? "Get Started" : mateWizardStep === 4 ? "Create Mate" : "Next";
 }
 
 function collectMateWizardData() {
@@ -214,7 +224,8 @@ function collectMateWizardData() {
 }
 
 function mateWizardNext() {
-  collectMateWizardData();
+  // Step 0 (intro) has no data to collect
+  if (mateWizardStep > 0) collectMateWizardData();
 
   // Validate current step
   if (mateWizardStep === 1) {
@@ -242,8 +253,8 @@ function mateWizardNext() {
 }
 
 function mateWizardBack() {
-  if (mateWizardStep > 1) {
-    collectMateWizardData();
+  if (mateWizardStep > 0) {
+    if (mateWizardStep > 1) collectMateWizardData();
     mateWizardStep--;
     updateMateWizardStep();
   }