clay-server 5.2.0-beta.1 → 5.2.0-beta.11

package/lib/public/modules/filebrowser.js

@@ -1,3 +1,5 @@
+import { presentedDocument, refreshPresentedDocument, closePresentedDocument } from './clay-studio-document.js';
+import { registerStudioPaint } from './clay-studio-render.js';
 import { iconHtml, refreshIcons } from './icons.js';
 import { escapeHtml, copyToClipboard } from './utils.js';
 import { renderMarkdown, highlightCodeBlocks, renderMermaidBlocks, exportMarkdownAsPdf } from './markdown.js';
@@ -192,6 +194,9 @@ export function initFileBrowser(_ctx) {
 
   document.getElementById("file-viewer-download").addEventListener("click", function () {
     if (!currentFilePath) return;
+    if ((store.get("studioDocumentView") || {}).descriptor && store.get("studioDocumentView").descriptor.path === currentFilePath) {
+      var link = document.createElement('a'); link.href = URL.createObjectURL(new Blob([currentContent || ''], { type: 'text/markdown;charset=utf-8' })); link.download = currentFilePath.split('/').pop(); link.click(); setTimeout(function () { URL.revokeObjectURL(link.href); }, 1000); return;
+    }
     downloadProjectFile(currentFilePath);
   });
 
@@ -459,12 +464,14 @@ function handleTreeKeyDown(e) {
 
 // --- File watch helpers ---
 function sendWatch(filePath) {
+  if ((store.get("studioDocumentView") || {}).descriptor && store.get("studioDocumentView").descriptor.path === filePath) return;
   if (ctx.ws && ctx.connected) {
     ctx.ws.send(JSON.stringify({ type: "fs_watch", path: filePath }));
   }
 }
 
 function sendUnwatch() {
+  if (store.get("studioDocumentView")) { closePresentedDocument(); return; }
   if (ctx.ws && ctx.connected) {
     ctx.ws.send(JSON.stringify({ type: "fs_unwatch" }));
   }
@@ -532,6 +539,7 @@ export function resetFileBrowser() {
   treeData = {};
   currentContent = null;
   currentFilePath = null;
+  store.set({ clayControlFileView: null });
   isRendered = false;
   currentIsMarkdown = false;
   currentIsSvg = false;
@@ -568,6 +576,7 @@ export function openFile(filePath, opts) {
   if (!state.connected) return false;
   if (opts && opts.projectSlug && opts.projectSlug !== state.currentSlug) return false;
   if (opts && opts.sessionId && String(opts.sessionId) !== String(state.activeSessionId)) return false;
+  closePresentedDocument();
   var workbenchRevision = claimRightWorkbench("file-viewer");
   if (followedFileChanged(filePath) || (opts && opts.diff && isFollowingMarkdown(filePath))) {
     cancelMarkdownFollow();
@@ -635,6 +644,7 @@ export function presentMarkdownEdit(msg) {
     content: typeof msg.content === "string" ? msg.content : "",
     size: msg.size || 0,
   });
+  registerStudioPaint(msg, document.querySelector("#file-viewer .file-viewer-header"), null, document.getElementById("file-viewer-body"));
 }
 
 function followedFileChanged(filePath) {
@@ -723,6 +733,7 @@ function requestDirectory(dirPath) {
 }
 
 function requestFileContent(filePath) {
+  if (refreshPresentedDocument(filePath)) return;
   var requestId = "file-read-" + Date.now() + "-" + Math.random().toString(36).slice(2);
   var state = store.snap();
   store.set({ fileReadRequest: { requestId: requestId, path: filePath, projectSlug: state.currentSlug || null, sessionId: state.activeSessionId != null ? String(state.activeSessionId) : null, accountId: state.myUserId || null, workbenchRevision: store.get('rightWorkbenchRevision') || 0 } });
@@ -1148,6 +1159,7 @@ function renderEntries(container, entries, depth) {
 // --- File viewer ---
 
 function showFileContent(msg, expectedRevision) {
+  var priorTarget = document.querySelector("#file-viewer .file-viewer-header"); if (priorTarget) delete priorTarget.dataset.controlSurface;
   if (!updateFileViewerTab(msg.path, { content: msg.content })) return;
   if (expectedRevision != null && !isRightWorkbenchCurrent("file-viewer", expectedRevision)) return;
   var pathEl = document.getElementById("file-viewer-path");
@@ -1170,6 +1182,8 @@ function showFileContent(msg, expectedRevision) {
   pendingRefresh = false;
   currentContent = null;
   currentFilePath = msg.path;
+  var sourceView = store.get('studioDocumentView'), sourceDescriptor = sourceView && sourceView.descriptor.path === msg.path ? sourceView.descriptor : null;
+  store.set({ clayControlFileView: { path: msg.path, revision: msg.controlRevision || null, projectSlug: sourceDescriptor ? sourceDescriptor.sourceSlug : store.get('currentSlug'), runtimeId: sourceDescriptor ? sourceDescriptor.runtimeId : store.get('controlRuntimeId') } });
   currentIsMarkdown = false;
   currentIsSvg = false;
   store.set({ fileViewerIsPlantUml: false, fileViewerIsHtml: false });
@@ -1279,6 +1293,8 @@ function showFileContent(msg, expectedRevision) {
     store.set({ pendingFileNavigation: null });
   }
 
+  var sourceView = presentedDocument(msg.path);
+  if (sourceView) Array.from(bodyEl.querySelectorAll('.clay-file-link')).forEach(function (link) { link.dataset.fileProjectSlug = sourceView.descriptor.sourceSlug; link.dataset.fileSessionId = String(sourceView.descriptor.sourceSessionId); });
   // Request edit history for this file (skip on auto-refresh)
   if (!keepRenderState) {
     historyVisible = false;
@@ -1361,7 +1377,9 @@ function pathsReferToSameFile(left, right) {
   return a === b || a.endsWith("/" + b) || b.endsWith("/" + a);
 }
 
-export function handleFileChanged(msg) {
+export function handleFileChanged(msg, presentedSource) {
+  var source = store.get('studioDocumentView');
+  if (source && source.descriptor.path === msg.path && (!presentedSource || presentedDocument(msg.path) !== presentedSource)) return;
   if (!msg.path || !pathsReferToSameFile(msg.path, currentFilePath)) return;
   if (ctx.fileViewerEl.classList.contains("hidden")) return;
   if (historyVisible || inlineDiffActive) return;
@@ -1602,6 +1620,7 @@ function formatSize(bytes) {
 // --- File edit history ---
 
 function requestFileHistory(filePath) {
+  if ((store.get("studioDocumentView") || {}).descriptor && store.get("studioDocumentView").descriptor.path === filePath) return;
   if (ctx.ws && ctx.connected) {
     ctx.ws.send(JSON.stringify({ type: "fs_file_history", path: filePath }));
   }

package/lib/public/modules/generation-stop.js

@@ -2,6 +2,13 @@ import { store } from './store.js';
 import { getWs } from './ws-ref.js';
 import { isDriverOperatedView } from './worker-pane-lock.js';
 
+export function stopGeneration() {
+  var ws = getWs();
+  if (!store.get('processing') || !store.get('connected') || !ws || ws.readyState !== 1) return false;
+  ws.send(JSON.stringify({ type: 'stop' }));
+  return true;
+}
+
 // Fallback Stop control for when Send cannot double as Stop: a draft sitting
 // in the composer (Send stays Send so the draft can still go out), or a
 // locked configured Worker pane (Send and the rest of the composer are
@@ -31,11 +38,7 @@ export function initGenerationStop() {
     button.title = store.get('connected') ? 'Stop generating' : 'Reconnect to stop generating';
     place();
   }
-  button.addEventListener('click', function () {
-    var ws = getWs();
-    if (!store.get('processing') || !store.get('connected') || !ws || ws.readyState !== 1) return;
-    ws.send(JSON.stringify({ type: 'stop' }));
-  });
+  button.addEventListener('click', stopGeneration);
   store.subscribe(function (state, previous) {
     if (state.processing !== previous.processing || state.connected !== previous.connected
       || state.splitGroups !== previous.splitGroups || state.activeSessionId !== previous.activeSessionId

package/lib/public/modules/git-panel.js

@@ -103,7 +103,8 @@ function renderFileRow(file, staged) {
   var actionTitle = staged ? "Unstage file — keep its changes" : "Stage file for commit";
   var actionIcon = staged ? "minus" : "plus";
   var actionsOpen = expandedFileActionsPath === file.path;
-  return '<div class="git-file-row' + (actionsOpen ? ' active' : '') + '">' +
+  var control = currentStatus && currentStatus.controlView, view = control && control.files.find(function (item) { return item.path === file.path; });
+  return '<div data-control-git-path="' + escapeHtml(file.path) + '" data-control-revision="' + escapeHtml(view && view.revision || '') + '" data-control-runtime="' + escapeHtml(control && control.runtimeId || '') + '" class="git-file-row' + (actionsOpen ? ' active' : '') + '">' +
     '<span class="git-file-status' + statusClass + '">' + escapeHtml(fileStatusLabel(file, staged)) + '</span>' +
     '<div class="git-file-main" data-git-file-item="' + pathKey + '" tabindex="0" aria-label="File actions for ' + escapeHtml(parts.name) + '" aria-expanded="' + (actionsOpen ? 'true' : 'false') + '">' +
       '<div class="git-file-name">' + escapeHtml(parts.name) + '</div>' +
@@ -282,6 +283,7 @@ export function refreshGitStatus() {
   return requestJson(basePath + "api/git/status", { cache: "no-store" }).then(function (status) {
     if (statusBasePath !== basePath) return status;
     currentStatus = status;
+    store.set({ clayControlGitView: status.controlView ? Object.assign({ projectSlug: store.get('currentSlug') }, status.controlView) : null });
     if (expandedFileActionsPath && !status.files.some(function (file) { return file.path === expandedFileActionsPath; })) {
       expandedFileActionsPath = null;
     }

package/lib/public/modules/github-star.js

@@ -0,0 +1,66 @@
+// github-star.js - Public star count beside the top-bar GitHub Star link.
+//
+// The link itself is static markup. This module only fills in the count read
+// from the server's cached GET /api/github-stars. An unknown count leaves the
+// count segment hidden; nothing is invented, and the module never writes to
+// GitHub or sends anything about the user.
+
+import { store } from './store.js';
+
+var REFRESH_MS = 60 * 60 * 1000;
+var MOBILE_QUERY = "(max-width: 768px)";
+
+var timer = null;
+var inflight = false;
+
+// 999 -> "999", 1234 -> "1.2k", 12500 -> "12.5k", 1200000 -> "1.2m"
+export function formatStarCount(n) {
+  if (typeof n !== "number" || !isFinite(n) || n < 0) return "";
+  n = Math.floor(n);
+  if (n < 1000) return String(n);
+  var units = [[1000000, "m"], [1000, "k"]];
+  for (var i = 0; i < units.length; i++) {
+    if (n >= units[i][0]) {
+      var v = Math.floor(n / units[i][0] * 10) / 10;
+      return (v % 1 === 0 ? String(v) : v.toFixed(1)) + units[i][1];
+    }
+  }
+  return String(n);
+}
+
+function render() {
+  var count = store.get("githubStarCount");
+  var countEl = document.getElementById("github-star-count");
+  var linkEl = document.getElementById("github-star-link");
+  if (!countEl || !linkEl) return;
+  var text = typeof count === "number" ? formatStarCount(count) : "";
+  countEl.textContent = text;
+  countEl.classList.toggle("hidden", !text);
+  linkEl.setAttribute("aria-label", text ? "Star Clay on GitHub, " + count + " stars" : "Star Clay on GitHub");
+}
+
+function isMobile() {
+  return !!(window.matchMedia && window.matchMedia(MOBILE_QUERY).matches);
+}
+
+function load() {
+  if (inflight || isMobile()) return Promise.resolve();
+  inflight = true;
+  return fetch("/api/github-stars", { credentials: "same-origin" }).then(function (res) {
+    return res.ok ? res.json() : null;
+  }).then(function (data) {
+    // Keep the last known count when the server has none or the call failed.
+    if (data && typeof data.stars === "number") {
+      store.set({ githubStarCount: data.stars });
+      render();
+    }
+  }).catch(function () {}).then(function () { inflight = false; });
+}
+
+export function initGithubStar() {
+  if (!document.getElementById("github-star")) return;
+  render();
+  load();
+  if (timer) clearInterval(timer);
+  timer = setInterval(load, REFRESH_MS);
+}

package/lib/public/modules/history-replay-batch.js

@@ -27,7 +27,15 @@ function canCombine(previous, message) {
   // can differ; the first token still supplies the message's display time.
   var keys = Object.keys(previous).concat(Object.keys(message));
   return keys.every(function (key) {
-    return key === 'text' || key === '_ts' || previous[key] === message[key];
+    // Socket JSON gives each event its own activation object. Compare every
+    // field, including future metadata, without weakening replay boundaries.
+    if (key === 'paneActivation' && previous[key] && message[key]) {
+      var before = previous[key], after = message[key];
+      return Object.keys(before).concat(Object.keys(after)).every(function (field) {
+        return before[field] === after[field];
+      });
+    }
+    return key === 'text' || key === '_ts' || key === '_historyIndex' || key === '_historyIndexes' || previous[key] === message[key];
   });
 }
 
@@ -105,6 +113,10 @@ export function receiveHistoryReplay(msg, dispatch) {
   if (canCombine(previous, msg)) {
     if (!batch.textParts) batch.textParts = [previous.text];
     batch.textParts.push(msg.text);
+    if (Number.isSafeInteger(msg._historyIndex) && msg._historyIndex >= 0) {
+      if (!previous._historyIndexes) previous._historyIndexes = Number.isSafeInteger(previous._historyIndex) ? [previous._historyIndex] : [];
+      previous._historyIndexes.push(msg._historyIndex);
+    }
   } else {
     finishText(batch);
     batch.items.push(Object.assign({}, msg));

package/lib/public/modules/home-debate-live.js

@@ -23,6 +23,7 @@ function debateIdentity(message, prior) {
   return {
     mateId: message.speakerMateId || message.mateId || previous.mateId || null,
     mateName: name,
+    avatarCatalogId: message.avatarCatalogId || previous.avatarCatalogId || cachedProfile.avatarCatalogId || "",
     avatarStyle: message.avatarStyle || previous.avatarStyle || cachedProfile.avatarStyle || "imprint",
     avatarSeed: message.avatarSeed || previous.avatarSeed || cachedProfile.avatarSeed || message.speakerMateId || message.mateId || name,
     avatarColor: message.avatarColor || previous.avatarColor || cachedProfile.avatarColor || "",
@@ -37,6 +38,7 @@ function mateForTurn(message) {
     name: identity.mateName,
     profile: {
       displayName: identity.mateName,
+      avatarCatalogId: identity.avatarCatalogId,
       avatarStyle: identity.avatarStyle,
       avatarSeed: identity.avatarSeed,
       avatarColor: identity.avatarColor,

package/lib/public/modules/home-debate-planning.js

@@ -123,11 +123,11 @@ export function createHomeDebateProposalCard(message, respond) {
 export function createHomeDebateQuestionCard(message, respond) {
   var question = Array.isArray(message.questions) && message.questions.length ? message.questions[0] : {};
   var card = document.createElement("section");
-  card.className = "home-debate-question";
+  card.className = "home-debate-question" + (message.flow === "mcp_import" ? " mcp-import-consent" : "");
   card.dataset.toolId = message.toolId || "";
   card.setAttribute("aria-busy", message.status === "submitting" ? "true" : "false");
-  var isMateCreation = message.flow === "mate_creation";
-  card.setAttribute("aria-label", (isMateCreation ? "Mate creation interview question: " : "Debate planning question: ") + (question.question || "Question"));
+  var isMateQuestion = message.flow === "mate_question", isMateCreation = message.flow === "mate_creation", isMcpImport = message.flow === "mcp_import";
+  card.setAttribute("aria-label", (isMateQuestion ? "Mate question: " : isMcpImport ? "MCP import consent: " : isMateCreation ? "Mate creation interview question: " : "Debate planning question: ") + (question.question || "Question"));
   if (question.header) card.appendChild(textElement("div", "home-debate-question-header", question.header));
   card.appendChild(textElement("h3", "home-debate-question-text", question.question || "Clay has a question."));
   var form = document.createElement("div");
@@ -162,8 +162,8 @@ export function createHomeDebateQuestionCard(message, respond) {
   answerControl.className = freeform ? "home-debate-question-freeform" : "home-debate-question-other";
   answerControl.placeholder = freeform ? (isMateCreation ? "Describe what you want in your own words" : "Describe the topic in your own words") : "Type another answer";
   answerLabel.appendChild(answerControl);
-  form.appendChild(answerLabel);
-  var submit = textElement("button", "home-debate-question-submit", message.status === "submitting" ? "Submitting…" : "Submit answer");
+  if (freeform || question.allowOther !== false) form.appendChild(answerLabel);
+  var submit = textElement("button", "home-debate-question-submit", message.status === "submitting" ? "Submitting…" : (isMcpImport || isMateQuestion) ? "Confirm choice" : "Submit answer");
   submit.type = "button";
   submit.disabled = message.status !== "pending" || !selected;
   function submitAnswer() {
@@ -253,7 +253,7 @@ export function normalizeHomeTranscript(raw) {
 export function applyHomeDebateQuestion(messages, msg) {
   if (!msg || !msg.toolId) return messages;
   for (var i = 0; i < messages.length; i++) if (messages[i].role === "question" && messages[i].toolId === msg.toolId) return messages;
-  return messages.concat([{ role: "question", flow: msg.type === "home_mate_creation_question" ? "mate_creation" : "debate", toolId: msg.toolId, questions: msg.questions || [], status: "pending", error: "" }]);
+  return messages.concat([{ role: "question", flow: msg.type === "home_mate_question" ? "mate_question" : msg.type === "home_mcp_import_question" ? "mcp_import" : msg.type === "home_mate_creation_question" ? "mate_creation" : "debate", toolId: msg.toolId, questions: msg.questions || [], status: "pending", error: "" }]);
 }
 
 export function resolveHomeDebateQuestion(messages, msg) {
@@ -296,7 +296,7 @@ export function markHomeDebateQuestionSubmitting(message, opener) {
 export function createHomeDebateResponder(sendMessage, getContext, onChange) {
   return function respond(message, action, opener, answers, modelOverrides) {
     if (!message || message.status === "submitting") return;
-    var payload = message.role === "question" ? { type: message.flow === "mate_creation" ? "home_mate_creation_question_response" : "home_debate_question_response", toolId: message.toolId, answers: answers || {} } : { type: "home_debate_proposal_response", proposalId: message.proposal.proposalId, action: action, modelOverrides: Array.isArray(modelOverrides) ? modelOverrides : [] };
+    var payload = message.role === "question" ? { type: message.flow === "mate_question" ? "home_mate_question_response" : message.flow === "mcp_import" ? "home_mcp_import_response" : message.flow === "mate_creation" ? "home_mate_creation_question_response" : "home_debate_question_response", toolId: message.toolId, answers: answers || {} } : { type: "home_debate_proposal_response", proposalId: message.proposal.proposalId, action: action, modelOverrides: Array.isArray(modelOverrides) ? modelOverrides : [] };
     Object.assign(payload, getContext());
     if (!sendMessage(payload)) return;
     if (message.role === "question") markHomeDebateQuestionSubmitting(message, opener);