clay-server 5.2.0-beta.1 → 5.2.0-beta.11

package/lib/pane-session-activation.js

@@ -0,0 +1,114 @@
+var provenance = require('./session-provenance');
+
+// This opt-in protocol only describes an authenticated ordinary pane snapshot.
+// It grants no action authority and is never a visible-render acknowledgement.
+function begin(ctx, ws, msg) {
+  if (!Object.prototype.hasOwnProperty.call(msg, 'paneActivation')) {
+    ws._clayPaneActivation = null;
+    return null;
+  }
+  var request = msg.paneActivation;
+  var session = ctx.sm.sessions.get(msg.id);
+  var userId = ws._clayUser && ws._clayUser.id || null;
+  var worker = provenance.isWorker(session);
+  var parentSession = worker && Array.from(ctx.sm.sessions.values()).find(function (parent) { return parent.sessionOriginId === session.sessionProvenance.parentSessionOriginId && !provenance.isWorker(parent); });
+  var identity = session && {
+    requestId: request && request.requestId,
+    generation: request && request.generation,
+    projectSlug: ctx.slug,
+    viewerId: userId,
+    ownerId: session.ownerId || null,
+    sessionId: session.localId,
+    sessionOriginId: session.sessionOriginId,
+    role: worker ? 'worker' : 'driver',
+    workerGeneration: worker ? session.sessionProvenance.generation : null,
+    parentSessionOriginId: worker ? session.sessionProvenance.parentSessionOriginId : null,
+    groupStamp: groupStamp(),
+  };
+  function groupStamp() {
+    var group = ctx.splitStore && ctx.splitStore.groupForMember(msg.id);
+    return group ? JSON.stringify({ id: group.id, members: group.members, pair: group.pair || null }) : null;
+  }
+  function allowed() {
+    if (typeof ws._clayAuthCheck === 'function' && !ws._clayAuthCheck()) return false;
+    var access = ctx.getProjectAccess ? ctx.getProjectAccess() : { visibility: 'public' };
+    if (!ctx.usersModule.isMultiUser()) return !session.ownerId;
+    return !!userId &&
+      !!ctx.usersModule.findUserById(userId) &&
+      ctx.usersModule.canAccessProject(userId, access) &&
+      ctx.usersModule.canAccessSession(userId, session, access);
+  }
+  var valid = request && typeof request === 'object' &&
+    typeof request.requestId === 'string' && /^[a-zA-Z0-9_-]{1,96}$/.test(request.requestId) &&
+    Number.isSafeInteger(request.generation) && request.generation > (ws._clayPaneActivationGeneration || 0) &&
+    ws._clayPane === true && !ws._clayContextual && !ctx.isMate && ws.readyState === 1 &&
+    session && session.sessionOriginId && !session.isMate &&
+    (session.runtimeMode || session.mode || 'gui') === 'gui' && !session.tuiSuspended &&
+    request.projectSlug === identity.projectSlug && request.viewerId === identity.viewerId &&
+    request.ownerId === identity.ownerId && request.sessionOriginId === identity.sessionOriginId &&
+    request.role === identity.role && request.workerGeneration === identity.workerGeneration &&
+    (!ctx.splitStore || request.groupStamp === identity.groupStamp && request.parentSessionOriginId === identity.parentSessionOriginId) &&
+    (!worker || Number.isSafeInteger(identity.workerGeneration) && identity.workerGeneration > 0) && allowed();
+  if (!valid) {
+    // Do not disclose whether a foreign or removed session exists.
+    ctx.sendTo(ws, { type: 'pane_activation_rejected', requestId: request && typeof request.requestId === 'string' ? request.requestId.slice(0, 96) : null });
+    return false;
+  }
+  ws._clayPaneActivationGeneration = identity.generation;
+  ws._clayPaneActivation = identity;
+  function current() {
+    return ws.readyState === 1 && ws._clayPane === true && !ws._clayContextual && !ctx.isMate && !session.isMate &&
+      ws._clayPaneActivation === identity &&
+      ctx.sm.sessions.get(msg.id) === session && session.sessionOriginId === identity.sessionOriginId &&
+      (ws._clayUser && ws._clayUser.id || null) === userId &&
+      (session.ownerId || null) === identity.ownerId &&
+      (session.runtimeMode || session.mode || 'gui') === 'gui' && !session.tuiSuspended &&
+      (provenance.isWorker(session) ? 'worker' : 'driver') === identity.role &&
+      (provenance.isWorker(session) ? session.sessionProvenance.generation : null) === identity.workerGeneration &&
+      groupStamp() === identity.groupStamp &&
+      (!worker || parentSession && ctx.sm.sessions.get(parentSession.localId) === parentSession &&
+        session.sessionProvenance.parentSessionOriginId === identity.parentSessionOriginId && parentSession.sessionOriginId === identity.parentSessionOriginId &&
+        !provenance.isWorker(parentSession) && (parentSession.ownerId || null) === identity.ownerId) &&
+      allowed();
+  }
+  function send(message) {
+    if (current() && ws._clayActiveSession === session.localId) ctx.sendTo(ws, Object.assign({}, message, { paneActivation: identity }));
+  }
+  var historyItems = [], historyText = 0;
+  // Only synchronous replay uses this bounded envelope. Each actual disclosure
+  // rechecks live authorization; nothing is cached across a send or async work.
+  send.history = function (message) {
+    if (message.type === 'history_done') {
+      flushHistory();
+      send(message);
+      return;
+    }
+    historyItems.push(message);
+    historyText += typeof message.text === 'string' ? message.text.length : 0;
+    if (historyItems.length >= 100 || historyText >= 65536) flushHistory();
+  };
+  function flushHistory() {
+    if (!historyItems.length) return;
+    var items = historyItems;
+    historyItems = []; historyText = 0;
+    send({ type: 'pane_history_batch', items: items });
+  }
+  if (current()) ctx.sendTo(ws, { type: 'pane_activation_started', paneActivation: identity });
+  ws._clayPaneActivationValid = function () { return current() && ws._clayActiveSession === identity.sessionId; };
+  return {
+    validate: function () {
+      if (current()) return true;
+      ctx.sendTo(ws, { type: 'pane_activation_rejected', requestId: identity.requestId });
+      ws._clayPaneActivation = null;
+      return false;
+    },
+    send: send,
+    finish: function () {
+      // Includes history listeners, status, permissions and context sources.
+      // Consumers still need to observe their own DOM/composer readiness.
+      if (ws._clayActiveSession === session.localId) send({ type: 'pane_activation_snapshot_done' });
+    },
+  };
+}
+
+module.exports = { begin: begin };

package/lib/pane-session-transport.js

@@ -0,0 +1,26 @@
+var AsyncLocalStorage = require('node:async_hooks').AsyncLocalStorage;
+var requests = new AsyncLocalStorage();
+
+function same(a, b) {
+  return !!a && !!b && ['requestId', 'generation', 'projectSlug', 'viewerId', 'ownerId', 'sessionId', 'sessionOriginId', 'role', 'workerGeneration', 'groupStamp', 'parentSessionOriginId'].every(function (key) { return a[key] === b[key]; });
+}
+function run(ws, msg, dispatch) {
+  var binding = ws._clayPaneActivation;
+  if (!binding && msg.paneBinding || binding && msg.type === 'switch_session' && !msg.paneActivation) return;
+  if (binding && ['switch_session', 'ping', 'pong', 'clay_ui_ready'].indexOf(msg.type) < 0) {
+    if (!same(binding, msg.paneBinding) || !ws._clayPaneActivationValid || !ws._clayPaneActivationValid()) return;
+  }
+  return requests.run({ ws: ws, binding: binding || null }, function () { return dispatch(ws, msg); });
+}
+// A direct asynchronous reply retains the request's original binding. Live
+// provider events instead supply their authoritative source session explicitly.
+function outbound(ws, message, sessionId) {
+  if (!message || message.paneActivation || /^pane_activation_/.test(message.type)) return message;
+  var scope = requests.getStore();
+  var binding = sessionId === undefined ? scope && scope.ws === ws && scope.binding : ws._clayPaneActivation;
+  if (!binding) return message;
+  if (sessionId !== undefined && binding.sessionId !== sessionId) return null;
+  if (!same(binding, ws._clayPaneActivation) || !ws._clayPaneActivationValid || !ws._clayPaneActivationValid()) return null;
+  return Object.assign({}, message, { paneActivation: binding });
+}
+module.exports = { run: run, outbound: outbound, same: same };

package/lib/project-admin-overview.js

@@ -0,0 +1,51 @@
+// This projection is an allowlist. Never add runtime/session/path objects here.
+function projectMetadata(status, access, users) {
+  if (!status || status.isMate || !access || access.error) return null;
+  var owner = access.ownerId && users.findUserById(access.ownerId);
+  return {
+    slug: status.slug,
+    project: status.title || status.project || status.slug,
+    title: status.title || status.project || status.slug,
+    projectOwnerId: owner ? owner.id : null,
+    ownerName: owner ? (owner.displayName || owner.username) : "Ownership needs recovery",
+    visibility: access.visibility,
+    contentAccess: false,
+    administrativeAccess: true,
+    ownershipRecovery: access.ownershipRecovery === "required" || !owner,
+    runtimeHealth: "Registered",
+  };
+}
+
+function metadataFor(user, status, access, users) {
+  if (!user || !users.findUserById(user.id) || user.role !== "admin" || !status || status.isMate || /^mate-/.test(status.slug)) return null;
+  return projectMetadata(status, access, users);
+}
+
+function escape(value) {
+  return String(value || "").replace(/[&<>"']/g, function (character) {
+    return { "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" }[character];
+  });
+}
+
+function page(metadata, projects) {
+  var privacyText = metadata.ownershipRecovery
+    ? "Content remains restricted because no verified owner is available. Ask the server operator to verify the account’s OS UID and real home/project mapping, then run the documented ownership repair."
+    : "Conversations, files and terminals are private. Ask the owner to share project access.";
+  var accessText = metadata.ownershipRecovery
+    ? "Ownership needs recovery. The server operator must independently verify or repair the authoritative account-to-OS mapping before ownership repair can succeed. Ambiguous records stay restricted; administrator status cannot claim this project. See the Project ownership and administrator access guide."
+    : "Only the project owner can change ownership, visibility and sharing. Administrator status does not grant access to private content.";
+  var strip = projects.filter(function (project) { return !project.isMate; }).map(function (project) {
+    return '<a class="icon-strip-item' + (project.slug === metadata.slug ? ' active' : '') + '" href="/p/' + encodeURIComponent(project.slug) + '/" title="' + escape(project.title || project.project) + '"><span class="icon-strip-name">' + escape((project.title || project.project || project.slug).substring(0, 2)) + '</span></a>';
+  }).join("");
+  return '<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>' + escape(metadata.title) + ' · Clay</title>' +
+    '<script src="/appearance-bootstrap.js"></script><link rel="stylesheet" href="/style.css"><link rel="stylesheet" href="/css/project-admin-overview.css"></head><body>' +
+    '<div id="layout"><header id="top-bar"><a href="/" class="top-bar-brand-link" aria-label="Clay home"><span class="top-bar-brand-wordmark"></span></a></header>' +
+    '<div id="layout-body"><nav id="icon-strip" aria-label="Projects"><div class="icon-strip-projects">' + strip + '</div></nav>' +
+    '<main id="main-area" class="project-admin-overview"><div class="project-admin-canvas"><h1>' + escape(metadata.title) + '</h1>' +
+    '<div role="tablist" aria-label="Project information"><button type="button" role="tab" aria-selected="true" id="overview-tab" aria-controls="overview-panel">Overview</button><button type="button" role="tab" aria-selected="false" id="access-tab" aria-controls="access-panel">Access</button></div>' +
+    '<section id="overview-panel" role="tabpanel" aria-labelledby="overview-tab"><dl><dt>Owner</dt><dd>' + escape(metadata.ownerName) + '</dd><dt>Visibility</dt><dd>' + escape(metadata.visibility) + '</dd><dt>Status</dt><dd>' + (metadata.ownershipRecovery ? 'Ownership needs recovery' : escape(metadata.runtimeHealth)) + '</dd><dt>Your access</dt><dd>Administrative metadata only</dd></dl><p>' + escape(privacyText) + '</p><p class="project-admin-secondary">Resource usage is unavailable for this project.</p></section>' +
+    '<section id="access-panel" role="tabpanel" aria-labelledby="access-tab" hidden><h2>Administrative metadata only</h2><p>' + escape(accessText) + '</p></section></div></main></div></div>' +
+    '<script type="module" src="/modules/project-admin-overview.js"></script></body></html>';
+}
+
+module.exports = { metadataFor: metadataFor, page: page };

package/lib/project-ask-user.js

@@ -25,8 +25,9 @@ function attachAskUser(ctx) {
       respond.cancel("Autonomous mode. Make your own decision.");
       return;
     }
-    var questions = planningQuestions(boundSession, request.questions);
+    var questions = ["mcp-import", "product-control"].indexOf(request.source) >= 0 ? request.questions : planningQuestions(boundSession, request.questions);
     var input = { questions: questions };
+    if (request.source === 'mcp-import') input.source = 'mcp-import';
     if (!boundSession.pendingAskUser) boundSession.pendingAskUser = {};
     var pending = {
       input: input,
@@ -38,15 +39,18 @@ function attachAskUser(ctx) {
     };
     boundSession.pendingAskUser[request.id] = pending;
     if (respond && typeof respond.onSettle === "function") {
-      respond.onSettle(function () {
+      respond.onSettle(function (result) {
+        if (request.source === 'product-control' && result.status !== 'submitted') ctx.record(boundSession, { type: 'product_control_question_expired', toolId: request.id, error: 'This exact change review expired or was cancelled. No change was authorized.' });
+        if (request.source === 'mate-schedule' && result.status !== 'submitted') ctx.record(boundSession, { type: 'mate_schedule_question_expired', toolId: request.id, error: 'This schedule review expired. Request a new review.' });
+        if (request.source === 'mcp-import' && result.status !== 'submitted') ctx.record(boundSession, { type: 'mcp_import_consent_expired', toolId: request.id, source: 'mcp-import', error: 'Import consent expired or was cancelled. No connection was imported.' });
         if (boundSession.pendingAskUser && boundSession.pendingAskUser[request.id] === pending) delete boundSession.pendingAskUser[request.id];
       });
     }
     if (!askUserIdentity.hasRecordedAskUserRequest(boundSession.history, request.id, input)) {
-      ctx.record(boundSession, { type: "tool_executing", id: request.id, name: "AskUserQuestion", input: input });
+      ctx.record(boundSession, { type: "tool_executing", id: request.id, name: "AskUserQuestion", input: input, source: request.source });
     }
     var router = ctx.getWorkerQuestionRouter && ctx.getWorkerQuestionRouter();
-    if (router) router.routeQuestion(boundSession, request, respond, function (answers, driverId) {
+    if (router && request.source !== "mcp-import" && request.source !== "mate-schedule" && request.source !== "product-control") router.routeQuestion(boundSession, request, respond, function (answers, driverId) {
       var displayAnswers = {};
       request.questions.forEach(function (question, index) { displayAnswers[index] = answers[question.id].join(", "); });
       ctx.record(boundSession, { type: "ask_user_answered", toolId: request.id, answers: displayAnswers, answeredByDriver: driverId });

package/lib/project-connection.js

@@ -3,7 +3,7 @@ var path = require("path");
 var usersModule = require("./users");
 var userPresence = require("./user-presence");
 var emailAccounts = require("./email-accounts");
-var { getCodexConfig } = require("./codex-defaults");
+var providerSettings = require("./yoke/settings");
 var yoke = require("./yoke");
 var permissionModes = require("./session-permission-mode");
 var sessionProvenance = require("./session-provenance");
@@ -143,6 +143,9 @@ function attachConnection(ctx) {
   var _warmedUp = false;
 
   function findRestoredActiveSession(ws, wsUser, allSessions) {
+    if (ws._clayContextual && ws._clayPaneSession) {
+      return { active: allSessions.find(function (session) { return session.localId === ws._clayPaneSession; }) || null, storedPresence: null };
+    }
     var active = null;
     var presenceKey = wsUser ? wsUser.id : "_default";
     var storedPresence = userPresence.getPresence(slug, presenceKey);
@@ -202,7 +205,7 @@ function attachConnection(ctx) {
     } else if (!usersModule.isMultiUser()) {
       allSessions = allSessions.filter(function (s) { return !s.ownerId; });
     }
-    var restoredState = ws._clayPane
+    var restoredState = ws._clayPane && !ws._clayContextual
       ? { active: null, storedPresence: null }
       : findRestoredActiveSession(ws, wsUser, allSessions);
     var restoredActive = restoredState.active;
@@ -217,7 +220,7 @@ function attachConnection(ctx) {
       sm.saveSessionFile(restoredActive);
     }
     var initialModels = (sm.modelsByVendor && sm.modelsByVendor[initialVendor]) || sm.availableModels || [];
-    sendTo(ws, { type: "info", cwd: cwd, slug: slug, project: title || project, version: currentVersion, debug: !!debug, dangerouslySkipPermissions: dangerouslySkipPermissions, osUsers: osUsers, lanHost: lanHost, projectCount: _filteredProjects.length, projects: _filteredProjects, projectOwnerId: projectOwnerId, ownerLocked: ownerLocked, vendors: yoke.VENDOR_REGISTRY, isMate: isMate, mateId: isMate ? mateId : null, mateDisplayName: isMate ? (mateDisplayName || title || project || "Mate") : "" });
+    sendTo(ws, { type: "info", controlRuntimeId: require("./clay-control-target-projection").runtime(sm), cwd: cwd, slug: slug, project: title || project, version: currentVersion, debug: !!debug, dangerouslySkipPermissions: dangerouslySkipPermissions, osUsers: osUsers, lanHost: lanHost, projectCount: _filteredProjects.length, projects: _filteredProjects, projectOwnerId: projectOwnerId, ownerLocked: ownerLocked, vendors: require("./yoke/vendor-registry").publicInfo(), isMate: isMate, mateId: isMate ? mateId : null, mateDisplayName: isMate ? (mateDisplayName || title || project || "Mate") : "" });
     if (typeof sendCursorSharingState === "function") sendCursorSharingState(ws);
     // Update notifications are pushed on a scheduled interval (see
     // scheduleUpdateBroadcast). We no longer push on connect to avoid
@@ -234,8 +237,8 @@ function attachConnection(ctx) {
     var initialPermissionState = permissionModes.clientState(restoredActive, sm.currentPermissionMode, sm.defaultVendor);
     sendTo(ws, { type: "config_state", model: initialModelInfo.model, vendor: initialVendor, sessionId: restoredActive ? restoredActive.localId : null, mode: initialPermissionState.requestedPermissionMode, effectivePermissionMode: initialPermissionState.effectivePermissionMode, permissionCapabilities: initialPermissionState.permissionCapabilities, mcpPermissionModeOverrides: initialPermissionState.mcpPermissionModeOverrides, effort: initialEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
     sendTo(ws, { type: "last_vendor", vendor: sm.lastVendor || "" });
-    sendTo(ws, Object.assign({ type: "codex_config" }, getCodexConfig(sm)));
-    sendTo(ws, { type: "term_list", terminals: tm.list() });
+    providerSettings.messages(sm).forEach(function(message) { sendTo(ws, message); });
+    sendTo(ws, { type: "term_list", terminals: tm.list(true) });
     // Any login flow already running in this project, so a reconnecting client
     // re-attaches to the existing login terminal instead of starting another.
     if (_vendorLogin) _vendorLogin.sendStateTo(ws);
@@ -267,7 +270,7 @@ function attachConnection(ctx) {
     var presenceKey = wsUser ? wsUser.id : "_default";
     var storedPresence = restoredState.storedPresence;
     var autoCreated = false;
-    if (!active && !ws._clayPane) {
+    if (!active && (!ws._clayPane || (ws._clayContextual && !ws._clayPaneSession))) {
       var autoOpts = {};
       if (wsUser && usersModule.isMultiUser()) autoOpts.ownerId = wsUser.id;
       active = sm.createSession(autoOpts, ws);
@@ -301,12 +304,13 @@ function attachConnection(ctx) {
       }
       sendTo(ws, { type: "history_meta", total: total, from: fromIndex });
       for (var i = fromIndex; i < total; i++) {
-        sendTo(ws, hydrateImageRefs(active.history[i]));
+        sendTo(ws, Object.assign({}, hydrateImageRefs(require("./yoke/usage").clientEvent(active.history[i], active.vendor || "claude")), { _historyIndex: i }));
       }
-      var _lastUsage = null, _lastModelUsage = null, _lastCost = null, _lastStreamInputTokens = null;
+      var _lastContext = null, _lastUsage = null, _lastModelUsage = null, _lastCost = null, _lastStreamInputTokens = null;
       for (var _ri = total - 1; _ri >= 0; _ri--) {
         if (active.history[_ri].type === "result") {
-          var _r = active.history[_ri];
+          var _r = require("./yoke/usage").clientEvent(active.history[_ri], active.vendor || "claude");
+          _lastContext = _r.context;
           _lastUsage = _r.usage || null;
           _lastModelUsage = _r.modelUsage || null;
           _lastCost = _r.cost != null ? _r.cost : null;
@@ -314,7 +318,7 @@ function attachConnection(ctx) {
           break;
         }
       }
-      sendTo(ws, { type: "history_done", lastUsage: _lastUsage, lastModelUsage: _lastModelUsage, lastCost: _lastCost, lastStreamInputTokens: _lastStreamInputTokens, contextUsage: active.lastContextUsage || null });
+      sendTo(ws, { type: "history_done", controlHistoryRevision: require("./clay-control-target-projection").digest(active.history || []), sessionId: active.localId, sessionOriginId: active.sessionOriginId || null, lastUsage: _lastUsage, lastModelUsage: _lastModelUsage, lastCost: _lastCost, lastStreamInputTokens: _lastStreamInputTokens, context: _lastContext, contextUsage: require("./yoke/usage").context(active.lastContextUsage, active.vendor || "claude") });
       if (scheduledMessages) scheduledMessages.sendState(active, ws);
       if (pairResultRecovery) pairResultRecovery.sendState(active, ws);
 

package/lib/project-control-git-view.js

@@ -0,0 +1,12 @@
+var fs = require('fs'), path = require('path');
+var projection = require('./clay-control-target-projection');
+function project(service, principal, status, manager) {
+  var before = service.rootIdentity(principal, 'git');
+  var directory = fs.realpathSync(status.gitDir), stat = fs.statSync(directory), indexPath = path.join(directory, 'index');
+  var index = fs.existsSync(indexPath) ? require('crypto').createHash('sha256').update(fs.readFileSync(indexPath)).digest('hex') : null;
+  var view = { runtimeId: projection.runtime(manager), repository: projection.digest([directory, [stat.dev, stat.ino, stat.mode, stat.uid, stat.gid]]),
+    files: status.files.slice(0, 200).map(function (file) { return { path: file.path, revision: projection.digest([status.oid, index, file]) }; }) };
+  if (service.rootIdentity(principal, 'git') !== before) throw new Error('Workspace identity changed during projection.');
+  return view;
+}
+module.exports = { project: project };

package/lib/project-debate.js

@@ -774,6 +774,7 @@ function attachDebate(ctx) {
       var identityMate = matesModule.getMate(debate.mateCtx, msg.mateId);
       var identityProfile = identityMate && identityMate.profile ? identityMate.profile : (identityMate || {});
       if (!msg.mateName) msg.mateName = identity.name;
+      if (!msg.avatarCatalogId) msg.avatarCatalogId = identityProfile.avatarCatalogId || "";
       if (!msg.avatarStyle) msg.avatarStyle = identity.avatarStyle;
       if (!msg.avatarSeed) msg.avatarSeed = identity.avatarSeed;
       if (!msg.avatarColor) msg.avatarColor = identity.avatarColor;

package/lib/project-delegated-follow-up.js

@@ -12,7 +12,7 @@ function unsafeReason(session, isPaired) {
   if (session.homeDebatePlanning || session.homeDebatePhase || session.debateSetupMode || session.debateState || session._debate) return "Debate sessions cannot receive project follow-ups.";
   if (session.loop || session.spawn || session.handoff || session.assignment || session.singleTurn || session._pairDelegation || isPaired) return "Orchestrated sessions cannot receive project follow-ups.";
   if (session.dangerouslySkipPermissions || session.permissionMode === "bypassPermissions") return "Full-access sessions cannot receive project follow-ups.";
-  if (session.destroying || session.scheduledMessage || session.rateLimitAutoContinuePending || session.taskStopRequested || session._runtimeRefreshRequested || session.pendingPush && session.pendingPush.length) return "Target session is not safely resumable right now.";
+  if (session.destroying || session.scheduledMessage || session.rateLimitAutoContinuePending || session.taskStopRequested || session._pendingMessageDrainPaused || session._runtimeRefreshRequested || session.pendingPush && session.pendingPush.length) return "Target session is not safely resumable right now.";
   return "";
 }
 
@@ -36,6 +36,7 @@ function attachDelegatedFollowUp(ctx) {
     var paired = !!(ctx.isPairedSession && ctx.isPairedSession(session));
     var reason = unsafeReason(session, paired);
     if (reason) throw new Error(reason);
+    if (ctx.isPendingQueuePaused && ctx.isPendingQueuePaused(session)) throw new Error("The Driver queue is stopped; explicit owner resume is required.");
     if (!ctx.canResumeVendor(session.vendor)) throw new Error("Target session provider cannot safely resume this conversation.");
     return { session: session, sessionRef: targetSessionRef, title: session.title || "Existing session" };
   }

package/lib/project-directory-claim.js

@@ -0,0 +1,65 @@
+// Reserve a new project directory before running Git or changing ownership.
+// Filesystem identity checks also keep failed attempts from deleting targets
+// replaced by another actor. Hostile OS/root mutation is outside this boundary.
+var fs = require("fs");
+var path = require("path");
+
+function canonical(candidate) {
+  var current = path.resolve(candidate);
+  var missing = [];
+  while (true) {
+    try { return path.join.apply(path, [fs.realpathSync(current)].concat(missing)); }
+    catch (error) {
+      if (error.code !== "ENOENT") throw error;
+      // A dangling symlink is an existing object, not a missing directory.
+      try { fs.lstatSync(current); throw new Error("A project path contains a dangling symlink."); }
+      catch (statError) { if (statError.code !== "ENOENT") throw statError; }
+      var parent = path.dirname(current);
+      if (parent === current) throw error;
+      missing.unshift(path.basename(current));
+      current = parent;
+    }
+  }
+}
+
+function inside(root, candidate) {
+  var relative = path.relative(root, candidate);
+  return relative !== ".." && relative.indexOf(".." + path.sep) !== 0 && !path.isAbsolute(relative);
+}
+
+function rejectIntersection(target, projects, userId) {
+  (projects || []).forEach(function (project) {
+    var root = canonical(project.path);
+    if (target === root || inside(target, root) || (project.ownerId !== userId && inside(root, target))) {
+      throw new Error("The destination intersects a registered project.");
+    }
+  });
+}
+
+function claim(options) {
+  var slug = options.slug;
+  if (!slug || slug === "." || slug === ".." || path.basename(slug) !== slug) throw new Error("Invalid project directory name.");
+  var base = canonical(options.baseDir);
+  var target = path.join(base, slug);
+  rejectIntersection(target, options.projects, options.userId);
+  fs.mkdirSync(base, { recursive: true });
+  if (fs.realpathSync(options.baseDir) !== base) throw new Error("The project base directory changed.");
+  rejectIntersection(target, options.projects, options.userId);
+  // EEXIST rejects directories, files, symlinks and concurrent claims alike.
+  fs.mkdirSync(target, { mode: 0o700 });
+  var identity = fs.lstatSync(target);
+  function assertOwned() {
+    var current = fs.lstatSync(target);
+    if (!current.isDirectory() || current.isSymbolicLink() || current.dev !== identity.dev || current.ino !== identity.ino || fs.realpathSync(base) !== base) {
+      throw new Error("The claimed project directory changed.");
+    }
+  }
+  function cleanup() {
+    try { assertOwned(); } catch (error) { return false; }
+    fs.rmSync(target, { recursive: true });
+    return true;
+  }
+  return { path: target, assertOwned: assertOwned, cleanup: cleanup };
+}
+
+module.exports = { claim: claim, canonical: canonical };

package/lib/project-file-operations.js

@@ -0,0 +1,61 @@
+// Shared file-viewer effects. Authority and scope are derived by each caller.
+var fs = require('fs'), path = require('path'), crypto = require('crypto');
+var resolve = require('./project-file-path').resolveFilePath;
+function hash(content) { return crypto.createHash('sha256').update(content).digest('hex'); }
+function attachFileOperations(ctx) {
+  function list(scope, requested) {
+    var dir = resolve(ctx.cwd, requested || '.', scope);
+    var items = scope.identity ? ctx.fsAsUser('list', { dir: dir }, scope.identity) : fs.readdirSync(dir, { withFileTypes: true }).map(function (item) { return { name: item.name, isDir: item.isDirectory() }; });
+    return items.filter(function (item) { return !item.isDir || !ctx.IGNORED_DIRS.has(item.name); }).map(function (item) { return { name: item.name, type: item.isDir ? 'dir' : 'file', path: path.relative(ctx.cwd, path.join(dir, item.name)).split(path.sep).join('/') }; });
+  }
+  function read(scope, requested) {
+    var file = resolve(ctx.cwd, requested, scope), identity = scope.identity;
+    var stat = identity ? ctx.fsAsUser('stat', { file: file }, identity) : fs.statSync(file);
+    if (stat.size > ctx.FS_MAX_SIZE) return { binary: true, size: stat.size, error: 'File too large (' + (stat.size / 1024 / 1024).toFixed(1) + ' MB)' };
+    var ext = path.extname(file).toLowerCase();
+    if (ctx.BINARY_EXTS.has(ext)) {
+      var binary = { binary: true, size: stat.size };
+      if (ctx.IMAGE_EXTS.has(ext)) binary.imageUrl = 'api/file?path=' + encodeURIComponent(requested);
+      return binary;
+    }
+    return { content: identity ? ctx.fsAsUser('read', { file: file, readContent: true }, identity).content : fs.readFileSync(file, 'utf8'), size: stat.size };
+  }
+  function snapshot(scope, requested) {
+    var file = resolve(ctx.cwd, requested, scope), stat = fs.lstatSync(file);
+    if (!stat.isFile() || stat.isSymbolicLink() || stat.nlink !== 1 || stat.size > 65536) throw new Error('Select a regular, singly linked text file of at most 64 KB.');
+    var result = read(scope, requested);
+    if (result.binary || typeof result.content !== 'string' || result.content.indexOf('\0') >= 0) throw new Error('Binary files are unavailable for canonical editing.');
+    return { dev: stat.dev, ino: stat.ino, mode: stat.mode, uid: stat.uid, gid: stat.gid, size: stat.size, mtime: stat.mtimeMs, hash: hash(result.content) };
+  }
+  function write(scope, requested, content, control) {
+    var file = resolve(ctx.cwd, requested, scope), attempted = false;
+    if (!control) {
+      if (scope.identity) ctx.fsAsUser('write', { file: file, content: content }, scope.identity);
+      else fs.writeFileSync(file, content, 'utf8');
+      return { ok: true };
+    }
+    if (typeof fs.constants.O_NOFOLLOW !== 'number') throw new Error('Canonical editing requires no-follow file descriptors on this platform.');
+    control.revalidate();
+    if (JSON.stringify(snapshot(scope, requested)) !== JSON.stringify(control.expected)) throw new Error('The exact file revision changed.');
+    try {
+      attempted = true;
+      if (scope.identity) ctx.fsAsUser('write_exact', { file: file, content: content, expected: control.expected, root: fs.realpathSync(ctx.cwd) }, scope.identity);
+      else {
+        var fd = fs.openSync(file, fs.constants.O_RDWR | fs.constants.O_NOFOLLOW);
+        try {
+          var stat = fs.fstatSync(fd), expected = control.expected;
+          if (!stat.isFile() || stat.nlink !== 1 || stat.dev !== expected.dev || stat.ino !== expected.ino || stat.mode !== expected.mode || stat.uid !== expected.uid || stat.gid !== expected.gid || stat.size !== expected.size || stat.mtimeMs !== expected.mtime || hash(fs.readFileSync(fd, 'utf8')) !== expected.hash) throw new Error('The open file revision changed.');
+          control.revalidate();
+          fs.ftruncateSync(fd, 0);
+          var bytes = Buffer.from(content, 'utf8'), offset = 0;
+          while (offset < bytes.length) { var written = fs.writeSync(fd, bytes, offset, bytes.length - offset, offset); if (!written) throw new Error('File write made no progress.'); offset += written; }
+          fs.fsyncSync(fd);
+        } finally { fs.closeSync(fd); }
+      }
+      control.revalidate();
+      return { status: 'completed', persisted: true, path: requested };
+    } catch (error) { error.productControlResult = { persisted: attempted ? 'unknown' : false, retrySafe: false, error: error.message }; throw error; }
+  }
+  return { list: list, read: read, write: write, snapshot: snapshot };
+}
+module.exports = { attachFileOperations: attachFileOperations };

package/lib/project-filesystem.js

@@ -37,6 +37,7 @@ function attachFilesystem(ctx) {
 
   var access = ctx.requestAccess || attachRequestAccess(ctx);
   var fileHistory = attachFileHistory(ctx, access);
+  var operations = require("./project-file-operations").attachFileOperations(ctx);
 
   function handleFilesystemMessage(ws, msg) {
     var fileScope;
@@ -57,40 +58,11 @@ function attachFilesystem(ctx) {
 
     // --- fs_list ---
     if (msg.type === "fs_list") {
-      var fsListIdentity = fileScope.identity;
-      var fsDir = fileTarget;
       try {
-        var fsListUserInfo = fsListIdentity;
-        var entries = [];
-        if (fsListUserInfo) {
-          // Run as target OS user to respect Linux file permissions
-          var rawEntries = fsAsUser("list", { dir: fsDir }, fsListUserInfo);
-          for (var fi = 0; fi < rawEntries.length; fi++) {
-            var re = rawEntries[fi];
-            if (re.isDir && IGNORED_DIRS.has(re.name)) continue;
-            entries.push({
-              name: re.name,
-              type: re.isDir ? "dir" : "file",
-              path: path.relative(cwd, path.join(fsDir, re.name)).split(path.sep).join("/"),
-            });
-          }
-        } else {
-          var items = fs.readdirSync(fsDir, { withFileTypes: true });
-          for (var fi = 0; fi < items.length; fi++) {
-            var item = items[fi];
-            if (item.isDirectory() && IGNORED_DIRS.has(item.name)) continue;
-            entries.push({
-              name: item.name,
-              type: item.isDirectory() ? "dir" : "file",
-              path: path.relative(cwd, path.join(fsDir, item.name)).split(path.sep).join("/"),
-            });
-          }
-        }
-        sendTo(ws, { type: "fs_list_result", path: msg.path || ".", entries: entries });
-        // Auto-watch the directory for changes
-        startDirWatch(ws, msg.path || ".");
+        sendTo(ws, { type: 'fs_list_result', path: msg.path || '.', entries: operations.list(fileScope, msg.path || '.') });
+        startDirWatch(ws, msg.path || '.');
       } catch (e) {
-        sendTo(ws, { type: "fs_list_result", path: msg.path, entries: [], error: fileError(e).message, errorCode: fileError(e).code });
+        sendTo(ws, { type: 'fs_list_result', path: msg.path, entries: [], error: fileError(e).message, errorCode: fileError(e).code });
       }
       return true;
     }
@@ -143,62 +115,19 @@ function attachFilesystem(ctx) {
 
     // --- fs_read ---
     if (msg.type === "fs_read") {
-      var fsReadIdentity = fileScope.identity;
-      var fsFile = fileTarget;
+      var metadata = { type: 'fs_read_result', path: msg.path, requestId: msg.requestId, projectSlug: msg.projectSlug, sessionId: msg.sessionId, accountId: msg.accountId };
       try {
-        var fsReadUserInfo = fsReadIdentity;
-        var ext = path.extname(fsFile).toLowerCase();
-        if (fsReadUserInfo) {
-          // Run stat and read as target OS user
-          var statResult = fsAsUser("stat", { file: fsFile }, fsReadUserInfo);
-          if (statResult.size > FS_MAX_SIZE) {
-            sendTo(ws, { type: "fs_read_result", path: msg.path, requestId: msg.requestId, projectSlug: msg.projectSlug, sessionId: msg.sessionId, accountId: msg.accountId, binary: true, size: statResult.size, error: "File too large (" + (statResult.size / 1024 / 1024).toFixed(1) + " MB)" });
-            return true;
-          }
-          if (BINARY_EXTS.has(ext)) {
-            var result = { type: "fs_read_result", path: msg.path, requestId: msg.requestId, projectSlug: msg.projectSlug, sessionId: msg.sessionId, accountId: msg.accountId, binary: true, size: statResult.size };
-            if (IMAGE_EXTS.has(ext)) result.imageUrl = "api/file?path=" + encodeURIComponent(msg.path);
-            sendTo(ws, result);
-            return true;
-          }
-          var readResult = fsAsUser("read", { file: fsFile, readContent: true }, fsReadUserInfo);
-          sendTo(ws, { type: "fs_read_result", path: msg.path, requestId: msg.requestId, projectSlug: msg.projectSlug, sessionId: msg.sessionId, accountId: msg.accountId, content: readResult.content, size: statResult.size });
-        } else {
-          var stat = fs.statSync(fsFile);
-          if (stat.size > FS_MAX_SIZE) {
-            sendTo(ws, { type: "fs_read_result", path: msg.path, requestId: msg.requestId, projectSlug: msg.projectSlug, sessionId: msg.sessionId, accountId: msg.accountId, binary: true, size: stat.size, error: "File too large (" + (stat.size / 1024 / 1024).toFixed(1) + " MB)" });
-            return true;
-          }
-          if (BINARY_EXTS.has(ext)) {
-            var result = { type: "fs_read_result", path: msg.path, requestId: msg.requestId, projectSlug: msg.projectSlug, sessionId: msg.sessionId, accountId: msg.accountId, binary: true, size: stat.size };
-            if (IMAGE_EXTS.has(ext)) result.imageUrl = "api/file?path=" + encodeURIComponent(msg.path);
-            sendTo(ws, result);
-            return true;
-          }
-          var content = fs.readFileSync(fsFile, "utf8");
-          sendTo(ws, { type: "fs_read_result", path: msg.path, requestId: msg.requestId, projectSlug: msg.projectSlug, sessionId: msg.sessionId, accountId: msg.accountId, content: content, size: stat.size });
-        }
-      } catch (e) {
-        sendTo(ws, { type: "fs_read_result", path: msg.path, requestId: msg.requestId, projectSlug: msg.projectSlug, sessionId: msg.sessionId, accountId: msg.accountId, error: fileError(e).message, errorCode: fileError(e).code });
+        var readResult = operations.read(fileScope, msg.path);
+        try { var fileSnapshot = operations.snapshot(fileScope, msg.path); if (fileSnapshot.hash === require('crypto').createHash('sha256').update(readResult.content).digest('hex')) readResult.controlRevision = require('./clay-control-target-projection').digest(fileSnapshot); } catch (ignored) {}
+        sendTo(ws, Object.assign(metadata, readResult));
       }
+      catch (e) { sendTo(ws, Object.assign(metadata, { error: fileError(e).message, errorCode: fileError(e).code })); }
       return true;
     }
 
-    // --- fs_write ---
-    if (msg.type === "fs_write") {
-      var fsWriteIdentity = fileScope.identity;
-      var fsWriteFile = fileTarget;
-      try {
-        var fsWriteUserInfo = fsWriteIdentity;
-        if (fsWriteUserInfo) {
-          fsAsUser("write", { file: fsWriteFile, content: msg.content || "" }, fsWriteUserInfo);
-        } else {
-          fs.writeFileSync(fsWriteFile, msg.content || "", "utf8");
-        }
-        sendTo(ws, { type: "fs_write_result", path: msg.path, ok: true });
-      } catch (e) {
-        sendTo(ws, { type: "fs_write_result", path: msg.path, ok: false, error: fileError(e).message, errorCode: fileError(e).code });
-      }
+    if (msg.type === 'fs_write') {
+      try { sendTo(ws, Object.assign({ type: 'fs_write_result', path: msg.path }, operations.write(fileScope, msg.path, msg.content || ''))); }
+      catch (e) { sendTo(ws, { type: 'fs_write_result', path: msg.path, ok: false, error: fileError(e).message, errorCode: fileError(e).code }); }
       return true;
     }
 
@@ -239,8 +168,8 @@ function attachFilesystem(ctx) {
         var setResult;
         try { setResult = opts.onSetProjectEnv(targetSlug, msg.envrc || ""); }
         catch (error) { sendTo(ws, { type: "set_project_env_result", slug: targetSlug, requestId: msg.requestId, ok: false, error: error.message }); return true; }
-        if (setResult.ok) onEnvironmentChanged();
-        sendTo(ws, { type: "set_project_env_result", ok: setResult.ok, slug: targetSlug, requestId: msg.requestId, error: setResult.error, timing: setResult.ok ? "Applies to newly created coding-agent processes. Active processes keep their current environment." : undefined });
+        if (setResult.ok && !setResult.runtimeRefreshed) onEnvironmentChanged();
+        sendTo(ws, Object.assign({}, setResult, { type: "set_project_env_result", slug: targetSlug, requestId: msg.requestId, timing: setResult.ok ? "Applies to newly created coding-agent processes. Active processes keep their current environment." : undefined }));
       } else {
         sendTo(ws, { type: "set_project_env_result", slug: targetSlug, requestId: msg.requestId, ok: false, error: "Not supported" });
       }
@@ -297,6 +226,7 @@ function attachFilesystem(ctx) {
 
   return {
     handleFilesystemMessage: handleFilesystemMessage,
+    productOperations: operations,
   };
 }