clay-server 5.1.0-beta.2 → 5.1.0

package/lib/project-connection.js

@@ -246,13 +246,6 @@ function attachConnection(ctx) {
     sendTo(ws, { type: "email_accounts_list", accounts: emailAccountsList, providers: emailAccounts.PROVIDER_PRESETS });
     sendTo(ws, { type: "notes_list", notes: nm.list() });
     sendTo(ws, { type: "loop_registry_updated", records: getHubSchedules() });
-    // Initial per-user preference: how to render Claude sessions.
-    if (usersModule && typeof usersModule.getClaudeOpenMode === "function") {
-      var _comUid = (wsUser && wsUser.id) || null;
-      var _comVal = _comUid ? usersModule.getClaudeOpenMode(_comUid) : "gui";
-      sendTo(ws, { type: "claude_open_mode_changed", claudeOpenMode: _comVal || "gui" });
-    }
-
     _loop.sendConnectionState(ws);
     if (_mcp) _mcp.sendConnectionState(ws);
     if (_notifications) _notifications.sendConnectionState(ws, sendTo);

package/lib/project-debate.js

@@ -1,3 +1,4 @@
+var resolveMateIdentityFile = require('./mate-identity-file').resolveMateIdentityFile;
 var fs = require("fs");
 var path = require("path");
 var crypto = require("crypto");
@@ -15,10 +16,10 @@ var debateToolPolicy = require("./home-debate-tool-policy");
  */
 function attachDebate(ctx) {
 
-  // For mate projects, enforce latest debate awareness prompt in CLAUDE.md
+  // For mate projects, enforce latest debate awareness prompt in AGENTS.md
   // so mates use the propose_debate MCP tool instead of writing files.
   if (ctx.isMate) {
-    var _debateClaudeMdPath = path.join(ctx.cwd, "CLAUDE.md");
+    var _debateClaudeMdPath = resolveMateIdentityFile(ctx.cwd);
     try { matesModule.enforceDebateAwareness(_debateClaudeMdPath); } catch (e) {}
   }
 

package/lib/project-filesystem.js

@@ -204,26 +204,28 @@ function attachFilesystem(ctx) {
 
     // --- Project settings permission gate ---
     if (msg.type === "get_project_env" || msg.type === "set_project_env" ||
-        msg.type === "read_global_claude_md" || msg.type === "write_global_claude_md" ||
         msg.type === "get_shared_env" || msg.type === "set_shared_env" ||
         msg.type === "transfer_project_owner") {
-      var globalSetting = /^(read_global_claude_md|write_global_claude_md|get_shared_env|set_shared_env)$/.test(msg.type);
+      var globalSetting = /^(get_shared_env|set_shared_env)$/.test(msg.type);
       var targetSlug = msg.slug || slug;
       if (!access.hasPermission(ws, "projectSettings") ||
           (globalSetting ? !access.isAdmin(ws) : !access.canAccessProject(ws, targetSlug))) {
-        sendTo(ws, { type: "error", text: "Project settings access is not permitted" });
+        sendTo(ws, { type: globalSetting ? (msg.type === 'get_shared_env' ? 'shared_env_result' : 'set_shared_env_result') : (msg.type === 'get_project_env' ? 'project_env_result' : msg.type === 'set_project_env' ? 'set_project_env_result' : 'error'), slug: targetSlug, requestId: msg.requestId, ok: false, error: 'Project settings access is not permitted', text: "Project settings access is not permitted" });
         return true;
       }
     }
 
     // --- Project environment variables ---
     if (msg.type === "get_project_env") {
+      if (typeof opts.onGetProjectEnv !== "function") { sendTo(ws, { type: "project_env_result", slug: targetSlug, requestId: msg.requestId, error: "Project environment is unavailable in this runtime." }); return true; }
       var envrc = "";
       if (typeof opts.onGetProjectEnv === "function") {
-        var envResult = opts.onGetProjectEnv(targetSlug);
+        var envResult;
+        try { envResult = opts.onGetProjectEnv(targetSlug); }
+        catch (error) { sendTo(ws, { type: "project_env_result", slug: targetSlug, requestId: msg.requestId, error: error.message }); return true; }
         envrc = envResult.envrc || "";
       }
-      sendTo(ws, { type: "project_env_result", slug: msg.slug, envrc: envrc });
+      sendTo(ws, { type: "project_env_result", slug: targetSlug, requestId: msg.requestId, envrc: envrc });
       return true;
     }
 
@@ -231,41 +233,16 @@ function attachFilesystem(ctx) {
       if (typeof opts.onSetProjectEnv === "function") {
         var envError = validateEnvString(msg.envrc || "");
         if (envError) {
-          sendTo(ws, { type: "set_project_env_result", ok: false, slug: msg.slug, error: envError });
+          sendTo(ws, { type: "set_project_env_result", ok: false, slug: targetSlug, requestId: msg.requestId, error: envError });
           return true;
         }
-        var setResult = opts.onSetProjectEnv(targetSlug, msg.envrc || "");
+        var setResult;
+        try { setResult = opts.onSetProjectEnv(targetSlug, msg.envrc || ""); }
+        catch (error) { sendTo(ws, { type: "set_project_env_result", slug: targetSlug, requestId: msg.requestId, ok: false, error: error.message }); return true; }
         if (setResult.ok) onEnvironmentChanged();
-        sendTo(ws, { type: "set_project_env_result", ok: setResult.ok, slug: msg.slug, error: setResult.error, timing: setResult.ok ? "Applies to newly created coding-agent processes. Active processes keep their current environment." : undefined });
+        sendTo(ws, { type: "set_project_env_result", ok: setResult.ok, slug: targetSlug, requestId: msg.requestId, error: setResult.error, timing: setResult.ok ? "Applies to newly created coding-agent processes. Active processes keep their current environment." : undefined });
       } else {
-        sendTo(ws, { type: "set_project_env_result", ok: false, error: "Not supported" });
-      }
-      return true;
-    }
-
-    // --- Global CLAUDE.md ---
-    if (msg.type === "read_global_claude_md") {
-      var globalMdPath = path.join(require("./config").REAL_HOME, ".claude", "CLAUDE.md");
-      try {
-        var globalMdContent = fs.readFileSync(globalMdPath, "utf8");
-        sendTo(ws, { type: "global_claude_md_result", content: globalMdContent });
-      } catch (e) {
-        sendTo(ws, { type: "global_claude_md_result", error: e.message });
-      }
-      return true;
-    }
-
-    if (msg.type === "write_global_claude_md") {
-      var globalMdDir = path.join(require("./config").REAL_HOME, ".claude");
-      var globalMdWritePath = path.join(globalMdDir, "CLAUDE.md");
-      try {
-        if (!fs.existsSync(globalMdDir)) {
-          fs.mkdirSync(globalMdDir, { recursive: true });
-        }
-        fs.writeFileSync(globalMdWritePath, msg.content || "", "utf8");
-        sendTo(ws, { type: "write_global_claude_md_result", ok: true });
-      } catch (e) {
-        sendTo(ws, { type: "write_global_claude_md_result", ok: false, error: e.message });
+        sendTo(ws, { type: "set_project_env_result", slug: targetSlug, requestId: msg.requestId, ok: false, error: "Not supported" });
       }
       return true;
     }
@@ -274,9 +251,12 @@ function attachFilesystem(ctx) {
     if (msg.type === "get_shared_env") {
       var sharedEnvrc = "";
       if (typeof opts.onGetSharedEnv === "function") {
-        var sharedResult = opts.onGetSharedEnv();
-        sharedEnvrc = sharedResult.envrc || "";
+        try {
+          var sharedResult = opts.onGetSharedEnv();
+          sharedEnvrc = sharedResult.envrc || "";
+        } catch (error) { sendTo(ws, { type: "shared_env_result", error: error.message }); return true; }
       }
+      if (typeof opts.onGetSharedEnv !== "function") { sendTo(ws, { type: "shared_env_result", error: "Shared environment is unavailable in this runtime." }); return true; }
       sendTo(ws, { type: "shared_env_result", envrc: sharedEnvrc });
       return true;
     }
@@ -288,7 +268,9 @@ function attachFilesystem(ctx) {
           sendTo(ws, { type: "set_shared_env_result", ok: false, error: sharedEnvError });
           return true;
         }
-        var sharedSetResult = opts.onSetSharedEnv(msg.envrc || "");
+        var sharedSetResult;
+        try { sharedSetResult = opts.onSetSharedEnv(msg.envrc || ""); }
+        catch (error) { sendTo(ws, { type: "set_shared_env_result", ok: false, error: error.message }); return true; }
         if (sharedSetResult.ok) onEnvironmentChanged();
         sendTo(ws, { type: "set_shared_env_result", ok: sharedSetResult.ok, error: sharedSetResult.error, timing: sharedSetResult.ok ? "Applies to newly created coding-agent processes. Active processes keep their current environment." : undefined });
       } else {

package/lib/project-mate-interaction.js

@@ -1,3 +1,4 @@
+var resolveMateIdentityFile = require('./mate-identity-file').resolveMateIdentityFile;
 var fs = require("fs");
 var path = require("path");
 var crypto = require("crypto");
@@ -729,12 +730,12 @@ function attachMateInteraction(ctx) {
           "Read it, then answer the user's question directly. Be concise and give your honest take.\n" +
           "You are not driving the session, so do not run tools or take actions unless the user explicitly asks; commenting and advising is the default.";
       } else {
-        // Load Mate CLAUDE.md
+        // Load Mate AGENTS.md
         var mateDir = matesModule.getMateDir(mateCtx, msg.mateId);
         try {
-          claudeMd = fs.readFileSync(path.join(mateDir, "CLAUDE.md"), "utf8");
+          claudeMd = fs.readFileSync(resolveMateIdentityFile(mateDir), "utf8");
         } catch (e) {
-          // CLAUDE.md may not exist for new mates
+          // AGENTS.md may not exist for new mates
         }
 
         // Load session digests (unified: uses memory-summary.md if available)
@@ -758,8 +759,8 @@ function attachMateInteraction(ctx) {
         onDone: mentionCallbacks.onDone,
         onError: mentionCallbacks.onError,
         canUseTool: function (toolName, input, toolOpts) {
-          // Full-auto mode: auto-approve everything except AskUserQuestion
-          if (sm.currentPermissionMode === "bypassPermissions" && toolName !== "AskUserQuestion") {
+          // Read the caller's live mode so reused mentions follow session changes.
+          if ((session.permissionMode || sm.currentPermissionMode) === "bypassPermissions" && toolName !== "AskUserQuestion") {
             return Promise.resolve({ behavior: "allow", updatedInput: input });
           }
           // Use the shared whitelist from sdk-bridge (read-only tools + safe bash commands)
@@ -826,7 +827,7 @@ function attachMateInteraction(ctx) {
   function loadMateClaudeMd(mateCtx, mateId) {
     var mateDir = matesModule.getMateDir(mateCtx, mateId);
     try {
-      return fs.readFileSync(path.join(mateDir, "CLAUDE.md"), "utf8");
+      return fs.readFileSync(resolveMateIdentityFile(mateDir), "utf8");
     } catch (e) {
       return "";
     }

package/lib/project-server-settings.js

@@ -0,0 +1,31 @@
+// Server administration messages. Every mutation returns an acknowledgement.
+var SETTINGS = {
+  set_pin: { callback: 'onSetPin', field: 'pin', valid: function (value) { return value === null || typeof value === 'string' && /^\d{6}$/.test(value); }, timing: 'Applies to new sign-ins.' },
+  set_keep_awake: { callback: 'onSetKeepAwake', field: 'value', timing: 'Applies while the daemon is running.' },
+  set_inherit_groups: { callback: 'onSetInheritGroups', field: 'value', timing: 'Applies to newly spawned agent and terminal processes.' },
+  set_image_retention: { callback: 'onSetImageRetention', field: 'days', valid: function (value) { return Number.isInteger(value) && value >= 0 && value <= 36500; }, timing: 'The next cleanup applies this period to existing images.' }
+};
+function handleServerSettings(ctx, ws, msg) {
+  var entry = SETTINGS[msg.type];
+  if (!entry) return false;
+  function reply(data) { ctx.sendTo(ws, Object.assign({ type: msg.type + '_result' }, data)); }
+  if (ctx.usersModule.isMultiUser()) {
+    var id = ws._clayUser && ws._clayUser.id;
+    var user = id && ctx.usersModule.findUserById(id);
+    if (!user || user.role !== 'admin') { reply({ ok: false, error: 'Administrator access required.' }); return true; }
+  }
+  var value = msg[entry.field];
+  if (entry.valid ? !entry.valid(value) : typeof value !== 'boolean') { reply({ ok: false, error: 'Invalid setting value.' }); return true; }
+  var opts = ctx.opts;
+  try {
+    var config = opts.onGetDaemonConfig ? opts.onGetDaemonConfig() : {};
+    if (msg.type === 'set_keep_awake' && config.platform !== 'darwin') throw new Error('Keep awake requires macOS.');
+    if (msg.type === 'set_inherit_groups') throw new Error('Group inheritance is automatic in OS-user mode and is no longer configurable.');
+    if (typeof opts[entry.callback] !== 'function') throw new Error('This runtime does not support saving this setting.');
+    var result = opts[entry.callback](value);
+    reply(Object.assign({}, result, { timing: entry.timing }));
+    if (result.ok && msg.type === 'set_keep_awake') ctx.send({ type: 'keep_awake_changed', keepAwake: result.keepAwake });
+  } catch (error) { reply({ ok: false, error: error.message || 'Could not save this setting.' }); }
+  return true;
+}
+module.exports = { handleServerSettings: handleServerSettings };

package/lib/project-sessions.js

@@ -1,6 +1,6 @@
+var serverSettingsMessages = require("./project-server-settings");
 var fs = require("fs");
 var path = require("path");
-var crypto = require("crypto");
 var { execFileSync } = require("child_process");
 var { CODEX_DEFAULTS, getCodexConfig } = require("./codex-defaults");
 var updateSnooze = require("./update-snooze");
@@ -217,16 +217,6 @@ function attachSessions(ctx) {
     return opts.canAccessProjectSlug(userId, targetSlug) === true;
   }
 
-  // Resolve the active user's Claude open-mode preference ('gui' or 'tui').
-  // Multi-user mode reads per-user storage; single-user mode falls back to
-  // the daemon-level default ('gui').
-  function getClaudeOpenModeForWs(ws) {
-    if (!usersModule || typeof usersModule.getClaudeOpenMode !== "function") return "gui";
-    var uid = ws && ws._clayUser ? ws._clayUser.id : null;
-    if (!uid) return "gui";
-    try { return usersModule.getClaudeOpenMode(uid) || "gui"; } catch (e) { return "gui"; }
-  }
-
   // Resolve the home directory where Claude Code writes JSONL for a
   // given session. In OS-isolation mode each Clay user runs as a real
   // Linux account so JSONL lives under /home/clay-name; for single-user
@@ -396,8 +386,8 @@ function attachSessions(ctx) {
     };
   }
 
-  // Spawn a transient PTY for "view this Claude GUI session as TUI" (the
-  // user's claudeOpenMode is 'tui'). The session itself stays a GUI session
+  // Resume a legacy terminal session without rewriting its saved origin.
+  // The session itself keeps its original mode
   // on disk; we only attach a runtime terminal so xterm can render
   // `claude --resume <cliSessionId>`. When the PTY dies the runtime link
   // clears and the next click can re-attach without converting the session.
@@ -441,8 +431,7 @@ function attachSessions(ctx) {
   // current click. Reads the CLI jsonl transcript (cli-sessions.js),
   // populates session.history, and tears
   // down the PTY. The born-TUI marker (session.mode === 'tui') is kept on
-  // disk so that flipping claudeOpenMode back to 'tui' later restores the
-  // embedded-terminal experience instead of locking the session as GUI.
+  // disk to preserve the session's origin and compatibility metadata.
   //
   // Idempotent: if the PTY is already gone and history is populated, this
   // is a no-op (avoids re-reading jsonl and re-writing the session file on
@@ -486,8 +475,7 @@ function attachSessions(ctx) {
   function resolveSessionForView(session, ws) {
     if (!session) return;
     if (session.vendor && !vendorSupportsTui(session.vendor)) { session.tuiSuspended = false; return; }
-    var pref = getClaudeOpenModeForWs(ws);
-    // A LIVE runtime always wins over the viewer's claudeOpenMode pref:
+    // Preserve a live runtime across this feature's retirement:
     // another user (or this user in another tab) may be in the session right
     // now, so we join it in whatever mode it is actually running and never
     // convert or kill it. "tui stays tui, gui stays gui."
@@ -512,23 +500,14 @@ function attachSessions(ctx) {
       session.tuiSuspended = false;
       return;
     }
-    // Cold session: apply the viewer's pref.
+    // Retired terminal presentation preferences never affect an idle session.
     if (session.mode === "tui") {
-      if (pref === "gui") {
-        prepareTuiSessionForGuiView(session);
-        session.runtimeMode = "gui";
-        session.runtimeTerminalId = null;
-        session.tuiSuspended = false;
-      } else {
-        prepareTuiSessionForGuiView(session);
-        session.runtimeMode = null;
-        session.runtimeTerminalId = null;
-        session.tuiSuspended = true;
-      }
+      prepareTuiSessionForGuiView(session);
+      session.runtimeMode = "gui";
+      session.runtimeTerminalId = null;
+      session.tuiSuspended = false;
     } else {
-      // Born-GUI: always GUI. We no longer auto-convert a GUI session to a
-      // `claude --resume` terminal on a pref=tui click - that hijacked shared
-      // GUI sessions in multi-user. Such sessions render as their SDK chat.
+      // Chat sessions always retain their SDK presentation.
       session.runtimeMode = null;
       session.tuiSuspended = false;
     }
@@ -593,6 +572,7 @@ function attachSessions(ctx) {
   }
 
   function handleSessionsMessage(ws, msg) {
+    if (serverSettingsMessages.handleServerSettings({ opts: opts, usersModule: usersModule, sendTo: sendTo, send: send }, ws, msg)) return true;
     if (contextUsage.handleMessage(ws, msg)) return true;
 
     if (msg.type === "push_subscribe") {
@@ -700,95 +680,27 @@ function attachSessions(ctx) {
       sessionOpts.sessionVisibility = visibilityChoice.visibility;
       if (msg.vendor) sessionOpts.vendor = msg.vendor;
       if (isMate && msg._mateDefaultsToken === mateDefaultsToken) sessionOpts.model = msg.model;
-      // Mode resolution: vendors without a TUI session mode are always GUI.
-      // TUI-capable sessions honor the explicit msg.mode if provided, otherwise
-      // fall back to the user's claudeOpenMode preference. This is what
-      // makes the sidebar's "Claude" icon button create the right kind of
-      // session without the client needing to know the preference.
-      var requestedMode;
-      if (msg.vendor && !vendorSupportsTui(msg.vendor)) {
-        requestedMode = "gui";
-      } else if (msg.mode === "tui" || msg.mode === "gui") {
-        requestedMode = msg.mode;
-      } else {
-        requestedMode = getClaudeOpenModeForWs(ws);
-      }
       var newSess;
-      if (requestedMode === "tui") {
-        // TUI sessions own their cliSessionId up-front so we can launch
-        // `claude --session-id <uuid>` and resume the same conversation
-        // from external terminals (claude --resume <uuid>) and from the
-        // jsonl watcher (~/.claude/projects/<cwd>/<uuid>.jsonl).
-        //
-        // Construction order matters: createSession() fires session_switched
-        // synchronously, so we must populate terminalId on the record before
-        // switching. Use createSessionRaw + switchSession to get the right
-        // ordering and avoid an extra rebroadcast.
-        sessionOpts.mode = "tui";
-        sessionOpts.cliSessionId = crypto.randomUUID();
-        sessionOpts.vendor = sessionOpts.vendor || "claude";
-        // Per-session bypass-permissions: TUI shell command only. The flag is
-        // persisted on the session so lazy-resume re-spawns the same way.
-        if (msg.dangerouslySkipPermissions) sessionOpts.dangerouslySkipPermissions = true;
-        newSess = sm.createSessionRaw(sessionOpts);
-        if (tm) {
-          var tuiSid = newSess.cliSessionId;
-          var tuiLocalId = newSess.localId;
-          var tuiSkip = newSess.dangerouslySkipPermissions ? " --dangerously-skip-permissions" : "";
-          var tuiCmd = "claude --session-id " + tuiSid + tuiSkip + "; exit\n";
-          var tuiTerm = tm.create(80, 24, getOsUserInfoForWs(ws), ws, {
-            initialInput: tuiCmd,
-            kind: "tui-session",
-            title: "claude " + tuiSid.slice(0, 8),
-            onExit: function (termSession) {
-              var s = sm.sessions.get(tuiLocalId);
-              if (!s) return;
-              if (termSession && termSession.reclaimed) {
-                // Reclaimed (idle sweep or explicit Close), not a real /exit:
-                // keep the session (its jsonl transcript stays on disk and
-                // lazy-resume can re-spawn claude). Just drop the dead PTY link.
-                s.terminalId = null;
-                try { sm.saveSessionFile(s); } catch (e) {}
-                try { sm.broadcastSessionList(); } catch (e) {}
-              } else {
-                try { sm.deleteSessionQuiet(tuiLocalId); } catch (e) {}
-                try { sm.broadcastSessionList(); } catch (e) {}
-              }
-            },
-            onData: makeTuiActivityHook(tuiLocalId),
-          });
-          if (tuiTerm) {
-            newSess.terminalId = tuiTerm.id;
-          }
-        }
-        // Persist immediately so the session reappears in the sidebar
-        // after a daemon restart (the SDK path saves on stream events,
-        // but TUI sessions never produce any so this is our only chance).
-        try { sm.saveSessionFile(newSess); } catch (e) {}
-        startTitleWatcher(newSess);
-        sm.switchSession(newSess.localId, ws);
+      var newSessionVendor = sessionOpts.vendor || sm.defaultVendor || "claude";
+      var newSessionEffort = isMate && msg._mateDefaultsToken === mateDefaultsToken
+        ? (msg.effort || "")
+        : ((sm.currentEffortByVendor && sm.currentEffortByVendor[newSessionVendor]) || sm.currentEffort || "medium");
+      sessionOpts.effort = yoke.clampEffort(newSessionVendor, newSessionEffort) || null;
+      // Reuse an existing blank GUI session instead of stacking another
+      // one. A vendor-less blank is acceptable: nothing has happened in it,
+      // so stamping the requested vendor is equivalent to a fresh create.
+      var reusable = msg.forceNew === true ? null : sm.findReusableBlankSession({
+        vendor: sessionOpts.vendor || null,
+        ownerId: sessionOpts.ownerId || null,
+      });
+      if (reusable) {
+        if (sessionOpts.vendor && reusable.vendor !== sessionOpts.vendor) reusable.vendor = sessionOpts.vendor;
+        if (!reusable.effort) reusable.effort = sessionOpts.effort;
+        // Reusable blanks already exist; do not retroactively change them.
+        sm.switchSession(reusable.localId, ws);
+        newSess = reusable;
       } else {
-        var newSessionVendor = sessionOpts.vendor || sm.defaultVendor || "claude";
-        var newSessionEffort = isMate && msg._mateDefaultsToken === mateDefaultsToken
-          ? (msg.effort || "")
-          : ((sm.currentEffortByVendor && sm.currentEffortByVendor[newSessionVendor]) || sm.currentEffort || "medium");
-        sessionOpts.effort = yoke.clampEffort(newSessionVendor, newSessionEffort) || null;
-        // Reuse an existing blank GUI session instead of stacking another
-        // one. A vendor-less blank is acceptable: nothing has happened in it,
-        // so stamping the requested vendor is equivalent to a fresh create.
-        var reusable = msg.forceNew === true ? null : sm.findReusableBlankSession({
-          vendor: sessionOpts.vendor || null,
-          ownerId: sessionOpts.ownerId || null,
-        });
-        if (reusable) {
-          if (sessionOpts.vendor && reusable.vendor !== sessionOpts.vendor) reusable.vendor = sessionOpts.vendor;
-          if (!reusable.effort) reusable.effort = sessionOpts.effort;
-          // Reusable blanks already exist; do not retroactively change them.
-          sm.switchSession(reusable.localId, ws);
-          newSess = reusable;
-        } else {
-          newSess = sm.createSession(sessionOpts, ws);
-        }
+        newSess = sm.createSession(sessionOpts, ws);
       }
       ws._clayActiveSession = newSess.localId;
       var folderPlaced = msg.folderId === undefined ? null : sessionFolders.placeNewSession(ws, newSess, msg.folderId, msg.folderSlug);
@@ -881,14 +793,11 @@ function attachSessions(ctx) {
         // resolveSessionForView sets runtimeMode / runtimeTerminalId /
         // tuiSuspended (and hydrates the transcript) before sm.switchSession
         // broadcasts session_switched. A live runtime keeps its actual mode
-        // for every viewer; only cold sessions follow the clicker's
-        // claudeOpenMode pref. Nothing is spawned here.
+        // for every viewer; idle sessions open in chat. Nothing is spawned here.
         var xmTarget = sm.sessions.get(msg.id);
         if (xmTarget && (!xmTarget.vendor || vendorSupportsTui(xmTarget.vendor))) {
           // Single source of truth: live runtime wins (tui stays tui, gui stays
-          // gui); only cold sessions follow the viewer's pref. No PTY is spawned
-          // on switch - born-TUI resumes lazily via the Resume bar
-          // (resume_tui_session), and born-GUI never auto-converts to a terminal.
+          // gui); idle legacy sessions hydrate their transcript into chat.
           resolveSessionForView(xmTarget, ws);
         }
         var switchTargetSess = sm.sessions.get(msg.id);
@@ -1063,12 +972,17 @@ function attachSessions(ctx) {
     }
 
     if (msg.type === "set_update_channel") {
-      if (!updateSnooze.isUpdateAdmin(ws, usersModule)) return true;
+      if (!updateSnooze.isUpdateAdmin(ws, usersModule)) { sendTo(ws, { type: "set_update_channel_result", ok: false, error: "Administrator access required." }); return true; }
       var newChannel = msg.channel === "beta" ? "beta" : "stable";
-      setUpdateChannel(newChannel);
-      setLatestVersion(null);
-      if (typeof opts.onSetUpdateChannel === "function") {
+      try {
+        if (typeof opts.onSetUpdateChannel !== "function") throw new Error("Release channel cannot be saved in this runtime.");
         opts.onSetUpdateChannel(newChannel);
+        setUpdateChannel(newChannel);
+        setLatestVersion(null);
+        sendTo(ws, { type: "set_update_channel_result", ok: true, timing: "Future update checks use this channel." });
+      } catch (error) {
+        sendTo(ws, { type: "set_update_channel_result", ok: false, error: error.message });
+        return true;
       }
       // Re-fetch with new channel and broadcast to admin clients, honouring
       // any snooze each of them has on the version that comes back.
@@ -1095,7 +1009,7 @@ function attachSessions(ctx) {
         } else {
           sendTo(ws, { type: "up_to_date", version: currentVersion });
         }
-      }).catch(function () {});
+      }).catch(function () { sendTo(ws, { type: "update_check_failed", error: "Could not check for updates. Retry when the server can reach the release service." }); });
       return true;
     }
 
@@ -2150,9 +2064,9 @@ function attachSessions(ctx) {
     if (msg.type === "get_daemon_config" || msg.type === "set_pin" || msg.type === "set_keep_awake" ||
         msg.type === "set_auto_continue" || msg.type === "set_inherit_groups" || msg.type === "set_image_retention" || msg.type === "shutdown_server" || msg.type === "restart_server") {
       if (usersModule.isMultiUser()) {
-        var _wsUser = ws._clayUser;
+        var _wsUser = ws._clayUser && usersModule.findUserById(ws._clayUser.id);
         if (!_wsUser || _wsUser.role !== "admin") {
-          sendTo(ws, { type: "error", message: "Admin access required" });
+          sendTo(ws, { type: msg.type + "_result", ok: false, error: "Administrator access required." });
           return true;
         }
       }
@@ -2160,28 +2074,15 @@ function attachSessions(ctx) {
 
     if (msg.type === "get_daemon_config") {
       if (typeof opts.onGetDaemonConfig === "function") {
-        var daemonConfig = opts.onGetDaemonConfig();
-        sendTo(ws, { type: "daemon_config", config: daemonConfig });
-      }
+        try { sendTo(ws, { type: "daemon_config", config: opts.onGetDaemonConfig() }); }
+        catch (error) { sendTo(ws, { type: "daemon_config", config: { error: 'Server configuration is unavailable. Close and reopen Settings to retry.' } }); }
+      } else { sendTo(ws, { type: "daemon_config", config: { error: 'Server configuration is unavailable in this runtime.' } }); }
       return true;
     }
 
-    if (msg.type === "set_pin") {
-      if (typeof opts.onSetPin === "function") {
-        var pinResult = opts.onSetPin(msg.pin || null);
-        sendTo(ws, { type: "set_pin_result", ok: pinResult.ok, pinEnabled: pinResult.pinEnabled });
-      }
-      return true;
-    }
 
-    if (msg.type === "set_keep_awake") {
-      if (typeof opts.onSetKeepAwake === "function") {
-        var kaResult = opts.onSetKeepAwake(msg.value);
-        sendTo(ws, { type: "set_keep_awake_result", ok: kaResult.ok, keepAwake: kaResult.keepAwake });
-        send({ type: "keep_awake_changed", keepAwake: kaResult.keepAwake });
-      }
-      return true;
-    }
+
+
 
     if (msg.type === "set_auto_continue") {
       if (typeof opts.onSetAutoContinue === "function") {
@@ -2192,14 +2093,7 @@ function attachSessions(ctx) {
       return true;
     }
 
-    if (msg.type === "set_inherit_groups") {
-      if (typeof opts.onSetInheritGroups === "function") {
-        var igResult = opts.onSetInheritGroups(msg.value);
-        sendTo(ws, { type: "set_inherit_groups_result", ok: igResult.ok, inheritGroups: igResult.inheritGroups });
-        send({ type: "inherit_groups_changed", inheritGroups: igResult.inheritGroups });
-      }
-      return true;
-    }
+
 
     if (msg.type === "get_claude_allow_list") {
       var galUid = ws._clayUser ? ws._clayUser.id : null;
@@ -2230,6 +2124,7 @@ function attachSessions(ctx) {
       // Re-install settings.json with the updated list so the new patterns
       // take effect on the next `claude` invocation. Resolve this user's
       // home (OS-mode: getent passwd; single-user: os.homedir()).
+      var salEffective = false;
       try {
         var salInstaller = require("./claude-hook-installer");
         var salHome = null;
@@ -2241,38 +2136,16 @@ function attachSessions(ctx) {
         }
         if (!salHome) salHome = require("os").homedir();
         var salMerged = (salInstaller.CLAY_MANAGED_ALLOW || []).concat(salResult.claudeUserAllowList);
-        salInstaller.installAllowList({ homeDirs: [salHome], patterns: salMerged });
+        var salInstalled = salInstaller.installAllowList({ homeDirs: [salHome], patterns: salMerged });
+        salEffective = !salInstalled.errors.length;
       } catch (e) {}
-      sendTo(ws, { type: "set_claude_user_allow_list_result", ok: true, patterns: salResult.claudeUserAllowList });
+      sendTo(ws, { type: "set_claude_user_allow_list_result", ok: true, effective: salEffective, patterns: salResult.claudeUserAllowList });
       return true;
     }
 
+    // Old clients receive an explicit refusal; stored legacy values are ignored.
     if (msg.type === "set_claude_open_mode") {
-      // Per-user preference: when Clay opens a Claude session, render it as
-      // the SDK-driven custom chat ("gui") or as an embedded `claude` TUI
-      // ("tui"). Applies to the next session open; currently displayed
-      // sessions are not re-rendered retroactively.
-      var comUserId = ws._clayUser ? ws._clayUser.id : null;
-      if (!comUserId) {
-        sendTo(ws, { type: "set_claude_open_mode_result", ok: false, error: "no_user" });
-        return true;
-      }
-      var comResult = usersModule.setClaudeOpenMode(comUserId, msg.value);
-      if (comResult && comResult.ok) {
-        sendTo(ws, { type: "set_claude_open_mode_result", ok: true, claudeOpenMode: comResult.claudeOpenMode });
-        // Echo as a "changed" broadcast for this user's other tabs/devices.
-        sendTo(ws, { type: "claude_open_mode_changed", claudeOpenMode: comResult.claudeOpenMode });
-      } else {
-        sendTo(ws, { type: "set_claude_open_mode_result", ok: false, error: (comResult && comResult.error) || "unknown" });
-      }
-      return true;
-    }
-
-    if (msg.type === "set_image_retention") {
-      if (typeof opts.onSetImageRetention === "function") {
-        var irResult = opts.onSetImageRetention(msg.days);
-        sendTo(ws, { type: "set_image_retention_result", ok: irResult.ok, days: irResult.days });
-      }
+      sendTo(ws, { type: "set_claude_open_mode_result", ok: false, error: "Terminal presentation has been removed. Claude opens in Clay chat." });
       return true;
     }
 

package/lib/project.js

@@ -1695,7 +1695,7 @@ function createProjectContext(opts) {
     },
   });
 
-  // Mate CLAUDE.md crisis safety watcher
+  // Mate AGENTS.md crisis safety watcher
   var crisisWatcher = null;
   var crisisDebounce = null;
 
@@ -2845,9 +2845,9 @@ function createProjectContext(opts) {
     icon = newIcon || null;
   }
 
-  // Mate projects: watch CLAUDE.md and enforce system-managed sections
+  // Mate projects: watch AGENTS.md and enforce system-managed sections
   if (isMate) {
-    var claudeMdPath = path.join(cwd, "CLAUDE.md");
+    var claudeMdPath = require("./mate-identity-file").resolveMateIdentityFile(cwd);
     // Derive mateId from cwd (last path segment) and build ctx for dynamic team section
     var _mateId = path.basename(cwd);
     var _mateCtx = matesModule.buildMateCtx(projectOwnerId);