clay-server 4.2.0-beta.1 → 4.2.0-beta.3

package/lib/project-connection.js

@@ -5,6 +5,7 @@ var userPresence = require("./user-presence");
 var emailAccounts = require("./email-accounts");
 var { getCodexConfig } = require("./codex-defaults");
 var yoke = require("./yoke");
+var permissionModes = require("./session-permission-mode");
 
 function dispatchMessageSafely(handleMessage, sendTo, slug, ws, msg) {
   try {
@@ -195,7 +196,8 @@ function attachConnection(ctx) {
     // model. Always send it so reconnects cannot fall back to "Not installed."
     var initialModelInfo = buildInitialModelInfo(sm, initialVendor, initialModel, initialModels, restoredActive ? restoredActive.localId : null);
     sendTo(ws, initialModelInfo);
-    sendTo(ws, { type: "config_state", model: initialModelInfo.model, vendor: initialVendor, sessionId: restoredActive ? restoredActive.localId : null, mode: sm.currentPermissionMode || "default", effort: initialEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+    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() });
@@ -270,7 +272,8 @@ function attachConnection(ctx) {
         try { resolveSessionForView(active, ws); } catch (e) {}
       }
       var _vendorCaps = (sm.capabilitiesByVendor && sm.capabilitiesByVendor[active.vendor || sm.defaultVendor || "claude"]) || {};
-      sendTo(ws, { type: "session_switched", id: active.localId, cliSessionId: active.cliSessionId || null, loop: active.loop || null, vendor: active.vendor || null, model: active.model || null, effort: active.effort || initialEffort || null, hasHistory: (active.history && active.history.length > 0), capabilities: _vendorCaps, mode: active.mode || "gui", terminalId: typeof active.terminalId === "number" ? active.terminalId : null, runtimeMode: active.runtimeMode || null, runtimeTerminalId: typeof active.runtimeTerminalId === "number" ? active.runtimeTerminalId : null, tuiSuspended: !!active.tuiSuspended, permissionMode: active.permissionMode || null });
+      var activePermissionState = permissionModes.clientState(active, sm.currentPermissionMode, sm.defaultVendor);
+      sendTo(ws, { type: "session_switched", id: active.localId, cliSessionId: active.cliSessionId || null, loop: active.loop || null, vendor: active.vendor || null, model: active.model || null, effort: active.effort || initialEffort || null, hasHistory: (active.history && active.history.length > 0), capabilities: _vendorCaps, mode: active.mode || "gui", terminalId: typeof active.terminalId === "number" ? active.terminalId : null, runtimeMode: active.runtimeMode || null, runtimeTerminalId: typeof active.runtimeTerminalId === "number" ? active.runtimeTerminalId : null, tuiSuspended: !!active.tuiSuspended, permissionMode: activePermissionState.requestedPermissionMode, effectivePermissionMode: activePermissionState.effectivePermissionMode, permissionCapabilities: activePermissionState.permissionCapabilities, mcpPermissionModeOverrides: activePermissionState.mcpPermissionModeOverrides });
       if (ctx.autonomousRun) sendTo(ws, { type: "autonomous_run_state", sessionId: active.localId, run: ctx.autonomousRun.project(active.autonomousRun) });
       // Send per-session context sources
       var sessionSources = loadContextSources(slug, active.localId);

package/lib/project-full-access.js

@@ -1,86 +1,99 @@
-// Shared, transactional control for Clay-managed per-session Skip Permissions.
+// Serialized, transactional owner for every per-session permission selection.
+// Skip is Clay-managed and deliberately maps the SDK to default.
 
 function createFullAccessService(ctx) {
   var sm = ctx.sm;
   var transitions = new Map();
-
   function serialize(session, action) {
     var prior = transitions.get(session.localId) || Promise.resolve();
     var next = prior.catch(function () {}).then(action);
     transitions.set(session.localId, next);
-    return next.finally(function () {
-      if (transitions.get(session.localId) === next) transitions.delete(session.localId);
-    });
+    return next.finally(function () { if (transitions.get(session.localId) === next) transitions.delete(session.localId); });
   }
-
   function snapshot(session) {
-    return {
-      permissionMode: session.permissionMode || null,
-      permissionModeBeforeFullAccess: session.permissionModeBeforeFullAccess || null,
-      enabled: session.permissionMode === "bypassPermissions",
-    };
+    return { permissionMode: session.permissionMode || null, permissionModeBeforeFullAccess: session.permissionModeBeforeFullAccess || null,
+      effectivePermissionMode: session.effectivePermissionMode || null, permissionModeFallbackReason: session.permissionModeFallbackReason || null,
+      enabled: session.permissionMode === "bypassPermissions" };
   }
-
-  function notify(session) {
+  function persist(session) {
+    sm.saveSessionFile(session);
+    sm.broadcastSessionList();
     if (typeof sm.sendToSession === "function") sm.sendToSession(session, { type: "session_full_access_changed", id: session.localId,
       enabled: session.permissionMode === "bypassPermissions", permissionMode: session.permissionMode });
   }
-
-  async function applyNativeMode(session, enabled) {
+  async function setNative(session, mode) {
     if (!session.queryInstance || typeof session.queryInstance.setPermissionMode !== "function") return;
-    // Clay's common permission callback remains the approval authority.
-    await session.queryInstance.setPermissionMode(enabled ? "default" : session.permissionMode);
+    await session.queryInstance.setPermissionMode(mode === "bypassPermissions" ? "default" : mode);
   }
-
-  async function applyEnabled(session, enabled) {
+  async function applyMode(session, mode) {
     var previous = snapshot(session);
-    if (previous.enabled === !!enabled) return previous;
-    if (enabled) {
-      session.permissionModeBeforeFullAccess = session.permissionMode || sm.currentPermissionMode || "default";
-      session.permissionMode = "bypassPermissions";
-    } else {
-      session.permissionMode = session.permissionModeBeforeFullAccess || "default";
-      session.permissionModeBeforeFullAccess = null;
-    }
+    if (previous.permissionMode === mode) return previous;
+    // Clear stale confirmation before the setter. An init/status event may
+    // arrive while it is pending; do not clear that newer observation later.
+    session.effectivePermissionMode = null;
+    session.permissionModeFallbackReason = null;
     try {
-      await applyNativeMode(session, !!enabled);
-      sm.saveSessionFile(session);
-      sm.broadcastSessionList();
-      notify(session);
-      return previous;
+      await setNative(session, mode);
     } catch (error) {
+      session.effectivePermissionMode = previous.effectivePermissionMode;
+      session.permissionModeFallbackReason = previous.permissionModeFallbackReason;
+      throw error;
+    }
+    session.permissionMode = mode;
+    session.permissionModeBeforeFullAccess = mode === "bypassPermissions" ? (previous.permissionMode || sm.currentPermissionMode || "default") : null;
+    try { persist(session); return previous; }
+    catch (error) {
       session.permissionMode = previous.permissionMode;
       session.permissionModeBeforeFullAccess = previous.permissionModeBeforeFullAccess;
+      session.effectivePermissionMode = previous.effectivePermissionMode;
+      session.permissionModeFallbackReason = previous.permissionModeFallbackReason;
+      try { await setNative(session, previous.permissionMode || "default"); }
+      catch (rollbackError) {
+        session.effectivePermissionMode = null;
+        session.permissionModeFallbackReason = "Permission rollback failed: " + (rollbackError.message || rollbackError);
+      }
       throw error;
     }
   }
-
+  function setMode(session, mode) { return serialize(session, function () { return applyMode(session, mode); }); }
   function setEnabled(session, enabled) {
-    return serialize(session, function () { return applyEnabled(session, enabled); });
-  }
-
-  async function applyRestore(session, prior) {
-    if (!prior) return;
-    var current = snapshot(session);
-    session.permissionMode = prior.permissionMode;
-    session.permissionModeBeforeFullAccess = prior.permissionModeBeforeFullAccess;
-    try {
-      await applyNativeMode(session, prior.enabled);
-      sm.saveSessionFile(session);
-      sm.broadcastSessionList();
-      notify(session);
-    } catch (error) {
-      session.permissionMode = current.permissionMode;
-      session.permissionModeBeforeFullAccess = current.permissionModeBeforeFullAccess;
-      throw error;
-    }
+    return serialize(session, function () {
+      return applyMode(session, enabled ? "bypassPermissions" : (session.permissionModeBeforeFullAccess || "default"));
+    });
   }
-
   function restore(session, prior) {
-    return serialize(session, function () { return applyRestore(session, prior); });
+    if (!prior) return Promise.resolve();
+    return serialize(session, async function () {
+      var current = snapshot(session);
+      // Runtime-effective state is an observation, not part of the selection
+      // snapshot. Clear it before the native setter and preserve any newer
+      // init/status event that arrives while the acknowledgement is pending.
+      session.effectivePermissionMode = null;
+      session.permissionModeFallbackReason = null;
+      try {
+        await setNative(session, prior.permissionMode || "default");
+      } catch (error) {
+        session.effectivePermissionMode = current.effectivePermissionMode;
+        session.permissionModeFallbackReason = current.permissionModeFallbackReason;
+        throw error;
+      }
+      session.permissionMode = prior.permissionMode;
+      session.permissionModeBeforeFullAccess = prior.permissionModeBeforeFullAccess;
+      try { persist(session); }
+      catch (error) {
+        session.permissionMode = current.permissionMode;
+        session.permissionModeBeforeFullAccess = current.permissionModeBeforeFullAccess;
+        session.effectivePermissionMode = null;
+        session.permissionModeFallbackReason = null;
+        try { await setNative(session, current.permissionMode || "default"); }
+        catch (rollbackError) {
+          session.effectivePermissionMode = null;
+          session.permissionModeFallbackReason = "Permission rollback failed: " + (rollbackError.message || rollbackError);
+        }
+        throw error;
+      }
+    });
   }
-
-  return { restore: restore, setEnabled: setEnabled, snapshot: snapshot };
+  return { restore: restore, setEnabled: setEnabled, setMode: setMode, snapshot: snapshot };
 }
-
 module.exports = { createFullAccessService: createFullAccessService };

package/lib/project-sessions.js

@@ -88,6 +88,7 @@ function attachSessions(ctx) {
   var slug = ctx.slug;
   var isMate = ctx.isMate;
   var osUsers = ctx.osUsers;
+  var dangerouslySkipPermissions = ctx.dangerouslySkipPermissions === true;
   var currentVersion = ctx.currentVersion;
   var sm = ctx.sm;
   var sdk = ctx.sdk;
@@ -98,6 +99,7 @@ function attachSessions(ctx) {
   var sendToAdmins = ctx.sendToAdmins;
   var broadcastUpdateAvailable = ctx.broadcastUpdateAvailable || function () {};
   var broadcastUpdateStarted = ctx.broadcastUpdateStarted || function () {};
+  var isDriverOperatedSession = ctx.isDriverOperatedSession || function () { return false; };
   var sendToUpdateUser = ctx.sendToUpdateUser || function () {};
   var sendToSession = ctx.sendToSession;
   var sendToSessionOthers = ctx.sendToSessionOthers;
@@ -1181,13 +1183,62 @@ function attachSessions(ctx) {
       return true;
     }
 
-    if (msg.type === "set_mcp_permission_mode_override" && msg.serverName) {
-      var session = getSessionForWs(ws);
-      if (session && sdk.setMcpPermissionModeOverride) {
-        // mode: "default" | "auto" | null (null clears the override)
-        var mcpMode = (msg.mode === "auto" || msg.mode === "default") ? msg.mode : null;
-        sdk.setMcpPermissionModeOverride(session, msg.serverName, mcpMode);
+    if (msg.type === "set_mcp_permission_mode_override") {
+      var mcpRequestId = typeof msg.requestId === "string" && msg.requestId.length <= 128 ? msg.requestId : null;
+      var mcpProjectSlug = typeof msg.projectSlug === "string" && msg.projectSlug.length <= 256 ? msg.projectSlug : null;
+      var mcpSessionId = Number(msg.sessionId);
+      var mcpServerName = typeof msg.serverName === "string" && msg.serverName.length > 0 && msg.serverName.length <= 256 ? msg.serverName : null;
+      var mcpSession = Number.isSafeInteger(mcpSessionId) ? sm.sessions.get(mcpSessionId) : null;
+      function mcpPermissionResult(ok, error, overrides) {
+        sendTo(ws, {
+          type: "mcp_permission_mode_result",
+          ok: ok === true,
+          requestId: mcpRequestId,
+          projectSlug: mcpProjectSlug,
+          sessionId: Number.isSafeInteger(mcpSessionId) ? mcpSessionId : null,
+          serverName: mcpServerName,
+          mode: ok ? mcpMode : null,
+          mcpPermissionModeOverrides: ok ? overrides || {} : {},
+          error: error || null,
+        });
+      }
+      var mcpMode = msg.mode === "auto" || msg.mode === "default" ? msg.mode : null;
+      var mcpModeValid = msg.mode == null || msg.mode === "" || msg.mode === "auto" || msg.mode === "default";
+      if (mcpProjectSlug !== slug) {
+        mcpPermissionResult(false, "The AI review request belongs to a different project.");
+        return true;
+      }
+      if (!mcpServerName || !mcpModeValid) {
+        mcpPermissionResult(false, "The AI review request is invalid.");
+        return true;
+      }
+      var mcpRuntimeMode = mcpSession && (mcpSession.runtimeMode || mcpSession.mode || "gui");
+      if (!mcpSession || !ownsSearchSession(ws, mcpSession) || mcpRuntimeMode !== "gui" || isDriverOperatedSession(mcpSession)) {
+        mcpPermissionResult(false, "AI review controls are only available on an accessible Driver GUI session.");
+        return true;
+      }
+      var mcpApplicable = (mcpSession.effectivePermissionMode === "auto" || mcpSession.effectivePermissionMode === "bypassPermissions") &&
+        mcpSession.permissionCapabilities && mcpSession.permissionCapabilities.mcpOverride === true && typeof sdk.setMcpPermissionModeOverride === "function";
+      if (!mcpApplicable) {
+        mcpPermissionResult(false, "AI review controls are not available for this session.");
+        return true;
       }
+      (async function () {
+        try {
+          var result = await sdk.setMcpPermissionModeOverride(mcpSession, mcpServerName, mcpMode);
+          if (!result || result.ok === false) {
+            mcpPermissionResult(false, result && result.error || "Failed to change AI review policy.");
+            return;
+          }
+          mcpSession.mcpPermissionModeOverrides = mcpSession.mcpPermissionModeOverrides || {};
+          if (mcpMode) mcpSession.mcpPermissionModeOverrides[mcpServerName] = mcpMode;
+          else delete mcpSession.mcpPermissionModeOverrides[mcpServerName];
+          if (typeof sm.saveSessionFile === "function") sm.saveSessionFile(mcpSession);
+          mcpPermissionResult(true, null, mcpSession.mcpPermissionModeOverrides);
+        } catch (error) {
+          mcpPermissionResult(false, "Failed to change AI review policy: " + (error.message || error));
+        }
+      })();
       return true;
     }
 
@@ -1204,6 +1255,10 @@ function attachSessions(ctx) {
             " is bound to '" + vendorSession.vendor + "', refused rebind to '" + msg.vendor + "'");
         } else {
           vendorSession.vendor = msg.vendor;
+          if (vendorSession.permissionMode === "auto" && msg.vendor !== "claude") {
+            vendorSession.permissionMode = "default";
+            vendorSession.effectivePermissionMode = null;
+          }
           if (vendorSession.vendor !== msg.vendor) vendorSession.model = "";
           sm.saveSessionFile(vendorSession);
           sm.broadcastSessionList();
@@ -1246,16 +1301,62 @@ function attachSessions(ctx) {
       return true;
     }
 
-    if (msg.type === "set_permission_mode" && msg.mode) {
-      sm.currentPermissionMode = msg.mode;
-      var session = getSessionForWs(ws);
-      if (session) {
-        session.permissionMode = msg.mode;
-        sm.saveSessionFile(session);
-        sm.broadcastSessionList();
-        sdk.setPermissionMode(session, msg.mode);
+    if (msg.type === "set_permission_mode") {
+      var permissionModes = require("./session-permission-mode");
+      var requestId = typeof msg.requestId === "string" && msg.requestId.length <= 128 ? msg.requestId : null;
+      var requestedProjectSlug = typeof msg.projectSlug === "string" && msg.projectSlug.length <= 256 ? msg.projectSlug : null;
+      var requestedSessionId = Number(msg.sessionId);
+      var session = Number.isSafeInteger(requestedSessionId) ? sm.sessions.get(requestedSessionId) : null;
+      function permissionResult(ok, error, includeState) {
+        var state = includeState && session ? permissionModes.clientState(session, sm.currentPermissionMode, sm.defaultVendor) : null;
+        sendTo(ws, {
+          type: "permission_mode_result",
+          ok: ok === true,
+          requestId: requestId,
+          projectSlug: requestedProjectSlug,
+          sessionId: Number.isSafeInteger(requestedSessionId) ? requestedSessionId : null,
+          mode: state ? state.requestedPermissionMode : null,
+          effectivePermissionMode: state ? state.effectivePermissionMode : null,
+          permissionCapabilities: state ? state.permissionCapabilities : null,
+          mcpPermissionModeOverrides: state ? state.mcpPermissionModeOverrides : {},
+          error: error || null,
+        });
       }
-      send({ type: "config_state", vendor: null, sessionId: null, mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+      if (requestedProjectSlug !== slug) {
+        permissionResult(false, "The permission request belongs to a different project.", false);
+        return true;
+      }
+      if (!session || !ownsSearchSession(ws, session) || isDriverOperatedSession(session)) {
+        permissionResult(false, "Permissions can only be changed on an accessible Driver session.", false);
+        return true;
+      }
+      var permissionRuntimeMode = session.runtimeMode || session.mode || "gui";
+      if (permissionRuntimeMode !== "gui") {
+        permissionResult(false, "Permissions can only be changed on a GUI session.", true);
+        return true;
+      }
+      if (dangerouslySkipPermissions) {
+        permissionResult(false, "Skip permissions is forced by the server setting.", true);
+        return true;
+      }
+      var valid = permissionModes.validate(session, msg.mode, sm.defaultVendor);
+      if (!valid.ok) { permissionResult(false, valid.error, true); return true; }
+      (async function() {
+        try {
+          if (session.permissionMode === "bypassPermissions" && valid.mode !== "bypassPermissions" && autonomousRun) {
+            await autonomousRun.stopForPermissionChange(session);
+          }
+          await fullAccessService.setMode(session, valid.mode);
+          var state = permissionModes.clientState(session, sm.currentPermissionMode, sm.defaultVendor);
+          sm.sendToSession(session, { type: "config_state", sessionId: session.localId, vendor: session.vendor || sm.defaultVendor || "claude", mode: state.requestedPermissionMode,
+            effectivePermissionMode: state.effectivePermissionMode, permissionRequestId: requestId,
+            permissionCapabilities: state.permissionCapabilities, mcpPermissionModeOverrides: state.mcpPermissionModeOverrides,
+            effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
+          permissionResult(true, null, true);
+        } catch (error) {
+          permissionResult(false, "Failed to change permission mode: " + (error.message || error), true);
+        }
+      })();
       return true;
     }
 
@@ -1263,12 +1364,12 @@ function attachSessions(ctx) {
       var fullAccessSession = msg.id ? sm.sessions.get(Number(msg.id)) : getSessionForWs(ws);
       var fullAccessEnabled = msg.enabled === true;
       var fullAccessMode = fullAccessSession && (fullAccessSession.runtimeMode || fullAccessSession.mode || "gui");
-      if (!fullAccessSession || fullAccessMode !== "gui") {
+      if (!fullAccessSession || fullAccessMode !== "gui" || isDriverOperatedSession(fullAccessSession)) {
         sendTo(ws, { type: "session_full_access_result", ok: false, id: msg.id || null, error: "Skip Permissions is only available for GUI sessions." });
         return true;
       }
       if (usersModule.isMultiUser() && ws._clayUser &&
-          !usersModule.canAccessSession(ws._clayUser.id, fullAccessSession, { visibility: "public" })) {
+          !usersModule.canAccessSession(ws._clayUser.id, fullAccessSession, getProjectAccess())) {
         sendTo(ws, { type: "session_full_access_result", ok: false, id: fullAccessSession.localId, error: "You do not have access to this session." });
         return true;
       }
@@ -1603,11 +1704,13 @@ function attachSessions(ctx) {
 
       // --- Plan approval: "allow_accept_edits" -- approve + switch to acceptEdits mode ---
       if (decision === "allow_accept_edits") {
-        sdk.setPermissionMode(session, "acceptEdits");
-        sm.currentPermissionMode = "acceptEdits";
-        send({ type: "config_state", vendor: null, sessionId: null, mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
-        pending.resolve({ behavior: "allow", updatedInput: pending.toolInput });
-        sm.sendAndRecord(session, { type: "permission_resolved", requestId: requestId, decision: decision });
+        fullAccessService.setMode(session, "acceptEdits").then(function() {
+          pending.resolve({ behavior: "allow", updatedInput: pending.toolInput });
+          sm.sendAndRecord(session, { type: "permission_resolved", requestId: requestId, decision: decision });
+        }).catch(function(error) {
+          pending.resolve({ behavior: "deny", message: "Could not enter the accepted-edits workflow." });
+          sendTo(ws, { type: "error", text: "Failed to change permission mode: " + (error.message || error) });
+        });
         return true;
       }
 
@@ -1632,10 +1735,6 @@ function attachSessions(ctx) {
           }
         });
 
-        // Update permission mode for the new session
-        sm.currentPermissionMode = "acceptEdits";
-        send({ type: "config_state", vendor: null, sessionId: null, mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
-
         // Build prompt from plan content (sent from client) or plan file path
         var clientPlanContent = msg.planContent || "";
         var planPrompt;
@@ -1654,6 +1753,7 @@ function attachSessions(ctx) {
         ]).then(function () {
           try {
             var newSession = sm.createSession(null, ws);
+            newSession.permissionMode = "acceptEdits";
             // Send the plan as the first user message (with planContent for UI rendering)
             var userMsg = { type: "user_message", text: planPrompt, planContent: clientPlanContent || null };
             newSession.history.push(userMsg);

package/lib/project-user-message.js

@@ -122,10 +122,13 @@ function attachUserMessage(ctx) {
   function handleUserMessage(ws, msg, forcedSession, internal) {
     if (msg.type === "pending_message_get" || msg.type === "pending_message_edit" || msg.type === "pending_message_cancel" || msg.type === "pending_message_reorder" || msg.type === "pending_message_resume") {
       var queueSession = forcedSession || getSessionForWs(ws);
-      if (!queueSession || !pendingMessageQueue) return true;
       var queueActor = ws && ws._clayUser;
       var queueResult;
-      if (msg.projectSlug !== slug) queueResult = { ok: false, error: "Project changed", sessionId: queueSession.localId, projectSlug: slug };
+      var requestedQueue = { ok: false, projectSlug: msg.projectSlug || slug, sessionId: msg.sessionId == null ? null : msg.sessionId, revision: 0, paused: false, items: [] };
+      if (!pendingMessageQueue) queueResult = Object.assign({}, requestedQueue, { error: "The message queue is unavailable." });
+      else if (!queueSession) queueResult = Object.assign({}, requestedQueue, { error: "The session is no longer available." });
+      else if (msg.projectSlug !== slug) queueResult = Object.assign({}, requestedQueue, { error: "Project changed" });
+      else if (msg.sessionId == null || String(msg.sessionId) !== String(queueSession.localId)) queueResult = Object.assign({}, requestedQueue, { error: "Session changed" });
       else if (msg.type === "pending_message_resume") {
         queueResult = pendingMessageQueue.resume(queueSession, queueActor, msg.revision, msg.sessionId);
         if (queueResult.ok && !queueResult.paused) {

package/lib/project.js

@@ -1945,6 +1945,7 @@ function createProjectContext(opts) {
     adapter: adapter,
     fullAccessService: _fullAccess,
     autonomousRun: _autonomousRun,
+    isDriverOperatedSession: function (session) { return !isMate && _sessionPair.workerPermission.isDriverOperated(session); },
     getProjectList: getProjectList,
     getProjectCount: getProjectCount,
     getScheduleCount: getScheduleCount,

package/lib/public/app.js

@@ -333,6 +333,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     cursorSharingHydrated: false,
     pendingOutboundMessages: [],
     pendingMessageQueue: { projectSlug: null, sessionId: null, revision: 0, paused: false, items: [], loading: false, error: "" },
+    pendingMessageQueueRecovery: false,
     pendingMessageQueueRequests: {},
     pendingMessageQueueEdit: null,
     pendingMessageQueueDrag: null,
@@ -493,6 +494,11 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     // new-session menu doesn't flash the TUI-only entry.
     claudeOpenMode: "gui",
     currentMode: "default",
+    effectivePermissionMode: null,
+    permissionCapabilities: { auto: false, mcpOverride: false },
+    permissionModePendingByTarget: {},
+    mcpPermissionModePendingByTarget: {},
+    mcpPermissionModeOverrides: {},
     currentEffort: "medium",
     currentBetas: [],
     currentThinking: "adaptive",

package/lib/public/css/filebrowser.css

@@ -686,6 +686,26 @@
   font-size: 12px;
   color: var(--text-muted);
 }
+.mcp-server-perm-mode {
+  max-width: 118px;
+  padding: 5px 24px 5px 8px;
+  border: 1px solid var(--border);
+  border-radius: 6px;
+  background: var(--bg);
+  color: var(--text);
+  font-size: 12px;
+}
+.mcp-server-perm-mode:disabled {
+  cursor: wait;
+  opacity: 0.55;
+}
+.mcp-server-perm-reason {
+  max-width: 180px;
+  color: var(--text-muted);
+  font-size: 11px;
+  line-height: 1.3;
+  text-align: right;
+}
 
 /* Beta toggle row inside settings card */
 .ps-beta-toggle-row,

package/lib/public/css/messages.css

@@ -508,6 +508,33 @@ pre:hover .code-copy-btn { opacity: 1; }
 .clay-file-link-label { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 .clay-file-link-notice { margin-top: 5px; color: var(--text-secondary); font-size: 12px; }
 
+.hosted-link-chip, .github-link-chip {
+  display: inline-flex;
+  align-items: center;
+  gap: 5px;
+  max-width: 100%;
+  padding: 3px 8px;
+  border: 1px solid color-mix(in srgb, var(--text) 16%, var(--border));
+  border-radius: 999px;
+  background: color-mix(in srgb, var(--text) 8%, var(--bg));
+  color: var(--text);
+  font-size: 0.92em;
+  line-height: 1.35;
+  vertical-align: baseline;
+  text-decoration: none !important;
+  transition: background 120ms ease, border-color 120ms ease, transform 120ms ease;
+}
+.hosted-link-chip { color: var(--text); }
+.md-content .github-link-chip { color: var(--text); }
+.md-content .gitlab-link-chip { color: var(--text); }
+.hosted-link-chip:hover, .github-link-chip:hover { background: color-mix(in srgb, var(--text) 14%, var(--bg-alt)); border-color: color-mix(in srgb, var(--text) 30%, var(--border)); }
+.hosted-link-chip:active, .github-link-chip:active { transform: translateY(1px); }
+.hosted-link-chip:focus-visible, .github-link-chip:focus-visible { outline: 2px solid var(--link); outline-offset: 2px; }
+.github-link-icon { display: inline-flex; width: 15px; height: 15px; flex: 0 0 15px; }
+.github-link-icon .lucide { width: 15px; height: 15px; }
+.github-link-main { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.github-link-kind { min-width: 0; max-width: 65%; flex: 0 1 auto; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: var(--text-muted); font-size: 0.88em; }
+
 .md-content ul, .md-content ol {
   padding-left: 24px;
   margin: 10px 0;

package/lib/public/css/overlays.css

@@ -519,6 +519,66 @@ button.top-bar-pill.pill-accent:hover { background: color-mix(in srgb, var(--acc
 .popover-copy.copied { color: var(--success); border-color: var(--success); }
 
 /* Skip permissions pill */
+.session-permission-control {
+  display: inline-flex;
+  align-items: center;
+  flex: 0 1 auto;
+  flex-wrap: wrap;
+  gap: 7px;
+  max-width: 100%;
+  min-width: 0;
+}
+.session-permission-control.hidden { display: none; }
+.session-permission-segmented {
+  display: inline-flex;
+  align-items: center;
+  flex: 0 0 auto;
+  gap: 2px;
+  padding: 2px;
+  border: 1px solid var(--border, rgba(255,255,255,.18));
+  border-radius: 999px;
+  background: var(--surface-raised, rgba(0,0,0,.18));
+}
+.session-permission-segmented button {
+  flex: 0 0 auto;
+  border: 0;
+  border-radius: 999px;
+  padding: 3px 8px;
+  color: var(--text-muted, inherit);
+  background: transparent;
+  font: inherit;
+  font-size: 11px;
+  white-space: nowrap;
+  cursor: pointer;
+}
+.session-permission-segmented button.active { background: var(--accent, #6f8cff); color: #fff; }
+.session-permission-segmented button:disabled { cursor: not-allowed; opacity: .5; }
+.session-permission-control.permission-pending .session-permission-segmented button:disabled { cursor: wait; }
+.session-permission-status {
+  flex: 1 1 118px;
+  min-width: 0;
+  max-width: 190px;
+  overflow-wrap: anywhere;
+  white-space: normal;
+  color: var(--text-dimmer, var(--text-muted));
+  font-size: 10px;
+  line-height: 1.2;
+}
+.session-permission-status.hidden { display: none; }
+.permission-runtime-fallback .session-permission-status { color: var(--warning, #d49a55); }
+.permission-globally-forced .session-permission-status { color: var(--warning, #d49a55); }
+.permission-label-short { display: none; }
+@media (max-width: 760px) {
+  .permission-label-long { display: none; }
+  .permission-label-short { display: inline; }
+  .session-permission-control { column-gap: 5px; row-gap: 2px; }
+  .session-permission-segmented button { padding-inline: 7px; }
+  .session-permission-status {
+    flex-basis: 96px;
+    max-width: 170px;
+    font-size: 9px;
+  }
+}
 #skip-perms-pill .lucide { width: 12px; height: 12px; flex-shrink: 0; }
 
 /* --- Confirm modal --- */

package/lib/public/css/pane.css

@@ -370,13 +370,31 @@ body.pane-mode #input-area {
    tie and keep the pill at its 22px title-bar size inside the 24px pane
    header. Scope under .split-pane-header to outrank them. */
 .split-pane-header .split-pane-full-access {
-  height: 15px;
+  height: auto;
   align-self: center;
   margin-left: 0;
-  padding: 0 3px 0 7px;
-  gap: 5px;
+  padding: 0;
+  gap: 4px;
   font-size: 8px;
   letter-spacing: 0.02em;
+  flex-wrap: nowrap;
+  flex: 0 0 auto;
+  overflow: hidden;
+}
+
+.split-pane-header .session-permission-segmented button {
+  padding: 1px 5px;
+  font-size: 8px;
+}
+
+.split-pane-header .session-permission-status {
+  flex: 0 0 auto;
+  min-width: 40px;
+  max-width: 72px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-size: 8px;
 }
 
 .split-pane-header .session-full-access-track {
@@ -395,7 +413,6 @@ body.pane-mode #input-area {
 
 @media (max-width: 900px) {
   .split-pane-header .session-full-access-label { display: none; }
-  .split-pane-header .split-pane-full-access { padding-left: 3px; }
 }
 
 .split-pane-close {

package/lib/public/css/pending-message-queue.css

@@ -167,6 +167,11 @@ button.pending-message-drag:active { cursor: grabbing; }
 .pending-message-banner-error { color: var(--error); font-size: 10px; line-height: 1.35; }
 .pending-message-error { margin-top: 4px; }
 .pending-message-banner-error { padding: 0 8px 6px; }
+.pending-message-restoring { padding: 0 8px 6px; color: var(--text-dimmer); font-size: 10px; line-height: 1.35; }
+
+.pending-message-drag:disabled,
+.pending-message-actions button:disabled,
+.pending-message-resume:disabled { cursor: not-allowed; opacity: .48; }
 
 .pending-message-drag:focus-visible,
 .pending-message-actions button:focus-visible,