clay-server 3.8.1 → 4.0.0-beta.1

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");
   }

package/lib/project-sessions.js

@@ -75,6 +75,7 @@ function attachSessions(ctx) {
   var sendToSessionOthers = ctx.sendToSessionOthers;
   var opts = ctx.opts;
   var usersModule = ctx.usersModule;
+  var getProjectAccess = ctx.getProjectAccess || function () { return { visibility: "public" }; };
   var userPresence = ctx.userPresence;
   var pushModule = ctx.pushModule;
   var getSessionForWs = ctx.getSessionForWs;
@@ -85,6 +86,60 @@ function attachSessions(ctx) {
   var onProcessingChanged = ctx.onProcessingChanged;
   var broadcastPresence = ctx.broadcastPresence;
   var adapter = ctx.adapter;
+
+  function ownsSearchSession(ws, session) {
+    if (!session) return false;
+    if (usersModule && typeof usersModule.isMultiUser === "function" && usersModule.isMultiUser()) {
+      return !!(ws && ws._clayUser && usersModule.canAccessSession(ws._clayUser.id, session, getProjectAccess()));
+    }
+    return !session.ownerId;
+  }
+
+  function respondToAskUser(session, msg) {
+    if (!session || !msg || !msg.toolId) return false;
+    var toolId = msg.toolId;
+    var answers = msg.answers || {};
+    var pending = session.pendingAskUser && session.pendingAskUser[toolId];
+    if (!pending) return false;
+    if (pending.mode === "yoke") {
+      try { yoke.userInput.normalizeAnswers(pending.request.questions, answers); }
+      catch (e) { return false; }
+    }
+    delete session.pendingAskUser[toolId];
+    sm.sendAndRecord(session, { type: "ask_user_answered", toolId: toolId, answers: answers });
+    if (pending.mode === "yoke" && typeof pending.respond === "function") {
+      pending.respond(answers);
+    } else if (pending.mode === "mcp") {
+      var answerText = formatAskUserAnswerAsMessage(pending.input, answers);
+      var userMsg = { type: "user_message", text: answerText, askUserAnswer: true };
+      session.history.push(userMsg);
+      sm.appendToSessionFile(session, userMsg);
+      sendToSession(session.localId, userMsg);
+      if (!session.isProcessing) {
+        session.isProcessing = true;
+        onProcessingChanged();
+        session.sentToolResults = {};
+        sendToSession(session.localId, { type: "status", status: "processing" });
+        if (!session.queryInstance && !session.worker) sdk.startQuery(session, answerText, undefined, ensureProjectAccessForSession(session));
+        else sdk.pushMessage(session, answerText);
+      } else {
+        sdk.pushMessage(session, answerText);
+      }
+    } else {
+      pending.resolve({ behavior: "deny", message: formatAskUserAnswerAsMessage(pending.input, answers) });
+    }
+    return true;
+  }
+
+  function cancelPendingAskUser(session, reason) {
+    var pendingMap = session && session.pendingAskUser ? session.pendingAskUser : {};
+    Object.keys(pendingMap).forEach(function (toolId) {
+      var pending = pendingMap[toolId];
+      if (pending && pending.respond && typeof pending.respond.cancel === "function") pending.respond.cancel(reason || "Cancelled");
+      else if (pending && typeof pending.resolve === "function") pending.resolve({ behavior: "deny", message: reason || "Cancelled" });
+    });
+    if (session) session.pendingAskUser = {};
+  }
   var getProjectList = ctx.getProjectList;
   var getProjectCount = ctx.getProjectCount;
   var getScheduleCount = ctx.getScheduleCount;
@@ -821,14 +876,19 @@ function attachSessions(ctx) {
     }
 
     if (msg.type === "search_sessions") {
-      var results = sm.searchSessions(msg.query || "");
+      var results = sm.searchSessions(msg.query || "", function (session) {
+        return ownsSearchSession(ws, session);
+      });
       sendTo(ws, { type: "search_results", query: msg.query || "", results: results });
       return true;
     }
 
     if (msg.type === "search_session_content") {
       var targetSession = msg.id ? sm.sessions.get(msg.id) : getSessionForWs(ws);
-      if (!targetSession) return true;
+      if (!ownsSearchSession(ws, targetSession)) {
+        sendTo(ws, { type: "search_content_results", query: msg.query || "", sessionId: msg.id || null, hits: [], total: 0 });
+        return true;
+      }
       var contentResults = sm.searchSessionContent(targetSession.localId, msg.query || "");
       var searchResp = { type: "search_content_results", query: msg.query || "", sessionId: targetSession.localId, hits: contentResults.hits, total: contentResults.total };
       if (msg.source) searchResp.source = msg.source;
@@ -1256,7 +1316,7 @@ function attachSessions(ctx) {
           session.blocks = {};
           session.sentToolResults = {};
           session.pendingPermissions = {};
-          session.pendingAskUser = {};
+          cancelPendingAskUser(session, "Conversation rewound");
           session.isProcessing = false;
           onProcessingChanged();
 
@@ -1328,53 +1388,7 @@ function attachSessions(ctx) {
 
     if (msg.type === "ask_user_response") {
       var session = getSessionForWs(ws);
-      if (!session) return true;
-      var toolId = msg.toolId;
-      var answers = msg.answers || {};
-      var pending = session.pendingAskUser[toolId];
-      if (!pending) return true;
-      delete session.pendingAskUser[toolId];
-      sm.sendAndRecord(session, { type: "ask_user_answered", toolId: toolId, answers: answers });
-
-      if (pending.mode === "mcp") {
-        // Stateless MCP path: the tool already returned. Inject the user's
-        // answer as a new user message so the conversation continues
-        // naturally on the next turn. This matches how the mate would see
-        // any other user input.
-        var answerText = formatAskUserAnswerAsMessage(pending.input, answers);
-        var userMsg = { type: "user_message", text: answerText };
-        session.history.push(userMsg);
-        sm.appendToSessionFile(session, userMsg);
-        sendToSession(session.localId, userMsg);
-
-        if (!session.isProcessing) {
-          session.isProcessing = true;
-          onProcessingChanged();
-          session.sentToolResults = {};
-          sendToSession(session.localId, { type: "status", status: "processing" });
-          if (!session.queryInstance && !session.worker) {
-            sdk.startQuery(session, answerText, undefined, ensureProjectAccessForSession(session));
-          } else {
-            sdk.pushMessage(session, answerText);
-          }
-        } else {
-          // Turn is still running; queue for the next turn.
-          sdk.pushMessage(session, answerText);
-        }
-      } else {
-        // Claude native AskUserQuestion path (built-in tool, intercepted via
-        // canUseTool). In headless SDK mode the built-in can't render its own
-        // answer UI: resolving "allow" lets it return an EMPTY result, so the
-        // model continues the same turn with no answer ("I don't see an
-        // answer"). Injected user messages also lose the race against that
-        // empty result. Instead, deliver the answer as the tool_result by
-        // denying with the formatted answer text — the SDK surfaces a deny
-        // `message` to the model as the tool result, so the model receives the
-        // user's choice in the same turn. (updatedInput.answers is not read by
-        // the 0.3.x built-in, which is what caused answers to be dropped.)
-        var nativeAnswerText = formatAskUserAnswerAsMessage(pending.input, answers);
-        pending.resolve({ behavior: "deny", message: nativeAnswerText });
-      }
+      if (session) respondToAskUser(session, msg);
       return true;
     }
 
@@ -1443,7 +1457,7 @@ function attachSessions(ctx) {
         session.isProcessing = false;
         onProcessingChanged();
         session.pendingPermissions = {};
-        session.pendingAskUser = {};
+        cancelPendingAskUser(session, "Conversation restarted");
         sm.broadcastSessionList();
         setImmediate(function () {
           if (session.abortController) {
@@ -2011,6 +2025,7 @@ function attachSessions(ctx) {
   return {
     handleSessionsMessage: handleSessionsMessage,
     resolveSessionForView: resolveSessionForView,
+    respondToAskUser: respondToAskUser,
   };
 }
 

package/lib/project-worker-proposal.js

@@ -167,16 +167,16 @@ function attachWorkerProposal(ctx) {
   }
 
   async function propose(args, session) {
-    if (!isEligible(session)) return toolResult({ error: "Worker suggestions are only available in an unpaired Fable session." });
-    if (hasPendingProposal(session)) return toolResult({ error: "A Worker suggestion is already awaiting a decision." });
+    if (!isEligible(session)) return toolResult({ error: "Split Worker suggestions are only available in an unpaired Fable session." });
+    if (hasPendingProposal(session)) return toolResult({ error: "A Split Worker suggestion is already awaiting a decision." });
     var summary = typeof args.summary === "string" ? args.summary.trim() : "";
     var plan = typeof args.plan === "string" ? args.plan.trim() : "";
     var task = typeof args.message === "string" ? args.message.trim() : "";
     if (!summary || !plan || !task) return toolResult({ error: "summary, plan, and message are required." });
-    if (task.length > MAX_TASK_CHARS) return toolResult({ error: "The Worker task is too long." });
+    if (task.length > MAX_TASK_CHARS) return toolResult({ error: "The Split Worker task is too long." });
     await ensureModelCatalogs();
     var options = proposalOptions();
-    if (options.installedVendors.length === 0) return toolResult({ error: "No coding agent is installed for a Worker session." });
+    if (options.installedVendors.length === 0) return toolResult({ error: "No coding agent is installed for a Split Worker session." });
     var recommendation = chooseRecommendation(args, session, options);
     var autoApprove = skipPermissionsEnabled(session);
     var proposal = {
@@ -200,17 +200,17 @@ function attachWorkerProposal(ctx) {
         effort: recommendation.effort,
         autoApproved: true,
       }, autoApprovalWs(session));
-      if (!accepted.ok) return toolResult({ error: accepted.error || "Could not start the Worker." });
+      if (!accepted.ok) return toolResult({ error: accepted.error || "Could not start the Split Worker." });
       return toolResult({
         status: "running",
         proposalId: proposal.proposalId,
-        instruction: "The Worker was auto-approved and started because skip permissions is enabled. Its result will return for review.",
+        instruction: "The Split Worker was auto-approved and started because skip permissions is enabled. Its result will return for review.",
       });
     }
     return toolResult({
       status: "posted",
       proposalId: proposal.proposalId,
-      instruction: "The Worker suggestion is visible in the chat. End this turn now and wait for the user's decision.",
+      instruction: "The Split Worker suggestion is visible in the chat. End this turn now and wait for the user's decision.",
     });
   }
 
@@ -231,10 +231,10 @@ function attachWorkerProposal(ctx) {
 
   function parsePartnerResult(result) {
     if (!result || result.isError || !result.content || !result.content[0]) {
-      return { status: "error", error: "Worker execution failed." };
+      return { status: "error", error: "Split Worker execution failed." };
     }
     try { return JSON.parse(result.content[0].text); }
-    catch (e) { return { status: "error", error: result.content[0].text || "Worker execution failed." }; }
+    catch (e) { return { status: "error", error: result.content[0].text || "Split Worker execution failed." }; }
   }
 
   async function runWorker(session, proposal) {
@@ -247,13 +247,13 @@ function attachWorkerProposal(ctx) {
     });
     var followup;
     if (result.status === "complete") {
-      followup = "[Worker execution completed]\nReview and verify the Worker's result. The Worker session remains available: if the implementation needs corrections or additional edits, send a follow-up with send_to_partner instead of taking over the Worker-owned files yourself. If that 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.\n\n" + (result.response || "The Worker completed without a text summary.");
+      followup = "[Split Worker execution completed]\nReview and verify the Split Worker's result. The Split Worker session remains available: if the implementation needs corrections or additional edits, send a follow-up with send_to_partner instead of taking over the Split Worker-owned files yourself. If that 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.\n\n" + (result.response || "The Split Worker completed without a text summary.");
     } else if (result.status === "interrupted") {
-      followup = "[Worker execution interrupted]\nThe 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.";
+      followup = "[Split Worker execution interrupted]\nThe 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 if (result.status === "running") {
-      followup = "[Worker execution is still running]\nUse read_partner to inspect progress before completing the task.";
+      followup = "[Split Worker execution is still running]\nUse read_partner to inspect progress before completing the task.";
     } else {
-      followup = "[Worker execution failed]\nInspect the failure and delegate a narrower follow-up to the Worker when implementation work remains.\n\n" + (result.error || result.response || "Unknown Worker error.");
+      followup = "[Split Worker execution failed]\nInspect the failure and delegate a narrower follow-up to the Split Worker when implementation work remains.\n\n" + (result.error || result.response || "Unknown Split Worker error.");
     }
     await resumeDriver(session, followup);
   }
@@ -272,8 +272,8 @@ function attachWorkerProposal(ctx) {
     var options = proposal.options || proposalOptions();
     var vendor = msg.vendor || proposal.recommendedVendor;
     var model = msg.model || "";
-    if (options.installedVendors.indexOf(vendor) === -1) throw new Error("Selected Worker vendor is not installed");
-    if (!modelIsAvailable(options, vendor, model)) throw new Error("Selected Worker model is unavailable");
+    if (options.installedVendors.indexOf(vendor) === -1) throw new Error("Selected Split Worker vendor is not installed");
+    if (!modelIsAvailable(options, vendor, model)) throw new Error("Selected Split Worker model is unavailable");
     var effort = yoke.clampEffort(vendor, msg.effort || proposal.recommendedEffort || "medium") || "";
     var startingPatch = { status: "starting", selectedVendor: vendor, selectedModel: model, selectedEffort: effort };
     if (msg.autoApproved) startingPatch.autoApproved = true;
@@ -288,7 +288,7 @@ function attachWorkerProposal(ctx) {
       else ctx.sendTo(ws, { type: "pair_session_created", ok: true, group: created.group });
       runWorker(session, proposal).catch(function (err) {
         updateProposal(session, proposal, { status: "error", error: err.message || String(err) });
-        resumeDriver(session, "[Worker execution failed]\n" + (err.message || String(err))).catch(function () {});
+        resumeDriver(session, "[Split Worker execution failed]\n" + (err.message || String(err))).catch(function () {});
       });
       return { ok: true, status: "running", group: created.group };
     } catch (err) {
@@ -300,11 +300,11 @@ function attachWorkerProposal(ctx) {
   async function respondToProposal(ws, msg) {
     var session = sessionForResponse(ws);
     var proposal = findProposal(session, msg.proposalId);
-    if (!proposal) throw new Error("Worker suggestion not found");
-    if (proposal.status !== "pending") throw new Error("Worker suggestion has already been resolved");
+    if (!proposal) throw new Error("Split Worker suggestion not found");
+    if (proposal.status !== "pending") throw new Error("Split Worker suggestion has already been resolved");
     if (!msg.accepted) {
       updateProposal(session, proposal, { status: "declined" });
-      await resumeDriver(session, "[Worker suggestion declined]\nContinue this task in the current session using the plan you already prepared.");
+      await resumeDriver(session, "[Split Worker suggestion declined]\nContinue this task in the current session using the plan you already prepared.");
       return { ok: true, status: "declined" };
     }
     return acceptProposal(session, proposal, msg, ws);
@@ -322,13 +322,13 @@ function attachWorkerProposal(ctx) {
     if (!isEligible(session)) return [];
     return [{
       name: "propose_worker",
-      description: "After making a concise plan for an implementation-heavy task, suggest that the user run the execution with another model in a visible Worker session. Use this only before substantial execution begins, never for small edits, explanations, or tasks the user asked you to keep in this session.",
+      description: "After making a concise plan for an implementation-heavy task, suggest that the user run the execution with another model in a visible Split Worker session. Use this only before substantial execution begins, never for small edits, explanations, or tasks the user asked you to keep in this session.",
       inputSchema: buildShape({
-        summary: { type: "string", description: "One short sentence explaining why a Worker is useful for this task." },
+        summary: { type: "string", description: "One short sentence explaining why a Split Worker is useful for this task." },
         plan: { type: "string", description: "A concise numbered implementation plan to show in the approval card." },
-        message: { type: "string", description: "Complete execution instructions for the Worker, including scope, constraints, validation, and expected result." },
-        recommendedVendor: { type: "string", description: "Optional installed vendor id for the Worker." },
-        recommendedModel: { type: "string", description: "Optional exact Worker model id. Omit when uncertain." },
+        message: { type: "string", description: "Complete execution instructions for the Split Worker, including scope, constraints, validation, and expected result." },
+        recommendedVendor: { type: "string", description: "Optional installed vendor id for the Split Worker." },
+        recommendedModel: { type: "string", description: "Optional exact Split Worker model id. Omit when uncertain." },
         recommendedEffort: { type: "string", description: "Optional reasoning effort: minimal, low, medium, high, xhigh, or max." },
       }, ["summary", "plan", "message"]),
       handler: function (args) { return propose(args || {}, session); },
@@ -337,7 +337,7 @@ function attachWorkerProposal(ctx) {
 
   function getSystemPrompt(session) {
     if (!isEligible(session)) return "";
-    return "You can introduce Clay's Driver/Worker workflow with propose_worker. For an implementation-heavy task that is likely to consume substantial execution time, first reason about the work and form a concise plan. Before editing files or running substantial execution, call propose_worker once with that plan and a complete Worker instruction, recommending another suitable execution model. Use it conservatively: do not suggest a Worker for questions, investigations, tiny fixes, or when the user explicitly wants you to execute here. After posting a proposal, end the turn and wait. If accepted, the Worker runs visibly and its result returns to you for review.";
+    return "You can introduce Clay's Driver/Split Worker workflow with propose_worker. For an implementation-heavy task that is likely to consume substantial execution time, first reason about the work and form a concise plan. Before editing files or running substantial execution, call propose_worker once with that plan and a complete Split Worker instruction, recommending another suitable execution model. Use it conservatively: do not suggest a Split Worker for questions, investigations, tiny fixes, or when the user explicitly wants you to execute here. After posting a proposal, end the turn and wait. If accepted, the Split Worker runs visibly and its result returns to you for review.";
   }
 
   return {

package/lib/project-workspace-query.js

@@ -0,0 +1,144 @@
+var workspaceMcp = require("./workspace-query-mcp-server");
+var clayHistoryMcp = require("./clay-history-mcp-server");
+
+function attachProjectWorkspaceQuery(ctx) {
+  var service = ctx.service;
+  var sm = ctx.sm;
+  var projectSlug = ctx.projectSlug;
+  var getProjectOwnerId = ctx.getProjectOwnerId || function () { return null; };
+  var isMate = ctx.isMate;
+  var mateId = ctx.mateId;
+
+  function binding(session) {
+    if (!service || isMate !== true || !mateId) return null;
+    if (session && (!sm || !sm.sessions || sm.sessions.get(session.localId) !== session)) return null;
+    if (session && (session.homeDebatePlanning === true || session.debateSetupMode === true || session._mentionInProgress === true || session.spawn)) return null;
+    return service.bindSource({
+      projectSlug: projectSlug,
+      projectOwnerId: getProjectOwnerId(),
+      isMate: true,
+      mateId: mateId,
+      session: session || null,
+    });
+  }
+
+  function getToolDefs(session) {
+    var bound = session ? binding(session) : null;
+    if (session && !bound) return [];
+    return workspaceMcp.getToolDefs(bound, !!(bound && bound.isClay));
+  }
+
+  function createMcpServer(adapter, session) {
+    if (!service || isMate !== true) return null;
+    var bound = session ? binding(session) : null;
+    var projectBound = binding(null);
+    if (!projectBound) return null;
+    return workspaceMcp.createMcpServer(adapter, bound, projectBound.isClay);
+  }
+
+  function createHistoryMcpServer(adapter, session) {
+    if (!adapter || typeof adapter.createToolServer !== "function") return null;
+    var bound = session ? binding(session) : null;
+    var projectBound = binding(null);
+    if (!projectBound || projectBound.isClay !== true) return null;
+    return adapter.createToolServer({
+      name: "clay-history",
+      version: "2.0.0",
+      tools: clayHistoryMcp.getToolDefs({ workspace: bound }),
+    });
+  }
+
+  function isAuthoritativeClay() {
+    var bound = binding(null);
+    return !!(bound && bound.isClay === true);
+  }
+
+  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-workspace",
+        name: defs[i].name,
+        description: defs[i].description || defs[i].name,
+        inputSchema: normalizeSchema(defs[i].inputSchema),
+      });
+    }
+    return tools;
+  }
+
+  function getDynamicToolDefs(session) {
+    return getToolDefs(session).map(function (tool) {
+      tool.permissionName = "mcp__clay-workspace__" + tool.name;
+      return tool;
+    });
+  }
+
+  function getHistoryDynamicToolDefs(session) {
+    var bound = session ? binding(session) : null;
+    if (!bound || bound.isClay !== true) return [];
+    return clayHistoryMcp.getToolDefs({ workspace: bound }).map(function (tool) {
+      tool.permissionName = "mcp__clay-history__" + tool.name;
+      return tool;
+    });
+  }
+
+  function getHistoryBridgeTools(session, normalizeSchema) {
+    if (!session) return [];
+    var bound = binding(session);
+    if (!bound || bound.isClay !== true) return [];
+    var defs = clayHistoryMcp.getToolDefs({ workspace: bound });
+    var tools = [];
+    for (var i = 0; i < defs.length; i++) {
+      tools.push({
+        server: "clay-history",
+        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("Workspace tools require a valid Clay 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("Workspace tool not found: " + toolName));
+  }
+
+  function callHistoryBridgeTool(session, toolName, args) {
+    var bound = session ? binding(session) : null;
+    if (!bound || bound.isClay !== true) return Promise.reject(new Error("Clay history requires a valid builtin Clay session."));
+    var defs = clayHistoryMcp.getToolDefs({ workspace: bound });
+    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("Clay history tool not found: " + toolName));
+  }
+
+  function getMemorySessions(session, excludeSource) {
+    var bound = session && service && typeof service.bindProjectSession === "function"
+      ? service.bindProjectSession({ projectSlug: projectSlug, session: session })
+      : binding(null);
+    return bound ? bound.getMemorySessions(excludeSource) : [];
+  }
+
+  return {
+    createMcpServer: createMcpServer,
+    createHistoryMcpServer: createHistoryMcpServer,
+    isAuthoritativeClay: isAuthoritativeClay,
+    getBridgeTools: getBridgeTools,
+    getHistoryBridgeTools: getHistoryBridgeTools,
+    getDynamicToolDefs: getDynamicToolDefs,
+    getHistoryDynamicToolDefs: getHistoryDynamicToolDefs,
+    callBridgeTool: callBridgeTool,
+    callHistoryBridgeTool: callHistoryBridgeTool,
+    getMemorySessions: getMemorySessions,
+  };
+}
+
+module.exports = { attachProjectWorkspaceQuery: attachProjectWorkspaceQuery };