clay-server 3.2.2-beta.3 → 3.3.0-beta.2

package/lib/project-email.js

@@ -9,31 +9,6 @@ var smtp = require("./smtp");
 var { CONFIG_DIR } = require("./config");
 
 var AUDIT_LOG_PATH = path.join(CONFIG_DIR, "email-audit.jsonl");
-var EMAIL_DEFAULTS_DIR = path.join(CONFIG_DIR, "email-defaults");
-
-// --- Project-level email defaults ---
-// Stores which email accounts should be auto-enabled for every new session.
-
-function loadEmailDefaults(slug) {
-  try {
-    var filePath = path.join(EMAIL_DEFAULTS_DIR, slug + ".json");
-    var data = JSON.parse(fs.readFileSync(filePath, "utf8"));
-    return data.accounts || [];
-  } catch (e) {
-    return [];
-  }
-}
-
-function saveEmailDefaults(slug, accountIds) {
-  try {
-    fs.mkdirSync(EMAIL_DEFAULTS_DIR, { recursive: true });
-    var filePath = path.join(EMAIL_DEFAULTS_DIR, slug + ".json");
-    fs.writeFileSync(filePath, JSON.stringify({ accounts: accountIds }), "utf8");
-  } catch (e) {
-    console.error("[email] Failed to save defaults:", e.message);
-  }
-}
-
 // --- Audit log (Server SMTP only) ---
 
 function appendAuditLog(entry) {
@@ -185,7 +160,6 @@ function formatTimeAgo(date) {
 function attachEmail(ctx) {
   var slug = ctx.slug;
   var send = ctx.send;
-  var sendTo = ctx.sendTo;
   var clients = ctx.clients;
   var loadContextSources = ctx.loadContextSources;
   var getUserIdForWs = ctx.getUserIdForWs;
@@ -327,17 +301,6 @@ function attachEmail(ctx) {
         }
       }
     }
-    // Fallback: if no session-level sources found, check project email defaults
-    if (result.length === 0) {
-      var defaults = loadEmailDefaults(slug);
-      for (var di = 0; di < defaults.length; di++) {
-        var dec = emailAccounts.getAccountDecrypted(userId, defaults[di]);
-        if (dec && !seen[dec.id]) {
-          seen[dec.id] = true;
-          result.push(dec);
-        }
-      }
-    }
     return result;
   }
 
@@ -376,28 +339,6 @@ function attachEmail(ctx) {
     };
   }
 
-  function handleEmailMessage(ws, msg) {
-    if (msg.type === "email_defaults_get") {
-      var defaults = loadEmailDefaults(slug);
-      sendTo(ws, { type: "email_defaults", accounts: defaults });
-      return true;
-    }
-    if (msg.type === "email_defaults_save") {
-      var accountIds = msg.accounts || [];
-      saveEmailDefaults(slug, accountIds);
-      // Broadcast to all clients on this project
-      var _defMsg = JSON.stringify({ type: "email_defaults", accounts: accountIds });
-      for (var c of clients) { if (c.readyState === 1) c.send(_defMsg); }
-      return true;
-    }
-    return false;
-  }
-
-  // Get default email account IDs for new sessions
-  function getEmailDefaults() {
-    return loadEmailDefaults(slug);
-  }
-
   function destroy() {
     if (pollTimer) {
       clearInterval(pollTimer);
@@ -421,10 +362,8 @@ function attachEmail(ctx) {
   }
 
   return {
-    handleEmailMessage: handleEmailMessage,
     getEmailContext: getEmailContext,
     getCheckedEmailAccounts: getCheckedEmailAccounts,
-    getEmailDefaults: getEmailDefaults,
     createMcpDeps: createMcpDeps,
     hasEmailCapability: hasEmailCapability,
     destroy: destroy,

package/lib/project-http.js

@@ -5,6 +5,7 @@ var crypto = require("crypto");
 var { execFileSync, spawn } = require("child_process");
 var { fsAsUser } = require("./os-users");
 var usersModule = require("./users");
+var gitCli = require("./git-cli");
 
 var IMAGE_EXTS = new Set([".png", ".jpg", ".jpeg", ".gif", ".webp", ".svg", ".bmp", ".ico"]);
 var MIME_TYPES = {
@@ -47,6 +48,7 @@ function attachHTTP(ctx) {
   var slug = ctx.slug;
   var project = ctx.project;
   var sm = ctx.sm;
+  var gitAttribution = ctx.gitAttribution;
   var send = ctx.send;
   var imagesDir = ctx.imagesDir;
   var osUsers = ctx.osUsers;
@@ -643,7 +645,108 @@ function attachHTTP(ctx) {
       return true;
     }
 
-    // Git dirty check
+    // Git panel status and actions
+    var isGitPanelRequest = urlPath === "/api/git/status" ||
+      urlPath === "/api/git/action" || urlPath.indexOf("/api/git/file-diff?") === 0 ||
+      urlPath.indexOf("/api/git/session-diff?") === 0;
+    if (isGitPanelRequest && usersModule.isMultiUser()) {
+      var gitRequestUser = req._clayUser;
+      var gitPermissions = gitRequestUser ? usersModule.getEffectivePermissions(gitRequestUser, osUsers) : null;
+      if (!gitPermissions || !gitPermissions.fileBrowser) {
+        res.writeHead(403, { "Content-Type": "application/json" });
+        res.end('{"error":"Git access is not permitted"}');
+        return true;
+      }
+    }
+
+    if (req.method === "GET" && urlPath === "/api/git/status") {
+      var gitUserInfo = getOsUserInfoForReq(req);
+      try {
+        var gitStatus = gitCli.getStatus(cwd, gitUserInfo);
+        if (gitAttribution) {
+          var visibleGitSessions = sm.sessions;
+          if (usersModule.isMultiUser() && req._clayUser) {
+            visibleGitSessions = new Map();
+            sm.sessions.forEach(function (session, id) {
+              if (usersModule.canAccessSession(req._clayUser.id, session, { visibility: "public" })) {
+                visibleGitSessions.set(id, session);
+              }
+            });
+          }
+          gitAttribution.decorateStatus(gitStatus, visibleGitSessions);
+        }
+        res.writeHead(200, { "Content-Type": "application/json", "Cache-Control": "no-store" });
+        res.end(JSON.stringify(gitStatus));
+      } catch (e) {
+        res.writeHead(500, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ error: e.message || "Unable to read Git status" }));
+      }
+      return true;
+    }
+
+    if (req.method === "GET" && urlPath.indexOf("/api/git/file-diff?") === 0) {
+      var gitDiffParams = new URLSearchParams(urlPath.slice(urlPath.indexOf("?")));
+      var gitDiffPath = gitDiffParams.get("path");
+      if (!gitDiffPath) {
+        res.writeHead(400, { "Content-Type": "application/json" });
+        res.end('{"error":"Missing file path"}');
+        return true;
+      }
+      try {
+        var gitDiffResult = gitCli.getFileDiff(cwd, gitDiffPath, getOsUserInfoForReq(req));
+        res.writeHead(200, { "Content-Type": "application/json", "Cache-Control": "no-store" });
+        res.end(JSON.stringify(gitDiffResult));
+      } catch (e) {
+        res.writeHead(400, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ error: e.message || "Unable to read file diff" }));
+      }
+      return true;
+    }
+
+    if (req.method === "GET" && urlPath.indexOf("/api/git/session-diff?") === 0) {
+      var sessionDiffParams = new URLSearchParams(urlPath.slice(urlPath.indexOf("?")));
+      var sessionDiffKey = sessionDiffParams.get("session");
+      var sessionDiffPath = sessionDiffParams.get("path");
+      if (!gitAttribution || !sessionDiffKey || !sessionDiffPath) {
+        res.writeHead(400, { "Content-Type": "application/json" });
+        res.end('{"error":"Missing session comparison"}');
+        return true;
+      }
+      try {
+        var requestedSessionVisible = false;
+        sm.sessions.forEach(function (session) {
+          var key = session.cliSessionId || ("local:" + session.localId);
+          if (key !== sessionDiffKey) return;
+          requestedSessionVisible = !usersModule.isMultiUser() ||
+            (req._clayUser && usersModule.canAccessSession(req._clayUser.id, session, { visibility: "public" }));
+        });
+        if (!requestedSessionVisible) throw new Error("Session comparison is unavailable");
+        var sessionDiff = gitAttribution.getSessionBaselineDiff(sessionDiffKey, sessionDiffPath, getOsUserInfoForReq(req));
+        res.writeHead(200, { "Content-Type": "application/json", "Cache-Control": "no-store" });
+        res.end(JSON.stringify(sessionDiff));
+      } catch (e) {
+        res.writeHead(400, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ error: e.message || "Unable to compare session changes" }));
+      }
+      return true;
+    }
+
+    if (req.method === "POST" && urlPath === "/api/git/action") {
+      var gitActionUserInfo = getOsUserInfoForReq(req);
+      parseJsonBody(req).then(function (body) {
+        return gitCli.runAction(cwd, body, gitActionUserInfo);
+      }).then(function (output) {
+        var updatedStatus = gitCli.getStatus(cwd, gitActionUserInfo);
+        res.writeHead(200, { "Content-Type": "application/json", "Cache-Control": "no-store" });
+        res.end(JSON.stringify({ ok: true, output: output, status: updatedStatus }));
+      }).catch(function (err) {
+        res.writeHead(400, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ error: err.userMessage || err.message || "Git action failed" }));
+      });
+      return true;
+    }
+
+    // Legacy dirty check used by the Ralph Loop flow
     if (req.method === "GET" && urlPath === "/api/git-dirty") {
       try {
         var out = execFileSync("git", ["status", "--porcelain"], { cwd: cwd, encoding: "utf8", timeout: 5000 });

package/lib/project-session-pair.js

@@ -1,4 +1,5 @@
 var pairMcp = require("./session-pair-mcp-server");
+var { attachWorkerProposal } = require("./project-worker-proposal");
 var yoke = require("./yoke");
 
 var MAX_RESPONSE_CHARS = 30000;
@@ -57,6 +58,7 @@ function recentTurns(session, count) {
 function attachSessionPair(ctx) {
   var sm = ctx.sm;
   var store = ctx.splitStore;
+  var workerProposal;
 
   function groupAndPartner(caller) {
     if (!caller) throw new Error("partner tools require a session-bound tool server");
@@ -91,6 +93,63 @@ function attachSessionPair(ctx) {
     broadcastDelegation(group, caller, partner, false);
   }
 
+  function resumeDriverWithResult(caller, partner, token) {
+    if (!token.detached || token.delivered || caller.destroying) return false;
+    token.delivered = true;
+    var failure = token.failure || null;
+    var response = token.response || "";
+    var text = "A 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.)")) +
+      "\n\nReview the result, verify it as needed, and continue the task.";
+    sm.sendAndRecord(caller, {
+      type: "user_message",
+      text: text,
+      _internal: true,
+      partnerResult: true,
+      partnerSessionId: partner.localId,
+    });
+    caller.lastActivity = Date.now();
+    var sdk = ctx.getSdk();
+    if (!sdk) {
+      sm.sendAndRecord(caller, { type: "error", text: "Could not resume the Driver: SDK bridge is not ready" });
+      return false;
+    }
+    if (!caller.isProcessing) {
+      caller.isProcessing = true;
+      caller.sentToolResults = {};
+      ctx.onProcessingChanged();
+      sm.sendToSession(caller, { type: "status", status: "processing" });
+    }
+    if (!sdk.pushMessage(caller, text)) {
+      caller._queryStartTs = Date.now();
+      Promise.resolve(sdk.startQuery(caller, text, undefined, ctx.getLinuxUserForSession(caller))).catch(function (err) {
+        caller.isProcessing = false;
+        sm.sendAndRecord(caller, { type: "error", text: err.message || String(err) });
+        ctx.onProcessingChanged();
+      });
+    }
+    sm.broadcastSessionList();
+    return true;
+  }
+
+  function handleTurnDone(partner) {
+    var token = partner && partner._pairDelegation;
+    if (!token) return false;
+    var group = store.groupForMember(partner.localId);
+    if (!group || group.id !== token.groupId || group.members.indexOf(token.from) === -1) return false;
+    var caller = sm.sessions.get(token.from);
+    if (!caller || caller.ownerId !== partner.ownerId) return false;
+    if (group.pair && (group.pair.driverId !== caller.localId || group.pair.workerId !== partner.localId)) {
+      finishDelegation(group, caller, partner, token);
+      return false;
+    }
+    token.response = responseText(partner.history || [], token.startIndex);
+    token.failure = errorSince(partner.history || [], token.startIndex);
+    finishDelegation(group, caller, partner, token);
+    return resumeDriverWithResult(caller, partner, token);
+  }
+
   function waitForPartner(group, caller, partner, token, timeoutSeconds) {
     return new Promise(function (resolve, reject) {
       var deadline = Date.now() + timeoutSeconds * 1000;
@@ -115,8 +174,9 @@ function attachSessionPair(ctx) {
         }
         if (Date.now() >= deadline) {
           clearInterval(timer);
+          token.detached = true;
           monitorPartner(group, caller, partner, token);
-          resolve({ status: "running", response: responseText(partner.history || [], token.startIndex), hint: "Use read_partner to check again." });
+          resolve({ status: "running", response: responseText(partner.history || [], token.startIndex), hint: "The completed result will be pushed back automatically. Use read_partner only for an interim status check." });
         }
       }, 500);
     });
@@ -127,7 +187,8 @@ function attachSessionPair(ctx) {
       var currentGroup = store.groupForMember(caller.localId);
       if (!currentGroup || currentGroup.id !== group.id || (!partner.isProcessing && !partner._queryStarting)) {
         clearInterval(timer);
-        finishDelegation(group, caller, partner, token);
+        if (currentGroup && currentGroup.id === group.id) handleTurnDone(partner);
+        else finishDelegation(group, caller, partner, token);
       }
     }, 500);
   }
@@ -143,7 +204,7 @@ function attachSessionPair(ctx) {
       timeout = Math.max(1, Math.min(900, timeout));
       var partner = resolved.partner;
       if (partner._pairDelegation) throw new Error("the partner is already handling a delegated task");
-      var token = { from: caller.localId, groupId: resolved.group.id, startIndex: partner.history.length };
+      var token = { from: caller.localId, groupId: resolved.group.id, startIndex: partner.history.length, message: message };
       partner._pairDelegation = token;
       partner._delegatedBy = caller.localId;
       sm.sendAndRecord(partner, {
@@ -173,8 +234,9 @@ function attachSessionPair(ctx) {
       }
       sm.broadcastSessionList();
       if (!wait) {
+        token.detached = true;
         monitorPartner(resolved.group, caller, partner, token);
-        return toolResult({ status: "running", partnerId: partner.localId, hint: "Use read_partner to check progress." });
+        return toolResult({ status: "running", partnerId: partner.localId, hint: "The completed result will be pushed back automatically. Use read_partner only for an interim status check." });
       }
       return toolResult(await waitForPartner(resolved.group, caller, partner, token, timeout));
     } catch (e) {
@@ -223,10 +285,11 @@ function attachSessionPair(ctx) {
     // pair worker at query start never sees the tools.
     var group = store.groupForMember(boundSession.localId);
     if (group && group.pair && group.pair.driverId !== boundSession.localId) return [];
-    return pairMcp.getToolDefs({
+    var tools = pairMcp.getToolDefs({
       send: function (args) { return sendToPartner(args, boundSession); },
       read: function (args) { return readPartner(args, boundSession); },
     });
+    return tools.concat(workerProposal.getToolDefs(boundSession));
   }
 
   function validateVendor(vendor) {
@@ -235,49 +298,69 @@ function attachSessionPair(ctx) {
     return vendor;
   }
 
+  function createPairRecord(ws, msg) {
+    if (ctx.isMate) throw new Error("Pair sessions are only available in projects");
+    var driverSpec = msg.driver || {};
+    var workerSpec = msg.worker || {};
+    var workerVendor = validateVendor(workerSpec.vendor || sm.lastVendor || "codex");
+    var ownerId = ws._clayUser && ctx.usersModule.isMultiUser() ? ws._clayUser.id : null;
+    var driver;
+    var groupName;
+    if (Number.isInteger(driverSpec.sessionId)) {
+      // "Add 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");
+      if ((driver.ownerId || null) !== ownerId) throw new Error("driver session access denied");
+      if (store.groupForMember(driver.localId)) throw new Error("this session is already in a split group");
+      groupName = undefined; // auto name from member titles
+    } else {
+      var driverVendor = validateVendor(driverSpec.vendor || "claude");
+      var driverEffort = yoke.clampEffort(driverVendor, driverSpec.effort || (sm.currentEffortByVendor && sm.currentEffortByVendor[driverVendor]) || sm.currentEffort || "medium") || null;
+      driver = sm.createSessionRaw({ ownerId: ownerId, vendor: driverVendor, model: driverSpec.model || null, effort: driverEffort });
+      driver.title = "Driver · " + ((yoke.getVendorInfo(driverVendor) || {}).displayName || driverVendor);
+      if (driverSpec.effort) driver.loopSettings = { effort: driverSpec.effort };
+      groupName = "Agent pair";
+    }
+    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);
+    if (workerSpec.effort) worker.loopSettings = { effort: workerSpec.effort };
+    var result = store.create(ws, {
+      members: [driver.localId, worker.localId],
+      pair: { driverId: driver.localId, workerId: worker.localId },
+      name: groupName,
+    });
+    if (!result.ok) throw new Error(result.error);
+    sm.broadcastSessionList();
+    return { driver: driver, worker: worker, group: result.group };
+  }
+
   function createPair(ws, msg) {
     try {
-      if (ctx.isMate) throw new Error("Pair sessions are only available in projects");
-      var driverSpec = msg.driver || {};
-      var workerSpec = msg.worker || {};
-      var workerVendor = validateVendor(workerSpec.vendor || sm.lastVendor || "codex");
-      var ownerId = ws._clayUser && ctx.usersModule.isMultiUser() ? ws._clayUser.id : null;
-      var driver;
-      var groupName;
-      if (Number.isInteger(driverSpec.sessionId)) {
-        // "Add 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");
-        if ((driver.ownerId || null) !== ownerId) throw new Error("driver session access denied");
-        if (store.groupForMember(driver.localId)) throw new Error("this session is already in a split group");
-        groupName = undefined; // auto name from member titles
-      } else {
-        var driverVendor = validateVendor(driverSpec.vendor || "claude");
-        var driverEffort = yoke.clampEffort(driverVendor, driverSpec.effort || (sm.currentEffortByVendor && sm.currentEffortByVendor[driverVendor]) || sm.currentEffort || "medium") || null;
-        driver = sm.createSessionRaw({ ownerId: ownerId, vendor: driverVendor, model: driverSpec.model || null, effort: driverEffort });
-        driver.title = "Driver · " + ((yoke.getVendorInfo(driverVendor) || {}).displayName || driverVendor);
-        if (driverSpec.effort) driver.loopSettings = { effort: driverSpec.effort };
-        groupName = "Agent pair";
-      }
-      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);
-      if (workerSpec.effort) worker.loopSettings = { effort: workerSpec.effort };
-      var result = store.create(ws, {
-        members: [driver.localId, worker.localId],
-        pair: { driverId: driver.localId, workerId: worker.localId },
-        name: groupName,
-      });
-      if (!result.ok) throw new Error(result.error);
-      sm.broadcastSessionList();
-      ctx.sendTo(ws, { type: "pair_session_created", ok: true, group: result.group });
+      var created = createPairRecord(ws, msg);
+      ctx.sendTo(ws, { type: "pair_session_created", ok: true, group: created.group });
     } catch (e) {
       ctx.sendTo(ws, { type: "pair_session_created", ok: false, error: e.message || String(e) });
     }
   }
 
+  workerProposal = attachWorkerProposal({
+    sm: sm,
+    isMate: ctx.isMate,
+    splitStore: store,
+    getSdk: ctx.getSdk,
+    sendTo: ctx.sendTo,
+    usersModule: ctx.usersModule,
+    getLinuxUserForSession: ctx.getLinuxUserForSession,
+    onProcessingChanged: ctx.onProcessingChanged,
+    adapters: ctx.adapters,
+    createPairRecord: createPairRecord,
+    sendToPartner: sendToPartner,
+  });
+
   function handleMessage(ws, msg) {
+    if (workerProposal.handleMessage(ws, msg)) return true;
     if (msg.type === "pair_session_options") {
       if (ctx.isMate) return false;
       ctx.sendTo(ws, {
@@ -298,11 +381,14 @@ function attachSessionPair(ctx) {
 
   function getSystemPrompt(session) {
     var group = store.groupForMember(session.localId);
-    if (!group || !group.pair || group.pair.driverId !== session.localId) return "";
-    return "You are the Driver in a two-agent pair. The tools send_to_partner and read_partner are provided directly to you. Use send_to_partner to delegate concrete bounded work to the Worker, use read_partner to inspect its progress or recent results, then 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.";
+    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 and read_partner are provided directly to you. Use send_to_partner to delegate concrete bounded work to the Worker. 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.";
+    }
+    return [pairPrompt, workerProposal.getSystemPrompt(session)].filter(Boolean).join("\n\n");
   }
 
-  return { getToolDefs: getToolDefs, handleMessage: handleMessage, getSystemPrompt: getSystemPrompt };
+  return { getToolDefs: getToolDefs, handleMessage: handleMessage, handleTurnDone: handleTurnDone, getSystemPrompt: getSystemPrompt };
 }
 
 module.exports = {

package/lib/project-sessions.js

@@ -104,7 +104,6 @@ function attachSessions(ctx) {
   var getLatestVersion = ctx.getLatestVersion;
   var setLatestVersion = ctx.setLatestVersion;
   var loadContextSources = ctx.loadContextSources;
-  var saveContextSources = ctx.saveContextSources;
 
   // Resolve the active user's Claude open-mode preference ('gui' or 'tui').
   // Multi-user mode reads per-user storage; single-user mode falls back to
@@ -516,7 +515,7 @@ function attachSessions(ctx) {
         // Reuse an existing blank GUI session instead of stacking another
         // one. A vendor-less blank is acceptable: nothing has happened in it,
         // so stamping the requested vendor is equivalent to a fresh create.
-        var reusable = sm.findReusableBlankSession({
+        var reusable = msg.forceNew === true ? null : sm.findReusableBlankSession({
           vendor: sessionOpts.vendor || null,
           ownerId: sessionOpts.ownerId || null,
         });
@@ -542,15 +541,6 @@ function attachSessions(ctx) {
         }
         send({ type: "last_vendor", vendor: msg.vendor });
       }
-      // Apply project-level email defaults to new session
-      if (typeof ctx._email === "object" && ctx._email.getEmailDefaults) {
-        var emailDefaults = ctx._email.getEmailDefaults();
-        if (emailDefaults.length > 0) {
-          var defaultSources = emailDefaults.map(function (id) { return "email:" + id; });
-          saveContextSources(slug, newSess.localId, defaultSources);
-          sendTo(ws, { type: "context_sources_state", active: defaultSources });
-        }
-      }
       var nsPresKey = ws._clayUser ? ws._clayUser.id : "_default";
       if (!ws._clayPane) userPresence.setPresence(slug, nsPresKey, newSess.localId, null);
       if (usersModule.isMultiUser() && !ws._clayPane) {

package/lib/project-user-message.js

@@ -57,6 +57,7 @@ function attachUserMessage(ctx) {
   var imagesDir = ctx.imagesDir;
 
   var onProcessingChanged = ctx.onProcessingChanged;
+  var gitAttribution = ctx.gitAttribution;
 
   var _loop = ctx._loop;
   var browserState = ctx.browserState;
@@ -293,6 +294,7 @@ function attachUserMessage(ctx) {
 
     var session = getSessionForWs(ws);
     if (!session) return true;
+    if (gitAttribution) gitAttribution.beginTurn(session);
 
     // Bind vendor to session on first message (if not already set)
     if (!session.vendor && msg.vendor) {