clay-server 5.1.1-beta.1 → 5.2.0-beta.10

package/lib/public/modules/account-transport-settings.js

@@ -0,0 +1,51 @@
+import { store } from './store.js';
+import { setSettingsDraft, clearSettingsDraft } from './server-settings-state.js';
+function render(state) {
+  var section = document.getElementById('account-transport'); if (!section) return;
+  section.hidden = !state.available;
+  if (!state.dirty) {
+    section.querySelector('[name=origin]').value = state.origin || '';
+    section.querySelector('[name=proxies]').value = (state.trustedProxies || []).join('\n');
+  }
+  section.querySelectorAll('input,textarea,button').forEach(function (element) { element.disabled = !!state.pending; });
+  section.querySelector('[role=status]').textContent = state.error || (state.pending ? 'Saving…' : state.origin ? 'Saved proxy HTTPS address: ' + state.origin : 'Direct HTTPS or localhost access. No proxy headers are trusted.');
+}
+export async function loadAccountTransportSettings() {
+  if ((store.get('accountTransport') || {}).dirty) return;
+  try {
+    var response = await fetch('/api/account-transport'); var data = await response.json();
+    if (!response.ok) throw new Error(data.error || 'Could not load connection settings.');
+    var state = Object.assign({}, data, { available: (store.get('accountAuthPolicy') || {}).method === 'password' });
+    store.set({ accountTransport: state }); render(state);
+  } catch (error) {
+    var state = Object.assign({}, store.get('accountTransport'), { error: error.message });
+    store.set({ accountTransport: state }); render(state);
+  }
+}
+export function initAccountTransportSettings() {
+  var anchor = document.getElementById('passkey-policy'); if (!anchor || document.getElementById('account-transport')) return;
+  var section = document.createElement('section'); section.id = 'account-transport'; section.className = 'settings-card'; section.hidden = true;
+  section.innerHTML = '<h3>HTTPS &amp; trusted proxies</h3><p class="settings-hint">Connection security for account users on this server. Account passwords require HTTPS for remote access. Localhost is available for setup and recovery.</p>' +
+    '<form><label class="settings-label" for="account-external-origin">Proxy HTTPS address</label><input class="us-text-input" id="account-external-origin" name="origin" type="url" placeholder="https://clay.example.com">' +
+    '<label class="settings-label" for="account-trusted-proxies">Trusted proxy IP addresses</label><textarea class="settings-network-origins" id="account-trusted-proxies" name="proxies" rows="2" placeholder="One exact IP address per line"></textarea>' +
+    '<p class="settings-hint">Leave empty for direct HTTPS. Each trusted proxy must overwrite X-Forwarded-Proto and X-Real-IP, prevent direct public access to the backend, and serve this HTTPS address. Forwarded host headers are ignored.</p>' +
+    '<label class="settings-label" for="account-transport-password">Administrator password</label><input class="us-text-input" id="account-transport-password" name="password" type="password" autocomplete="current-password" required>' +
+    '<div class="settings-form-actions"><button class="settings-btn-sm">Save connection settings</button></div></form><p class="settings-hint" role="status"></p>';
+  anchor.after(section);
+  section.querySelectorAll('[name=origin],[name=proxies]').forEach(function (input) { input.oninput = function () {
+    var state = Object.assign({}, store.get('accountTransport'), { dirty: true, error: '' });
+    setSettingsDraft('accountTransport', true); store.set({ accountTransport: state }); render(state);
+  }; });
+  section.querySelector('form').onsubmit = async function (event) {
+    event.preventDefault(); var password = section.querySelector('[name=password]');
+    var state = Object.assign({}, store.get('accountTransport'), { pending: true, error: '' }); store.set({ accountTransport: state }); render(state);
+    try {
+      var response = await fetch('/api/account-transport', { method: 'PUT', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({
+        origin: section.querySelector('[name=origin]').value.trim(), trustedProxies: section.querySelector('[name=proxies]').value.split(/\s+/).filter(Boolean), currentPassword: password.value,
+      }) });
+      var data = await response.json(); if (!response.ok) throw new Error(data.error || 'Could not save connection settings.');
+      state = Object.assign({}, data, { available: true }); clearSettingsDraft('accountTransport');
+    } catch (error) { state.error = error.message; state.pending = false; }
+    finally { password.value = ''; store.set({ accountTransport: state }); render(state); }
+  };
+}

package/lib/public/modules/admin-settings-projects.js

@@ -16,7 +16,7 @@ export function loadProjectsTab(body) {
 
   var accessPromises = projectList.map(function (p) {
     return apiGet("/api/admin/projects/" + p.slug + "/access").then(function (access) {
-      return { slug: p.slug, title: p.title || p.project || p.slug, projectOwnerId: p.projectOwnerId || null, visibility: access.visibility || "public", allowedUsers: access.allowedUsers || [] };
+      return { slug: p.slug, title: p.title || p.project || p.slug, projectOwnerId: p.projectOwnerId || null, visibility: access.visibility || "public", allowedUsers: access.allowedUsers || [], readOnly: access.contentAccess === false || p.projectOwnerId !== store.get("myUserId") };
     });
   });
 
@@ -39,9 +39,13 @@ function renderProjectsTab(body, projectAccessList, allUsers) {
     html += '<div class="admin-project-slug">' + escapeHtml(p.slug) + '</div>';
     html += '</div>';
     html += '<div class="admin-project-controls">';
+    if (p.readOnly) {
+      html += '<span class="admin-project-access-readonly">Administrative metadata only</span></div></div>';
+      continue;
+    }
     // Owner select
     html += '<select aria-label="Project owner" class="admin-owner-select" data-slug="' + escapeHtml(p.slug) + '">';
-    html += '<option value=""' + (!p.projectOwnerId ? ' selected' : '') + '>No owner</option>';
+    if (!p.projectOwnerId) html += '<option value="" selected disabled>Ownership needs recovery</option>';
     for (var u = 0; u < allUsers.length; u++) {
       var user = allUsers[u];
       var sel = p.projectOwnerId === user.id ? ' selected' : '';

package/lib/public/modules/app-connection.js

@@ -1,3 +1,4 @@
+import { leaveRevokedProject, reconnectDestination } from './project-access-recovery.js';
 // app-connection.js - WebSocket connection, reconnect, status
 // Extracted from app.js (PR-22)
 
@@ -25,6 +26,7 @@ import { clearMcpPermissionModePending } from './mcp-ui.js';
 import { createWebSocketLifecycle } from './websocket-lifecycle.js';
 import { createWebSocketWatchdog } from './websocket-watchdog.js';
 import { resetHistoryReplayBatch } from './history-replay-batch.js';
+import { paneOutgoing } from './pane-activation.js';
 
 var connectOverlay = null;
 var hasConnectedOnce = false;
@@ -355,6 +357,7 @@ export function connect() {
       console.log("[clay] WebSocket reconnected after " + (Date.now() - disconnectedAt) + "ms");
     }
     disconnectedAt = 0;
+    newWs.send(JSON.stringify({ type: "clay_ui_ready", version: 1 }));
     setStatus("connected");
     startHeartbeat(newWs, attemptEpoch);
     lifecycle.clearRetry();
@@ -369,6 +372,8 @@ export function connect() {
     var currentWs = getWs();
     var _origSend = currentWs.send.bind(currentWs);
     currentWs.send = function (data) {
+      data = paneOutgoing(data);
+      if (data === null) return false;
       blinkIO();
       return _origSend(data);
     };
@@ -460,7 +465,12 @@ export function scheduleReconnect(reason) {
         location.reload();
         return;
       }
-      connect();
+      return res.json().then(function (info) {
+        if (!lifecycle.canProceed(authEpoch)) return;
+        var destination = reconnectDestination(info, store.get('currentSlug'));
+        if (destination) { leaveRevokedProject(destination); return; }
+        connect();
+      });
     }).catch(function () {
       var authFinished = lifecycle.finishAuth(authEpoch, authToken);
       if (authFinished && lifecycle.canProceed(authEpoch)) connect();

package/lib/public/modules/app-favicon.js

@@ -5,8 +5,9 @@ import { refreshIcons } from './icons.js';
 import { store } from './store.js';
 import { getSendBtn, getStatusDot } from './dom-refs.js';
 import { onThemeChange } from './theme.js';
-import { getActivityEl, setActivityEl, addToMessages, scrollToBottom, VENDOR_AVATARS } from './app-rendering.js';
+import { getActivityEl, setActivityEl, addToMessages, scrollToBottom } from './app-rendering.js';
 import { escapeHtml } from './utils.js';
+import { resolveProjectAssistantIdentity, applyProjectAssistantIdentity } from './project-chat-identity.js';
 
 // --- Module-owned state ---
 var faviconLink, faviconOrigHref, faviconCanvas, faviconCtx, faviconImg, faviconImgReady;
@@ -197,7 +198,7 @@ export function stopUrgentBlink() {
 
 export function setActivity(text) {
   var thinkingState = store.get('thinkingState');
-  if (text === "thinking" && thinkingState && thinkingState.active) {
+  if ((text === "thinking" || text === "running") && thinkingState && thinkingState.active) {
     // Live Thinking already owns the tail progress UI. Compaction and tool
     // activity intentionally continue through so their distinct states show.
     if (getActivityEl()) {
@@ -210,14 +211,12 @@ export function setActivity(text) {
     if (!getActivityEl()) {
       var _actEl = document.createElement("div");
       _actEl.className = "activity-inline";
-      // In channel mode (Claude Code / Codex sessions), include the vendor
-      // avatar so the user can see who is responding while the dots are
-      // animating. DM mode handles its own avatar via mate-thinking
-      // elements and shouldn't pick up a vendor avatar here.
+      // The same session-bound identity owns waiting, thoughts and replies.
+      // DM mode retains its own Mate-thinking row.
       var _isDm = !!(store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate);
       if (!_isDm) {
-        var _vendor = store.get('currentVendor') || 'claude';
-        var _avatarUrl = VENDOR_AVATARS[_vendor] || VENDOR_AVATARS.claude;
+        var _identity = resolveProjectAssistantIdentity(store.snap(), store.get('currentVendor'));
+        var _avatarUrl = _identity.avatarUrl;
         _actEl.innerHTML =
           '<img class="activity-inline-avatar" src="' + escapeHtml(_avatarUrl) + '" alt="">' +
           '<div class="mate-thinking-dots"><span></span><span></span><span></span></div>';
@@ -225,9 +224,19 @@ export function setActivity(text) {
         _actEl.innerHTML =
           '<div class="mate-thinking-dots"><span></span><span></span><span></span></div>';
       }
+      _actEl.setAttribute("role", "status");
+      _actEl.setAttribute("aria-live", "polite");
       setActivityEl(_actEl);
-      addToMessages(_actEl);
     }
+    var activity = getActivityEl();
+    var labels = { waiting: "Waiting for provider", running: "Working", background: "Background work pending" };
+    var label = activity.querySelector(".activity-state-label");
+    if (labels[text]) {
+      if (!label) { label = document.createElement("span"); label.className = "activity-state-label activity-text"; activity.appendChild(label); }
+      label.textContent = labels[text];
+    } else if (label) label.remove();
+    applyProjectAssistantIdentity(activity, resolveProjectAssistantIdentity(store.snap(), store.get('currentVendor')));
+    addToMessages(activity);
     scrollToBottom();
   } else {
     if (getActivityEl()) {

package/lib/public/modules/app-header.js

@@ -267,14 +267,16 @@ export function initHeader() {
           addRow("Local ID", split.panes[pi].sessionId);
           if (member && member.cliSessionId) {
             addRow("Session ID", member.cliSessionId);
-            addRow("Resume", "claude --resume " + member.cliSessionId);
+            var memberResume = ((store.get("vendorInfo") || {})[member.vendor || "claude"] || {}).terminalResumeCommand;
+            if (memberResume) addRow("Resume", memberResume + " " + member.cliSessionId);
           }
         }
       } else {
         var s = store.snap();
         if (s.cliSessionId) addRow("Session ID", s.cliSessionId);
         if (s.activeSessionId) addRow("Local ID", s.activeSessionId);
-        if (s.cliSessionId) addRow("Resume", "claude --resume " + s.cliSessionId);
+        var resume = ((s.vendorInfo || {})[s.currentVendor] || {}).terminalResumeCommand;
+        if (s.cliSessionId && resume) addRow("Resume", resume + " " + s.cliSessionId);
       }
 
       document.body.appendChild(pop);
@@ -350,6 +352,7 @@ export function prependOlderHistory(items, meta) {
 
   // Save current rendering state
   var savedMsgEl = store.get('currentMsgEl');
+  var savedReplayingHistory = store.get('replayingHistory');
   var savedActivity = getActivityEl();
   var savedFullText = store.get('currentFullText');
   var savedTurnCounter = getTurnCounter();
@@ -359,7 +362,7 @@ export function prependOlderHistory(items, meta) {
   var savedUsage = JSON.parse(JSON.stringify(getSessionUsage()));
 
   // Reset to initial values for clean rendering
-  store.set({ currentMsgEl: null, currentFullText: "" });
+  store.set({ currentMsgEl: null, currentFullText: "", replayingHistory: true });
   setActivityEl(null);
   setTurnCounter(0);
   resetToolState();
@@ -387,7 +390,7 @@ export function prependOlderHistory(items, meta) {
   setPrependAnchor(null);
 
   // Restore saved state
-  store.set({ currentMsgEl: savedMsgEl, currentFullText: savedFullText });
+  store.set({ currentMsgEl: savedMsgEl, currentFullText: savedFullText, replayingHistory: savedReplayingHistory });
   setActivityEl(savedActivity);
   setTurnCounter(savedTurnCounter);
   restoreToolState(savedToolsState);

package/lib/public/modules/app-loop-ui.js

@@ -657,6 +657,8 @@ function renderPreviewModelTab(bodyEl) {
   }
 
   var opts = {
+    effortLevels: ((store.get("vendorInfo") || {})[store.get("currentVendor")] || {}).effortLevels || [],
+    configuration: ((store.get("vendorInfo") || {})[store.get("currentVendor")] || {}).configuration || {},
     models: s.currentModels || [],
     currentModel: _previewLoopSettings.model || "",
     currentMode: _previewLoopSettings.permissionMode || "default",

package/lib/public/modules/app-message-router.js

@@ -1,3 +1,5 @@
+import { handleContextualConversations } from './contextual-mate-sessions.js';
+import { handleMateContextMessage } from './contextual-mate-context.js';
 import { handleIssueReference } from './clay-issue-links.js';
 // Narrow pre-router for Home and Capsule protocol responses kept out of the legacy router.
 
@@ -15,10 +17,14 @@ import { handleDefaultAiMessage } from './default-ai.js';
 import { handleCursorSharingMessage } from './cursor-sharing-preference.js';
 import { handlePendingMessageQueueMessage } from './pending-message-queue.js';
 import { receiveHistoryReplay } from './history-replay-batch.js';
+import { filterPaneActivation } from './pane-activation.js';
+import { deferSessionSwitch } from './session-switch-defer.js';
 import { handleProjectMateCreationMessage } from './project-mate-creation-workspace.js';
 import { handleProjectDebatePlanningMessage } from './project-debate-planning-workspace.js';
 
 export function handleHomeProtocolMessage(msg) {
+  if (handleContextualConversations(msg)) return true;
+  if (handleMateContextMessage(msg)) return true;
   if (handleIssueReference(msg)) return true;
   if (handleClaySessionTarget(msg)) return true;
   if (isHomeWorkspaceAssignmentMessage(msg)) {
@@ -58,6 +64,10 @@ export function handleHomeProtocolMessage(msg) {
     handleHomeDebateTranscript(msg);
     return true;
   }
+  if (msg.type === "home_mcp_import_question" || msg.type === "home_mcp_import_question_resolved" || msg.type === "home_mate_question" || msg.type === "home_mate_question_resolved") {
+    if (!handleSearchClayMessage(msg)) handleHomeDebateTranscript(msg);
+    return true;
+  }
   if (msg.type === "home_debate_question" || msg.type === "home_debate_question_resolved" || msg.type === "home_debate_event") {
     handleHomeDebateTranscript(msg);
     return true;
@@ -86,6 +96,17 @@ export function handleHomeProtocolMessage(msg) {
 }
 
 export function processMessage(msg) {
+  if (filterPaneActivation(msg)) return;
+  if (deferSessionSwitch(msg)) return;
+  if (msg.type === 'pane_history_batch') {
+    if (!msg.paneActivation || !Array.isArray(msg.items) || msg.items.length > 100) return;
+    msg.items.forEach(function (item) {
+      // Every original event keeps its order/index and goes through the same
+      // stale-binding filter and replay handler as an individual socket event.
+      if (item && item.type !== 'pane_history_batch') processMessage(Object.assign({}, item, { paneActivation: msg.paneActivation }));
+    });
+    return;
+  }
   receiveHistoryReplay(msg, dispatchMessage);
 }
 
@@ -100,7 +121,7 @@ function dispatchMessage(msg) {
   if (handleDefaultAiMessage(msg)) return;
   if (handleCursorSharingMessage(msg)) return;
   var searchHandled = handleSearchClayMessage(msg);
-  if (searchHandled && (msg.type === "home_clay_activity" || msg.type === "home_mate_stopping" || msg.type.indexOf("home_mate_permission_") === 0)) return;
+  if (searchHandled) return;
   if (handleHomeProtocolMessage(msg)) return;
   processAppMessage(msg);
 }