clay-server 5.0.2-beta.1 → 5.1.0-beta.2

package/lib/public/modules/project-switcher.js

@@ -16,8 +16,7 @@
 import { store } from './store.js';
 import { refreshIcons } from './icons.js';
 import { getCachedProjects, switchProject } from './app-projects.js';
-import { showHomeHub, isHomeHubVisible } from './app-home-hub.js';
-import { openHomeChat } from './home-mate-chat.js';
+import { openMateWorkspace, mateForWorkspace } from './project-mate-navigation.js';
 import { mateAvatarUrl } from './avatar.js';
 import { parseEmojis } from './markdown.js';
 import { isExternalWorktree, externalWorktreeTooltip, appendExternalWorktreeBadge } from './worktree-location.js';
@@ -34,7 +33,6 @@ var _entries = [];
 
 export function openSwitcherForMode(mode) {
   if (mode !== 'project' && mode !== 'mate') return;
-  if (mode === 'mate' && !isHomeHubVisible()) return;
   if (_open) closeSwitcher(false);
   openSwitcher(mode);
 }
@@ -145,7 +143,6 @@ function handleKeyDown(e) {
   // same shortcut cycles.
   if (isMod && (k === 'e' || k === 'm')) {
     var requestedMode = k === 'e' ? 'project' : 'mate';
-    if (requestedMode === 'mate' && !isHomeHubVisible()) return;
     e.preventDefault();
     e.stopPropagation();
     if (!_open) {
@@ -246,7 +243,8 @@ function pickInitialIndex() {
 
 function currentActiveKey() {
   if (_mode === 'mate') {
-    return mateIdFrom(store.get('dmTargetUser'));
+    var mate = mateForWorkspace(store.snap());
+    return mate ? mate.id : null;
   }
   return store.get('currentSlug');
 }
@@ -277,7 +275,8 @@ function buildProjectEntries() {
 
 function buildMateEntries() {
   var mates = store.get('cachedMatesList') || [];
-  var currentMateId = mateIdFrom(store.get('dmTargetUser'));
+  var current = mateForWorkspace(store.snap());
+  var currentMateId = current ? current.id : null;
   // Natural list order; MRU is only for choosing the initial highlight.
   return mates.map(function (m) {
     return {
@@ -302,8 +301,7 @@ function closeSwitcher(commit) {
   if (!entry || entry.disabled) return;
   if (_mode === 'mate') {
     if (entry.key !== currentActiveKey()) {
-      showHomeHub();
-      openHomeChat(entry.key);
+      openMateWorkspace(entry.key);
     }
   } else {
     if (entry.key !== store.get('currentSlug')) switchProject(entry.key);

package/lib/public/modules/projects-hub-view.js

@@ -18,12 +18,12 @@ function setupAction(mode, icon, title, text, disabled) {
 
 export function projectsHubContent(state) {
   var projects = ordinaryProjects(state.projectsHubList);
-  var ready = state.projectListLoaded && state.homeSurfaceLoaded;
+  var ready = state.projectListLoaded;
   var welcome = ready && (state.projectsShowGuide || (!projects.length && (state.onboardingStep || 'welcome') === 'welcome'));
   var allowed = state.projectsAccessLoaded && (!state.permissions || state.permissions.createProject === true);
   var available = allowed && state.connected && !state.pendingHomeProjectSlug;
-  var html = '<header class="projects-header"><a class="projects-brand" href="/" data-projects-action="home"><img src="/clay-studio-symbol.png" alt="">Clay Studio</a>' +
-    '<nav aria-label="Workspace navigation">' + button('home', 'Home', 'projects-button-quiet') + button('settings', 'Settings', 'projects-button-quiet') + '</nav></header>';
+  var html = '<header class="projects-header"><a class="projects-brand" href="/projects"><img src="/clay-studio-symbol.png" alt="">Clay Studio</a>' +
+    '<nav aria-label="Workspace navigation">' + button('settings', 'Settings', 'projects-button-quiet') + '</nav></header>';
   html += '<main class="projects-main" aria-labelledby="projects-title">';
   if (!ready) return html + '<div class="projects-loading" role="status"><h1 id="projects-title" tabindex="-1">Your projects</h1><p>Loading your workspace…</p></div></main>';
   if (welcome) {
@@ -31,9 +31,8 @@ export function projectsHubContent(state) {
       '<h1 id="projects-title" tabindex="-1">A place for<br>your next idea.</h1>' +
       '<p class="projects-lead">Bring a project. Describe what you want to build.<br>Your AI Driver helps you take it from there.</p>' +
       '<div class="projects-intro-grid"><div><span>01 / PROJECTS</span><h2>Work on something real.</h2><p>Open a folder, start fresh, or clone a repository. Your conversations and tools stay with the project.</p></div>' +
-      '<div><span>02 / HOME</span><h2>Make room to think.</h2><p>Talk with Clay and your Mates, explore ideas, and return to your projects whenever you’re ready.</p></div></div>' +
-      '<div class="projects-welcome-actions">' + button('start', projects.length ? 'Explore your projects ' + iconHtml('arrow-right') : 'Set up your first project ' + iconHtml('arrow-right'), 'projects-button-primary') +
-      button('skip', 'Explore Home first', 'projects-button-quiet') + '</div>' +
+      '<div><span>02 / MATES</span><h2>Bring in the right perspective.</h2><p>Your Mates live beside projects and open their conversations in the same focused workspace.</p></div></div>' +
+      '<div class="projects-welcome-actions">' + button('start', projects.length ? 'Explore your projects ' + iconHtml('arrow-right') : 'Set up your first project ' + iconHtml('arrow-right'), 'projects-button-primary') + '</div>' +
       '<p class="projects-footnote">You can revisit this guide from Projects at any time.</p></section></main>';
   }
   html += '<div class="projects-heading"><div><div class="projects-eyebrow">YOUR WORKSPACE</div><h1 id="projects-title" tabindex="-1">' + (projects.length ? 'Projects' : 'Start with a project.') + '</h1>' +

package/lib/public/modules/projects-hub.js

@@ -1,6 +1,5 @@
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
-import { hideHomeHub, showHomeHub } from './app-home-hub.js';
 import { openAddProjectModal, switchProject } from './app-projects.js';
 import { openUserSettings } from './user-settings.js';
 import { rememberHomePrimarySurface, updateHomeSurfacePreference } from './home-surface.js';
@@ -37,7 +36,6 @@ function focusHeading() {
 }
 
 export function showProjectsHub(fromHistory) {
-  hideHomeHub();
   store.set({ projectsHubVisible: true, pendingHomeProjectSlug: null });
   document.body.classList.add('projects-active');
   root().classList.remove('hidden');
@@ -67,14 +65,12 @@ function handleClick(event) {
   if (!button || button.disabled) return;
   event.preventDefault();
   var action = button.dataset.projectsAction;
-  if (action === 'home') { showHomeHub(); return; }
   if (action === 'settings') { openUserSettings(); return; }
   if (action === 'guide') { store.set({ projectsShowGuide: true }); render(); focusHeading(); return; }
-  if (action === 'start' || action === 'skip') {
+  if (action === 'start') {
     store.set({ projectsShowGuide: false });
     updateHomeSurfacePreference({ onboardingStep: 'project' });
-    if (action === 'skip') showHomeHub();
-    else { render(); focusHeading(); }
+    render(); focusHeading();
     return;
   }
   var ws = getWs();

package/lib/public/modules/qrcode.js

@@ -1,7 +1,18 @@
 import { copyToClipboard } from './utils.js';
 
-function getShareUrl() {
-  var url = window.location.href;
+var activeShareUrl = null;
+var activeShareTitle = null;
+
+export function getShareUrl(projectSlug) {
+  var locationUrl = new URL(window.location.href);
+  if (projectSlug) {
+    var projectIndex = locationUrl.pathname.indexOf("/p/");
+    var prefix = projectIndex === -1 ? "" : locationUrl.pathname.substring(0, projectIndex);
+    locationUrl.pathname = prefix + "/p/" + encodeURIComponent(projectSlug) + "/";
+    locationUrl.search = "";
+    locationUrl.hash = "";
+  }
+  var url = locationUrl.href;
   var h = window.location.hostname;
   if ((h === "localhost" || h === "127.0.0.1") && window.__lanHost) {
     url = url.replace(h + ":" + window.location.port, window.__lanHost);
@@ -9,13 +20,15 @@ function getShareUrl() {
   return url;
 }
 
-export function triggerShare() {
-  var url = getShareUrl();
+export function triggerShare(options) {
+  options = options || {};
+  var url = getShareUrl(options.projectSlug);
+  var title = options.title || document.title || "Clay";
 
   // Use Web Share API on mobile only
   var isMobile = window.innerWidth <= 768 || /Mobi|Android/i.test(navigator.userAgent);
   if (isMobile && navigator.share) {
-    navigator.share({ title: document.title || "Clay", url: url }).catch(function () {});
+    navigator.share({ title: title, url: url }).catch(function () {});
     return;
   }
 
@@ -28,6 +41,8 @@ export function triggerShare() {
   var qr = qrcode(0, "M");
   qr.addData(url);
   qr.make();
+  activeShareUrl = url;
+  activeShareTitle = title;
   qrCanvas.innerHTML = qr.createSvgTag(5, 0);
   qrUrl.innerHTML = url + '<span class="qr-hint">click to copy</span>';
 
@@ -49,7 +64,7 @@ export function initQrCode() {
 
   // click URL to copy
   qrUrl.addEventListener("click", function () {
-    var url = getShareUrl();
+    var url = activeShareUrl || getShareUrl();
     copyToClipboard(url).then(function () {
       qrUrl.innerHTML = "Copied!";
       qrUrl.classList.add("copied");
@@ -62,6 +77,8 @@ export function initQrCode() {
 
   qrOverlay.addEventListener("click", function () {
     qrOverlay.classList.add("hidden");
+    activeShareUrl = null;
+    activeShareTitle = null;
   });
 
   // prevent closing when clicking the inner card
@@ -73,8 +90,8 @@ export function initQrCode() {
   var qrShareBtn = document.getElementById("qr-share-btn");
   if (qrShareBtn) {
     qrShareBtn.addEventListener("click", function () {
-      var url = getShareUrl();
-      navigator.share({ title: document.title || "Clay", url: url }).catch(function () {});
+      var url = activeShareUrl || getShareUrl();
+      navigator.share({ title: activeShareTitle || document.title || "Clay", url: url }).catch(function () {});
     });
   }
 
@@ -82,6 +99,8 @@ export function initQrCode() {
   document.addEventListener("keydown", function (e) {
     if (e.key === "Escape" && !qrOverlay.classList.contains("hidden")) {
       qrOverlay.classList.add("hidden");
+      activeShareUrl = null;
+      activeShareTitle = null;
     }
   });
 }

package/lib/public/modules/search-clay-chat.js

@@ -1,7 +1,6 @@
 // Compact Clay conversation hosted inside the global search drawer.
 import { getWs } from './ws-ref.js';
-import { showHomeHub } from './app-home-hub.js';
-import { openHomeConversation } from './home-mate-chat.js';
+import { openProjectSession } from './project-session-navigation.js';
 import { refreshIcons } from './icons.js';
 import { store } from './store.js';
 import { mateAvatarUrl } from './avatar.js';
@@ -231,12 +230,9 @@ function respondToPermission(permission, decision) {
 }
 
 function expand() {
-  if (!state || !state.mateId || !state.sessionId) return;
-  var mateId = state.mateId;
-  var sessionId = state.sessionId;
+  if (!state || !state.mateId || !state.localId) return;
   if (closeHandler) closeHandler();
-  showHomeHub();
-  openHomeConversation(mateId, sessionId);
+  openProjectSession('mate-' + state.mateId, state.localId);
 }
 
 function render() {
@@ -259,7 +255,7 @@ function render() {
     var actions = document.createElement("div");
     actions.className = "search-clay-header-actions";
     actions.appendChild(button("search", "Search", "Back to search", function () { detachSearchClayChat(); if (backHandler) backHandler(); }));
-    actions.appendChild(button("maximize-2", "Expand", "Open this conversation in Home", expand));
+    actions.appendChild(button("maximize-2", "Expand", "Open this conversation in project chat", expand));
     header.appendChild(actions);
     shell.appendChild(header);
     transcript = document.createElement("div");
@@ -318,8 +314,8 @@ function render() {
   sendButton.disabled = state.processing ? (!state.sessionId || state.stopping) : (!state.sessionId || !input.value.trim());
   sendButton.setAttribute("aria-label", state.processing ? (state.stopping ? "Stopping Clay" : "Stop Clay") : "Send to Clay");
   sendButton.innerHTML = state.processing ? '<i data-lucide="square" aria-hidden="true"></i>' : '<i data-lucide="arrow-up" aria-hidden="true"></i>';
-  var expandButton = shell.querySelector('.search-clay-icon-button[aria-label="Open this conversation in Home"]');
-  if (expandButton) expandButton.disabled = !state.sessionId;
+  var expandButton = shell.querySelector('.search-clay-icon-button[aria-label="Open this conversation in project chat"]');
+  if (expandButton) expandButton.disabled = !state.localId;
   refreshIcons();
   transcript.scrollTop = follow ? transcript.scrollHeight : previousTop;
 }
@@ -331,7 +327,7 @@ export function startSearchClayChat(query, host, onBack, onClose) {
   backHandler = onBack;
   closeHandler = onClose;
   var startedAt = Date.now();
-  state = { requestId: requestId(), mateId: null, sessionId: null, messages: [{ role: "user", text: clean }], queuedUsers: [], pendingTurns: 1, activities: [], permissions: [], activityExpanded: false, stream: "", draft: "", processing: true, stopping: false, awaitingCompletion: true, activity: "thinking", step: 0, startedAt: startedAt, updatedAt: startedAt, query: clean };
+  state = { requestId: requestId(), mateId: null, sessionId: null, localId: null, messages: [{ role: "user", text: clean }], queuedUsers: [], pendingTurns: 1, activities: [], permissions: [], activityExpanded: false, stream: "", draft: "", processing: true, stopping: false, awaitingCompletion: true, activity: "thinking", step: 0, startedAt: startedAt, updatedAt: startedAt, query: clean };
   store.set({ searchClayChatState: state });
   startProgressTimer();
   render();
@@ -382,6 +378,7 @@ export function handleSearchClayMessage(msg) {
     updateActivity(msg);
   } else if (msg.type === "home_mate_history") {
     state.sessionId = msg.sessionId || state.sessionId;
+    state.localId = typeof msg.localId === "number" ? msg.localId : state.localId;
     state.messages = Array.isArray(msg.messages) ? msg.messages.filter(function (item) { return item && (item.role === "user" || item.role === "assistant"); }).map(function (item) { return { role: item.role, text: item.text || "" }; }) : state.messages;
     state.processing = msg.isProcessing === true;
     state.awaitingCompletion = state.processing;

package/lib/public/modules/session-activity-tooltip.js

@@ -0,0 +1,12 @@
+function formatSessionActivity(value) {
+  if (!value) return "";
+  var date = new Date(value);
+  if (isNaN(date.getTime())) return "";
+  try {
+    return "Last activity: " + new Intl.DateTimeFormat(undefined, { dateStyle: "medium", timeStyle: "short" }).format(date);
+  } catch (error) {
+    return "Last activity: " + date.toLocaleString();
+  }
+}
+
+export { formatSessionActivity };

package/lib/public/modules/session-create-form.js

@@ -1,6 +1,6 @@
 // The inline "new session" draft row that sits under a folder header (also when
-// the folder is collapsed): provider icon, a compact provider picker and icon
-// Cancel. The stable header action becomes Create. State and server round
+// the folder is collapsed): provider icon, a compact provider picker, Create
+// and icon Cancel. The header action remains New session. State and server round
 // trips are in session-create.js; this module only builds and repaints the DOM
 // from the store, so the row keeps its provider, focus and error across list
 // rerenders and server updates.
@@ -12,7 +12,7 @@ import { startNewSession } from './sidebar-sessions.js';
 import { closeMobileSheet } from './sidebar-mobile.js';
 import {
   createState, createOptions, installedVendorIds,
-  openSessionCreate, closeSessionCreate, chooseVendor, setCreateMenu, submitSessionCreate, saveProjectDefault, retryOptions
+  beginSessionCreate, closeSessionCreate, chooseVendor, setCreateMenu, submitSessionCreate, submitMateSessionCreate, saveProjectDefault, retryOptions
 } from './session-create.js';
 
 // Every registered provider, in the established order, followed by any the
@@ -61,6 +61,15 @@ function focusHeaderButton(folderId) {
   requestAnimationFrame(applyFocus);
 }
 
+function focusCreateRow(folderId) {
+  var rows = document.querySelectorAll('.session-create-row[data-folder-id="' + folderId + '"]');
+  for (var i = 0; i < rows.length; i++) {
+    if (!rows[i].getClientRects().length) continue;
+    var target = rows[i].querySelector('[data-focus-key="vendor"]') || rows[i].querySelector('[data-focus-key="create"]') || rows[i].querySelector('[data-focus-key="cancel"]');
+    if (target && !target.disabled) { target.focus({ preventScroll: true }); return; }
+  }
+}
+
 function prefersReducedMotion() {
   return typeof window !== "undefined" && window.matchMedia && window.matchMedia("(prefers-reduced-motion: reduce)").matches;
 }
@@ -106,20 +115,25 @@ function createStatusMessage(form, options, valid) {
 function paintNewSessionButton(btn, folderId, label) {
   var form = createState();
   var active = !!(form && form.folderId === folderId);
+  var direct = active && form.mode === "mate-direct";
   var options = createOptions();
-  var valid = active && options.loaded && installedVendorIds().indexOf(form.vendor) !== -1;
+  var valid = direct || (active && options.loaded && installedVendorIds().indexOf(form.vendor) !== -1);
   var pending = active && form.phase === "pending";
-  var buttonText = !active ? "New session" : (pending ? "Creating…" : (!options.loaded ? "Loading…" : (!valid ? "Choose provider" : "Click to create")));
-  var status = active ? createStatusMessage(form, options, valid) : "";
+  var uncertain = direct && form.phase === "uncertain";
+  var buttonText = direct ? (pending ? "Creating…" : (uncertain ? "Check sessions" : "Retry")) : "New session";
+  var status = active ? (direct ? (form.error || (pending ? "Creating session…" : "")) : createStatusMessage(form, options, valid)) : "";
   ensureNewSessionButtonContent(btn);
-  btn.classList.toggle("is-create", active);
+  btn.classList.toggle("is-create", direct);
   btn.setAttribute("aria-expanded", String(active));
   btn.setAttribute("aria-busy", String(pending));
-  btn.setAttribute("aria-label", active ? (pending ? "Creating session in " : (valid ? "Click to create session in " : buttonText + " for ")) + label : "New session in " + label);
+  var activeLabel = direct
+    ? (pending ? "Creating session in " : (uncertain ? "Check sessions in " : "Retry new session in "))
+    : "New session in ";
+  btn.setAttribute("aria-label", active ? activeLabel + label : "New session in " + label);
   var controls = btn.getAttribute("aria-controls");
   if (active && status && controls) btn.setAttribute("aria-describedby", controls + "-status");
   else btn.removeAttribute("aria-describedby");
-  btn.disabled = active ? (pending || !valid) : !!(form && form.phase === "pending");
+  btn.disabled = direct ? (pending || uncertain) : !!(form && form.phase === "pending");
   setNewSessionButtonText(btn, buttonText, active && (!form.openedAt || Date.now() - form.openedAt < 400 || btn.isConnected));
   refreshIcons();
 }
@@ -136,8 +150,12 @@ export function renderNewSessionButton(folderId, label, surface) {
   btn.addEventListener("click", function (event) {
     event.stopPropagation();
     var live = createState();
-    if (live && live.folderId === folderId) { submitAndClose(); return; }
-    openSessionCreate(folderId);
+    if (live && live.folderId === folderId) {
+      if (live.mode === "mate-direct") submitMateSessionCreate();
+      else focusCreateRow(folderId);
+      return;
+    }
+    beginSessionCreate(folderId);
     focusHeaderButton(folderId);
   });
   return btn;
@@ -160,6 +178,10 @@ export function renderCreateRow(folderId, label, surface) {
   root.setAttribute("role", "group");
   root.setAttribute("aria-label", "New session in " + label);
   root.dataset.folderId = folderId;
+  if (form.mode === "mate-direct") {
+    paintMateDirectRow(root, form);
+    return root;
+  }
   root.addEventListener("keydown", function (event) {
     // Enter and Escape belong to the input method while composing.
     if (event.isComposing || event.keyCode === 229) return;
@@ -195,6 +217,43 @@ export function renderCreateRow(folderId, label, surface) {
   return root;
 }
 
+function paintMateDirectRow(root, form) {
+  var pending = form.phase === "pending";
+  var uncertain = form.phase === "uncertain";
+  root.setAttribute("aria-busy", String(pending));
+  root.innerHTML = "";
+  var line = document.createElement("div");
+  line.className = "session-create-line session-create-direct-line";
+  var status = document.createElement("div");
+  status.id = root.id + "-status";
+  status.className = "session-create-status" + (form.error ? " is-error" : "");
+  status.setAttribute("role", form.error ? "alert" : "status");
+  status.textContent = form.error || "Creating session…";
+  line.appendChild(status);
+  if (!pending && !uncertain) {
+    var retry = document.createElement("button");
+    retry.type = "button";
+    retry.className = "session-create-retry";
+    retry.dataset.focusKey = "retry";
+    retry.textContent = "Retry";
+    retry.addEventListener("click", function () { submitMateSessionCreate(); });
+    line.appendChild(retry);
+  }
+  var cancel = iconButton("x", "Close new session status", "cancel", function () { closeAndFocus(form.folderId); });
+  cancel.disabled = pending;
+  line.appendChild(cancel);
+  root.appendChild(line);
+  if (form.wantFocus && !pending && !uncertain) {
+    queueMicrotask(function () {
+      if (!retry.isConnected) return;
+      retry.focus({ preventScroll: true });
+      var live = createState();
+      if (live) store.set({ sessionCreate: Object.assign({}, live, { wantFocus: false }) });
+    });
+  }
+  refreshIcons();
+}
+
 function closeMenu(refocus) {
   var live = createState();
   if (!live || !live.menuOpen) return;
@@ -223,10 +282,16 @@ function submitAndClose() {
 function paintRow(root) {
   var form = createState();
   if (!form) return;
+  if (form.mode === "mate-direct") {
+    paintMateDirectRow(root, form);
+    return;
+  }
   var options = createOptions();
   var pending = form.phase === "pending";
   var active = document.activeElement;
   var focusKey = active && root.contains(active) ? active.dataset.focusKey : null;
+  var installed = installedVendorIds();
+  var valid = options.loaded && installed.indexOf(form.vendor) !== -1;
   // An explicit focus request wins over wherever focus happens to be.
   if (form.wantFocus && root.getClientRects().length) focusKey = form.focusKey || "vendor";
   root.setAttribute("aria-busy", String(pending));
@@ -234,8 +299,6 @@ function paintRow(root) {
 
   var line = document.createElement("div");
   line.className = "session-create-line";
-  var installed = installedVendorIds();
-
   var icon = document.createElement("img");
   icon.className = "session-create-icon";
   icon.alt = "";
@@ -268,12 +331,21 @@ function paintRow(root) {
   });
   line.appendChild(picker);
 
+  var submit = document.createElement("button");
+  submit.type = "button";
+  submit.className = "session-create-submit";
+  submit.dataset.focusKey = "create";
+  submit.textContent = "Create";
+  submit.setAttribute("aria-label", "Create " + (root.getAttribute("aria-label") || "new session"));
+  submit.disabled = pending || !valid;
+  submit.addEventListener("click", function (event) { event.stopPropagation(); submitAndClose(); });
+  line.appendChild(submit);
+
   var cancel = iconButton("x", "Cancel new session", "cancel", function () { closeAndFocus(form.folderId); });
   cancel.disabled = pending;
   line.appendChild(cancel);
   root.appendChild(line);
 
-  var valid = options.loaded && installed.indexOf(form.vendor) !== -1;
   var optionsError = options.error || "";
   var message = createStatusMessage(form, options, valid);
   var status = document.createElement("div");

package/lib/public/modules/session-create.js

@@ -2,15 +2,15 @@
 //
 // Every real folder header (custom folders and Unfiled, not the Favorites tag) has a quiet
 // "+ New session" button that opens one draft row directly under that header:
-// provider icon, a compact provider picker and icon Cancel; the same header
-// action that opened the draft becomes Create. Only the
+// provider icon, a compact provider picker, Create and icon Cancel. Only the
 // provider is chosen; the model and effort stay whatever that provider's
 // existing defaults produce. The installed providers and the project default
 // come from the server; the saved project default is preselected, and a
 // default changes only through the explicit action beside an available
 // provider. All mutable state lives in the store (sessionCreate,
 // sessionCreateOptions, sessionCreateLocks, sessionCreateReveal); the DOM is
-// built in session-create-form.js.
+// built in session-create-form.js. Provider-mode submission is an explicit
+// Create action inside the draft row; the header only opens or focuses it.
 
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
@@ -18,6 +18,7 @@ import { showToast } from './utils.js';
 import { resolvePreferredVendor } from './default-vendor.js';
 import { sendFolderOp, currentFolderState } from './session-folders.js';
 import { queueSidebarCreationEffect } from './sidebar-creation-effect.js';
+import { isMateWorkspace } from './project-mate-navigation.js';
 
 // Ids are unique without any module-level counter.
 function nextId(prefix) {
@@ -66,13 +67,29 @@ export function openSessionCreate(folderId) {
   }
   var options = createOptions();
   store.set({ sessionCreate: {
-    folderId: folderId, vendor: options.loaded ? preferredVendor(options) : "", phase: "ready", requestId: null, timer: null, error: "", notice: "",
+    mode: "provider", folderId: folderId, vendor: options.loaded ? preferredVendor(options) : "", phase: "ready", requestId: null, timer: null, error: "", notice: "",
     defaultRequestId: null, defaultSaving: false, defaultVendor: null, focusKey: "vendor", wantFocus: false, scroll: true, restoreFocusKey: null,
     openedAt: Date.now(),
   } });
   requestOptions();
 }
 
+export function beginSessionCreate(folderId) {
+  if (!isMateWorkspace(store.snap())) {
+    openSessionCreate(folderId);
+    return true;
+  }
+  var current = createState();
+  if (current && current.phase === "pending") return false;
+  if (!current || current.mode !== "mate-direct" || current.folderId !== folderId) {
+    store.set({ sessionCreate: {
+      mode: "mate-direct", folderId: folderId, phase: "ready", requestId: null, timer: null,
+      error: "", notice: "", focusKey: "retry", wantFocus: false, scroll: true, openedAt: Date.now(),
+    } });
+  }
+  return submitMateSessionCreate();
+}
+
 export function closeSessionCreate() {
   var current = createState();
   if (!current || current.phase === "pending") return;
@@ -178,10 +195,35 @@ export function submitSessionCreate(startNewSession) {
   return true;
 }
 
+export function submitMateSessionCreate() {
+  var form = createState();
+  if (!form || form.mode !== "mate-direct" || form.phase === "pending" || form.phase === "uncertain") return false;
+  var requestId = nextId("scm-");
+  var timer = setTimeout(function () { onPendingTimeout(requestId); }, PENDING_TIMEOUT_MS);
+  patch({ phase: "pending", requestId: requestId, error: "", notice: "", timer: timer, wantFocus: false });
+  if (!send({
+    type: "new_session",
+    mateDefaults: true,
+    forceNew: true,
+    requestId: requestId,
+    folderSlug: store.get('currentSlug'),
+    folderId: form.folderId === "unfiled" ? null : form.folderId,
+  })) {
+    clearTimeout(timer);
+    patch({ phase: "ready", requestId: null, timer: null, error: "Not connected. Reconnect and try again.", focusKey: "retry", wantFocus: true });
+    return false;
+  }
+  return true;
+}
+
 function onPendingTimeout(requestId) {
   var form = createState();
   if (!form || form.requestId !== requestId || form.phase !== "pending") return;
   forgetLock(requestId);
+  if (form.mode === "mate-direct") {
+    patch({ phase: "uncertain", timer: null, error: "No response yet. The session may already have been created; check the list before trying again." });
+    return;
+  }
   patch({ phase: "ready", requestId: null, timer: null, error: "No response yet. The session may already have been created; check the list first." });
 }
 
@@ -200,7 +242,7 @@ export function handleNewSessionResult(msg) {
   clearTimeout(form.timer);
   if (!msg.ok) {
     restoreLock(msg.requestId);
-    patch({ phase: "ready", requestId: null, timer: null, error: msg.error || "The session could not be created.", focusKey: "create", wantFocus: true });
+    patch({ phase: "ready", requestId: null, timer: null, error: msg.error || "The session could not be created.", focusKey: form.mode === "mate-direct" ? "retry" : "create", wantFocus: true });
     return true;
   }
   forgetLock(msg.requestId);
@@ -300,7 +342,8 @@ function onDisconnect(form) {
   if (!form) return;
   if (form.timer) clearTimeout(form.timer);
   if (form.phase === "pending") {
-    patch({ phase: "ready", requestId: null, timer: null, error: "Connection lost. The session may already have been created; check the list first." });
+    if (form.mode === "mate-direct") patch({ phase: "uncertain", timer: null, error: "Connection lost. The session may already have been created; check the list before trying again." });
+    else patch({ phase: "ready", requestId: null, timer: null, error: "Connection lost. The session may already have been created; check the list first." });
   }
   if (form.defaultSaving) patch({ defaultSaving: false, defaultRequestId: null, defaultVendor: null, error: "Connection lost before the project default was confirmed." });
 }
@@ -319,7 +362,7 @@ store.subscribe(function (state, previous) {
   var form = state.sessionCreate;
   if (previous.connected && !state.connected) onDisconnect(form);
   // The providers are requested again after a reconnect.
-  if (!previous.connected && state.connected && form) requestOptions();
+  if (!previous.connected && state.connected && form && form.mode !== "mate-direct") requestOptions();
   // Folder removed while its row was open: say so instead of letting a later
   // create fail, and never silently file the session elsewhere.
   if (form && state.sessionFolders !== previous.sessionFolders && form.folderId !== "unfiled") {

package/lib/public/modules/session-list-visibility.js

@@ -0,0 +1,41 @@
+// Visibility policy for the ordinary desktop and mobile session lists.
+// Debate sessions remain in the session cache for the Debate workbench and
+// exact-session navigation; only their ordinary-list presentation is removed.
+
+export function isDebateOwnedSession(session) {
+  var phase = session && session.homeDebatePhase;
+  return !!(session && (
+    session.homeDebatePlanning === true
+    || phase === "planning"
+    || phase === "live"
+    || phase === "ended"
+    || phase === "interrupted"
+    || (session.loop && session.loop.source === "debate")
+  ));
+}
+
+export function ordinarySessionListSessions(sessions) {
+  var source = Array.isArray(sessions) ? sessions : [];
+  var hiddenIds = new Set();
+  for (var i = 0; i < source.length; i++) {
+    if (isDebateOwnedSession(source[i])) hiddenIds.add(source[i].id);
+  }
+
+  // A debate Driver owns its Worker rows even if an older Worker payload did
+  // not copy the debate marker. Follow parent links so those children cannot
+  // leak into the ordinary list as orphan Workers.
+  var changed = true;
+  while (changed) {
+    changed = false;
+    for (var j = 0; j < source.length; j++) {
+      var session = source[j];
+      if (hiddenIds.has(session.id) || !hiddenIds.has(session.parentSessionId)) continue;
+      hiddenIds.add(session.id);
+      changed = true;
+    }
+  }
+
+  return source.filter(function (session) {
+    return !hiddenIds.has(session.id);
+  });
+}

package/lib/public/modules/session-presence-ui.js

@@ -38,7 +38,10 @@ export function renderSessionPresence(row, sessionId) {
     container.appendChild(more);
   }
 
-  var anchor = row.querySelector(".session-row-trailing, .session-item-age, .mobile-worker-generation, .mobile-session-unread, .session-row-actions, .mobile-session-star");
+  var anchor = row.querySelector(".session-item-age, .mobile-worker-generation, .mobile-session-unread, .session-row-actions, .mobile-session-star");
+  // Desktop age/actions now live inside one trailing slot. insertBefore only
+  // accepts a direct child, so promote a nested match to its row-level owner.
+  while (anchor && anchor.parentNode !== row) anchor = anchor.parentNode;
   row.insertBefore(container, anchor || null);
   return container;
 }