clay-server 2.22.2 → 2.23.0-beta.1

package/lib/build-user-env.js

@@ -0,0 +1,57 @@
+// build-user-env.js — Build a minimal, safe environment for user subprocesses.
+// Prevents leaking the root daemon's full process.env to user sessions.
+
+var os = require("os");
+
+// Only these vars are forwarded from the daemon's environment.
+var ALLOWED_KEYS = ["PATH", "LANG", "NODE_ENV"];
+
+/**
+ * Build a clean env object for spawning a user process.
+ * osUserInfo: { uid, gid, home, user, shell } or null for same-user fallback.
+ */
+function buildUserEnv(osUserInfo) {
+  var env = {};
+
+  // Copy only allowlisted keys from daemon env
+  for (var i = 0; i < ALLOWED_KEYS.length; i++) {
+    var key = ALLOWED_KEYS[i];
+    if (process.env[key]) env[key] = process.env[key];
+  }
+
+  // Copy all LC_* locale vars
+  var keys = Object.keys(process.env);
+  for (var j = 0; j < keys.length; j++) {
+    if (keys[j].indexOf("LC_") === 0) {
+      env[keys[j]] = process.env[keys[j]];
+    }
+  }
+
+  // Terminal settings
+  env.TERM = "xterm-256color";
+  env.COLORFGBG = "15;0"; // Suppress OSC 11 background-color queries
+
+  // User identity
+  if (osUserInfo) {
+    env.HOME = osUserInfo.home;
+    env.USER = osUserInfo.user;
+    env.LOGNAME = osUserInfo.user;
+    if (osUserInfo.shell) env.SHELL = osUserInfo.shell;
+  } else {
+    env.HOME = process.env.HOME || os.homedir();
+    env.USER = process.env.USER || "";
+    env.LOGNAME = process.env.LOGNAME || process.env.USER || "";
+    env.SHELL = process.env.SHELL || "/bin/bash";
+  }
+
+  // XDG runtime dir (needed for dbus, systemd user services, etc.)
+  if (osUserInfo) {
+    env.XDG_RUNTIME_DIR = "/run/user/" + osUserInfo.uid;
+  } else if (process.env.XDG_RUNTIME_DIR) {
+    env.XDG_RUNTIME_DIR = process.env.XDG_RUNTIME_DIR;
+  }
+
+  return env;
+}
+
+module.exports = { buildUserEnv: buildUserEnv };

package/lib/mates.js

@@ -283,6 +283,89 @@ var TEAM_SECTION =
   "Check the team registry when it would be relevant to know who else is available or what they do. " +
   "You cannot message other Mates directly yet, but knowing your team helps you work with the user more effectively.\n";
 
+// --- Project registry ---
+
+var PROJECT_REGISTRY_MARKER = "<!-- PROJECT_REGISTRY_MANAGED_BY_SYSTEM -->";
+
+function buildProjectRegistrySection(projects) {
+  if (!projects || projects.length === 0) return "";
+  var section = "\n\n" + PROJECT_REGISTRY_MARKER + "\n" +
+    "## Available Projects\n\n" +
+    "**This section is managed by the system and cannot be removed.**\n\n" +
+    "The following projects are registered in this workspace. " +
+    "Use this information when the user references a project by name, " +
+    "so you do not need to ask for the path.\n\n" +
+    "| Project | Path |\n" +
+    "|---------|------|\n";
+  for (var i = 0; i < projects.length; i++) {
+    var p = projects[i];
+    var name = (p.icon ? p.icon + " " : "") + (p.title || p.slug || path.basename(p.path));
+    section += "| " + name + " | `" + p.path + "` |\n";
+  }
+  return section;
+}
+
+/**
+ * Enforce the project registry section on a mate's CLAUDE.md.
+ * Inserts after team awareness section and before session memory section.
+ * Pass the current project list; if empty, removes the section.
+ * Returns true if the file was modified.
+ */
+function enforceProjectRegistry(filePath, projects) {
+  if (!fs.existsSync(filePath)) return false;
+
+  var content = fs.readFileSync(filePath, "utf8");
+  var newSection = buildProjectRegistrySection(projects);
+
+  // Strip existing section if present
+  var markerIdx = content.indexOf(PROJECT_REGISTRY_MARKER);
+  if (markerIdx !== -1) {
+    var afterMarker = content.substring(markerIdx);
+    // Find next system marker
+    var nextIdx = -1;
+    var candidates = [SESSION_MEMORY_MARKER, STICKY_NOTES_MARKER, DEBATE_AWARENESS_MARKER, crisisSafety.MARKER];
+    for (var c = 0; c < candidates.length; c++) {
+      var ci = afterMarker.indexOf(candidates[c]);
+      if (ci !== -1 && (nextIdx === -1 || ci < nextIdx)) nextIdx = ci;
+    }
+
+    if (nextIdx !== -1) {
+      var existing = afterMarker.substring(0, nextIdx).trimEnd();
+      if (existing === newSection.trimStart().trimEnd()) return false; // already correct
+      content = content.substring(0, markerIdx).trimEnd() + content.substring(markerIdx + nextIdx);
+    } else {
+      var existing = afterMarker.trimEnd();
+      if (existing === newSection.trimStart().trimEnd()) return false;
+      content = content.substring(0, markerIdx).trimEnd();
+    }
+  }
+
+  // If no projects, just remove the section (already done above)
+  if (!newSection) {
+    if (markerIdx !== -1) {
+      fs.writeFileSync(filePath, content, "utf8");
+      return true;
+    }
+    return false;
+  }
+
+  // Insert before session memory, sticky notes, debate, or crisis safety
+  var insertBefore = -1;
+  var insertCandidates = [SESSION_MEMORY_MARKER, STICKY_NOTES_MARKER, DEBATE_AWARENESS_MARKER, crisisSafety.MARKER];
+  for (var ic = 0; ic < insertCandidates.length; ic++) {
+    var pos = content.indexOf(insertCandidates[ic]);
+    if (pos !== -1) { insertBefore = pos; break; }
+  }
+  if (insertBefore !== -1) {
+    content = content.substring(0, insertBefore).trimEnd() + newSection + "\n\n" + content.substring(insertBefore);
+  } else {
+    content = content.trimEnd() + newSection;
+  }
+
+  fs.writeFileSync(filePath, content, "utf8");
+  return true;
+}
+
 function hasTeamSection(content) {
   return content.indexOf(TEAM_MARKER) !== -1;
 }
@@ -302,14 +385,16 @@ function enforceTeamAwareness(filePath) {
   if (teamIdx !== -1) {
     // Extract existing team section (up to next system marker or end)
     var afterTeam = content.substring(teamIdx);
-    // Find the nearest following system marker (session memory or crisis safety)
+    // Find the nearest following system marker (project registry, session memory, or crisis safety)
     var nextMarkerIdx = -1;
+    var projIdx = afterTeam.indexOf(PROJECT_REGISTRY_MARKER);
     var memIdx = afterTeam.indexOf(SESSION_MEMORY_MARKER);
     var crisisIdx = afterTeam.indexOf(crisisSafety.MARKER);
-    if (memIdx !== -1 && (crisisIdx === -1 || memIdx < crisisIdx)) {
-      nextMarkerIdx = memIdx;
-    } else if (crisisIdx !== -1) {
-      nextMarkerIdx = crisisIdx;
+    var teamNextCandidates = [projIdx, memIdx, crisisIdx];
+    for (var tn = 0; tn < teamNextCandidates.length; tn++) {
+      if (teamNextCandidates[tn] !== -1 && (nextMarkerIdx === -1 || teamNextCandidates[tn] < nextMarkerIdx)) {
+        nextMarkerIdx = teamNextCandidates[tn];
+      }
     }
     var existing;
     if (nextMarkerIdx !== -1) {
@@ -324,11 +409,14 @@ function enforceTeamAwareness(filePath) {
     content = content.substring(0, teamIdx).trimEnd() + content.substring(endOfTeam);
   }
 
-  // Insert before session memory or crisis safety section if present, otherwise append
+  // Insert before project registry, session memory, or crisis safety section if present, otherwise append
+  var projRegPos = content.indexOf(PROJECT_REGISTRY_MARKER);
   var sessionMemPos = content.indexOf(SESSION_MEMORY_MARKER);
   var crisisPos = content.indexOf(crisisSafety.MARKER);
   var insertBefore = -1;
-  if (sessionMemPos !== -1) {
+  if (projRegPos !== -1) {
+    insertBefore = projRegPos;
+  } else if (sessionMemPos !== -1) {
     insertBefore = sessionMemPos;
   } else if (crisisPos !== -1) {
     insertBefore = crisisPos;
@@ -377,24 +465,34 @@ function enforceSessionMemory(filePath) {
   if (memIdx !== -1) {
     // Extract existing section (up to next system marker or end)
     var afterMem = content.substring(memIdx);
-    var crisisIdx = afterMem.indexOf(crisisSafety.MARKER);
+    var nextMemIdx = -1;
+    var memNextCandidates = [STICKY_NOTES_MARKER, DEBATE_AWARENESS_MARKER, crisisSafety.MARKER];
+    for (var mn = 0; mn < memNextCandidates.length; mn++) {
+      var mni = afterMem.indexOf(memNextCandidates[mn]);
+      if (mni !== -1 && (nextMemIdx === -1 || mni < nextMemIdx)) nextMemIdx = mni;
+    }
     var existing;
-    if (crisisIdx !== -1) {
-      existing = afterMem.substring(0, crisisIdx).trimEnd();
+    if (nextMemIdx !== -1) {
+      existing = afterMem.substring(0, nextMemIdx).trimEnd();
     } else {
       existing = afterMem.trimEnd();
     }
     if (existing === SESSION_MEMORY_SECTION.trimStart().trimEnd()) return false; // already correct
 
     // Strip the existing session memory section
-    var endOfMem = crisisIdx !== -1 ? memIdx + crisisIdx : content.length;
+    var endOfMem = nextMemIdx !== -1 ? memIdx + nextMemIdx : content.length;
     content = content.substring(0, memIdx).trimEnd() + content.substring(endOfMem);
   }
 
-  // Insert before crisis safety section if present, otherwise append
-  var crisisPos = content.indexOf(crisisSafety.MARKER);
-  if (crisisPos !== -1) {
-    content = content.substring(0, crisisPos).trimEnd() + SESSION_MEMORY_SECTION + "\n\n" + content.substring(crisisPos);
+  // Insert before sticky notes, debate, or crisis safety section if present, otherwise append
+  var memInsertBefore = -1;
+  var memInsertCandidates = [STICKY_NOTES_MARKER, DEBATE_AWARENESS_MARKER, crisisSafety.MARKER];
+  for (var mi = 0; mi < memInsertCandidates.length; mi++) {
+    var mip = content.indexOf(memInsertCandidates[mi]);
+    if (mip !== -1) { memInsertBefore = mip; break; }
+  }
+  if (memInsertBefore !== -1) {
+    content = content.substring(0, memInsertBefore).trimEnd() + SESSION_MEMORY_SECTION + "\n\n" + content.substring(memInsertBefore);
   } else {
     content = content.trimEnd() + SESSION_MEMORY_SECTION;
   }
@@ -430,6 +528,86 @@ function enforceStickyNotes(filePath) {
   var content = fs.readFileSync(filePath, "utf8");
 
   var markerIdx = content.indexOf(STICKY_NOTES_MARKER);
+  if (markerIdx !== -1) {
+    var afterMarker = content.substring(markerIdx);
+    var stickyNextIdx = -1;
+    var stickyNextCandidates = [DEBATE_AWARENESS_MARKER, crisisSafety.MARKER];
+    for (var sn = 0; sn < stickyNextCandidates.length; sn++) {
+      var sni = afterMarker.indexOf(stickyNextCandidates[sn]);
+      if (sni !== -1 && (stickyNextIdx === -1 || sni < stickyNextIdx)) stickyNextIdx = sni;
+    }
+    var existing;
+    if (stickyNextIdx !== -1) {
+      existing = afterMarker.substring(0, stickyNextIdx).trimEnd();
+    } else {
+      existing = afterMarker.trimEnd();
+    }
+    if (existing === STICKY_NOTES_SECTION.trimStart().trimEnd()) return false;
+
+    var endOfSection = stickyNextIdx !== -1 ? markerIdx + stickyNextIdx : content.length;
+    content = content.substring(0, markerIdx).trimEnd() + content.substring(endOfSection);
+  }
+
+  var stickyInsertBefore = -1;
+  var stickyInsertCandidates = [DEBATE_AWARENESS_MARKER, crisisSafety.MARKER];
+  for (var si = 0; si < stickyInsertCandidates.length; si++) {
+    var sip = content.indexOf(stickyInsertCandidates[si]);
+    if (sip !== -1) { stickyInsertBefore = sip; break; }
+  }
+  if (stickyInsertBefore !== -1) {
+    content = content.substring(0, stickyInsertBefore).trimEnd() + STICKY_NOTES_SECTION + "\n\n" + content.substring(stickyInsertBefore);
+  } else {
+    content = content.trimEnd() + STICKY_NOTES_SECTION;
+  }
+
+  fs.writeFileSync(filePath, content, "utf8");
+  return true;
+}
+
+// --- Debate awareness ---
+
+var DEBATE_AWARENESS_MARKER = "<!-- DEBATE_AWARENESS_MANAGED_BY_SYSTEM -->";
+
+var DEBATE_AWARENESS_SECTION =
+  "\n\n" + DEBATE_AWARENESS_MARKER + "\n" +
+  "## Proposing Debates\n\n" +
+  "**This section is managed by the system and cannot be removed.**\n\n" +
+  "When the user suggests that a topic would benefit from a multi-perspective debate " +
+  "(e.g., \"let's debate this\", \"I want to hear different viewpoints\"), you can propose " +
+  "a structured debate by writing a brief file.\n\n" +
+  "**How to propose a debate:**\n" +
+  "1. Generate a unique ID: `debate_` followed by the current timestamp in milliseconds\n" +
+  "2. Write the brief as JSON to: `.clay/debates/<debate_id>/brief.json` (relative to the project root)\n" +
+  "3. The system will detect the file and show the user an inline card with your proposal\n" +
+  "4. The user can then approve or cancel the debate\n\n" +
+  "**Brief JSON schema:**\n" +
+  "```json\n" +
+  "{\n" +
+  "  \"topic\": \"The refined debate topic\",\n" +
+  "  \"format\": \"free_discussion\",\n" +
+  "  \"context\": \"Key context from the conversation that panelists should know\",\n" +
+  "  \"specialRequests\": \"Any special instructions, or null\",\n" +
+  "  \"panelists\": [\n" +
+  "    {\n" +
+  "      \"mateId\": \"<mate UUID from the team roster above>\",\n" +
+  "      \"role\": \"The perspective or stance this panelist should take\",\n" +
+  "      \"brief\": \"Specific guidance for this panelist\"\n" +
+  "    }\n" +
+  "  ]\n" +
+  "}\n" +
+  "```\n\n" +
+  "**Rules:**\n" +
+  "- Choose 2-4 panelists from the team roster. Pick mates whose expertise fits the topic.\n" +
+  "- Do NOT include yourself as a panelist. You will moderate the debate.\n" +
+  "- Only propose a debate when the user explicitly asks for one.\n" +
+  "- Make sure the directory exists before writing (use mkdir -p or equivalent).\n";
+
+function enforceDebateAwareness(filePath) {
+  if (!fs.existsSync(filePath)) return false;
+
+  var content = fs.readFileSync(filePath, "utf8");
+
+  var markerIdx = content.indexOf(DEBATE_AWARENESS_MARKER);
   if (markerIdx !== -1) {
     var afterMarker = content.substring(markerIdx);
     var crisisIdx = afterMarker.indexOf(crisisSafety.MARKER);
@@ -439,7 +617,7 @@ function enforceStickyNotes(filePath) {
     } else {
       existing = afterMarker.trimEnd();
     }
-    if (existing === STICKY_NOTES_SECTION.trimStart().trimEnd()) return false;
+    if (existing === DEBATE_AWARENESS_SECTION.trimStart().trimEnd()) return false;
 
     var endOfSection = crisisIdx !== -1 ? markerIdx + crisisIdx : content.length;
     content = content.substring(0, markerIdx).trimEnd() + content.substring(endOfSection);
@@ -447,9 +625,9 @@ function enforceStickyNotes(filePath) {
 
   var crisisPos = content.indexOf(crisisSafety.MARKER);
   if (crisisPos !== -1) {
-    content = content.substring(0, crisisPos).trimEnd() + STICKY_NOTES_SECTION + "\n\n" + content.substring(crisisPos);
+    content = content.substring(0, crisisPos).trimEnd() + DEBATE_AWARENESS_SECTION + "\n\n" + content.substring(crisisPos);
   } else {
-    content = content.trimEnd() + STICKY_NOTES_SECTION;
+    content = content.trimEnd() + DEBATE_AWARENESS_SECTION;
   }
 
   fs.writeFileSync(filePath, content, "utf8");
@@ -715,6 +893,12 @@ module.exports = {
   enforceStickyNotes: enforceStickyNotes,
   STICKY_NOTES_MARKER: STICKY_NOTES_MARKER,
   STICKY_NOTES_SECTION: STICKY_NOTES_SECTION,
+  enforceProjectRegistry: enforceProjectRegistry,
+  buildProjectRegistrySection: buildProjectRegistrySection,
+  PROJECT_REGISTRY_MARKER: PROJECT_REGISTRY_MARKER,
+  enforceDebateAwareness: enforceDebateAwareness,
+  DEBATE_AWARENESS_MARKER: DEBATE_AWARENESS_MARKER,
+  DEBATE_AWARENESS_SECTION: DEBATE_AWARENESS_SECTION,
   createBuiltinMate: createBuiltinMate,
   getInstalledBuiltinKeys: getInstalledBuiltinKeys,
   getMissingBuiltinKeys: getMissingBuiltinKeys,