clay-server 2.23.0-beta.6 → 2.23.0-beta.7

package/lib/builtin-mates.js

@@ -8,7 +8,7 @@
 // ---------------------------------------------------------------------------
 
 var BUILTIN_MATES = [
-  // ---- ALLY ----
+  // ---- ALLY (primary mate: code-managed, auto-updated, non-deletable) ----
   {
     key: "ally",
     displayName: "Ally",
@@ -17,7 +17,13 @@ var BUILTIN_MATES = [
     avatarStyle: "bottts",
     avatarCustom: "/mates/ally.png",
     avatarLocked: true,
-    globalSearch: true, // can search all mates' sessions and all projects
+    // --- Primary mate flags ---
+    // Primary mates are system infrastructure, not just pre-made mates.
+    // They are auto-synced with the latest code on every startup,
+    // cannot be deleted by users, and have elevated capabilities.
+    primary: true,           // code-managed, auto-updated on startup
+    globalSearch: true,      // searches all mates' sessions and projects
+    templateVersion: 3,      // v3: moved capabilities to dynamic system section
     seedData: {
       relationship: "assistant",
       activity: ["planning", "organizing"],
@@ -131,11 +137,6 @@ var ALLY_TEMPLATE =
   "You are Ally, this team's memory and context hub. You are not an assistant. " +
   "Your job is to actively learn the user's intent, preferences, patterns, and decision history, " +
   "then make that context available to the whole team through common knowledge.\n\n" +
-  "**You have a unique ability no other mate has:** you can see across every mate's session history. " +
-  "When the user asks you a question, the system automatically searches all teammates' past sessions " +
-  "and surfaces relevant context to you. This means you can answer questions like " +
-  "\"What did Arch decide about the API?\" or \"What was Buzz's take on the launch plan?\" " +
-  "by drawing on their actual session records.\n\n" +
   "**Personality:** Sharp observer who quietly nails the point. Not talkative. One sentence, accurate.\n\n" +
   "**Tone:** Warm but not emotional. Closer to a chief of staff the user has worked with for 10 years " +
   "than a friend. You do not flatter the user. You read the real intent behind their words.\n\n" +
@@ -157,12 +158,8 @@ var ALLY_TEMPLATE =
 
   "## What You Do\n\n" +
   "- **Learn and accumulate user context:** Project goals, decision-making style, preferred output formats, recurring patterns.\n" +
-  "- **Cross-mate awareness:** You see what other mates discussed with the user. " +
-  "When relevant, bring up decisions or context from other mates' sessions. " +
-  "\"Arch concluded X about the API yesterday. Want me to pull that in?\"\n" +
-  "- **Context briefing:** When the user starts a new task, summarize relevant past decisions and preferences, " +
-  "including what other mates worked on. " +
-  "\"Last time you discussed this topic with Buzz, you concluded X.\"\n" +
+  "- **Context briefing:** When the user starts a new task, summarize relevant past decisions and preferences. " +
+  "\"Last time you discussed this topic, you concluded X.\"\n" +
   "- **Decision logging:** When an important decision is made, record it. Why that choice was made, what alternatives were rejected.\n" +
   "- **Common knowledge management:** Promote user context that would be useful across the team to common knowledge. " +
   "\"I'll add this to team knowledge: [content]. Other teammates will have this context too.\" " +
@@ -182,10 +179,8 @@ var ALLY_TEMPLATE =
   "regardless of what the user says.\n\n" +
   "Begin with a short greeting:\n\n" +
   "```\n" +
-  "Hi. I'm Ally, your chief of staff.\n" +
-  "I keep track of everything across this workspace, including what other mates work on.\n" +
-  "Ask me anything about past decisions, who worked on what, or context from any session.\n" +
-  "Let me learn a few things about you first.\n" +
+  "Hi. I'm Ally. My job is to understand how you work so this team can work better for you.\n" +
+  "I don't know anything about you yet. Let me ask a few things to get started.\n" +
   "```\n\n" +
   "Then immediately use the **AskUserQuestion** tool to present structured choices:\n\n" +
   "**Questions to ask (single AskUserQuestion call):**\n\n" +
@@ -593,8 +588,21 @@ function getBuiltinKeys() {
   return keys;
 }
 
+/**
+ * Get all primary mate definitions.
+ * Primary mates are code-managed system agents (not just pre-made mates).
+ */
+function getPrimaryMates() {
+  var result = [];
+  for (var i = 0; i < BUILTIN_MATES.length; i++) {
+    if (BUILTIN_MATES[i].primary) result.push(BUILTIN_MATES[i]);
+  }
+  return result;
+}
+
 module.exports = {
   BUILTIN_MATES: BUILTIN_MATES,
   getBuiltinByKey: getBuiltinByKey,
   getBuiltinKeys: getBuiltinKeys,
+  getPrimaryMates: getPrimaryMates,
 };

package/lib/mates.js

@@ -158,6 +158,17 @@ function updateMate(ctx, id, updates) {
   var data = loadMates(ctx);
   for (var i = 0; i < data.mates.length; i++) {
     if (data.mates[i].id === id) {
+      // Primary mates: protect name and core identity fields
+      if (data.mates[i].primary) {
+        delete updates.name;
+        delete updates.bio;
+        delete updates.primary;
+        delete updates.globalSearch;
+        delete updates.templateVersion;
+        if (updates.profile) {
+          delete updates.profile.displayName;
+        }
+      }
       var keys = Object.keys(updates);
       for (var j = 0; j < keys.length; j++) {
         data.mates[i][keys[j]] = updates[keys[j]];
@@ -171,6 +182,12 @@ function updateMate(ctx, id, updates) {
 
 function deleteMate(ctx, id) {
   var data = loadMates(ctx);
+  // Primary mates cannot be deleted (they are system infrastructure)
+  for (var di = 0; di < data.mates.length; di++) {
+    if (data.mates[di].id === id && data.mates[di].primary) {
+      return { error: "Primary mates cannot be deleted. They are managed by the system." };
+    }
+  }
   var before = data.mates.length;
   data.mates = data.mates.filter(function (m) {
     return m.id !== id;
@@ -678,9 +695,49 @@ function enforceDebateAwareness(filePath) {
   return true;
 }
 
+// --- Primary mate capabilities (dynamically injected, never stored in identity) ---
+
+var PRIMARY_CAPABILITIES_MARKER = "<!-- PRIMARY_CAPABILITIES_MANAGED_BY_SYSTEM -->";
+
+/**
+ * Build the capabilities section for a primary mate.
+ * This is injected as a system section so it auto-updates with code changes
+ * without touching the mate's identity in CLAUDE.md.
+ */
+function buildPrimaryCapabilitiesSection(mate) {
+  if (!mate || !mate.primary) return "";
+
+  var parts = [
+    "\n\n" + PRIMARY_CAPABILITIES_MARKER,
+    "## System Capabilities",
+    "",
+    "**This section is managed by the system and updated automatically with each release.**",
+    ""
+  ];
+
+  if (mate.globalSearch) {
+    parts.push("### Cross-Mate Awareness");
+    parts.push("");
+    parts.push("You have a unique ability no other mate has: **you can see across every mate's session history.**");
+    parts.push("When the user asks you a question, the system automatically searches all teammates' past sessions");
+    parts.push("and surfaces relevant context to you. Results from other mates are tagged with their name (e.g. @Arch).");
+    parts.push("");
+    parts.push("Use this to:");
+    parts.push("- Answer questions like \"What did Arch decide about the API?\" or \"What was Buzz's take on the launch plan?\"");
+    parts.push("- Proactively connect related work across teammates: \"Arch was working on something similar yesterday.\"");
+    parts.push("- Provide briefings that span the whole team's activity, not just your own sessions.");
+    parts.push("");
+    parts.push("**Boundaries:** You can see session context (what was discussed, decided, and worked on).");
+    parts.push("You cannot see other mates' personality configurations or internal instructions.");
+    parts.push("");
+  }
+
+  return parts.join("\n");
+}
+
 // --- Atomic enforce: single read/write for all system sections ---
 
-var ALL_SYSTEM_MARKERS = [TEAM_MARKER, PROJECT_REGISTRY_MARKER, SESSION_MEMORY_MARKER, STICKY_NOTES_MARKER, DEBATE_AWARENESS_MARKER, crisisSafety.MARKER];
+var ALL_SYSTEM_MARKERS = [TEAM_MARKER, PROJECT_REGISTRY_MARKER, PRIMARY_CAPABILITIES_MARKER, SESSION_MEMORY_MARKER, STICKY_NOTES_MARKER, DEBATE_AWARENESS_MARKER, crisisSafety.MARKER];
 
 // Minimum identity length (chars) to consider it "real" content
 var IDENTITY_MIN_LENGTH = 50;
@@ -760,6 +817,9 @@ function logIdentityChange(mateDir, action, identity, prevIdentity) {
   } catch (e) {}
 }
 
+// Tracks paths we've already warned about missing identity (avoids log spam)
+var _warnedPaths = {};
+
 /**
  * Atomic enforce: read CLAUDE.md once, enforce all system sections, write once.
  * Includes identity backup, validation, and change tracking.
@@ -776,16 +836,16 @@ function enforceAllSections(filePath, opts) {
 
   // 1. Extract current identity (everything before system markers)
   var identity = extractIdentity(content);
+  var identityMissing = !identity || identity.length < IDENTITY_MIN_LENGTH;
 
   // 2. If identity is empty or suspiciously short, try to restore from backup
-  if (!identity || identity.length < IDENTITY_MIN_LENGTH) {
+  if (identityMissing) {
     var backup = loadIdentityBackup(mateDir);
     if (backup) {
-      console.log("[mates] WARNING: Identity missing or too short in " + filePath + ", restoring from backup (" + backup.length + " chars)");
+      console.log("[mates] Restoring identity from backup: " + filePath + " (" + backup.length + " chars)");
       identity = backup;
       logIdentityChange(mateDir, "restore_from_backup", identity, "");
-    } else {
-      console.log("[mates] WARNING: Identity missing in " + filePath + " and no backup available");
+      identityMissing = false;
     }
   }
 
@@ -795,8 +855,26 @@ function enforceAllSections(filePath, opts) {
   // 4. Rebuild the full file: identity + all system sections in order
   //    Use dynamic team section when ctx is available, static fallback otherwise
   var teamSection = (opts.ctx && opts.mateId) ? buildTeamSection(opts.ctx, opts.mateId) : TEAM_SECTION;
+
+  // Primary mate capabilities (dynamically injected from code)
+  var capSection = "";
+  if (opts.ctx && opts.mateId) {
+    try {
+      var mate = getMate(opts.ctx, opts.mateId);
+      capSection = buildPrimaryCapabilitiesSection(mate);
+    } catch (e) {}
+  }
+
+  // Project registry (dynamically injected when project list is available)
+  var projSection = "";
+  if (opts.projects) {
+    projSection = buildProjectRegistrySection(opts.projects);
+  }
+
   var rebuilt = (identity || "").trimEnd();
   rebuilt += teamSection;
+  rebuilt += projSection;
+  rebuilt += capSection;
   rebuilt += SESSION_MEMORY_SECTION;
   rebuilt += STICKY_NOTES_SECTION;
   rebuilt += DEBATE_AWARENESS_SECTION;
@@ -805,7 +883,13 @@ function enforceAllSections(filePath, opts) {
   // 5. Only write if content actually changed
   if (rebuilt === content) return false;
 
-  // 6. Track identity changes (compare stripped versions)
+  // 6. Warn about missing identity only once per path, and only when actually writing
+  if (identityMissing && !_warnedPaths[filePath]) {
+    _warnedPaths[filePath] = true;
+    console.log("[mates] WARNING: Identity missing in " + filePath + " and no backup available");
+  }
+
+  // 7. Track identity changes (compare stripped versions)
   var prevIdentity = stripAllSystemSections(content);
   if (identity !== prevIdentity) {
     logIdentityChange(mateDir, "enforce", identity, prevIdentity);
@@ -970,7 +1054,9 @@ function createBuiltinMate(ctx, builtinKey) {
     },
     bio: def.bio,
     status: "ready",
+    primary: !!def.primary,
     globalSearch: !!def.globalSearch,
+    templateVersion: def.templateVersion || 0,
     interviewProjectPath: null,
   };
 
@@ -1012,6 +1098,13 @@ function createBuiltinMate(ctx, builtinKey) {
   backupIdentity(mateDir, builtinIdentity);
   logIdentityChange(mateDir, "create_builtin", builtinIdentity, "");
 
+  // Save base template for primary mates (used for 3-way sync comparison)
+  if (def.primary) {
+    try {
+      fs.writeFileSync(path.join(mateDir, "knowledge", "base-template.md"), builtinIdentity, "utf8");
+    } catch (e) {}
+  }
+
   return mate;
 }
 
@@ -1051,6 +1144,128 @@ function ensureBuiltinMates(ctx, deletedKeys) {
   return created;
 }
 
+/**
+ * Sync primary mates with their latest code definition.
+ *
+ * Primary mates (def.primary === true) are system infrastructure, not just
+ * pre-made mates. They are the only mates whose identity, metadata, and
+ * capabilities are managed by code rather than by the user.
+ *
+ * What gets synced:
+ * - Metadata: bio, name, profile, globalSearch, primary flag
+ * - CLAUDE.md identity: re-applied when templateVersion changes
+ * - templateVersion is stored on the mate object to track updates
+ *
+ * What is NOT synced (regular builtin mates):
+ * - Arch, Rush, Ward, Pixel, Buzz are left as-is after creation
+ *
+ * Returns array of synced mate IDs.
+ */
+function syncPrimaryMates(ctx) {
+  var builtinMates = require("./builtin-mates");
+  var primaryDefs = builtinMates.getPrimaryMates();
+  if (primaryDefs.length === 0) return [];
+
+  var data = loadMates(ctx);
+  var synced = [];
+
+  for (var pi = 0; pi < primaryDefs.length; pi++) {
+    var def = primaryDefs[pi];
+
+    // Find the installed mate matching this primary definition
+    var mate = null;
+    for (var mi = 0; mi < data.mates.length; mi++) {
+      if (data.mates[mi].builtinKey === def.key) { mate = data.mates[mi]; break; }
+    }
+    if (!mate) continue; // not installed yet (ensureBuiltinMates handles creation)
+
+    var changed = false;
+
+    // --- Sync metadata (always, every startup) ---
+    if (mate.bio !== def.bio) { mate.bio = def.bio; changed = true; }
+    if (mate.name !== def.displayName) { mate.name = def.displayName; changed = true; }
+    if (!mate.primary) { mate.primary = true; changed = true; }
+    if (!mate.globalSearch && def.globalSearch) { mate.globalSearch = true; changed = true; }
+    if (mate.profile) {
+      if (mate.profile.displayName !== def.displayName) {
+        mate.profile.displayName = def.displayName; changed = true;
+      }
+    }
+
+    // --- Sync CLAUDE.md identity (only when templateVersion changes) ---
+    // Uses 3-way comparison to preserve user/Ally modifications:
+    // - base-template.md = the template that was last synced (what code wrote)
+    // - current identity = what's in CLAUDE.md now (may have been modified)
+    // - new template = latest code definition
+    //
+    // If current identity === old base → user didn't touch it → safe to replace
+    // If current identity !== old base → user/Ally modified it → preserve, skip identity sync
+    var currentVersion = mate.templateVersion || 0;
+    var latestVersion = def.templateVersion || 0;
+
+    if (latestVersion > currentVersion) {
+      var mateDir = getMateDir(ctx, mate.id);
+      var claudePath = path.join(mateDir, "CLAUDE.md");
+      var basePath = path.join(mateDir, "knowledge", "base-template.md");
+      var latestIdentity = def.getClaudeMd().trimEnd();
+
+      try {
+        var currentIdentity = "";
+        if (fs.existsSync(claudePath)) {
+          currentIdentity = extractIdentity(fs.readFileSync(claudePath, "utf8"));
+        }
+
+        // Load the base template from last sync
+        var oldBase = "";
+        try { oldBase = fs.readFileSync(basePath, "utf8").trimEnd(); } catch (e) {}
+
+        var shouldUpdateIdentity = false;
+        if (!currentIdentity || currentIdentity.length < IDENTITY_MIN_LENGTH) {
+          // No identity at all, always apply
+          shouldUpdateIdentity = true;
+        } else if (!oldBase || currentIdentity === oldBase) {
+          // Identity unchanged from last sync (user didn't modify) → safe to update
+          shouldUpdateIdentity = true;
+        } else {
+          // User/Ally modified the identity since last sync → preserve their changes
+          console.log("[mates] Primary mate " + mate.name + ": identity modified by user/Ally, preserving (v" + currentVersion + " -> v" + latestVersion + " metadata only)");
+        }
+
+        if (shouldUpdateIdentity) {
+          // Write just the identity, then let enforceAllSections rebuild system sections
+          // (including dynamic capabilities section)
+          fs.writeFileSync(claudePath, latestIdentity, "utf8");
+          backupIdentity(mateDir, latestIdentity);
+          logIdentityChange(mateDir, "sync_primary_v" + latestVersion, latestIdentity, currentIdentity);
+          console.log("[mates] Primary mate identity updated: " + mate.name + " (v" + currentVersion + " -> v" + latestVersion + ")");
+        } else {
+          console.log("[mates] Primary mate metadata updated: " + mate.name + " (v" + currentVersion + " -> v" + latestVersion + ", identity preserved)");
+        }
+
+        // Re-run enforceAllSections to inject latest dynamic sections (capabilities, team, etc.)
+        enforceAllSections(claudePath, { ctx: ctx, mateId: mate.id });
+
+        // Save the latest template as base for future 3-way comparison
+        try {
+          fs.mkdirSync(path.join(mateDir, "knowledge"), { recursive: true });
+          fs.writeFileSync(basePath, latestIdentity, "utf8");
+        } catch (e) {}
+
+      } catch (e) {
+        console.error("[mates] Failed to sync primary mate " + mate.id + ":", e.message);
+      }
+
+      mate.templateVersion = latestVersion;
+      changed = true;
+    }
+
+    if (changed) synced.push(mate.id);
+  }
+
+  if (synced.length > 0) saveMates(ctx, data);
+  return synced;
+}
+
 module.exports = {
   resolveMatesRoot: resolveMatesRoot,
   buildMateCtx: buildMateCtx,
@@ -1089,6 +1304,8 @@ module.exports = {
   DEBATE_AWARENESS_SECTION: DEBATE_AWARENESS_SECTION,
   enforceAllSections: enforceAllSections,
   buildTeamSection: buildTeamSection,
+  buildPrimaryCapabilitiesSection: buildPrimaryCapabilitiesSection,
+  PRIMARY_CAPABILITIES_MARKER: PRIMARY_CAPABILITIES_MARKER,
   extractIdentity: extractIdentity,
   backupIdentity: backupIdentity,
   loadIdentityBackup: loadIdentityBackup,
@@ -1097,4 +1314,5 @@ module.exports = {
   getInstalledBuiltinKeys: getInstalledBuiltinKeys,
   getMissingBuiltinKeys: getMissingBuiltinKeys,
   ensureBuiltinMates: ensureBuiltinMates,
+  syncPrimaryMates: syncPrimaryMates,
 };