clay-server 2.34.0-beta.9 → 2.34.1-beta.1

package/lib/public/modules/sidebar.js

@@ -94,12 +94,14 @@ export function initSidebar(_ctx) {
     }
   } catch (e) {}
 
-  ctx.newSessionBtn.addEventListener("click", function () {
-    if (ctx.ws && ctx.connected) {
-      ctx.ws.send(JSON.stringify({ type: "new_session" }));
-      closeSidebar();
-    }
-  });
+  if (ctx.newSessionBtn) {
+    ctx.newSessionBtn.addEventListener("click", function () {
+      if (ctx.ws && ctx.connected) {
+        ctx.ws.send(JSON.stringify({ type: "new_session" }));
+        closeSidebar();
+      }
+    });
+  }
 
   // --- Loop (Ralph wizard) tool-palette tile ---
   // The tile is rendered by tool-palette.js at the stable id

package/lib/public/modules/tools.js

@@ -1,7 +1,7 @@
 import { escapeHtml, copyToClipboard } from './utils.js';
 import { iconHtml, refreshIcons } from './icons.js';
 import { renderMarkdown, highlightCodeBlocks, renderMermaidBlocks } from './markdown.js';
-import { renderUnifiedDiff, renderSplitDiff, renderPatchDiff } from './diff.js';
+import { renderUnifiedDiff, renderSplitDiff, renderPatchDiff, reconstructPatchSources } from './diff.js';
 import { openFile } from './filebrowser.js';
 import { mateAvatarUrl } from './avatar.js';
 import { getChatLayout } from './theme.js';
@@ -1740,12 +1740,12 @@ export function updateToolExecuting(id, name, input) {
   ctx.scrollToBottom();
 }
 
-function renderEditDiff(oldStr, newStr, filePath) {
+// Shared chrome (filename header + unified/split toggle) for diff renderings.
+// makeUnified and makeSplit are factories that return a fresh body element.
+function buildDiffChrome(filePath, linkOldStr, linkNewStr, makeUnified, makeSplit) {
   var wrapper = document.createElement("div");
   wrapper.className = "edit-diff";
-  var lang = getLanguageFromPath(filePath);
 
-  // Header with file path and split toggle (desktop only)
   var header = document.createElement("div");
   header.className = "edit-diff-header";
 
@@ -1758,7 +1758,7 @@ function renderEditDiff(oldStr, newStr, filePath) {
         e.stopPropagation();
         openFile(fp, { diff: { oldStr: os || "", newStr: ns || "" } });
       });
-    })(filePath, oldStr, newStr);
+    })(filePath, linkOldStr, linkNewStr);
   }
   header.appendChild(pathSpan);
 
@@ -1784,7 +1784,7 @@ function renderEditDiff(oldStr, newStr, filePath) {
 
   wrapper.appendChild(header);
 
-  var currentBody = renderUnifiedDiff(oldStr, newStr, lang);
+  var currentBody = makeUnified();
   wrapper.appendChild(currentBody);
 
   unifiedBtn.addEventListener("click", function (e) {
@@ -1794,7 +1794,7 @@ function renderEditDiff(oldStr, newStr, filePath) {
     unifiedBtn.classList.add("active");
     splitBtn.classList.remove("active");
     wrapper.removeChild(currentBody);
-    currentBody = renderUnifiedDiff(oldStr, newStr, lang);
+    currentBody = makeUnified();
     wrapper.appendChild(currentBody);
     refreshIcons();
   });
@@ -1806,7 +1806,7 @@ function renderEditDiff(oldStr, newStr, filePath) {
     splitBtn.classList.add("active");
     unifiedBtn.classList.remove("active");
     wrapper.removeChild(currentBody);
-    currentBody = renderSplitDiff(oldStr, newStr, lang);
+    currentBody = makeSplit();
     wrapper.appendChild(currentBody);
     refreshIcons();
   });
@@ -1814,6 +1814,29 @@ function renderEditDiff(oldStr, newStr, filePath) {
   return wrapper;
 }
 
+function renderEditDiff(oldStr, newStr, filePath) {
+  var lang = getLanguageFromPath(filePath);
+  return buildDiffChrome(
+    filePath,
+    oldStr,
+    newStr,
+    function () { return renderUnifiedDiff(oldStr, newStr, lang); },
+    function () { return renderSplitDiff(oldStr, newStr, lang); }
+  );
+}
+
+function renderPatchDiffBlock(patchText, filePath) {
+  var lang = getLanguageFromPath(filePath);
+  var sources = reconstructPatchSources(patchText);
+  return buildDiffChrome(
+    filePath,
+    sources.oldStr,
+    sources.newStr,
+    function () { return renderPatchDiff(patchText, lang); },
+    function () { return renderSplitDiff(sources.oldStr, sources.newStr, lang); }
+  );
+}
+
 function isDiffContent(text) {
   var lines = text.split("\n");
   var hasHunkHeader = false;
@@ -1921,8 +1944,12 @@ export function updateToolResult(id, content, isError, images) {
   if (hasEditDiff) {
     resultBlock.appendChild(renderEditDiff(tool.input.old_string, tool.input.new_string, tool.input.file_path));
   } else if (!isError && isDiffContent(displayContent)) {
-    var patchLang = tool.input && tool.input.file_path ? getLanguageFromPath(tool.input.file_path) : null;
-    resultBlock.appendChild(renderPatchDiff(displayContent, patchLang));
+    var patchFilePath = tool.input && tool.input.file_path ? tool.input.file_path : null;
+    if (patchFilePath) {
+      resultBlock.appendChild(renderPatchDiffBlock(displayContent, patchFilePath));
+    } else {
+      resultBlock.appendChild(renderPatchDiff(displayContent, null));
+    }
   } else if (!isError && tool.name === "Read" && tool.input && tool.input.file_path && isImagePath(tool.input.file_path)) {
     // Image file: show inline preview
     var imgWrap = document.createElement("div");

package/lib/public/sw.js

@@ -1,4 +1,4 @@
-var CACHE_NAME = "clay-offline-v2";
+var CACHE_NAME = "clay-offline-v3";
 
 self.addEventListener("install", function (event) {
   event.waitUntil(self.skipWaiting());

package/lib/sdk-bridge.js

@@ -182,6 +182,22 @@ function createSDKBridge(opts) {
     return sm.availableModels || [];
   }
 
+  // Model list entries may be plain strings (Codex) or { value, displayName }
+  // objects (Claude SDK). Normalize to the identifier string.
+  function modelEntryValue(entry) {
+    if (!entry) return "";
+    if (typeof entry === "string") return entry;
+    return entry.value || entry.id || "";
+  }
+
+  function modelListContains(list, modelId) {
+    if (!list || !modelId) return false;
+    for (var mi = 0; mi < list.length; mi++) {
+      if (modelEntryValue(list[mi]) === modelId) return true;
+    }
+    return false;
+  }
+
   function sendModelInfoForVendor(vendor, model) {
     send({
       type: "model_info",
@@ -1221,10 +1237,15 @@ function createSDKBridge(opts) {
     var sessionVendor = session.vendor || (adapter && adapter.vendor) || null;
     if (sessionVendor) {
       var vendorModels = (sm.modelsByVendor && sm.modelsByVendor[sessionVendor]) || [];
-      if (vendorModels.length > 0 && queryModel && vendorModels.indexOf(queryModel) === -1) {
-        queryModel = vendorModels[0];
+      if (vendorModels.length > 0 && queryModel && !modelListContains(vendorModels, queryModel)) {
+        queryModel = modelEntryValue(vendorModels[0]);
       }
     }
+    // Guard against anything upstream having set queryModel to an object
+    // (e.g. a cached ModelInfo leaked through). Always coerce to string id.
+    if (queryModel && typeof queryModel !== "string") {
+      queryModel = modelEntryValue(queryModel) || undefined;
+    }
 
     var codexConfig = getCodexConfig(sm);
     var mergedMcpServers = mergeMcpServers(getMcpServers(), getRemoteMcpServers) || undefined;
@@ -1480,6 +1501,10 @@ function createSDKBridge(opts) {
   }
 
   async function setModel(session, model) {
+    // Normalize to string id in case a { value, displayName } object slips in
+    if (model && typeof model !== "string") {
+      model = modelEntryValue(model);
+    }
     if (!session.queryInstance) {
       // No active query — just store the model for next startQuery
       sm.currentModel = model;

package/lib/sessions.js

@@ -96,6 +96,7 @@ function createSessionManager(opts) {
       if (session.vendor) metaObj.vendor = session.vendor;
       if (session.sessionVisibility) metaObj.sessionVisibility = session.sessionVisibility;
       if (session.bookmarked) metaObj.bookmarked = true;
+      if (typeof session.favoriteOrder === "number") metaObj.favoriteOrder = session.favoriteOrder;
       if (session.lastRewindUuid) metaObj.lastRewindUuid = session.lastRewindUuid;
       if (session.loop) metaObj.loop = session.loop;
       if (session.debateState) metaObj.debateState = session.debateState;
@@ -202,6 +203,7 @@ function createSessionManager(opts) {
       if (m.ownerId) session.ownerId = m.ownerId;
       session.sessionVisibility = m.sessionVisibility || "shared";
       session.bookmarked = !!m.bookmarked;
+      session.favoriteOrder = typeof m.favoriteOrder === "number" ? m.favoriteOrder : null;
       sessions.set(localId, session);
     }
   }
@@ -241,6 +243,7 @@ function createSessionManager(opts) {
       ownerId: s.ownerId || null,
       sessionVisibility: s.sessionVisibility || "shared",
       bookmarked: !!s.bookmarked,
+      favoriteOrder: typeof s.favoriteOrder === "number" ? s.favoriteOrder : null,
       unread: unreadMap[s.localId] || 0,
       vendor: s.vendor || null,
     };
@@ -303,6 +306,7 @@ function createSessionManager(opts) {
       ownerId: (sessionOpts && sessionOpts.ownerId) || null,
       sessionVisibility: (sessionOpts && sessionOpts.sessionVisibility) || "shared",
       bookmarked: false,
+      favoriteOrder: null,
       vendor: (sessionOpts && sessionOpts.vendor) || null,
     };
     sessions.set(localId, session);
@@ -334,6 +338,7 @@ function createSessionManager(opts) {
       ownerId: (sessionOpts && sessionOpts.ownerId) || null,
       sessionVisibility: (sessionOpts && sessionOpts.sessionVisibility) || "shared",
       bookmarked: false,
+      favoriteOrder: null,
       vendor: (sessionOpts && sessionOpts.vendor) || null,
     };
     sessions.set(localId, session);
@@ -525,6 +530,38 @@ function createSessionManager(opts) {
     sessions.delete(localId);
   }
 
+  function deleteSessionsBulk(localIds, targetWs) {
+    if (!Array.isArray(localIds) || localIds.length === 0) return;
+
+    var seen = {};
+    var ids = [];
+    for (var i = 0; i < localIds.length; i++) {
+      var id = localIds[i];
+      if (typeof id !== "number" || seen[id] || !sessions.has(id)) continue;
+      seen[id] = true;
+      ids.push(id);
+    }
+    if (ids.length === 0) return;
+
+    var deletedActive = false;
+    for (var j = 0; j < ids.length; j++) {
+      if (ids[j] === activeSessionId) deletedActive = true;
+      deleteSessionQuiet(ids[j]);
+    }
+
+    if (sessions.size === 0) {
+      createSession(null, targetWs);
+      return;
+    }
+
+    if (deletedActive) {
+      var remaining = [...sessions.keys()];
+      switchSession(remaining[remaining.length - 1], targetWs);
+    } else {
+      broadcastSessionList();
+    }
+  }
+
   function doSendToSession(session, obj) {
     // Send to active clients without recording to history/disk (ephemeral data)
     if (sendEach) {
@@ -622,7 +659,10 @@ function createSessionManager(opts) {
       history: cliHistory,
       messageUUIDs: [],
       bookmarked: false,
+      favoriteOrder: null,
     };
+    if (opts && opts.vendor) session.vendor = opts.vendor;
+    if (opts && opts.ownerId) session.ownerId = opts.ownerId;
     sessions.set(localId, session);
     saveSessionFile(session);
     switchSession(localId, targetWs);
@@ -843,6 +883,7 @@ function createSessionManager(opts) {
     switchSession: switchSession,
     deleteSession: deleteSession,
     deleteSessionQuiet: deleteSessionQuiet,
+    deleteSessionsBulk: deleteSessionsBulk,
     resumeSession: resumeSession,
     broadcastSessionList: broadcastSessionList,
     getTotalUnread: function (ws) {
@@ -876,10 +917,61 @@ function createSessionManager(opts) {
       var session = sessions.get(localId);
       if (!session) return { error: "Session not found" };
       session.bookmarked = !!bookmarked;
+      if (session.bookmarked) {
+        var maxOrder = -1;
+        sessions.forEach(function (s) {
+          if (s.bookmarked && typeof s.favoriteOrder === "number" && s.favoriteOrder > maxOrder) {
+            maxOrder = s.favoriteOrder;
+          }
+        });
+        session.favoriteOrder = maxOrder + 1;
+      } else {
+        session.favoriteOrder = null;
+      }
       saveSessionFile(session);
       broadcastSessionList();
       return { ok: true };
     },
+    reorderBookmarkedSessions: function (sourceId, targetId, insertBefore) {
+      var source = sessions.get(sourceId);
+      var target = sessions.get(targetId);
+      if (!source || !target) return { error: "Session not found" };
+      if (!source.bookmarked || !target.bookmarked) return { error: "Only favorites can be reordered" };
+
+      var favorites = [];
+      sessions.forEach(function (s) {
+        if (s.bookmarked) favorites.push(s);
+      });
+      favorites.sort(function (a, b) {
+        var ao = typeof a.favoriteOrder === "number" ? a.favoriteOrder : Number.MAX_SAFE_INTEGER;
+        var bo = typeof b.favoriteOrder === "number" ? b.favoriteOrder : Number.MAX_SAFE_INTEGER;
+        if (ao !== bo) return ao - bo;
+        return (b.lastActivity || 0) - (a.lastActivity || 0);
+      });
+
+      var reordered = [];
+      for (var i = 0; i < favorites.length; i++) {
+        if (favorites[i].localId !== sourceId) reordered.push(favorites[i]);
+      }
+
+      var targetIdx = -1;
+      for (var j = 0; j < reordered.length; j++) {
+        if (reordered[j].localId === targetId) {
+          targetIdx = j;
+          break;
+        }
+      }
+      if (targetIdx === -1) return { error: "Target favorite not found" };
+      if (!insertBefore) targetIdx++;
+      reordered.splice(targetIdx, 0, source);
+
+      for (var k = 0; k < reordered.length; k++) {
+        reordered[k].favoriteOrder = k;
+        saveSessionFile(reordered[k]);
+      }
+      broadcastSessionList();
+      return { ok: true };
+    },
     setSessionOwner: function (localId, ownerId) {
       var session = sessions.get(localId);
       if (!session) return { error: "Session not found" };

package/lib/ws-schema.js

@@ -21,6 +21,8 @@ var schema = {
   "delete_session":           { direction: "c2s", handler: "lib/project-sessions.js", description: "Delete a session by ID" },
   "rename_session":           { direction: "c2s", handler: "lib/project-sessions.js", description: "Rename a session" },
   "set_session_bookmark":     { direction: "c2s", handler: "lib/project-sessions.js", description: "Bookmark or unbookmark a session in the sidebar" },
+  "reorder_session_bookmarks": { direction: "c2s", handler: "lib/project-sessions.js", description: "Reorder favorited sessions within the favorites area" },
+  "bulk_delete_sessions":    { direction: "c2s", handler: "lib/project-sessions.js", description: "Delete a group of sessions at once" },
   "resume_session":           { direction: "c2s", handler: "lib/project-sessions.js", description: "Resume a CLI session by its CLI session ID" },
   "set_session_visibility":   { direction: "c2s", handler: "lib/project-sessions.js", description: "Show or hide a session in the sidebar" },
   "search_sessions":          { direction: "c2s", handler: "lib/project-sessions.js", description: "Search session titles" },

package/lib/yoke/adapters/codex.js

@@ -793,10 +793,37 @@ function createCodexQueryHandle(appServer, queryOpts) {
 
   // --- Main query loop ---
   async function runQueryLoop(initialMessage) {
-    // Prepend system prompt (project instructions from YOKE layer) to first message
-    var currentMessage = systemPrompt
-      ? systemPrompt + "\n\n" + initialMessage
-      : initialMessage;
+    // Prepend system prompt (project instructions from YOKE layer) to first message.
+    // initialMessage may be a string (text-only) or an array of content items
+    // (e.g. [{ type: "text", text: "..." }, ...] when images/attachments are present).
+    // Naive string concatenation on an array coerces it via toString(), producing
+    // "[object Object]" inside the prompt, so we must branch on the shape.
+    var currentMessage;
+    if (!systemPrompt) {
+      currentMessage = initialMessage;
+    } else if (typeof initialMessage === "string") {
+      currentMessage = systemPrompt + "\n\n" + initialMessage;
+    } else if (Array.isArray(initialMessage)) {
+      // Prepend systemPrompt to the first text item; if none exists, insert one.
+      var cloned = initialMessage.slice();
+      var injected = false;
+      for (var i = 0; i < cloned.length; i++) {
+        if (cloned[i] && cloned[i].type === "text") {
+          cloned[i] = {
+            type: "text",
+            text: systemPrompt + "\n\n" + (cloned[i].text || ""),
+          };
+          injected = true;
+          break;
+        }
+      }
+      if (!injected) {
+        cloned.unshift({ type: "text", text: systemPrompt });
+      }
+      currentMessage = cloned;
+    } else {
+      currentMessage = initialMessage;
+    }
 
     try {
       // Set event handler on app-server

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "2.34.0-beta.9",
+  "version": "2.34.1-beta.1",
   "description": "Self-hosted Claude Code in your browser. Multi-session, multi-user, push notifications.",
   "bin": {
     "clay-server": "./bin/cli.js",