clay-server 3.8.1 → 4.0.0-beta.10

package/lib/project-mate-knowledge.js

@@ -0,0 +1,110 @@
+// Session-bound `clay-knowledge` wiring for Mate projects.
+//
+// Mate Knowledge is available only inside a Mate project. A non-Mate Project
+// Driver session gets nothing here and continues to use `clay-logs`. Which
+// tool set a Mate receives is decided by the server Mate registry through the
+// service binder, never by a project flag or a tool argument.
+
+var knowledgeMcp = require("./mate-knowledge-mcp-server");
+
+var SYSTEM_PROMPT_LABEL = "--- Your Knowledge (durable personal and expertise context; manage via clay-knowledge tools) ---";
+var CLAY_PROMPT_LABEL = "--- Mate Knowledge coordination (via clay-knowledge tools) ---";
+
+function attachProjectMateKnowledge(ctx) {
+  var service = ctx.service;
+  var sm = ctx.sm;
+  var slug = ctx.projectSlug;
+  var isMate = ctx.isMate === true;
+  var mateId = ctx.mateId || null;
+  var getProjectOwnerId = ctx.getProjectOwnerId || function () { return null; };
+
+  function binding(session) {
+    if (!service || !isMate || !mateId) return null;
+    if (session && (!sm || !sm.sessions || sm.sessions.get(session.localId) !== session)) return null;
+    return service.bind({
+      projectSlug: slug,
+      projectOwnerId: getProjectOwnerId(),
+      isMate: true,
+      mateId: mateId,
+      session: session || null,
+    });
+  }
+
+  // Decided once from the project-level binding so a static descriptor and a
+  // session-bound server always advertise the same tool set.
+  function includeClay() {
+    var projectBound = binding(null);
+    return !!(projectBound && projectBound.isClay === true);
+  }
+
+  function getToolDefs(session) {
+    if (!service || !isMate) return [];
+    var bound = session ? binding(session) : null;
+    if (session && !bound) return [];
+    return knowledgeMcp.getToolDefs(bound, includeClay());
+  }
+
+  function createMcpServer(adapter, session) {
+    if (!service || !isMate) return null;
+    if (!binding(null)) return null;
+    var bound = session ? binding(session) : null;
+    // A session that cannot bind still gets the fail-closed descriptor rather
+    // than a silently missing server.
+    return knowledgeMcp.createMcpServer(adapter, bound, includeClay());
+  }
+
+  function getDynamicToolDefs(session) {
+    return getToolDefs(session).map(function (tool) {
+      tool.permissionName = "mcp__clay-knowledge__" + tool.name;
+      return tool;
+    });
+  }
+
+  function getBridgeTools(session, normalizeSchema) {
+    if (!session) return [];
+    var defs = getToolDefs(session);
+    var tools = [];
+    for (var i = 0; i < defs.length; i++) {
+      tools.push({
+        server: "clay-knowledge",
+        name: defs[i].name,
+        description: defs[i].description || defs[i].name,
+        inputSchema: normalizeSchema(defs[i].inputSchema),
+      });
+    }
+    return tools;
+  }
+
+  function callBridgeTool(session, toolName, args) {
+    if (!session) return Promise.reject(new Error("Knowledge tools require a valid Mate session."));
+    var defs = getToolDefs(session);
+    for (var i = 0; i < defs.length; i++) {
+      if (defs[i].name === toolName) return Promise.resolve(defs[i].handler(args || {}));
+    }
+    return Promise.reject(new Error("Knowledge tool not found: " + toolName));
+  }
+
+  function getSystemPrompt(session) {
+    if (!service || !isMate) return "";
+    var bound = session ? binding(session) : binding(null);
+    if (!bound) return "";
+    return bound.isClay
+      ? CLAY_PROMPT_LABEL + "\n" + knowledgeMcp.CLAY_CONTRACT
+      : SYSTEM_PROMPT_LABEL + "\n" + knowledgeMcp.MATE_CONTRACT;
+  }
+
+  return {
+    createMcpServer: createMcpServer,
+    getToolDefs: getToolDefs,
+    getDynamicToolDefs: getDynamicToolDefs,
+    getBridgeTools: getBridgeTools,
+    callBridgeTool: callBridgeTool,
+    getSystemPrompt: getSystemPrompt,
+  };
+}
+
+module.exports = {
+  SYSTEM_PROMPT_LABEL: SYSTEM_PROMPT_LABEL,
+  CLAY_PROMPT_LABEL: CLAY_PROMPT_LABEL,
+  attachProjectMateKnowledge: attachProjectMateKnowledge,
+};

package/lib/project-memory.js

@@ -1,5 +1,17 @@
 var fs = require("fs");
 var path = require("path");
+var mateSync = require("./mate-knowledge-sync");
+
+// Mirror a Mate-owned durable memory source into the Clay-wide Knowledge
+// backend after the legacy write has already succeeded. Reconciling the source
+// covers writes, rewrites, and removals with one call.
+function mirrorMateSource(mateDir, fileName, actor) {
+  mateSync.syncQuietly({
+    mateDir: mateDir,
+    fileName: fileName,
+    actor: actor || { type: "agent" },
+  });
+}
 
 function attachMemory(ctx) {
   var cwd = ctx.cwd;
@@ -8,7 +20,8 @@ function attachMemory(ctx) {
   var sendTo = ctx.sendTo;
   var matesModule = ctx.matesModule;
   var sessionSearch = ctx.sessionSearch;
-  var getAllProjectSessions = ctx.getAllProjectSessions;
+  var getWorkspaceMemorySessions = ctx.getWorkspaceMemorySessions || function () { return []; };
+  var getOwnedCurrentSessions = ctx.getOwnedCurrentSessions || function () { return []; };
   var projectOwnerId = ctx.projectOwnerId;
   var handleMessage = ctx.handleMessage;
 
@@ -166,7 +179,7 @@ function attachMemory(ctx) {
         var timelineEntries = [];
 
         // Own sessions
-        sm.sessions.forEach(function (s) {
+        getOwnedCurrentSessions().forEach(function (s) {
           if (s.hidden || !s.history || s.history.length === 0) return;
           timelineEntries.push({
             title: s.title || "New Session",
@@ -176,7 +189,7 @@ function attachMemory(ctx) {
         });
 
         // Cross-project sessions
-        var crossForTimeline = getAllProjectSessions();
+        var crossForTimeline = getWorkspaceMemorySessions();
         for (var cti = 0; cti < crossForTimeline.length; cti++) {
           var cs = crossForTimeline[cti];
           timelineEntries.push({
@@ -209,7 +222,7 @@ function attachMemory(ctx) {
       try {
         // Collect mate's own sessions
         var mateSessions = [];
-        sm.sessions.forEach(function (s) {
+        getOwnedCurrentSessions().forEach(function (s) {
           if (!s.hidden && s.history && s.history.length > 0) {
             mateSessions.push(s);
           }
@@ -218,7 +231,7 @@ function attachMemory(ctx) {
         // globalSearch: also collect sessions from all other projects + knowledge files
         var knowledgeFiles = [];
         if (hasGlobalSearch) {
-          var crossSessions = getAllProjectSessions();
+          var crossSessions = getWorkspaceMemorySessions();
           for (var cs = 0; cs < crossSessions.length; cs++) {
             mateSessions.push(crossSessions[cs]);
           }
@@ -466,6 +479,7 @@ function attachMemory(ctx) {
           }
           fs.mkdirSync(knowledgeDir, { recursive: true });
           fs.writeFileSync(summaryFile, cleaned + "\n", "utf8");
+          mirrorMateSource(path.dirname(knowledgeDir), "memory-summary.md");
           console.log("[memory-summary] Updated memory-summary.md for mate " + mateId);
         } catch (e) {
           console.error("[memory-summary] Failed to write memory-summary.md for mate " + mateId + ":", e.message);
@@ -572,6 +586,7 @@ function attachMemory(ctx) {
           }
           fs.mkdirSync(knowledgeDir, { recursive: true });
           fs.writeFileSync(summaryFile, cleaned + "\n", "utf8");
+          mirrorMateSource(path.dirname(knowledgeDir), "memory-summary.md");
           console.log("[memory-summary] Generated initial memory-summary.md for mate " + mateId + " from " + digestsText.length + " digests");
         } catch (e) {
           console.error("[memory-summary] Failed to write initial memory-summary.md for mate " + mateId + ":", e.message);
@@ -595,7 +610,7 @@ function attachMemory(ctx) {
 
   // --- Message handlers for memory management UI ---
 
-  function handleMemoryList(ws) {
+  function readMemoryState() {
     var digestFile = path.join(cwd, "knowledge", "session-digests.jsonl");
     var summaryFile = path.join(cwd, "knowledge", "memory-summary.md");
     var entries = [];
@@ -620,7 +635,12 @@ function attachMemory(ctx) {
     } catch (e) {}
     // Return newest first
     entries.reverse();
-    sendTo(ws, { type: "memory_list", entries: entries, summary: summary });
+    return { entries: entries, summary: summary };
+  }
+
+  function handleMemoryList(ws) {
+    var state = readMemoryState();
+    sendTo(ws, { type: "memory_list", entries: state.entries, summary: state.summary });
   }
 
   function handleMemorySearch(ws, msg) {
@@ -660,6 +680,14 @@ function attachMemory(ctx) {
         } else {
           fs.writeFileSync(digestFile, lines.join("\n") + "\n");
         }
+        // Reconciling the journal after the rewrite tombstones the removed
+        // line, so a deleted memory does not stay active in the new backend.
+        var deleteUser = (ws && ws._clayUser) || null;
+        mirrorMateSource(cwd, "session-digests.jsonl", {
+          type: deleteUser ? "user" : "system",
+          userId: deleteUser ? deleteUser.id : null,
+          displayName: deleteUser ? (deleteUser.displayName || deleteUser.username) : null,
+        });
       }
     } catch (e) {}
     sendTo(ws, { type: "memory_deleted", index: msg.index });
@@ -671,6 +699,7 @@ function attachMemory(ctx) {
     gateMemory: gateMemory,
     updateMemorySummary: updateMemorySummary,
     initMemorySummary: initMemorySummary,
+    readMemoryState: readMemoryState,
     handleMemoryList: handleMemoryList,
     handleMemorySearch: handleMemorySearch,
     handleMemoryDelete: handleMemoryDelete,

package/lib/project-models.js

@@ -12,6 +12,46 @@ function modelEntryMatches(entry, value) {
   return entry.value === value || entry.id === value || entry.resolvedModel === value;
 }
 
+function normalizeCatalogModels(models) {
+  var normalized = [];
+  models = models || [];
+  for (var i = 0; i < models.length; i++) {
+    var value = modelEntryValue(models[i]);
+    if (!value) continue;
+    var displayName = typeof models[i] === "string" ? models[i] : (models[i].displayName || models[i].name || value);
+    var searchParts = [value, displayName];
+    if (typeof models[i] === "object") {
+      searchParts.push(models[i].id || "");
+      searchParts.push(models[i].resolvedModel || "");
+    }
+    normalized.push({ value: value, displayName: displayName, search: searchParts.join(" ").toLowerCase(), source: models[i] });
+  }
+  return normalized;
+}
+
+function selectCatalogModel(models, defaultModel, alias) {
+  var entries = normalizeCatalogModels(models);
+  if (entries.length === 0) return null;
+  var configured = null;
+  for (var i = 0; i < entries.length; i++) {
+    if (modelEntryMatches(entries[i].source, defaultModel)) {
+      configured = entries[i];
+      break;
+    }
+  }
+  alias = alias === "fast" || alias === "deep" ? alias : "standard";
+  if (alias === "standard" && configured) return configured;
+  var matcher = alias === "fast"
+    ? /haiku|mini|flash|fast|lite|small|luna/
+    : alias === "deep"
+      ? /opus|\bpro\b|max|deep|large|\bsol\b|reason/
+      : /sonnet|standard|balanced|terra/;
+  for (var mi = 0; mi < entries.length; mi++) {
+    if (matcher.test(entries[mi].search)) return entries[mi];
+  }
+  return configured || entries[0];
+}
+
 function attachModels(ctx) {
   var cwd = ctx.cwd;
   var slug = ctx.slug;
@@ -25,26 +65,36 @@ function attachModels(ctx) {
   var serverTls = ctx.serverTls;
   var serverAuthToken = ctx.serverAuthToken;
 
-  async function loadVendorModels(ws, msg) {
-    var vendor = msg.vendor || "";
-    var requestId = msg.requestId || null;
-    var loadError = null;
-    var vendorAdapter = null;
-    var session = getSessionForWs(ws);
+  function getVendorAvailability() {
+    var available = (sm.availableVendors || []).slice();
+    var installed = (sm.installedVendors || []).slice();
+    var ids = available.slice();
+    for (var i = 0; i < installed.length; i++) {
+      if (ids.indexOf(installed[i]) === -1) ids.push(installed[i]);
+    }
+    return ids.map(function (vendor) {
+      var info = yoke.getVendorInfo(vendor);
+      return {
+        id: vendor,
+        displayName: info && info.displayName ? info.displayName : vendor,
+        installed: installed.indexOf(vendor) !== -1,
+      };
+    });
+  }
 
-    if (!vendor) {
-      sendTo(ws, {
-        type: "model_info",
-        vendor: vendor,
-        requestId: requestId,
-        modelStatus: "error",
-        error: "No vendor was selected.",
-        model: "",
-        models: [],
-        sessionId: session ? session.localId : null,
-      });
-      return;
+  function modelDisplayName(models, value) {
+    for (var i = 0; i < models.length; i++) {
+      if (!modelEntryMatches(models[i], value)) continue;
+      return typeof models[i] === "string" ? models[i] : (models[i].displayName || modelEntryValue(models[i]));
     }
+    return value;
+  }
+
+  async function getVendorCatalog(ws, vendor) {
+    var loadError = null;
+    var loadedDefaultModel = "";
+    var vendorAdapter = null;
+    if (!vendor) return { vendor: "", models: [], capabilities: {}, status: "error", error: "No vendor was selected." };
 
     try {
       var modelLinuxUser = getLinuxUserForWs(ws);
@@ -75,6 +125,7 @@ function attachModels(ctx) {
           });
           sm.capabilitiesByVendor = sm.capabilitiesByVendor || {};
           sm.capabilitiesByVendor[vendor] = readyResult.capabilities || {};
+          loadedDefaultModel = readyResult.defaultModel || "";
           sm.modelsByVendor = sm.modelsByVendor || {};
           if (Array.isArray(readyResult.models) && readyResult.models.length > 0) {
             sm.modelsByVendor[vendor] = readyResult.models;
@@ -110,6 +161,84 @@ function attachModels(ctx) {
     }
 
     var vendorModels = (sm.modelsByVendor && sm.modelsByVendor[vendor]) || [];
+    var vendorInfo = yoke.getVendorInfo(vendor);
+    var displayName = vendorInfo ? vendorInfo.displayName : vendor;
+    var status = vendorModels.length > 0 ? "ready" : (loadError ? "error" : "empty");
+    var defaultModel = "";
+    var preferredModels = [
+      (sm.defaultModelByVendor && sm.defaultModelByVendor[vendor]) || "",
+      loadedDefaultModel,
+    ];
+    for (var preferredIndex = 0; preferredIndex < preferredModels.length && !defaultModel; preferredIndex++) {
+      for (var modelIndex = 0; modelIndex < vendorModels.length; modelIndex++) {
+        if (!modelEntryMatches(vendorModels[modelIndex], preferredModels[preferredIndex])) continue;
+        defaultModel = modelEntryValue(vendorModels[modelIndex]);
+        break;
+      }
+    }
+    var errorText = "";
+    if (status === "error") {
+      errorText = "Could not load " + displayName + " models: " + (loadError.message || loadError);
+    } else if (status === "empty") {
+      errorText = displayName + " returned no models. Check CLI authentication and retry.";
+    }
+    return {
+      vendor: vendor,
+      models: vendorModels,
+      defaultModel: defaultModel,
+      capabilities: (sm.capabilitiesByVendor && sm.capabilitiesByVendor[vendor]) || {},
+      availableVendors: sm.availableVendors || [],
+      installedVendors: sm.installedVendors || [],
+      status: status,
+      error: errorText,
+    };
+  }
+
+  async function resolveConfiguredModel(ws, alias) {
+    var availability = getVendorAvailability();
+    var candidates = [];
+    var preferredVendor = sm.defaultVendor || "";
+    if (preferredVendor) candidates.push(preferredVendor);
+    for (var i = 0; i < availability.length; i++) {
+      if (candidates.indexOf(availability[i].id) === -1) candidates.push(availability[i].id);
+    }
+    var errors = [];
+    for (var ci = 0; ci < candidates.length; ci++) {
+      var catalog = await getVendorCatalog(ws, candidates[ci]);
+      var models = catalog.models || [];
+      var selected = selectCatalogModel(models, catalog.defaultModel, alias);
+      if (catalog.status !== "ready" || !selected) {
+        if (catalog.error) errors.push(catalog.error);
+        continue;
+      }
+      var info = yoke.getVendorInfo(catalog.vendor);
+      return {
+        status: "ready",
+        vendor: catalog.vendor,
+        vendorName: info && info.displayName ? info.displayName : catalog.vendor,
+        alias: alias === "fast" || alias === "deep" ? alias : "standard",
+        model: selected.value,
+        modelName: selected.displayName || modelDisplayName(models, selected.value),
+        error: "",
+      };
+    }
+    return {
+      status: "error",
+      vendor: preferredVendor,
+      vendorName: preferredVendor ? ((yoke.getVendorInfo(preferredVendor) || {}).displayName || preferredVendor) : "",
+      model: "",
+      modelName: "",
+      alias: alias === "fast" || alias === "deep" ? alias : "standard",
+      error: errors[0] || "No configured model is available. Sign in to an installed model provider CLI, then retry.",
+    };
+  }
+
+  async function loadVendorModels(ws, msg) {
+    var vendor = msg.vendor || "";
+    var requestId = msg.requestId || null;
+    var session = getSessionForWs(ws);
+    var catalog = await getVendorCatalog(ws, vendor);
+    var vendorModels = catalog.models;
     var modelToSend = modelEntryValue(vendorModels[0]);
     var preferredModel = (session && session.vendor === vendor && session.model) || (sm.defaultModelByVendor && sm.defaultModelByVendor[vendor]) || "";
     if (preferredModel) {
@@ -120,27 +249,18 @@ function attachModels(ctx) {
         }
       }
     }
-    var vendorInfo = yoke.getVendorInfo(vendor);
-    var displayName = vendorInfo ? vendorInfo.displayName : vendor;
-    var status = vendorModels.length > 0 ? "ready" : (loadError ? "error" : "empty");
-    var errorText = "";
-    if (status === "error") {
-      errorText = "Could not load " + displayName + " models: " + (loadError.message || loadError);
-    } else if (status === "empty") {
-      errorText = displayName + " returned no models. Check CLI authentication and retry.";
-    }
     sendTo(ws, {
       type: "model_info",
       model: modelToSend,
       models: vendorModels,
       vendor: vendor,
       sessionId: session ? session.localId : null,
-      capabilities: (sm.capabilitiesByVendor && sm.capabilitiesByVendor[vendor]) || {},
-      availableVendors: sm.availableVendors || [],
-      installedVendors: sm.installedVendors || [],
+      capabilities: catalog.capabilities,
+      availableVendors: catalog.availableVendors,
+      installedVendors: catalog.installedVendors,
       requestId: requestId,
-      modelStatus: status,
-      error: errorText,
+      modelStatus: catalog.status,
+      error: catalog.error,
     });
   }
 
@@ -208,6 +328,9 @@ function attachModels(ctx) {
 
   return {
     handleMessage: handleMessage,
+    getVendorCatalog: getVendorCatalog,
+    getVendorAvailability: getVendorAvailability,
+    resolveConfiguredModel: resolveConfiguredModel,
     loadVendorModels: loadVendorModels,
     selectModel: selectModel,
   };
@@ -217,4 +340,6 @@ module.exports = {
   attachModels: attachModels,
   modelEntryMatches: modelEntryMatches,
   modelEntryValue: modelEntryValue,
+  normalizeCatalogModels: normalizeCatalogModels,
+  selectCatalogModel: selectCatalogModel,
 };

package/lib/project-session-notes.js

@@ -7,7 +7,7 @@ var MAX_NOTE_PROMPT_CHARS = 800;
 var NOTES_LABEL = "--- Project sticky notes (cross-session work memory; manage via clay-notes tools) ---";
 var NOTES_HINT = "- More notes are available; call list_notes for the rest.";
 var PROACTIVE_POLICY = sessionNotesMcp.MEMORY_CONTRACT + " If an injected preview is relevant or truncated, call list_notes before acting or writing so you do not create a duplicate.";
-var NOTE_COLORS = ["yellow", "blue", "green", "pink", "orange", "purple"];
+var NOTE_COLORS = ["purple", "green", "yellow", "blue", "pink", "orange"];
 
 function toolResult(value) {
   return Promise.resolve({ content: [{ type: "text", text: JSON.stringify(value) }] });
@@ -150,7 +150,7 @@ function attachSessionNotes(ctx) {
     var placement = autoPlacement(notes);
     var created = nm.create({
       text: text,
-      color: color || "yellow",
+      color: color || "purple",
       x: placement.x,
       y: placement.y,
       origin: { sessionId: caller.localId, vendor: caller.vendor || "claude" },

package/lib/project-session-pair.js

@@ -100,11 +100,11 @@ function attachSessionPair(ctx) {
     var response = token.response || "";
     var text;
     if (token.interrupted) {
-      text = "[Worker execution interrupted] The user interrupted the Worker mid-turn. Its work is PARTIAL and unverified — do not treat it as finished. Review what was done and decide next steps with the user.";
+      text = "[Split Worker execution interrupted] The user interrupted the Split Worker mid-turn. Its work is PARTIAL and unverified — do not treat it as finished. Review what was done and decide next steps with the user.";
     } else {
-      text = "A Worker task delegated through send_to_partner has finished.\n\n" +
+      text = "A Split Worker task delegated through send_to_partner has finished.\n\n" +
         "Original task:\n" + token.message + "\n\n" +
-        (failure ? "Worker error:\n" + failure : "Worker result:\n" + (response || "(No text response was recorded.)")) +
+        (failure ? "Split Worker error:\n" + failure : "Split Worker result:\n" + (response || "(No text response was recorded.)")) +
         "\n\nReview the result, verify it as needed, and continue the task.";
     }
     sm.sendAndRecord(caller, {
@@ -361,7 +361,7 @@ function attachSessionPair(ctx) {
     var driver;
     var groupName;
     if (Number.isInteger(driverSpec.sessionId)) {
-      // "Add Worker" on an existing session: the current session becomes
+      // "Add Split Worker" on an existing session: the current session becomes
       // the Driver with its full conversation context intact.
       driver = sm.sessions.get(driverSpec.sessionId);
       if (!driver) throw new Error("driver session not found");
@@ -378,7 +378,7 @@ function attachSessionPair(ctx) {
     }
     var workerEffort = yoke.clampEffort(workerVendor, workerSpec.effort || (sm.currentEffortByVendor && sm.currentEffortByVendor[workerVendor]) || sm.currentEffort || "medium") || null;
     var worker = sm.createSessionRaw({ ownerId: ownerId, vendor: workerVendor, model: workerSpec.model || null, effort: workerEffort });
-    worker.title = "Worker · " + ((yoke.getVendorInfo(workerVendor) || {}).displayName || workerVendor);
+    worker.title = "Split Worker · " + ((yoke.getVendorInfo(workerVendor) || {}).displayName || workerVendor);
     if (workerSpec.effort) worker.loopSettings = { effort: workerSpec.effort };
     var result = store.create(ws, {
       members: [driver.localId, worker.localId],
@@ -393,7 +393,7 @@ function attachSessionPair(ctx) {
   function createWorkerForDriver(driver, args) {
     if (ctx.isMate) throw new Error("Pair sessions are only available in projects");
     var installed = sm.installedVendors || [];
-    if (installed.length === 0) throw new Error("no coding agent is installed for a Worker session");
+    if (installed.length === 0) throw new Error("no coding agent is installed for a Split Worker session");
     var vendor = typeof args.workerVendor === "string" ? args.workerVendor.trim() : "";
     if (vendor) validateVendor(vendor);
     if (!vendor) {
@@ -468,9 +468,9 @@ function attachSessionPair(ctx) {
     var group = store.groupForMember(session.localId);
     var pairPrompt = "";
     if (group && group.pair && group.pair.driverId === session.localId) {
-      pairPrompt = "You are the Driver in a two-agent pair. The tools send_to_partner, read_partner, interrupt_partner, and close_partner are provided directly to you. Use send_to_partner to delegate concrete bounded work to the Worker. The human may also message or stop the Worker directly; treat that intervention as authoritative. Use close_partner immediately when the human asks to close, dismiss, or remove the Worker pane; it preserves the session history. A completed Worker turn leaves the Worker session available for more work. Use interrupt_partner when execution must stop or change direction but the pair should remain open; its work is partial and unverified until you review it. If review or user feedback requires corrections to the Worker's implementation, delegate a follow-up turn to that Worker instead of editing the Worker-owned files yourself. If the Worker is no longer available, keep the work in the visible Worker flow and use send_to_partner again after the stale pair is removed; never substitute a background session. If a non-waiting delegation finishes later, Clay pushes the result back and resumes you automatically; use read_partner only when you need an interim status check. Integrate and verify the final outcome. Do not search the project for implementations of these tools, and do not delegate work that must be performed sequentially in this same session.";
+      pairPrompt = "You are the Driver in a two-agent pair. The tools send_to_partner, read_partner, interrupt_partner, and close_partner are provided directly to you. Infer the user's intended target from conversational and UI context. References to the user-visible paired or split pane, its session, its activity or status, or a collaborator the user opened resolve to Clay's Split Worker and the appropriate partner tool. Internal Sub-agents are a distinct execution mechanism, not a lexical category; use them only when the user clearly intends internal or background parallel delegation rather than the visible paired session. When ambiguous and a visible pair exists, prefer the visible Split Worker. If the ambiguity would materially change where work runs, ask a concise clarification instead of guessing. Use send_to_partner to delegate concrete bounded work to the Split Worker. The human may also message or stop the Split Worker directly; treat that intervention as authoritative. Use close_partner immediately when the human asks to close, dismiss, or remove the Split Worker pane; it preserves the session history. A completed Split Worker turn leaves the Split Worker session available for more work. Use interrupt_partner when execution must stop or change direction but the pair should remain open; its work is partial and unverified until you review it. If review or user feedback requires corrections to the Split Worker's implementation, delegate a follow-up turn to that Split Worker instead of editing the Split Worker-owned files yourself. If the Split Worker is no longer available, keep the work in the visible Split Worker flow and use send_to_partner again after the stale pair is removed; never substitute a background Sub-agent. If a non-waiting delegation finishes later, Clay pushes the result back and resumes you automatically; use read_partner only when you need an interim status check. Integrate and verify the final outcome. Do not search the project for implementations of these tools, and do not delegate work that must be performed sequentially in this same session.";
     } else if (!group && !ctx.isMate) {
-      pairPrompt = "When the user asks you to open or use a visible Worker, call send_to_partner directly. Clay will create the paired Worker session and open it in the right pane automatically before delivering the task. Do not ask the user to start split mode and do not use a background sub-agent as a substitute for a visible Worker.";
+      pairPrompt = "Infer the user's intended target from conversational and UI context. References to a user-visible paired or split pane, its session, its activity or status, or a collaborator the user wants opened resolve to Clay's Split Worker and its partner tools. Internal Sub-agents are a distinct execution mechanism, not a lexical category; use them only when the user clearly intends internal or background parallel delegation rather than a visible paired session. When ambiguity would materially change where work runs, ask a concise clarification instead of guessing. When the user intends a visible collaborator, call send_to_partner directly; Clay will create the paired Split Worker session and open it in the right pane automatically before delivering the task. Do not ask the user to start split mode and do not use a background Sub-agent as a substitute for a visible Split Worker.";
     }
     return [pairPrompt, workerProposal.getSystemPrompt(session)].filter(Boolean).join("\n\n");
   }