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

package/lib/public/modules/home-mate-settings.js

@@ -1,10 +1,15 @@
-// Centered General/Model/Memory/Knowledge settings dialog.
+// Centered General/Model/Prompt settings dialog.
 
+import { renderMateColorPicker, resetMateColor, mateColorSaving, applyMateColorResult } from './home-mate-color-picker.js';
+import { resetMateProfile, hasMateProfileDraft, mateProfileSaving, applyMateProfile, renderMateProfile } from './home-mate-profile-editor.js';
+import { showConfirm } from './app-misc.js';
+import { resetMateInstructions, loadMateInstructions, renderMateInstructions, applyMateInstructions, hasMateInstructionDraft } from './home-mate-instructions.js';
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
 import { iconHtml, refreshIcons } from './icons.js';
-import { editMateProfile, confirmMateRemoval } from './mate-management.js';
-import { resetHomeMateModelPicker, clearHomeMateModelPicker, requestHomeMateModels, renderHomeMateModelPicker, applyHomeMateModelsState, applyHomeMateModelResult } from './home-mate-model-picker.js';
+import { confirmMateRemoval } from './mate-management.js';
+import { renderHomeMateAvatarEditor, confirmHomeMateAvatar, failHomeMateAvatar, clearHomeMateAvatarEditor } from './home-mate-avatar-editor.js';
+import { resetHomeMateModelPicker, clearHomeMateModelPicker, hasHomeMateModelDraft, requestHomeMateModels, renderHomeMateModelPicker, applyHomeMateModelsState, applyHomeMateModelResult } from './home-mate-model-picker.js';
 
 var dialog = null;
 var dialogOpener = null;
@@ -52,31 +57,7 @@ function setTransientDrawerMask(masked) {
 }
 
 function focusableElements(root) {
-  return root ? root.querySelectorAll('button:not([disabled]), [href], input:not([disabled]), textarea:not([disabled]), select:not([disabled]), [tabindex]:not([tabindex="-1"])') : [];
-}
-
-function restoreModelFocusAfterRender() {
-  var active = document.activeElement;
-  var focusedModel = active && active.dataset ? active.dataset.homeMateModel : null;
-  var focusedVendor = active && active.dataset ? active.dataset.homeMateVendor : null;
-  var focusedControl = active && active.dataset ? active.dataset.homeModelFocus : null;
-  return function () {
-    if (!dialog) return;
-    var selectors = [
-      { selector: "[data-home-mate-model]", key: "homeMateModel", value: focusedModel },
-      { selector: "[data-home-mate-vendor]", key: "homeMateVendor", value: focusedVendor },
-      { selector: "[data-home-model-focus]", key: "homeModelFocus", value: focusedControl },
-    ];
-    for (var i = 0; i < selectors.length; i++) {
-      if (!selectors[i].value) continue;
-      var nodes = dialog.querySelectorAll(selectors[i].selector);
-      for (var j = 0; j < nodes.length; j++) {
-        if (nodes[j].dataset[selectors[i].key] !== selectors[i].value) continue;
-        nodes[j].focus({ preventScroll: true });
-        return;
-      }
-    }
-  };
+  return root ? Array.from(root.querySelectorAll('button:not([disabled]), [href], input:not([disabled]), textarea:not([disabled]), select:not([disabled]), [tabindex]:not([tabindex="-1"])')).filter(function (el) { return el.getClientRects().length && el.tabIndex >= 0; }) : [];
 }
 
 function addEmpty(container, text) {
@@ -87,30 +68,30 @@ function addEmpty(container, text) {
 }
 
 function renderGeneral(body, mate) {
-  var profile = mate && mate.profile ? mate.profile : {};
-  var identity = document.createElement("section");
-  identity.className = "home-mate-settings-identity";
-  var eyebrow = document.createElement("span");
-  eyebrow.textContent = mate && mate.primary ? "Primary Mate" : mate && mate.builtinKey ? "Built-in Mate" : "Custom Mate";
-  var name = document.createElement("h3");
-  name.textContent = getMateName(mate);
-  var bio = document.createElement("p");
-  bio.textContent = profile.bio || (mate && mate.bio) || "Profile and management controls for this Mate.";
-  identity.appendChild(eyebrow);
-  identity.appendChild(name);
-  identity.appendChild(bio);
-  body.appendChild(identity);
+  var description = document.createElement("p");
+  description.className = "mate-settings-help";
+  description.textContent = "Manage " + getMateName(mate) + "’s identity and appearance.";
+  body.appendChild(description);
+  renderMateProfile(body, mate, renderDialogContent, function () {
+    store.set({mateSettingsAvatarOpen: !store.get('mateSettingsAvatarOpen')});
+    renderDialogContent();
+  });
+  if (store.get('mateSettingsAvatarOpen')) {
+    var appearance = document.createElement("section");
+    appearance.className = "mate-settings-appearance";
+    renderHomeMateAvatarEditor(appearance, mate, renderDialogContent);
+    var done = document.createElement('button'); done.type = 'button'; done.className = 'mate-settings-button'; done.textContent = 'Done';
+    done.addEventListener('click',function () { store.set({mateSettingsAvatarOpen:false}); renderDialogContent(); document.getElementById('mate-profile-avatar').focus(); });
+    appearance.appendChild(done);
+    body.appendChild(appearance);
+  }
+  renderMateColorPicker(body, mate, renderDialogContent);
   if (!mate || mate.primary) {
-    addEmpty(body, "This primary Mate is managed by Clay.");
+    addEmpty(body, "Clay manages this Mate’s core profile.");
     return;
   }
   var actions = document.createElement("div");
   actions.className = "home-mate-settings-actions";
-  var edit = document.createElement("button");
-  edit.type = "button";
-  edit.className = "home-mate-settings-action";
-  edit.innerHTML = iconHtml("edit-2") + "<span>Edit profile</span>";
-  edit.addEventListener("click", function () { editMateProfile(edit, mate); });
   var remove = document.createElement("button");
   remove.type = "button";
   remove.className = "home-mate-settings-action is-danger";
@@ -119,90 +100,46 @@ function renderGeneral(body, mate) {
   removeLabel.textContent = mate.builtinKey ? "Remove Mate" : "Delete Mate";
   remove.appendChild(removeLabel);
   remove.addEventListener("click", function () { confirmMateRemoval(remove, mate, closeHomeMateSettings); });
-  actions.appendChild(edit);
+  var dangerCopy = document.createElement("div");
+  dangerCopy.className = "mate-settings-danger-copy";
+  dangerCopy.innerHTML = "<h4>Danger zone</h4><p>Permanently delete this Mate and its workspace data. This cannot be undone.</p>";
+  actions.appendChild(dangerCopy);
   actions.appendChild(remove);
   body.appendChild(actions);
 }
 
-function renderMemory(body) {
-  if (!memoryState) {
-    addEmpty(body, "Loading memory…");
-    return;
-  }
-  if (memoryState.summary) {
-    var summary = document.createElement("section");
-    summary.className = "home-mate-settings-summary";
-    var heading = document.createElement("h3");
-    heading.textContent = "Working summary";
-    var text = document.createElement("p");
-    text.textContent = memoryState.summary;
-    summary.appendChild(heading);
-    summary.appendChild(text);
-    body.appendChild(summary);
-  }
-  var entries = memoryState.entries || [];
-  for (var i = 0; i < entries.length; i++) {
-    var item = document.createElement("article");
-    item.className = "home-mate-settings-memory";
-    var title = document.createElement("h3");
-    title.textContent = entries[i].topic || entries[i].date || "Memory";
-    var detail = document.createElement("p");
-    detail.textContent = entries[i].my_position || entries[i].decisions || entries[i].outcome || "";
-    item.appendChild(title);
-    if (detail.textContent) item.appendChild(detail);
-    body.appendChild(item);
-  }
-  if (!memoryState.summary && !entries.length) addEmpty(body, "No memories yet.");
-}
-
-function renderKnowledge(body) {
-  if (!knowledgeState) {
-    addEmpty(body, "Loading knowledge…");
-    return;
-  }
-  var files = knowledgeState.files || [];
-  for (var i = 0; i < files.length; i++) {
-    var item = document.createElement("div");
-    item.className = "home-mate-settings-file";
-    item.innerHTML = iconHtml("file-text");
-    var name = document.createElement("span");
-    name.textContent = typeof files[i] === "string" ? files[i] : files[i].name || "Untitled";
-    item.appendChild(name);
-    body.appendChild(item);
-  }
-  if (!files.length) addEmpty(body, "No knowledge files yet.");
-}
-
 function requestSection(section) {
   if (section === "model" && !modelRequested) {
     modelRequested = true;
-    var mate = getMate(dialogMateId);
-    requestHomeMateModels((mate || {}).vendor || "", renderDialogContent, false);
-  }
-  if (section === "memory") {
-    memoryState = null;
-    memoryRequestId = nextRequestId("memory");
-    send({ type: "home_mate_memory_list", mateId: dialogMateId, requestId: memoryRequestId });
-  }
-  if (section === "knowledge") {
-    knowledgeState = null;
-    knowledgeRequestId = nextRequestId("knowledge");
-    send({ type: "home_mate_knowledge_list", mateId: dialogMateId, requestId: knowledgeRequestId });
+    requestHomeMateModels((getMate(dialogMateId) || {}).vendor || "", renderDialogContent);
   }
 }
 
+function savePending() {
+  var prompt = store.get('mateInstructionsDraft');
+  var model = store.get('mateModelDraft');
+  return mateColorSaving() || mateProfileSaving() || !!((prompt && prompt.status === 'saving') || (model && model.saveId));
+}
+
 function renderDialogContent() {
   if (!dialog) return;
+  dialog.dataset.section = dialogSection;
   var body = dialog.querySelector(".home-mate-settings-body");
   if (!body) return;
+  var focus = document.activeElement;
+  var focusId = focus && focus.id;
+  var ownedFocus = focus && body.contains(focus);
+  var selection = focus && focus.tagName === 'TEXTAREA' ? [focus.selectionStart, focus.selectionEnd] : null;
+  var scroll = body.parentElement.scrollTop;
+  var expanded = body.querySelector('.mate-settings-appearance');
+  var appearanceOpen = expanded && expanded.open;
   body.innerHTML = "";
   var mate = getMate(dialogMateId);
   var contentTitle = dialog.querySelector(".home-mate-settings-content-title");
-  if (contentTitle) contentTitle.textContent = dialogSection.charAt(0).toUpperCase() + dialogSection.slice(1) + " settings";
+  if (contentTitle) contentTitle.textContent = dialogSection.charAt(0).toUpperCase() + dialogSection.slice(1);
   if (dialogSection === "general") renderGeneral(body, mate);
   else if (dialogSection === "model") renderHomeMateModelPicker(body, renderDialogContent);
-  else if (dialogSection === "memory") renderMemory(body);
-  else renderKnowledge(body);
+  else renderMateInstructions(body, renderDialogContent);
   var nav = dialog.querySelectorAll("[data-home-mate-settings-section]");
   for (var i = 0; i < nav.length; i++) {
     var active = nav[i].dataset.homeMateSettingsSection === dialogSection;
@@ -211,10 +148,22 @@ function renderDialogContent() {
     else nav[i].removeAttribute("aria-current");
   }
   refreshIcons();
+  dialog.querySelector('.home-mate-settings-close').disabled = savePending();
+  var appearance = body.querySelector('.mate-settings-appearance');
+  if (appearance && appearanceOpen) appearance.open = true;
+  body.parentElement.scrollTop = scroll;
+  var nextFocus = focusId && document.getElementById(focusId);
+  if (nextFocus && !nextFocus.disabled) {
+    nextFocus.focus({preventScroll:true});
+    if (selection) nextFocus.setSelectionRange(selection[0], selection[1]);
+  } else if (ownedFocus) {
+    var fallback = body.querySelector('#mate-prompt-input:not(:disabled), #mate-settings-model-trigger:not(:disabled)') || contentTitle;
+    if (fallback) fallback.focus({preventScroll:true});
+  }
 }
 
 function selectSection(section, focusContent) {
-  if (section !== "general" && section !== "model" && section !== "memory" && section !== "knowledge") return;
+  if (section !== "general" && section !== "model" && section !== "prompt") return;
   dialogSection = section;
   requestSection(section);
   renderDialogContent();
@@ -227,6 +176,7 @@ function selectSection(section, focusContent) {
 function handleDialogKeydown(event) {
   if (!dialog) return;
   if (document.querySelector(".profile-popover") || document.querySelector("#confirm-modal:not(.hidden)")) return;
+  if (event.target.closest && event.target.closest(".worker-runtime-options")) return;
   if (event.key === "Escape") {
     event.preventDefault();
     event.stopPropagation();
@@ -247,7 +197,14 @@ function handleDialogKeydown(event) {
   }
 }
 
-export function closeHomeMateSettings() {
+export function closeHomeMateSettings(force) {
+  if (force !== true && savePending()) return false;
+  if (force !== true && (hasMateProfileDraft() || hasMateInstructionDraft() || hasHomeMateModelDraft())) {
+    var previous = document.activeElement;
+    showConfirm("Discard unsaved Mate settings?", function () { closeHomeMateSettings(true); }, "Discard changes", false, function () { if (previous && previous.isConnected) previous.focus(); });
+    document.getElementById("confirm-cancel").focus();
+    return false;
+  }
   var opener = dialogOpener;
   if (dialog) dialog.remove();
   dialog = null;
@@ -258,7 +215,12 @@ export function closeHomeMateSettings() {
   memoryState = null;
   knowledgeState = null;
   modelRequested = false;
+  store.set({mateSettingsAvatarOpen:false});
+  resetMateProfile();
+  resetMateColor();
   clearHomeMateModelPicker();
+  resetMateInstructions(null);
+  clearHomeMateAvatarEditor();
   document.removeEventListener("keydown", handleDialogKeydown, true);
   document.body.classList.remove("home-mate-settings-open");
   setTransientDrawerMask(false);
@@ -267,11 +229,16 @@ export function closeHomeMateSettings() {
 
 export function openHomeMateSettings(mateId, opener, options) {
   var mate = getMate(mateId);
-  if (!mate) return false;
-  closeHomeMateSettings();
+  if (!mate || (dialog && savePending())) return false;
+  if (dialog && (hasMateProfileDraft() || hasMateInstructionDraft() || hasHomeMateModelDraft())) {
+    showConfirm("Discard unsaved Mate settings?", function () { closeHomeMateSettings(true); openHomeMateSettings(mateId, opener, options); }, "Discard changes", false);
+    return false;
+  }
+  closeHomeMateSettings(true);
+  resetMateInstructions(mateId);
   dialogMateId = mateId;
   dialogOpener = opener || document.activeElement;
-  dialogSection = options && options.section === "model" ? "model" : "general";
+  dialogSection = options && ["model", "prompt"].indexOf(options.section) !== -1 ? options.section : "general";
   modelRequested = false;
   resetHomeMateModelPicker(mateId, getMateName(mate), mate, options && options.sessionId);
   var overlay = document.createElement("div");
@@ -305,7 +272,7 @@ export function openHomeMateSettings(mateId, opener, options) {
   var nav = document.createElement("nav");
   nav.className = "home-mate-settings-nav";
   nav.setAttribute("aria-label", "Mate settings sections");
-  var sections = ["general", "model", "memory", "knowledge"];
+  var sections = ["general", "model", "prompt"];
   for (var i = 0; i < sections.length; i++) {
     (function (section) {
       var button = document.createElement("button");
@@ -319,7 +286,7 @@ export function openHomeMateSettings(mateId, opener, options) {
   var content = document.createElement("section");
   content.className = "home-mate-settings-content";
   var contentTitle = document.createElement("h3");
-  contentTitle.className = "home-mate-settings-content-title sr-only";
+  contentTitle.className = "home-mate-settings-content-title";
   contentTitle.tabIndex = -1;
   contentTitle.textContent = "Mate settings content";
   var body = document.createElement("div");
@@ -339,6 +306,7 @@ export function openHomeMateSettings(mateId, opener, options) {
   document.addEventListener("keydown", handleDialogKeydown, true);
   renderDialogContent();
   requestSection(dialogSection);
+  loadMateInstructions(renderDialogContent);
   refreshIcons();
   requestAnimationFrame(function () { close.focus({ preventScroll: true }); });
   return true;
@@ -361,23 +329,48 @@ export function handleHomeMateKnowledgeState(msg) {
 export function handleHomeMateModelsState(msg) {
   if (!dialog || !applyHomeMateModelsState(msg)) return false;
   if (dialogSection === "model") {
-    var restoreFocus = restoreModelFocusAfterRender();
     renderDialogContent();
-    restoreFocus();
   }
   return true;
 }
 
 export function handleHomeMateModelResult(msg) {
   if (!dialog || !applyHomeMateModelResult(msg)) return false;
+  if (msg.ok) {
+    var mates = store.get('cachedMatesList') || [];
+    store.set({ cachedMatesList: mates.map(function (mate) {
+      return mate && mate.id === msg.mateId ? Object.assign({}, mate, { vendor: msg.vendor, model: msg.model }) : mate;
+    }) });
+  }
   if (dialogSection === "model") {
-    var restoreFocus = restoreModelFocusAfterRender();
     renderDialogContent();
-    restoreFocus();
   }
   return true;
 }
 
-export function syncHomeMateSettingsTarget() {
-  if (dialogMateId && !getMate(dialogMateId)) closeHomeMateSettings();
+export function syncHomeMateSettingsTarget(msg) {
+  if (msg) { applyMateProfile(msg); applyMateColorResult(msg); }
+  if (!dialogMateId) return;
+  var mate = getMate(dialogMateId);
+  if (!mate) closeHomeMateSettings();
+  else {
+    confirmHomeMateAvatar(mate);
+    dialog.querySelector(".home-mate-settings-header span").textContent = getMateName(mate);
+    renderDialogContent();
+  }
+}
+
+export function handleHomeMateAvatarError(msg) {
+  if (!dialog || !msg) return false;
+  var colorHandled = applyMateColorResult(msg);
+  var profileHandled = applyMateProfile(msg);
+  if (!colorHandled && !profileHandled && !failHomeMateAvatar(msg.mateId, msg.error)) return false;
+  renderDialogContent();
+  return true;
+}
+
+export function handleMateInstructionsResult(msg) {
+  if (!dialog || !applyMateInstructions(msg)) return false;
+  if (dialogSection === 'prompt') renderDialogContent();
+  return true;
 }

package/lib/public/modules/home-shell.js

@@ -1,9 +1,12 @@
 // Reversible project-chrome suppression for the home route.
+import { store } from './store.js';
 
 export function showHomeShell() {
   document.body.classList.add("home-active");
+  store.set({ homeShellVisible: true });
 }
 
 export function hideHomeShell() {
   document.body.classList.remove("home-active");
+  store.set({ homeShellVisible: false });
 }

package/lib/public/modules/home-surface-boot.js

@@ -1,6 +1,5 @@
 // One-shot routing for a server-selected project or the no-project Home fallback.
 import { store } from './store.js';
-import { rememberHomePrimarySurface } from './home-surface.js';
 
 var initialized = false;
 var resolved = false;
@@ -17,12 +16,7 @@ export function resolveHomeBootDestination(options) {
   // Home is entered only through an explicit in-app action; reloading `/`
   // returns to the project workspace even if Home was the last open surface.
   if (options.currentSlug) return "project";
-  if (options.surfaceLoaded !== true) return "wait";
   if (options.projectsLoaded !== true) return "wait";
-  if (options.surface === "home") {
-    if (options.dockLoaded !== true) return "wait";
-    return "home";
-  }
   return "projects";
 }
 
@@ -50,7 +44,6 @@ function settleBoot(state) {
   if (destination === "wait") return;
   resolved = true;
   if (destination === "project") {
-    rememberHomePrimarySurface("project");
     if (!explicitProjectPath(location.pathname)) {
       var route = projectRoute(state.currentSlug);
       if (route) history.replaceState(null, "", route);
@@ -61,8 +54,7 @@ function settleBoot(state) {
     if (input && !input.disabled) input.focus({ preventScroll: true });
     return;
   }
-  if (destination === "projects") store.set({ homeSurfaceBootResolved: true, projectsHubRestoreRequested: true });
-  else store.set({ homeSurfaceBootResolved: true, homeSurfaceRestoreRequested: true });
+  store.set({ homeSurfaceBootResolved: true, projectsHubRestoreRequested: true });
   finishPendingShell();
 }
 

package/lib/public/modules/icon-strip-tooltip.js

@@ -0,0 +1,95 @@
+// Singleton tooltip controller for the compact project strip.
+// Accessible trigger labels remain on the trigger; visible tooltip metadata is
+// explicit so names containing commas are never parsed as status copy.
+
+var iconStripTooltip = null;
+
+function tooltipMetadata(value) {
+  if (typeof value === "string") return { text: value };
+  return value && typeof value === "object" ? value : { text: "" };
+}
+
+export function hideIconTooltip() {
+  if (!iconStripTooltip) return;
+  iconStripTooltip.remove();
+  iconStripTooltip = null;
+}
+
+export function showIconTooltip(el, text, options) {
+  hideIconTooltip();
+  var metadata = Object.assign({ text: text || "" }, options || {});
+  var tip = document.createElement("div");
+  tip.className = "icon-strip-tooltip";
+  tip.setAttribute("role", "tooltip");
+  tip.dataset.tooltipKind = metadata.kind || "project";
+  if (metadata.kind === "mate") {
+    tip.classList.add("icon-strip-tooltip-mate");
+    var identity = document.createElement("span");
+    identity.className = "icon-strip-tooltip-mate-identity";
+    var avatar = document.createElement("img");
+    avatar.className = "icon-strip-tooltip-mate-avatar";
+    avatar.alt = "";
+    avatar.draggable = false;
+    avatar.src = metadata.avatarUrl || "";
+    var label = document.createElement("span");
+    label.className = "icon-strip-tooltip-label";
+    label.textContent = metadata.text;
+    identity.appendChild(avatar);
+    identity.appendChild(label);
+    tip.appendChild(identity);
+  } else {
+    tip.textContent = metadata.text;
+  }
+  document.body.appendChild(tip);
+  iconStripTooltip = tip;
+
+  requestAnimationFrame(function () {
+    if (iconStripTooltip !== tip || !tip.isConnected) return;
+    var rect = el.getBoundingClientRect();
+    tip.style.top = (rect.top + rect.height / 2 - tip.offsetHeight / 2) + "px";
+    tip.classList.add("visible");
+  });
+}
+
+export function showIconTooltipHtml(el, html, options) {
+  hideIconTooltip();
+  options = options || {};
+  var tip = document.createElement("div");
+  tip.className = "icon-strip-tooltip" + (options.className ? " " + options.className : "");
+  tip.setAttribute("role", "tooltip");
+  tip.style.whiteSpace = "normal";
+  tip.style.maxWidth = "260px";
+  tip.innerHTML = html;
+  document.body.appendChild(tip);
+  iconStripTooltip = tip;
+
+  requestAnimationFrame(function () {
+    if (iconStripTooltip !== tip || !tip.isConnected) return;
+    var rect = el.getBoundingClientRect();
+    if (options.placement === "bottom") {
+      var left = rect.left + rect.width / 2 - tip.offsetWidth / 2;
+      left = Math.max(12, Math.min(left, window.innerWidth - tip.offsetWidth - 12));
+      tip.style.left = left + "px";
+      tip.style.top = (rect.bottom + 8) + "px";
+    } else {
+      tip.style.top = (rect.top + rect.height / 2 - tip.offsetHeight / 2) + "px";
+    }
+    tip.classList.add("visible");
+  });
+}
+
+export function bindIconTooltip(el, resolveMetadata) {
+  function show() {
+    var metadata = tooltipMetadata(typeof resolveMetadata === "function" ? resolveMetadata() : resolveMetadata);
+    showIconTooltip(el, metadata.text || "", metadata);
+  }
+  el.addEventListener("mouseenter", show);
+  el.addEventListener("focus", show);
+  el.addEventListener("mouseleave", hideIconTooltip);
+  el.addEventListener("blur", hideIconTooltip);
+  el.addEventListener("click", hideIconTooltip);
+  el.addEventListener("contextmenu", hideIconTooltip);
+  el.addEventListener("keydown", function (event) {
+    if (event.key === "Escape") hideIconTooltip();
+  });
+}

package/lib/public/modules/knowledge-db-edit-state.js

@@ -0,0 +1,35 @@
+export function isRecordEdit(edit) {
+  return !!(edit && !edit.schema && !edit.view && !edit.settings && !edit.recover);
+}
+
+export function buildRecordAttempt(edit, databaseId, databaseRevision, values) {
+  if (edit.attempt) return edit.attempt;
+  var creating = edit.creating === true;
+  var payload = { databaseId: databaseId, values: JSON.parse(JSON.stringify(values)), operationId: edit.operationId };
+  if (creating) payload.expectedDatabaseRevision = databaseRevision;
+  else { payload.recordId = edit.recordId; payload.expectedRevision = edit.baseVersion; }
+  return { type: creating ? 'knowledge_db_record_create' : 'knowledge_db_record_update', payload: payload, creating: creating, recordId: edit.recordId || null, submittedVersion: edit.version || 0 };
+}
+
+export function buildCreateAttempt(draft, name) {
+  if (draft.attempt) return draft.attempt;
+  return { operationId: draft.operationId, name: name };
+}
+
+export function isCurrentAttempt(edit, attempt) {
+  return !!(edit && edit.attempt && attempt && edit.attempt.payload.operationId === attempt.payload.operationId);
+}
+
+export function applyRecordSave(edit, record, newOperationId, acknowledgedAttempt) {
+  if (!isCurrentAttempt(edit, acknowledgedAttempt)) return { edit: edit, later: false, stale: true };
+  var later = (edit.version || 0) > acknowledgedAttempt.submittedVersion;
+  if (!later) return { edit: null, later: false };
+  return { later: true, edit: Object.assign({}, edit, { creating: false, recordId: record.id, baseVersion: record.revision, saving: false, retryPending: false, attempt: null, operationId: newOperationId, error: '' }) };
+}
+
+export function updateViewPresentation(view, values) {
+  var next = Object.assign({}, view, { name: values.name, columns: values.columns });
+  if (view.filters.length <= 1) next.filters = values.filters;
+  if (view.sorts.length <= 1) next.sorts = values.sorts;
+  return next;
+}