clay-server 2.32.0 → 2.32.1-beta.2

package/lib/sdk-bridge.js

@@ -107,7 +107,14 @@ function createSDKBridge(opts) {
   var mateDisplayName = opts.mateDisplayName || "";
   var isMate = opts.isMate || (slug.indexOf("mate-") === 0);
   var dangerouslySkipPermissions = opts.dangerouslySkipPermissions || false;
-  var mcpServers = opts.mcpServers || null;
+  // mcpServers may be either a static object or a getter function. The
+  // getter form lets callers gate individual servers at call time (e.g.
+  // clay-browser is only exposed while the Chrome extension is connected).
+  var _mcpServersSrc = opts.mcpServers || null;
+  function getMcpServers() {
+    if (typeof _mcpServersSrc === "function") return _mcpServersSrc() || null;
+    return _mcpServersSrc;
+  }
   var getRemoteMcpServers = opts.getRemoteMcpServers || null;
   var clayPort = opts.clayPort || 2633;
   var clayTls = opts.clayTls || false;
@@ -921,7 +928,7 @@ function createSDKBridge(opts) {
         type: "auth_required",
         text: vendorName + " is not logged in.",
         vendor: session.vendor,
-        loginCommand: session.vendor === "codex" ? "codex --login" : session.vendor + " login",
+        loginCommand: session.vendor === "codex" ? "codex login" : session.vendor + " login",
         linuxUser: authLinuxUser,
         canAutoLogin: canAutoLogin,
       });
@@ -1004,7 +1011,10 @@ function createSDKBridge(opts) {
     if (dangerouslySkipPermissions) {
       claudeOpts.allowDangerouslySkipPermissions = true;
     }
-    var modeToApply = session._loopPermissionMode || (session.acceptEditsAfterStart ? "acceptEdits" : sm.currentPermissionMode);
+    var globalMode = sm.currentPermissionMode || "default";
+    var loopFloor = session.acceptEditsAfterStart ? "acceptEdits" : "default";
+    var effectiveDefault = globalMode === "bypassPermissions" ? globalMode : (loopFloor !== "default" ? loopFloor : globalMode);
+    var modeToApply = session._loopPermissionMode || effectiveDefault;
     if (session.acceptEditsAfterStart) delete session.acceptEditsAfterStart;
     if (modeToApply && modeToApply !== "default") {
       claudeOpts.permissionMode = modeToApply;
@@ -1043,7 +1053,7 @@ function createSDKBridge(opts) {
       cwd: cwd,
       model: queryModel,
       effort: ls.effort || sm.currentEffort || undefined,
-      toolServers: mergeMcpServers(mcpServers, getRemoteMcpServers) || undefined,
+      toolServers: mergeMcpServers(getMcpServers(), getRemoteMcpServers) || undefined,
       resumeSessionId: session.cliSessionId || undefined,
       abortController: linuxUser ? undefined : session.abortController,
       canUseTool: function(toolName, input, toolOpts) {
@@ -1201,8 +1211,11 @@ function createSDKBridge(opts) {
     if (tryExec("which claude")) result.push("claude");
 
     // Codex: check bundled binary or PATH
-    var codexBin = path.join(__dirname, "../node_modules/@openai/codex-darwin-arm64/vendor/aarch64-apple-darwin/codex/codex");
-    if (fs.existsSync(codexBin) || tryExec("which codex")) result.push("codex");
+    var codexBin = null;
+    try {
+      codexBin = require("./yoke/codex-app-server").findCodexPath();
+    } catch (e) {}
+    if ((codexBin && fs.existsSync(codexBin)) || tryExec("which codex")) result.push("codex");
 
     return result;
   }
@@ -1386,7 +1399,7 @@ function createSDKBridge(opts) {
         cwd: cwd,
         systemPrompt: opts.claudeMd,
         model: opts.model || undefined,
-        toolServers: opts.includeMcpServers ? (mergeMcpServers(mcpServers, getRemoteMcpServers) || undefined) : undefined,
+        toolServers: opts.includeMcpServers ? (mergeMcpServers(getMcpServers(), getRemoteMcpServers) || undefined) : undefined,
         abortController: abortController,
         canUseTool: opts.canUseTool || function (toolName, input) {
           var whitelisted = checkToolWhitelist(toolName, input);

package/lib/server-settings.js

@@ -450,6 +450,59 @@ function attachSettings(ctx) {
       return true;
     }
 
+    // GET /api/user/tool-palettes
+    if (req.method === "GET" && fullUrl === "/api/user/tool-palettes") {
+      var muGet = getMultiUserFromReq(req);
+      var palettes = {};
+      if (!muGet) {
+        if (typeof opts.onGetToolPalettes === "function") {
+          palettes = opts.onGetToolPalettes() || {};
+        }
+      } else {
+        palettes = users.getToolPalettes(muGet.id) || {};
+      }
+      res.writeHead(200, { "Content-Type": "application/json" });
+      res.end(JSON.stringify(palettes));
+      return true;
+    }
+
+    // PUT /api/user/tool-palettes
+    if (req.method === "PUT" && fullUrl === "/api/user/tool-palettes") {
+      var muPut = getMultiUserFromReq(req);
+      var bodyTp = "";
+      req.on("data", function (chunk) { bodyTp += chunk; });
+      req.on("end", function () {
+        try {
+          var dataTp = JSON.parse(bodyTp);
+          var paletteName = dataTp.palette;
+          var order = dataTp.order;
+          var hidden = dataTp.hidden;
+          var result;
+          if (!muPut) {
+            if (typeof opts.onSetToolPalette !== "function") {
+              res.writeHead(500, { "Content-Type": "application/json" });
+              res.end('{"error":"Not supported"}');
+              return;
+            }
+            result = opts.onSetToolPalette(paletteName, order, hidden);
+          } else {
+            result = users.setToolPalette(muPut.id, paletteName, order, hidden);
+          }
+          if (result && result.error) {
+            res.writeHead(400, { "Content-Type": "application/json" });
+            res.end(JSON.stringify({ error: result.error }));
+            return;
+          }
+          res.writeHead(200, { "Content-Type": "application/json" });
+          res.end(JSON.stringify(result));
+        } catch (e) {
+          res.writeHead(400, { "Content-Type": "application/json" });
+          res.end('{"error":"Invalid request"}');
+        }
+      });
+      return true;
+    }
+
     // GET /api/user/auto-continue
     if (req.method === "GET" && fullUrl === "/api/user/auto-continue") {
       var mu = getMultiUserFromReq(req);

package/lib/sessions.js

@@ -723,7 +723,9 @@ function createSessionManager(opts) {
         }
       }
       var toMigrate = candidates.filter(function(item) {
-        return sdkTitles[item.cliSessionId] !== item.title;
+        var relayTitle = (item.title || "").trim();
+        var sdkTitle = (sdkTitles[item.cliSessionId] || "").trim();
+        return sdkTitle !== relayTitle;
       });
       if (toMigrate.length === 0) return;
       var migrated = 0;
@@ -732,7 +734,7 @@ function createSessionManager(opts) {
       for (var j = 0; j < toMigrate.length; j++) {
         (function(item) {
           chain = chain.then(function() {
-            return adapter.renameSession(item.cliSessionId, item.title, { dir: migrateCwd }).then(function() {
+            return adapter.renameSession(item.cliSessionId, item.title.trim(), { dir: migrateCwd }).then(function() {
               migrated++;
             }).catch(function(e) {
               failed++;

package/lib/users-preferences.js

@@ -175,6 +175,52 @@ function attachPreferences(deps) {
     return { error: "User not found" };
   }
 
+  // --- Per-user tool palette preferences ---
+  //
+  // Each user can customize the sidebar tool grid by reordering or
+  // hiding individual tools. Stored as an object keyed by palette name
+  // ("session" or "mate"), each holding { order: [...ids], hidden: [...ids] }.
+  // Missing ids are treated as "use registry default at the end", so new
+  // tools added in future releases show up for existing users without a
+  // migration.
+
+  var VALID_PALETTES = { session: true, mate: true };
+
+  function getToolPalettes(userId) {
+    var data = loadUsers();
+    for (var i = 0; i < data.users.length; i++) {
+      if (data.users[i].id === userId) {
+        return data.users[i].toolPalettes || {};
+      }
+    }
+    return {};
+  }
+
+  function setToolPalette(userId, paletteName, order, hidden) {
+    if (!VALID_PALETTES[paletteName]) {
+      return { error: "Unknown palette" };
+    }
+    var safeOrder = Array.isArray(order)
+      ? order.filter(function (s) { return typeof s === "string"; })
+      : [];
+    var safeHidden = Array.isArray(hidden)
+      ? hidden.filter(function (s) { return typeof s === "string"; })
+      : [];
+    var data = loadUsers();
+    for (var i = 0; i < data.users.length; i++) {
+      if (data.users[i].id === userId) {
+        if (!data.users[i].toolPalettes) data.users[i].toolPalettes = {};
+        data.users[i].toolPalettes[paletteName] = {
+          order: safeOrder,
+          hidden: safeHidden,
+        };
+        saveUsers(data);
+        return { ok: true, palette: paletteName, order: safeOrder, hidden: safeHidden };
+      }
+    }
+    return { error: "User not found" };
+  }
+
   // --- Mate onboarding ---
 
   function setMateOnboarded(userId) {
@@ -203,6 +249,8 @@ function attachPreferences(deps) {
     setChatLayout: setChatLayout,
     getAutoContinue: getAutoContinue,
     setAutoContinue: setAutoContinue,
+    getToolPalettes: getToolPalettes,
+    setToolPalette: setToolPalette,
     setMateOnboarded: setMateOnboarded,
   };
 }

package/lib/users.js

@@ -416,6 +416,8 @@ var getChatLayout = preferences.getChatLayout;
 var setChatLayout = preferences.setChatLayout;
 var getAutoContinue = preferences.getAutoContinue;
 var setAutoContinue = preferences.setAutoContinue;
+var getToolPalettes = preferences.getToolPalettes;
+var setToolPalette = preferences.setToolPalette;
 var setMateOnboarded = preferences.setMateOnboarded;
 
 module.exports = {
@@ -473,6 +475,8 @@ module.exports = {
   setMateOnboarded: setMateOnboarded,
   getAutoContinue: getAutoContinue,
   setAutoContinue: setAutoContinue,
+  getToolPalettes: getToolPalettes,
+  setToolPalette: setToolPalette,
   getDeletedBuiltinKeys: getDeletedBuiltinKeys,
   addDeletedBuiltinKey: addDeletedBuiltinKey,
   removeDeletedBuiltinKey: removeDeletedBuiltinKey,

package/lib/yoke/index.js

@@ -84,8 +84,8 @@ function checkAuth() {
 
   function checkCodex() {
     try {
-      var path = require("path");
-      var codexBin = path.join(__dirname, "../../node_modules/@openai/codex-darwin-arm64/vendor/aarch64-apple-darwin/codex/codex");
+      var findCodexPath = require("./codex-app-server").findCodexPath;
+      var codexBin = findCodexPath();
       execSync(codexBin + " login status", { timeout: 5000, encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] });
       return true;
     } catch (e) {
@@ -111,7 +111,8 @@ function checkInstalled() {
     result.claude = true;
   } catch (e) {}
   try {
-    var codexBin = path.join(__dirname, "../../node_modules/@openai/codex-darwin-arm64/vendor/aarch64-apple-darwin/codex/codex");
+    var findCodexPath = require("./codex-app-server").findCodexPath;
+    var codexBin = findCodexPath();
     if (fs.existsSync(codexBin)) result.codex = true;
   } catch (e) {}
   return result;

package/package.json

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