clay-server 5.2.0-beta.4 → 5.2.0-beta.5

package/lib/public/modules/tools.js

@@ -1,3 +1,5 @@
+import { clayToolGroupSummary } from './clay-tool-presentation.js';
+import { applyClayToolItem, applyClayToolResult, finishClayToolItem, findEndedClayTool, clayToolResultGroup, bindToolGroupDisclosure, syncToolGroupDisclosure, syncClayToolGroup } from './clay-tool-activity.js';
 import { escapeHtml, copyToClipboard } from './utils.js';
 import { iconHtml, refreshIcons } from './icons.js';
 import { renderMarkdown, highlightCodeBlocks, renderMermaidBlocks } from './markdown.js';
@@ -76,6 +78,8 @@ function findToolGroup(groupId) {
 }
 
 function toolGroupSummary(group) {
+  var claySummary = clayToolGroupSummary(group, tools);
+  if (claySummary) return claySummary;
   var names = group.toolNames;
   var count = names.length;
   var allDone = group.doneCount >= count;
@@ -167,6 +171,8 @@ function updateToolGroupHeader(group) {
     header.style.display = "none";
     group.el.classList.remove("collapsed");
   }
+  syncToolGroupDisclosure(group.el);
+  syncClayToolGroup(group);
 }
 
 function isPlanFile(filePath) {
@@ -1628,9 +1634,9 @@ export function createToolItem(id, name) {
     }
 
     applyProjectAssistantIdentity(groupEl, identity);
-    groupEl.querySelector(".tool-group-header").addEventListener("click", function () {
-      groupEl.classList.toggle("collapsed");
-      if (currentToolGroup) currentToolGroup.userToggled = true;
+    bindToolGroupDisclosure(groupEl, function () {
+      var group = findToolGroup(groupEl.dataset.groupId);
+      if (group) group.userToggled = true;
     });
 
     ctx.addToMessages(groupEl);
@@ -1640,6 +1646,8 @@ export function createToolItem(id, name) {
       el: groupEl,
       id: "g" + toolGroupCounter,
       toolNames: [],
+      toolIds: [],
+      toolRecords: {},
       toolCount: 0,
       doneCount: 0,
       errorCount: 0,
@@ -1666,17 +1674,21 @@ export function createToolItem(id, name) {
 
   el.querySelector(".tool-name").textContent = name;
 
+  tools[id] = { el: el, name: name, input: null, done: false, groupId: currentToolGroup.id };
+  applyClayToolItem(tools[id]);
+
   // Append to group instead of messages directly
   currentToolGroup.el.querySelector(".tool-group-items").appendChild(el);
   currentToolGroup.toolNames.push(name);
+  currentToolGroup.toolIds.push(id);
+  currentToolGroup.toolRecords[id] = tools[id];
   currentToolGroup.toolCount++;
   updateToolGroupHeader(currentToolGroup);
 
   refreshIcons();
   maybeScrollToBottom();
 
-  tools[id] = { el: el, name: name, input: null, done: false, groupId: currentToolGroup.id };
-  ctx.setActivity("Running " + name + "...");
+  ctx.setActivity(tools[id].clayActivity ? tools[id].clayActivity.label : "Running " + name + "...");
 }
 
 export function updateToolExecuting(id, name, input) {
@@ -1684,6 +1696,12 @@ export function updateToolExecuting(id, name, input) {
   if (!tool) return;
 
   tool.input = input;
+  if (applyClayToolItem(tool)) {
+    ctx.setActivity(tool.clayActivity.label);
+    updateToolGroupHeader(findToolGroup(tool.groupId));
+    maybeScrollToBottom();
+    return;
+  }
   var descEl = tool.el.querySelector(".tool-desc");
   descEl.textContent = toolSummary(name, input);
 
@@ -1893,9 +1911,17 @@ function isImagePath(filePath) {
 }
 
 export function updateToolResult(id, content, isError, images) {
-  var tool = tools[id];
+  var tool = tools[id] || findEndedClayTool(ctx.messagesEl, id);
   if (!tool) return;
 
+  if (applyClayToolResult(tool, content, isError)) {
+    markToolDone(id, tool.clayActivity.phase === "error" || tool.clayActivity.phase === "cancelled");
+    applyClayToolItem(tool);
+    updateToolGroupHeader(clayToolResultGroup(tool, findToolGroup(tool.groupId)));
+    maybeScrollToBottom();
+    return;
+  }
+
   // Re-render the sublabel from the now-complete input (streaming can have
   // built it from a partial one), but in its terminal form: a result has
   // arrived, so this call is no longer running.
@@ -2026,6 +2052,7 @@ export function markToolDone(id, isError) {
     icon.innerHTML = '<span class="check">' + iconHtml("check") + '</span>';
   }
   refreshIcons();
+  finishClayToolItem(tool, findToolGroup(tool.groupId));
 
   // Update group state
   if (tool.groupId) {
@@ -2244,6 +2271,7 @@ export function removeToolFromGroup(toolId) {
   var group = findToolGroup(tool.groupId);
   if (!group) return;
   group.toolCount--;
+  if (group.toolIds) group.toolIds = group.toolIds.filter(function (id) { return id !== toolId; });
   // Remove tool name from the names array (remove first occurrence)
   var idx = group.toolNames.indexOf(tool.name);
   if (idx !== -1) group.toolNames.splice(idx, 1);

package/lib/public/modules/user-settings-appearance.js

@@ -31,7 +31,11 @@ function addTerminalTypography(section) {
     var option = document.createElement('option'); option.value = font.family; option.textContent = font.label; family.appendChild(option);
   });
   function sync() {
-    if (store.get('userTerminalDirty')) return;
+    if (store.get('userTerminalDirty')) {
+      var dirty = family.value !== getTerminalFontFamily() || size.value !== String(getTerminalFontSize());
+      store.set({userTerminalDirty:dirty});
+      if (dirty) return;
+    }
     var value = getTerminalFontFamily();
     if (!Array.from(family.options).some(function (option) { return option.value === value; })) {
       var option = document.createElement('option'); option.value = value; option.textContent = 'Custom font'; family.appendChild(option);
@@ -41,7 +45,10 @@ function addTerminalTypography(section) {
     family.dispatchEvent(new Event('settings-sync'));
   }
   async function save() {
-    var value = Number(size.value); store.set({ userTerminalDirty: true });
+    var dirty = family.value !== getTerminalFontFamily() || size.value !== String(getTerminalFontSize());
+    store.set({userTerminalDirty:dirty});
+    if (!dirty) {retry.hidden = true;status.textContent = '';status.dataset.state = '';return;}
+    var value = Number(size.value);
     if (!Number.isInteger(value) || value < 9 || value > 32) { status.textContent = 'Choose a whole size from 9 to 32.'; status.dataset.state = 'error'; return; }
     family.disabled = true; size.disabled = true; retry.hidden = true; status.textContent = 'Saving…'; status.dataset.state = '';
     try {
@@ -50,6 +57,6 @@ function addTerminalTypography(section) {
     finally { family.disabled = false; size.disabled = false; family.dispatchEvent(new Event('settings-sync')); }
   }
   family.onchange = save; size.onchange = save; retry.onclick = save;
-  size.oninput = function () { store.set({ userTerminalDirty: true }); };
+  size.oninput = function () { store.set({ userTerminalDirty: family.value !== getTerminalFontFamily() || size.value !== String(getTerminalFontSize()) }); };
   onTerminalFontChange(sync); sync(); enhanceSettingsSelects(content);
 }

package/lib/public/modules/user-settings-editors.js

@@ -19,6 +19,6 @@ function wrapEditor(content, title, summary) {
 }
 export function initPersonalEditors() {
   var allow=document.getElementById('us-claude-allow-list');var permission=wrapEditor(allow.closest('.settings-card'),'Personal allow rules',function(){var count=(store.get('userAllowSaved') || []).length;return count+' personal rules. Managed defaults apply separately.';});
-  permission.done.textContent='Cancel';permission.done.onclick=function(){function cancel(){allow.value=(store.get('userAllowSaved') || []).join('\n');store.set({userAllowDirty:false});permission.content.hidden=true;permission.state.hidden=false;permission.edit.hidden=false;permission.edit.focus();}if(store.get('userAllowDirty'))showConfirmDialog('Discard unsaved command rules?', 'Discard',cancel);else cancel();};
+  permission.done.textContent='Cancel';permission.done.onclick=function(){function cancel(){allow.value=(store.get('userAllowSaved') || []).join('\n');store.set({userAllowDirty:false,userAllowNeedsRetry:false});permission.content.hidden=true;permission.state.hidden=false;permission.edit.hidden=false;permission.edit.focus();}if(store.get('userAllowDirty'))showConfirmDialog('Discard unsaved command rules?', 'Discard',cancel);else cancel();};
   store.subscribe(function(state,previous){if(state.userAllowSaved!==previous.userAllowSaved){permission.state.textContent=(state.userAllowSaved || []).length+' personal rules. Managed defaults apply separately.';if(previous.userAllowDirty && !state.userAllowDirty){permission.content.hidden=true;permission.state.hidden=false;permission.edit.hidden=false;permission.edit.focus();}}});
 }

package/lib/public/modules/user-settings-layout.js

@@ -69,12 +69,21 @@ export function loadUserSettingsExtras(page) {
   if (page === 'us-ai') { mountDefaultAi(document.getElementById('us-default-ai')); requestDefaultAi(); var ws=getWs();if(ws && ws.readyState===1)ws.send(JSON.stringify({type:'get_claude_allow_list'})); }
 }
 export function finishUserSettingsExtras() {closeSpeechPicker();unmountDefaultAi(document.getElementById('us-default-ai'));}
-export function guardUserSettingsLeave(done) {
+export function guardUserSettingsLeave(done, destination) {
+  var active = document.querySelector('#user-settings .us-section.active');
+  var page = active && active.dataset.section;
+  if (destination && resolveUserSettingsPage(destination) === page) {done();return;}
+  function leaving(id) {return !destination || page === id;}
   var pin = document.getElementById('us-pin-form');
   var pinDirty = pin && !pin.classList.contains('hidden') && Array.from(pin.querySelectorAll('input')).some(function (input) {return !!input.value;});
   var key = document.getElementById('us-linear-key');
   if(store.get('speechPopup'))return;
-  var dirty = store.get('personalEmailDirty') || store.get('personalLinearDirty') || store.get('userVoiceDirty') || store.get('notificationDraft') || store.get('appearanceSaveError') || store.get('userProfileDirty') || store.get('userTerminalDirty') || pinDirty || key && key.value || store.get('defaultAiDraftDirty') || store.get('userAllowDirty');
+  var dirty = leaving('us-integrations') && (store.get('personalEmailDirty') || store.get('personalLinearDirty') || key && key.value) ||
+    leaving('us-chat') && store.get('userVoiceDirty') ||
+    leaving('us-notifications') && store.get('notificationDraft') ||
+    leaving('us-appearance') && (store.get('appearanceDraft') || store.get('userTerminalDirty')) ||
+    leaving('us-account') && (store.get('userProfileDirty') || pinDirty) ||
+    leaving('us-ai') && (store.get('defaultAiDraftDirty') || store.get('userAllowDirty'));
   if (!dirty) {done();return;}
   showConfirmDialog('Your unsaved changes will remain in this tab. Leave this editor and keep the draft?', 'Keep draft and leave', done);
 }

package/lib/public/modules/user-settings-preferences.js

@@ -27,7 +27,10 @@ export function initPersonalPreferences() {
     catch(error){preferenceStatus('us-layout-switcher',error.message+' Try again.',true);}
     finally{controls.forEach(function(el){el.disabled=false;});}
   };});
-  var textarea=document.getElementById('us-claude-allow-list');textarea.oninput=function(){store.set({userAllowDirty:true});};
+  var textarea=document.getElementById('us-claude-allow-list');textarea.oninput=function(){
+    var patterns=textarea.value.split('\n').map(function(line){return line.trim();}).filter(Boolean);
+    store.set({userAllowDirty:!!store.get('userAllowNeedsRetry') || JSON.stringify(patterns)!==JSON.stringify(store.get('userAllowSaved') || [])});
+  };
   document.getElementById('us-claude-allow-save').onclick=function(){
     var ws=getWs();if(!ws || ws.readyState!==1){preferenceStatus('us-claude-allow-list','Disconnected. Your draft is retained.',true);return;}
     this.disabled=true;preferenceStatus('us-claude-allow-list','Saving…');ws.send(JSON.stringify({type:'set_claude_user_allow_list',patterns:textarea.value.split('\n').map(function(line){return line.trim();}).filter(Boolean)}));
@@ -37,11 +40,12 @@ export function initPersonalPreferences() {
 export function handlePersonalSettingsMessage(msg) {
   if(msg.type==='claude_allow_list') {
     store.set({userAllowSaved:msg.user || []});
+    if(store.get('userAllowDirty'))document.getElementById('us-claude-allow-list').oninput();
     if(store.get('userAllowDirty'))return;
   }
   if(msg.type==='set_claude_user_allow_list_result') {
     document.getElementById('us-claude-allow-save').disabled=false;
-    if(msg.ok)store.set({userAllowDirty:msg.effective===false,userAllowSaved:msg.patterns || []});
+    if(msg.ok)store.set({userAllowDirty:msg.effective===false,userAllowNeedsRetry:msg.effective===false,userAllowSaved:msg.patterns || []});
     var message=msg.ok ? (msg.effective===false ? 'Saved to your account, but not installed in Claude. Check filesystem access, then Save to retry.' : 'Saved. Applies on the next Claude invocation.') : msg.error || 'Save failed. Your draft is retained.';
     preferenceStatus('us-claude-allow-list',message,!msg.ok || msg.effective===false);
   }

package/lib/public/modules/user-settings-profile.js

@@ -13,10 +13,20 @@ export function initPersonalProfile() {
   name.after(form); var input = form.querySelector('input');
   function close() { form.hidden = true; name.hidden = false; edit.hidden = false; edit.focus(); }
   edit.onclick = function () {
-    if (!store.get('userProfileDirty')) input.value = getProfile().name || name.textContent;
+    if (!store.get('userProfileDirty')) {
+      input.value = name.textContent || getProfile().name;
+      store.set({userProfileSavedName:input.value.trim()});
+    }
     form.hidden = false; name.hidden = true; edit.hidden = true; input.focus(); input.select();
   };
-  input.oninput = function () { store.set({ userProfileDirty: true }); };
+  input.oninput = function () { store.set({ userProfileDirty: input.value.trim() !== store.get('userProfileSavedName') }); };
+  store.subscribe(function (state, previous) {
+    if (state.userSettingsProfile === previous.userSettingsProfile || !state.userSettingsProfile) return;
+    var data = state.userSettingsProfile;
+    var saved = data.name || data.displayName || data.username || 'Clay User';
+    if (!state.userProfileDirty) input.value = saved;
+    store.set({userProfileSavedName:saved.trim(), userProfileDirty:input.value.trim() !== saved.trim()});
+  });
   form.onsubmit = async function (event) {
     event.preventDefault(); var save = form.querySelector('[type=submit]'); var status = form.querySelector('[role=status]');
     if (!input.value.trim()) { status.textContent = 'Enter a display name.'; return; }

package/lib/public/modules/user-settings.js

@@ -75,7 +75,7 @@ export function initUserSettings() {
   for (var i = 0; i < navItems.length; i++) {
     navItems[i].addEventListener('click', function () {
       var section = this.dataset.section;
-      guardUserSettingsLeave(function () { switchSection(section); });
+      guardUserSettingsLeave(function () { switchSection(section); }, section);
     });
   }
 
@@ -83,7 +83,8 @@ export function initUserSettings() {
   var navDropdown = document.getElementById('user-settings-nav-dropdown');
   if (navDropdown) {
     navDropdown.addEventListener('change', function () {
-      var value = this.value; guardUserSettingsLeave(function () {switchSection(value);});
+      var value = this.value; guardUserSettingsLeave(function () {switchSection(value);}, value);
+      this.value = settingsEl.querySelector('.us-section.active').dataset.section;
     });
   }
 

package/lib/public/style.css

@@ -88,3 +88,5 @@
 @import url("css/server-settings-system.css");
 
 @import url("css/project-settings-modal.css");
+
+@import url("css/clay-tool-activity.css");

package/lib/scheduled-task-records.js

@@ -18,6 +18,7 @@ function createScheduledTaskRecords(ctx) {
     var runs = Array.isArray(record.runs) ? record.runs : [];
     var readiness = ctx.runtimeStatus ? ctx.runtimeStatus(record) : null;
     return {
+      createdBy: record.createdBy || null, updatedBy: record.updatedBy || null,
       id: record.id, revision: Number(record.updatedAt || 0), name: record.name || "",
       instructions: record.task || record.prompt || record.instructions || "",
       cron: record.cron || null, date: record.date || null, time: record.time || null,
@@ -49,7 +50,7 @@ function createScheduledTaskRecords(ctx) {
     return { ok: true, record: publicRecord(record) };
   }
 
-  function update(session, id, revision, patch) {
+  function update(session, id, revision, patch, actor) {
     if (typeof id !== "string" || !ID_PATTERN.test(id)) return { ok: false, error: "Scheduled task id is invalid." };
     var record = ctx.registry.getById(id);
     if (!record) return { ok: false, error: "Scheduled task not found." };
@@ -94,6 +95,7 @@ function createScheduledTaskRecords(ctx) {
     }
     try {
       var updateData = Object.assign({}, checked.value);
+      if (actor) updateData.updatedBy = actor;
       if (claimOwner) { updateData.ownerId = session.ownerId; updateData.enabled = true; }
       if (updateData.cron) {
         updateData.date = record.cron && !record.scheduleRule ? record.date || null : null;

package/lib/scheduler.js

@@ -239,6 +239,7 @@ function createLoopRegistry(opts) {
 
   function register(data) {
     var rec = {
+      createdBy: data.createdBy || null, updatedBy: data.updatedBy || null, creationFingerprint: data.creationFingerprint || null,
       id: data.id || ("loop_" + Date.now() + "_" + require("crypto").randomBytes(3).toString("hex")),
       name: data.name || "Untitled",
       task: data.task || "",
@@ -297,6 +298,7 @@ function createLoopRegistry(opts) {
     if (!rec) return null;
     var previous = Object.assign({}, rec);
 
+    if (data.updatedBy !== undefined) rec.updatedBy = data.updatedBy;
     if (data.name !== undefined) rec.name = data.name;
     if (data.cron !== undefined) rec.cron = data.cron;
     if (data.enabled !== undefined) rec.enabled = data.enabled;