clay-server 2.27.1 → 2.28.0-beta.2

package/lib/public/modules/scheduler.js

@@ -7,8 +7,10 @@
 
 import { iconHtml } from './icons.js';
 import { showToast } from './utils.js';
+import { renderModelList, renderModeList, renderEffortBar, renderThinkingBar } from './settings-defaults.js';
+import { store } from './store.js';
 import { initSchedulerConfig, setupCreateModal, openCreateModal, openCreateModalWithRecord, closeCreateModal, removePreview, getPreviewEl, showPreviewOnCell, showPreviewOnSlot, showPreviewForCreate, applyDraggedTask, parseCronSimple } from './scheduler-config.js';
-import { initSchedulerHistory, renderHistory } from './scheduler-history.js';
+import { initSchedulerHistory, renderHistory, _lastFiles as lastLoopFiles } from './scheduler-history.js';
 export { handleLoopRegistryUpdated, handleLoopRegistryFiles, handleScheduleRunStarted, handleScheduleRunFinished, handleLoopScheduled } from './scheduler-history.js';
 
 var ctx = null;
@@ -671,7 +673,7 @@ function renderDetail() {
   html += '<div class="scheduler-detail-tabs">';
   html += '<button class="scheduler-detail-tab active" data-tab="prompt">PROMPT.md</button>';
   html += '<button class="scheduler-detail-tab" data-tab="judge">JUDGE.md</button>';
-  html += '<button class="scheduler-detail-tab" data-tab="meta">Info</button>';
+  html += '<button class="scheduler-detail-tab" data-tab="model">Model</button>';
   html += '</div>';
 
   html += '<div class="scheduler-detail-body" id="scheduler-detail-body">';
@@ -738,41 +740,83 @@ function renderDetailBody(tab, rec) {
   var bodyEl2 = document.getElementById("scheduler-detail-body");
   if (!bodyEl2) return;
 
-  if (tab === "meta") {
-    var isScheduled = !!rec.cron;
-    var lastRun = rec.runs && rec.runs.length > 0 ? rec.runs[rec.runs.length - 1] : null;
-    var scheduleStr = isScheduled ? cronToHuman(rec.cron) : "One-off";
-    var statusStr = isScheduled ? (rec.enabled ? "Enabled" : "Paused") : "One-off";
-    var createdStr = rec.createdAt ? formatDateTime(new Date(rec.createdAt)) : "—";
-    var lastRunStr = "Never";
-    if (lastRun) {
-      var resultStr = lastRun.result || "?";
-      var iterStr = (lastRun.iterations || 0) + " iter";
-      lastRunStr = formatDateTime(new Date(lastRun.finishedAt || lastRun.startedAt)) + " — " + resultStr + " (" + iterStr + ")";
-    }
-
-    var html = '<div class="scheduler-detail-meta">';
-    html += '<span class="scheduler-detail-meta-label">Schedule</span>';
-    html += '<span class="scheduler-detail-meta-value">' + esc(scheduleStr) + '</span>';
-    html += '<span class="scheduler-detail-meta-label">Status</span>';
-    html += '<span class="scheduler-detail-meta-value">' + esc(statusStr) + '</span>';
-    html += '<span class="scheduler-detail-meta-label">Max Iterations</span>';
-    html += '<span class="scheduler-detail-meta-value">' + (rec.maxIterations || "—") + '</span>';
-    html += '<span class="scheduler-detail-meta-label">Created</span>';
-    html += '<span class="scheduler-detail-meta-value">' + esc(createdStr) + '</span>';
-    html += '<span class="scheduler-detail-meta-label">Last Run</span>';
-    html += '<span class="scheduler-detail-meta-value">' + esc(lastRunStr) + '</span>';
-    if (isScheduled && rec.nextRunAt) {
-      html += '<span class="scheduler-detail-meta-label">Next Run</span>';
-      html += '<span class="scheduler-detail-meta-value">' + esc(formatDateTime(new Date(rec.nextRunAt))) + '</span>';
-    }
-    html += '</div>';
-    bodyEl2.innerHTML = html;
-  } else {
-    // prompt or judge — request files from server
-    bodyEl2.innerHTML = '<div class="scheduler-detail-loading">Loading...</div>';
-    send({ type: "loop_registry_files", id: selectedTaskId });
+  if (tab === "model") {
+    renderModelTab(bodyEl2, rec);
+    return;
   }
+
+  // prompt or judge — request files from server
+  bodyEl2.innerHTML = '<div class="scheduler-detail-loading">Loading...</div>';
+  send({ type: "loop_registry_files", id: selectedTaskId });
+}
+
+function renderModelTab(bodyEl, rec) {
+  var settings = lastLoopFiles.settings || {};
+  var loopFilesId = rec.linkedTaskId || rec.id;
+
+  bodyEl.innerHTML =
+    '<div class="scheduler-model-settings">' +
+      '<div class="settings-card"><div class="settings-field">' +
+        '<label class="settings-label">Model</label>' +
+        '<div class="settings-hint">Choose the Claude model for this task.</div>' +
+        '<div id="ls-model-list" class="settings-model-list"></div>' +
+      '</div></div>' +
+      '<div class="settings-card"><div class="settings-field">' +
+        '<label class="settings-label">Mode</label>' +
+        '<div class="settings-hint">Controls how Claude handles tool use and file edits.</div>' +
+        '<div id="ls-mode-list" class="settings-model-list"></div>' +
+      '</div></div>' +
+      '<div class="settings-card"><div class="settings-field">' +
+        '<label class="settings-label">Effort</label>' +
+        '<div class="settings-hint">Controls how much thinking effort Claude puts into responses.</div>' +
+        '<div class="settings-btn-group" id="ls-effort-bar"></div>' +
+      '</div></div>' +
+      '<div class="settings-card"><div class="settings-field">' +
+        '<label class="settings-label">Thinking</label>' +
+        '<div class="settings-hint">Controls whether Claude shows its reasoning process.</div>' +
+        '<div class="settings-btn-group" id="ls-thinking-bar"></div>' +
+        '<div id="ls-thinking-budget-row" class="settings-budget-row" style="display:none">' +
+          '<label class="settings-budget-label">Budget tokens</label>' +
+          '<input id="ls-thinking-budget" type="number" class="settings-budget-input" min="1024" max="128000" step="1024" value="10000">' +
+        '</div>' +
+      '</div></div>' +
+    '</div>';
+
+  function saveLoopSetting(key, value) {
+    var updated = Object.assign({}, settings);
+    updated[key] = value;
+    settings = updated;
+    send({ type: "loop_registry_save_files", id: loopFilesId, settings: updated });
+  }
+
+  var opts = {
+    models: store.getState().currentModels || [],
+    currentModel: settings.model || "",
+    currentMode: settings.permissionMode || "default",
+    currentEffort: settings.effort || "medium",
+    currentThinking: settings.thinking || "adaptive",
+    currentThinkingBudget: settings.thinkingBudget || 10000,
+    sendMsg: function (msgType, data) {
+      if (msgType === "set_model" || msgType === "loop_set_model") {
+        saveLoopSetting("model", data.model);
+      } else if (msgType === "loop_set_mode") {
+        saveLoopSetting("permissionMode", data.mode);
+      } else if (msgType === "loop_set_effort") {
+        saveLoopSetting("effort", data.effort);
+      } else if (msgType === "set_thinking") {
+        saveLoopSetting("thinking", data.thinking);
+        if (data.budgetTokens) saveLoopSetting("thinkingBudget", data.budgetTokens);
+      }
+    },
+    modelMsgType: "loop_set_model",
+    modeMsgType: "loop_set_mode",
+    effortMsgType: "loop_set_effort",
+  };
+
+  renderModelList("ls", opts);
+  renderModeList("ls", opts);
+  renderEffortBar("ls", opts);
+  renderThinkingBar("ls", opts);
 }
 
 // --- Chat reparenting ---

package/lib/sdk-bridge.js

@@ -10,6 +10,31 @@ var { splitShellSegments, attachSkillDiscovery } = require("./sdk-skill-discover
 var { createMessageQueue } = require("./sdk-message-queue");
 var { attachMessageProcessor } = require("./sdk-message-processor");
 
+// Merge in-process MCP servers with remote (extension-bridged) MCP servers.
+// Returns the merged object, or null if no servers exist.
+function mergeMcpServers(localServers, getRemoteFn) {
+  var merged = {};
+  var hasAny = false;
+  if (localServers) {
+    var lk = Object.keys(localServers);
+    for (var i = 0; i < lk.length; i++) {
+      merged[lk[i]] = localServers[lk[i]];
+      hasAny = true;
+    }
+  }
+  if (typeof getRemoteFn === "function") {
+    var remote = getRemoteFn();
+    if (remote) {
+      var rk = Object.keys(remote);
+      for (var j = 0; j < rk.length; j++) {
+        merged[rk[j]] = remote[rk[j]];
+        hasAny = true;
+      }
+    }
+  }
+  return hasAny ? merged : null;
+}
+
 function createSDKBridge(opts) {
   var cwd = opts.cwd;
   var slug = opts.slug || "";
@@ -22,6 +47,7 @@ function createSDKBridge(opts) {
   var isMate = opts.isMate || (slug.indexOf("mate-") === 0);
   var dangerouslySkipPermissions = opts.dangerouslySkipPermissions || false;
   var mcpServers = opts.mcpServers || null;
+  var getRemoteMcpServers = opts.getRemoteMcpServers || null;
   var onProcessingChanged = opts.onProcessingChanged || function () {};
   var onTurnDone = opts.onTurnDone || null;
 
@@ -553,20 +579,32 @@ function createSDKBridge(opts) {
       agentProgressSummaries: true,
     };
 
-    if (mcpServers) queryOptions.mcpServers = mcpServers;
-    if (sm.currentModel) queryOptions.model = sm.currentModel;
-    if (sm.currentEffort) queryOptions.effort = sm.currentEffort;
+    var _mergedMcp = mergeMcpServers(mcpServers, getRemoteMcpServers);
+    if (_mergedMcp) queryOptions.mcpServers = _mergedMcp;
+
+    // Per-loop settings override global defaults when present
+    var ls2 = session.loopSettings || {};
+
+    if (ls2.model || sm.currentModel) queryOptions.model = ls2.model || sm.currentModel;
+    if (ls2.effort || sm.currentEffort) queryOptions.effort = ls2.effort || sm.currentEffort;
     if (sm.currentBetas && sm.currentBetas.length > 0) queryOptions.betas = sm.currentBetas;
-    if (sm.currentThinking === "disabled") {
+
+    var thinkingMode2 = ls2.thinking || sm.currentThinking;
+    if (thinkingMode2 === "disabled") {
       queryOptions.thinking = { type: "disabled" };
-    } else if (sm.currentThinking === "budget" && sm.currentThinkingBudget) {
-      queryOptions.thinking = { type: "enabled", budgetTokens: sm.currentThinkingBudget };
+    } else if (thinkingMode2 === "budget") {
+      var budgetTokens2 = ls2.thinkingBudget || sm.currentThinkingBudget;
+      if (budgetTokens2) queryOptions.thinking = { type: "enabled", budgetTokens: budgetTokens2 };
+    }
+
+    if (ls2.disableAllHooks !== undefined) {
+      queryOptions.settings = Object.assign({}, queryOptions.settings || {}, { disableAllHooks: ls2.disableAllHooks });
     }
 
     if (dangerouslySkipPermissions) {
       queryOptions.allowDangerouslySkipPermissions = true;
     }
-    var modeToApply = session.acceptEditsAfterStart ? "acceptEdits" : sm.currentPermissionMode;
+    var modeToApply = ls2.permissionMode || (session.acceptEditsAfterStart ? "acceptEdits" : sm.currentPermissionMode);
     if (session.acceptEditsAfterStart) delete session.acceptEditsAfterStart;
     if (modeToApply && modeToApply !== "default") {
       queryOptions.permissionMode = modeToApply;
@@ -959,6 +997,19 @@ function createSDKBridge(opts) {
       return { behavior: "allow", updatedInput: input };
     }
 
+    // Auto-approve remote MCP tools that the user explicitly enabled in project settings.
+    // These are user-owned local MCP servers, so no additional permission prompt needed.
+    if (toolName.indexOf("mcp__") === 0 && getRemoteMcpServers) {
+      var _rmcp = getRemoteMcpServers();
+      if (_rmcp) {
+        var _mcpParts = toolName.split("__");
+        var _mcpServerName = _mcpParts.length >= 2 ? _mcpParts[1] : "";
+        if (_rmcp[_mcpServerName]) {
+          return { behavior: "allow", updatedInput: input };
+        }
+      }
+    }
+
     // Auto-approve safe Bash commands (read-only, non-destructive)
     // Applies to ALL sessions (mates and regular projects alike).
     // These are purely read-only commands that cannot modify files, install
@@ -1429,7 +1480,7 @@ function createSDKBridge(opts) {
       abortController: session.abortController,
       promptSuggestions: true,
       agentProgressSummaries: true,
-      mcpServers: mcpServers || undefined,
+      mcpServers: mergeMcpServers(mcpServers, getRemoteMcpServers) || undefined,
       canUseTool: function(toolName, input, toolOpts) {
         return handleCanUseTool(session, toolName, input, toolOpts);
       },
@@ -1438,29 +1489,44 @@ function createSDKBridge(opts) {
       },
     };
 
-    if (sm.currentModel) {
-      queryOptions.model = sm.currentModel;
+    // Per-loop settings override global defaults when present
+    var ls = session.loopSettings || {};
+
+    if (ls.model || sm.currentModel) {
+      queryOptions.model = ls.model || sm.currentModel;
     }
 
-    if (sm.currentEffort) {
-      queryOptions.effort = sm.currentEffort;
+    if (ls.effort || sm.currentEffort) {
+      queryOptions.effort = ls.effort || sm.currentEffort;
     }
 
     if (sm.currentBetas && sm.currentBetas.length > 0) {
       queryOptions.betas = sm.currentBetas;
     }
 
-    if (sm.currentThinking === "disabled") {
+    var thinkingMode = ls.thinking || sm.currentThinking;
+    if (thinkingMode === "disabled") {
       queryOptions.thinking = { type: "disabled" };
-    } else if (sm.currentThinking === "budget" && sm.currentThinkingBudget) {
-      queryOptions.thinking = { type: "enabled", budgetTokens: sm.currentThinkingBudget };
+    } else if (thinkingMode === "budget") {
+      var budgetTokens = ls.thinkingBudget || sm.currentThinkingBudget;
+      if (budgetTokens) queryOptions.thinking = { type: "enabled", budgetTokens: budgetTokens };
+    }
+
+    if (ls.permissionMode) {
+      // Will be applied below, store for later
+      session._loopPermissionMode = ls.permissionMode;
+    }
+
+    // Pass through any extra SDK settings from LOOP.json
+    if (ls.disableAllHooks !== undefined) {
+      queryOptions.settings = Object.assign({}, queryOptions.settings || {}, { disableAllHooks: ls.disableAllHooks });
     }
 
     if (dangerouslySkipPermissions) {
       queryOptions.allowDangerouslySkipPermissions = true;
     }
     // Pass permissionMode in queryOptions at creation time to avoid race condition
-    var modeToApply = session.acceptEditsAfterStart ? "acceptEdits" : sm.currentPermissionMode;
+    var modeToApply = session._loopPermissionMode || (session.acceptEditsAfterStart ? "acceptEdits" : sm.currentPermissionMode);
     if (session.acceptEditsAfterStart) delete session.acceptEditsAfterStart;
     if (modeToApply && modeToApply !== "default") {
       queryOptions.permissionMode = modeToApply;
@@ -1763,7 +1829,10 @@ function createSDKBridge(opts) {
           },
         };
       if (opts.model) mentionQueryOptions.model = opts.model;
-      if (opts.includeMcpServers && mcpServers) mentionQueryOptions.mcpServers = mcpServers;
+      if (opts.includeMcpServers) {
+        var _mentionMcp = mergeMcpServers(mcpServers, getRemoteMcpServers);
+        if (_mentionMcp) mentionQueryOptions.mcpServers = _mentionMcp;
+      }
       query = sdk.query({
         prompt: mq,
         options: mentionQueryOptions,

package/lib/server-mates.js

@@ -65,8 +65,13 @@ function attachMates(ctx) {
   // --- Mate message handlers ---
 
   function handleMessage(ws, msg) {
-    if (!users.isMultiUser() || !ws._clayUser) return false;
-    var userId = ws._clayUser.id;
+    var userId;
+    if (users.isMultiUser()) {
+      if (!ws._clayUser) return false;
+      userId = ws._clayUser.id;
+    } else {
+      userId = "default";
+    }
 
     if (msg.type === "mate_create") {
       if (!msg.seedData) return true;

package/lib/server.js

@@ -144,6 +144,8 @@ function createServer(opts) {
   var onSetServerDefaultMode = opts.onSetServerDefaultMode || null;
   var onGetProjectDefaultMode = opts.onGetProjectDefaultMode || null;
   var onSetProjectDefaultMode = opts.onSetProjectDefaultMode || null;
+  var onGetProjectMcpServers = opts.onGetProjectMcpServers || null;
+  var onSetProjectMcpServers = opts.onSetProjectMcpServers || null;
   var onGetDaemonConfig = opts.onGetDaemonConfig || null;
   var onSetPin = opts.onSetPin || null;
   var onSetKeepAwake = opts.onSetKeepAwake || null;
@@ -766,6 +768,8 @@ function createServer(opts) {
         return origEmit.apply(ws, arguments);
       };
       ws._clayUser = wsUser; // attach user context
+      var remoteAddr = req.socket.remoteAddress || "";
+      ws._clayLocal = (remoteAddr === "127.0.0.1" || remoteAddr === "::1" || remoteAddr === "::ffff:127.0.0.1");
       // Clear cross-project unread for this project when client connects
       var unreadMap = getCrossProjectUnread(ws);
       if (unreadMap[wsSlug]) {
@@ -984,6 +988,8 @@ function createServer(opts) {
       onSetServerDefaultMode: onSetServerDefaultMode,
       onGetProjectDefaultMode: onGetProjectDefaultMode,
       onSetProjectDefaultMode: onSetProjectDefaultMode,
+      onGetProjectMcpServers: onGetProjectMcpServers,
+      onSetProjectMcpServers: onSetProjectMcpServers,
       onGetDaemonConfig: onGetDaemonConfig,
       onSetPin: onSetPin,
       onSetKeepAwake: onSetKeepAwake,

package/lib/ws-schema.js

@@ -338,6 +338,16 @@ var schema = {
   "clay_ext_result":          { direction: "s2c", handler: "lib/public/modules/app-misc.js", description: "Browser extension command result (broadcast)" },
   "clay_ext_command":         { direction: "c2s", handler: "lib/public/modules/app-misc.js", description: "Send a command to the browser extension" },
 
+  // -----------------------------------------------------------------------
+  // MCP Bridge (remote MCP servers via Chrome Extension)
+  // -----------------------------------------------------------------------
+  "mcp_servers_available":    { direction: "c2s", handler: "lib/project-mcp.js", description: "Report available MCP servers from Chrome Extension" },
+  "mcp_tool_call":            { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Forward MCP tool call to extension or HTTP endpoint" },
+  "mcp_tool_result":          { direction: "c2s", handler: "lib/project-mcp.js", description: "Return MCP tool result from extension" },
+  "mcp_tool_error":           { direction: "c2s", handler: "lib/project-mcp.js", description: "Return MCP tool error from extension" },
+  "mcp_toggle_server":        { direction: "c2s", handler: "lib/project-mcp.js", description: "Toggle MCP server enabled state for this project" },
+  "mcp_servers_state":        { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Broadcast MCP server list and enabled state to clients" },
+
   // -----------------------------------------------------------------------
   // Skills
   // -----------------------------------------------------------------------

package/package.json

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