clay-server 5.1.0-beta.1 → 6.0.0-beta.1

package/lib/mate-knowledge-sync.js

@@ -23,7 +23,7 @@ var config = require("./config");
 var knowledgeImport = require("./knowledge-import");
 
 var SOURCE_NAMESPACE = "mate-knowledge";
-var SOURCE_VERSION = 2;
+var SOURCE_VERSION = 3;
 var MAX_SOURCE_BYTES = 64 * 1024 * 1024;
 
 // Identity and template artifacts. Never mirrored, at any version.
@@ -84,6 +84,13 @@ function sourceKindFor(name) {
   return null;
 }
 
+function safeSourceName(value) {
+  var name = String(value || "").replace(/\\/g, "/").replace(/^\.\//, ""); var parts = name.split("/");
+  if (!name || name[0] === "/" || name.length > 500 || parts.length > 20) return null;
+  if (parts.some(function (part) { return !part || part === "." || part === ".." || part.length > 120; })) return null;
+  return parts.join("/");
+}
+
 function isJournal(name) {
   return !!JOURNAL_KINDS[name] || /\.jsonl$/.test(name);
 }
@@ -133,9 +140,8 @@ function isMateSourceEntry(entry) {
   if (typeof source.sourceVersion !== "number" || source.sourceVersion > SOURCE_VERSION) return false;
   var name = source.fileName;
   if (!name || typeof name !== "string") return false;
-  // The file name and the relative path must agree, so neither field alone is
-  // trusted, and the name must be a plain basename.
-  if (path.basename(name) !== name) return false;
+  // The source name and relative path must agree, so neither field alone is trusted.
+  if (safeSourceName(name) !== name) return false;
   return source.relPath === relativeSource(name);
 }
 
@@ -180,6 +186,18 @@ function readStat(filePath) {
   }
 }
 
+function safeKnowledgeFileStat(root, name) {
+  var parts = name.split("/"); var cursor = root;
+  for (var i = 0; i < parts.length; i++) {
+    cursor = path.join(cursor, parts[i]); var stat;
+    try { stat = fs.lstatSync(cursor); } catch (error) { if (error.code === "ENOENT") return null; throw error; }
+    if (stat.isSymbolicLink()) throw new Error("Knowledge source contains a symbolic link.");
+    if (i < parts.length - 1 && !stat.isDirectory()) throw new Error("Knowledge source path is not a directory.");
+    if (i === parts.length - 1 && !stat.isFile()) return null;
+  }
+  return fs.statSync(cursor);
+}
+
 // --- File-addressed sources -------------------------------------------
 
 function syncFile(importer, scope, name, kind, filePath, stat, actor, summary) {
@@ -361,8 +379,8 @@ function syncMateSource(opts) {
     var scope = options.scope || scopeForMateDir(options.mateDir);
     if (!scope) return summary;
     if (options.mateName) scope.mateName = options.mateName;
-    var name = path.basename(String(options.fileName || ""));
-    if (!name) return summary;
+    var rawName = String(options.fileName || ""); var name = safeSourceName(rawName);
+    if (!name) { if (rawName) summary.unsupported++; return summary; }
     if (IDENTITY_FILES.indexOf(name) !== -1) { summary.identitySkipped++; return summary; }
     if (EXCLUDED_FILES.indexOf(name) !== -1) { summary.excluded++; return summary; }
     var kind = sourceKindFor(name);
@@ -370,8 +388,8 @@ function syncMateSource(opts) {
 
     var actor = normalizeActor(options.actor);
     var importer = options.importer || importerFor(scope, options.baseDir);
-    var filePath = path.join(scope.mateDir, "knowledge", name);
-    var stat = readStat(filePath);
+    var knowledgeRoot = path.join(scope.mateDir, "knowledge"); var filePath = path.join(knowledgeRoot, name);
+    var stat = safeKnowledgeFileStat(knowledgeRoot, name);
 
     if (isJournal(name)) syncJournal(importer, scope, name, kind, filePath, stat, actor, summary);
     else syncFile(importer, scope, name, kind, filePath, stat, actor, summary);
@@ -382,19 +400,11 @@ function syncMateSource(opts) {
   return summary;
 }
 
-// Alias that reads better at a call site reacting to a removal or a rewrite.
 function reconcileSource(opts) {
   return syncMateSource(opts);
 }
 
 // Reconcile every durable source in one Mate directory, in both directions.
-//
-// Enumerating the directory alone is not enough. A knowledge file or a whole
-// journal can be deleted while the daemon is stopped, or by direct filesystem
-// tooling, and nothing would ever call syncMateSource for it again. So the
-// scope's own live records are also consulted: any source this module
-// previously imported that is no longer on disk is reconciled, which tombstones
-// a missing file record or every line of a missing journal.
 function reconcileMate(opts) {
   var options = opts || {};
   var summary = options.summary || newSummary();
@@ -404,11 +414,17 @@ function reconcileMate(opts) {
   var knowledgeDir = path.join(scope.mateDir, "knowledge");
   var present = {};
   var entries = [];
-  try {
-    entries = fs.readdirSync(knowledgeDir, { withFileTypes: true });
-  } catch (e) {
-    entries = [];
+  function discover(relative) {
+    var folder = relative ? path.join(knowledgeDir, relative) : knowledgeDir; var children;
+    try { children = fs.readdirSync(folder, { withFileTypes: true }); } catch (error) { return; }
+    for (var d = 0; d < children.length; d++) {
+      var name = relative ? relative + "/" + children[d].name : children[d].name; var stat;
+      try { stat = fs.lstatSync(path.join(knowledgeDir, name)); } catch (error) { continue; }
+      if (stat.isSymbolicLink()) continue;
+      if (stat.isDirectory()) discover(name); else if (stat.isFile()) entries.push({ name: name });
+    }
   }
+  discover("");
   var importer = options.importer || importerFor(scope, options.baseDir);
 
   function reconcileOne(fileName) {
@@ -423,7 +439,6 @@ function reconcileMate(opts) {
   }
 
   for (var i = 0; i < entries.length; i++) {
-    if (!entries[i].isFile()) continue;
     // Recorded as present whatever its kind, so an excluded or unsupported file
     // that still exists is never mistaken for a deleted source.
     present[entries[i].name] = true;

package/lib/mate-workspace-color.js

@@ -0,0 +1,4 @@
+// Only curated pigments may affect a Mate's workspace surface.
+var COLORS = ['mint', 'rose', 'plum', 'coral', 'peach', 'gold', 'sky', 'indigo', 'stone'];
+function valid(value) { return typeof value === 'string' && COLORS.indexOf(value) !== -1; }
+module.exports = { colors: COLORS, valid: valid };

package/lib/mates.js

@@ -2,6 +2,7 @@ var fs = require("fs");
 var path = require("path");
 var crypto = require("crypto");
 var config = require("./config");
+var workspaceColor = require("./mate-workspace-color");
 
 var crisisSafety = require("./crisis-safety");
 var matesPrompts = require("./mates-prompts");
@@ -192,9 +193,17 @@ function getMate(ctx, id) {
 }
 
 function updateMate(ctx, id, updates) {
+  updates = Object.assign({}, updates);
+  delete updates.id;
+  delete updates.createdBy;
+  delete updates.builtinKey;
   var data = loadMates(ctx);
   for (var i = 0; i < data.mates.length; i++) {
     if (data.mates[i].id === id) {
+      if (Object.prototype.hasOwnProperty.call(updates, "workspaceColor")) {
+        if (data.mates[i].primary || data.mates[i].builtinKey === "clay") delete updates.workspaceColor;
+        else if (!workspaceColor.valid(updates.workspaceColor)) return { error: "Choose a supported workspace color." };
+      }
       // Primary mates: protect name and core identity fields
       if (data.mates[i].primary) {
         delete updates.name;
@@ -206,6 +215,15 @@ function updateMate(ctx, id, updates) {
           delete updates.profile.displayName;
         }
       }
+      // Locked built-in artwork is server-managed. Preserve it even when a
+      // stale or crafted client submits a replacement profile object.
+      if (data.mates[i].profile && data.mates[i].profile.avatarLocked && updates.profile) {
+        updates.profile.avatarStyle = data.mates[i].profile.avatarStyle;
+        updates.profile.avatarSeed = data.mates[i].profile.avatarSeed;
+        updates.profile.avatarColor = data.mates[i].profile.avatarColor;
+        updates.profile.avatarCustom = data.mates[i].profile.avatarCustom;
+        updates.profile.avatarLocked = true;
+      }
       var keys = Object.keys(updates);
       for (var j = 0; j < keys.length; j++) {
         data.mates[i][keys[j]] = updates[keys[j]];

package/lib/os-users.js

@@ -17,20 +17,11 @@ function isSafeLinuxUsername(username) {
 // --- Supplementary group inheritance (issue #367) ---
 // Node's child_process { uid, gid } options call setuid/setgid but never
 // initgroups(), so spawned sessions drop all supplementary groups (docker,
-// video, wheel, ...). When inheritGroups is enabled we route the spawn through
+// video, wheel, ...). Route user-switched spawns through
 // `setpriv --init-groups` so the child gets the same groups as a normal login.
-var _inheritGroups = true; // default: behave like a normal login shell
 var _setprivAvail = null;
 var _warnedNoSetpriv = false;
 
-function setInheritGroups(value) {
-  _inheritGroups = !!value;
-}
-
-function getInheritGroups() {
-  return _inheritGroups;
-}
-
 function setprivAvailable() {
   if (_setprivAvail !== null) return _setprivAvail;
   try {
@@ -50,7 +41,7 @@ function setprivAvailable() {
  * spawn()/execFileSync()/pty.spawn().
  *
  * - Same-user spawns (no uid/gid in options) are returned unchanged.
- * - When inheritGroups is disabled, or setpriv is unavailable, falls back to
+ * - When setpriv is unavailable, falls back to
  *   Node's uid/gid options (primary group only) so behavior degrades safely.
  * Requires the parent process to be root, which is the case in os-users mode.
  */
@@ -62,7 +53,7 @@ function wrapSpawnAsUser(command, args, options, setprivCheck) {
   if (uid == null || gid == null) return { command: command, args: args, options: options };
 
   var hasSetpriv = typeof setprivCheck === "function" ? setprivCheck() : setprivAvailable();
-  if (_inheritGroups && hasSetpriv) {
+  if (hasSetpriv) {
     var wrappedArgs = ["--reuid", String(uid), "--regid", String(gid), "--init-groups", "--", command].concat(args);
     var newOpts = Object.assign({}, options);
     delete newOpts.uid;
@@ -70,9 +61,9 @@ function wrapSpawnAsUser(command, args, options, setprivCheck) {
     return { command: "setpriv", args: wrappedArgs, options: newOpts };
   }
 
-  if (_inheritGroups && !_warnedNoSetpriv) {
+  if (!_warnedNoSetpriv) {
     _warnedNoSetpriv = true;
-    console.warn("[os-users] inheritGroups enabled but `setpriv` not found; supplementary groups will be dropped. Install util-linux to restore them.");
+    console.warn("[os-users] `setpriv` not found; supplementary groups will be dropped. Install util-linux to restore them.");
   }
   return { command: command, args: args, options: options };
 }
@@ -673,8 +664,6 @@ module.exports = {
   grantAllUsersAccess: grantAllUsersAccess,
   installClaudeCli: installClaudeCli,
   claudeAvailableForUser: claudeAvailableForUser,
-  setInheritGroups: setInheritGroups,
-  getInheritGroups: getInheritGroups,
   wrapSpawnAsUser: wrapSpawnAsUser,
   deactivateLinuxUser: deactivateLinuxUser,
   ensureProjectsDir: ensureProjectsDir,

package/lib/project-connection.js

@@ -6,6 +6,7 @@ var emailAccounts = require("./email-accounts");
 var { getCodexConfig } = require("./codex-defaults");
 var yoke = require("./yoke");
 var permissionModes = require("./session-permission-mode");
+var sessionProvenance = require("./session-provenance");
 
 function dispatchMessageSafely(handleMessage, sendTo, slug, ws, msg) {
   try {
@@ -45,6 +46,36 @@ function buildInitialModelInfo(sm, initialVendor, initialModel, initialModels, s
   };
 }
 
+function buildRestoredSessionMessage(active, initialEffort, capabilities, permissionState) {
+  return {
+    type: "session_switched",
+    id: active.localId,
+    sessionOriginId: active.sessionOriginId || null,
+    sessionRole: sessionProvenance.isWorker(active) ? "worker" : "driver",
+    cliSessionId: active.cliSessionId || null,
+    loop: active.loop || null,
+    vendor: active.vendor || null,
+    model: active.model || null,
+    effort: active.effort || initialEffort || null,
+    hasHistory: !!(active.history && active.history.length > 0),
+    capabilities: capabilities,
+    isProcessing: !!active.isProcessing,
+    mateCreation: active.mateCreationMode === true,
+    mateCreationPhase: active.homeMateCreationPhase || null,
+    debatePlanning: active.debateSetupMode === true,
+    debatePhase: active.homeDebatePhase || null,
+    mode: active.mode || "gui",
+    terminalId: typeof active.terminalId === "number" ? active.terminalId : null,
+    runtimeMode: active.runtimeMode || null,
+    runtimeTerminalId: typeof active.runtimeTerminalId === "number" ? active.runtimeTerminalId : null,
+    tuiSuspended: !!active.tuiSuspended,
+    permissionMode: permissionState.requestedPermissionMode,
+    effectivePermissionMode: permissionState.effectivePermissionMode,
+    permissionCapabilities: permissionState.permissionCapabilities,
+    mcpPermissionModeOverrides: permissionState.mcpPermissionModeOverrides,
+  };
+}
+
 /**
  * Attach connection/disconnection handlers to a project context.
  *
@@ -63,6 +94,8 @@ function attachConnection(ctx) {
   var cwd = ctx.cwd;
   var slug = ctx.slug;
   var isMate = ctx.isMate;
+  var mateId = ctx.mateId || null;
+  var mateDisplayName = ctx.mateDisplayName || "";
   var osUsers = ctx.osUsers;
   var debug = ctx.debug;
   var dangerouslySkipPermissions = ctx.dangerouslySkipPermissions;
@@ -184,7 +217,7 @@ function attachConnection(ctx) {
       sm.saveSessionFile(restoredActive);
     }
     var initialModels = (sm.modelsByVendor && sm.modelsByVendor[initialVendor]) || sm.availableModels || [];
-    sendTo(ws, { type: "info", cwd: cwd, slug: slug, project: title || project, version: currentVersion, debug: !!debug, dangerouslySkipPermissions: dangerouslySkipPermissions, osUsers: osUsers, lanHost: lanHost, projectCount: _filteredProjects.length, projects: _filteredProjects, projectOwnerId: projectOwnerId, ownerLocked: ownerLocked, vendors: yoke.VENDOR_REGISTRY });
+    sendTo(ws, { type: "info", cwd: cwd, slug: slug, project: title || project, version: currentVersion, debug: !!debug, dangerouslySkipPermissions: dangerouslySkipPermissions, osUsers: osUsers, lanHost: lanHost, projectCount: _filteredProjects.length, projects: _filteredProjects, projectOwnerId: projectOwnerId, ownerLocked: ownerLocked, vendors: yoke.VENDOR_REGISTRY, isMate: isMate, mateId: isMate ? mateId : null, mateDisplayName: isMate ? (mateDisplayName || title || project || "Mate") : "" });
     if (typeof sendCursorSharingState === "function") sendCursorSharingState(ws);
     // Update notifications are pushed on a scheduled interval (see
     // scheduleUpdateBroadcast). We no longer push on connect to avoid
@@ -213,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);
@@ -262,7 +288,7 @@ function attachConnection(ctx) {
       }
       var _vendorCaps = (sm.capabilitiesByVendor && sm.capabilitiesByVendor[active.vendor || sm.defaultVendor || "claude"]) || {};
       var activePermissionState = permissionModes.clientState(active, sm.currentPermissionMode, sm.defaultVendor);
-      sendTo(ws, { type: "session_switched", id: active.localId, sessionOriginId: active.sessionOriginId || null, cliSessionId: active.cliSessionId || null, loop: active.loop || null, vendor: active.vendor || null, model: active.model || null, effort: active.effort || initialEffort || null, hasHistory: (active.history && active.history.length > 0), capabilities: _vendorCaps, isProcessing: !!active.isProcessing, mode: active.mode || "gui", terminalId: typeof active.terminalId === "number" ? active.terminalId : null, runtimeMode: active.runtimeMode || null, runtimeTerminalId: typeof active.runtimeTerminalId === "number" ? active.runtimeTerminalId : null, tuiSuspended: !!active.tuiSuspended, permissionMode: activePermissionState.requestedPermissionMode, effectivePermissionMode: activePermissionState.effectivePermissionMode, permissionCapabilities: activePermissionState.permissionCapabilities, mcpPermissionModeOverrides: activePermissionState.mcpPermissionModeOverrides });
+      sendTo(ws, buildRestoredSessionMessage(active, initialEffort, _vendorCaps, activePermissionState));
       if (ctx.autonomousRun) sendTo(ws, { type: "autonomous_run_state", sessionId: active.localId, run: ctx.autonomousRun.project(active.autonomousRun) });
       // Send per-session context sources
       var sessionSources = loadContextSources(slug, active.localId);
@@ -382,5 +408,6 @@ function attachConnection(ctx) {
 module.exports = {
   attachConnection: attachConnection,
   buildInitialModelInfo: buildInitialModelInfo,
+  buildRestoredSessionMessage: buildRestoredSessionMessage,
   dispatchMessageSafely: dispatchMessageSafely,
 };

package/lib/project-debate-proposal.js

@@ -227,6 +227,12 @@ function attachDebateProposal(ctx) {
 
     var found = findPendingProposal(ws, msg);
     if (!found) return true;
+    if (msg.sessionId != null && (String(found.pending.session.localId) !== String(msg.sessionId)
+        || String(ws._clayActiveSession) !== String(msg.sessionId)
+        || (found.pending.session.ownerId && (!ws._clayUser || ws._clayUser.id !== found.pending.session.ownerId)))) {
+      ctx.sendTo(ws, { type: "debate_error", error: "This proposal belongs to a different session." });
+      return true;
+    }
     startApprovedProposal(ws, msg, found).catch(function (error) {
       delete pendingProposals[found.key];
       rejectProposal(ws, found.pending, error && error.message ? error.message : "The selected debate models could not be verified.");

package/lib/project-debate-workspace.js

@@ -0,0 +1,43 @@
+// Project-bound access to the same participation actions used by Home debates.
+function handleProjectDebateControl(ws, msg, session, engine, sendTo) {
+  if (msg.type !== "project_debate_control" && msg.type !== "project_debate_state") return false;
+  var userId = ws && ws._clayUser && ws._clayUser.id;
+  var valid = session && msg.sessionId != null && String(session.localId) === String(msg.sessionId)
+    && (!session.ownerId || session.ownerId === userId);
+  if (msg.type === "project_debate_state") {
+    sendTo(ws, { type: "project_debate_state", sessionId: msg.sessionId, header: valid ? debateHeader(session) : null });
+    return true;
+  }
+  var ok = false;
+  if (valid) {
+    if (session.homeDebatePlanning) ok = engine.handleHomeControl(ws, msg, session);
+    else if (msg.action === "hand_raise") { engine.handleDebateHandRaise(ws, session); ok = true; }
+    else if (msg.action === "stop") ok = engine.handleDebateStop(ws, session);
+    else if (msg.action === "cancel_stop") ok = engine.handleDebateCancelStop(ws, session);
+    else if (msg.action === "user_floor") { engine.handleDebateUserFloorResponse(ws, msg, session); ok = true; }
+    else if (msg.action === "conclude" || msg.action === "resume") {
+      engine.handleDebateConcludeResponse(ws, { action: msg.action === "resume" ? "continue" : msg.response, text: msg.text || "" }, session);
+      ok = true;
+    }
+  }
+  sendTo(ws, { type: "project_debate_control_result", sessionId: msg.sessionId, ok: !!ok, error: ok ? null : "This debate action is no longer available. Reopen the debate and try again." });
+  return true;
+}
+function debateHeader(session) {
+  var header = null;
+  (session.history || []).forEach(function (event) {
+    if (event.type === "debate_started") header = Object.assign({}, event, { role: "debate_header", phase: "live", round: 1, interaction: null, handRaised: false });
+    if (!header) return;
+    if (event.round) header.round = event.round;
+    if (event.type === "debate_conclude_confirm") header.interaction = "conclude";
+    if (event.type === "debate_user_floor") header.interaction = "user_floor";
+    if (event.type === "debate_user_floor_done") { header.interaction = null; header.handRaised = false; }
+    if (event.type === "debate_hand_raised") header.handRaised = true;
+    if (event.type === "debate_stop_requested") header.stopping = true;
+    if (event.type === "debate_stop_cancelled") header.stopping = false;
+    if (event.type === "debate_turn" || event.type === "debate_resumed") { header.interaction = null; header.phase = "live"; }
+    if (event.type === "debate_ended") { header.phase = event.reason === "interrupted" ? "interrupted" : "ended"; header.reason = event.reason; header.interaction = null; header.stopping = false; }
+  });
+  return header;
+}
+module.exports = { handleProjectDebateControl: handleProjectDebateControl, debateHeader: debateHeader };

package/lib/project-debate.js

@@ -1859,6 +1859,7 @@ function attachDebate(ctx) {
     handleDebateHandRaise: handleDebateHandRaise,
     handleDebateComment: handleDebateComment,
     handleDebateStop: handleDebateStop,
+    handleDebateCancelStop: handleDebateCancelStop,
     handleDebateConcludeResponse: handleDebateConcludeResponse,
     handleDebateConfirmBrief: handleDebateConfirmBrief,
     handleDebateUserFloorResponse: handleDebateUserFloorResponse,

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 {