clay-server 2.47.0-beta.6 → 3.0.0-beta.2

package/lib/project-sessions.js

@@ -175,6 +175,11 @@ function attachSessions(ctx) {
         var termId = (typeof s.runtimeTerminalId === "number")
           ? s.runtimeTerminalId
           : (typeof s.terminalId === "number" ? s.terminalId : null);
+        // Adopted external CLI sessions (a standalone `claude` run in this
+        // cwd) must not banner: the user is already looking at that terminal.
+        // Once they open the session in Clay a PTY attaches and banners
+        // become meaningful.
+        if (s.adopted && termId === null) return;
         // Don't banner a session someone is already watching — they can see
         // the reply in the TUI. Gate at the source (server) rather than relying
         // on the client's activeSessionId suppression, which isn't reliable for
@@ -428,6 +433,9 @@ function attachSessions(ctx) {
     }
 
     if (msg.type === "new_session") {
+      // Opportunistic hygiene: drop blanks that sat untouched past the grace
+      // period before deciding whether to reuse or create.
+      sm.sweepBlankSessions();
       var sessionOpts = {};
       if (ws._clayUser && usersModule.isMultiUser()) sessionOpts.ownerId = ws._clayUser.id;
       if (msg.sessionVisibility) sessionOpts.sessionVisibility = msg.sessionVisibility;
@@ -500,7 +508,27 @@ function attachSessions(ctx) {
         startTitleWatcher(newSess);
         sm.switchSession(newSess.localId, ws);
       } else {
-        newSess = sm.createSession(sessionOpts, ws);
+        var newSessionVendor = sessionOpts.vendor || sm.defaultVendor || "claude";
+        sessionOpts.effort = yoke.clampEffort(
+          newSessionVendor,
+          (sm.currentEffortByVendor && sm.currentEffortByVendor[newSessionVendor]) || sm.currentEffort || "medium"
+        ) || null;
+        // 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({
+          vendor: sessionOpts.vendor || null,
+          ownerId: sessionOpts.ownerId || null,
+        });
+        if (reusable) {
+          if (sessionOpts.vendor && reusable.vendor !== sessionOpts.vendor) reusable.vendor = sessionOpts.vendor;
+          if (!reusable.effort) reusable.effort = sessionOpts.effort;
+          if (msg.sessionVisibility) reusable.sessionVisibility = msg.sessionVisibility;
+          sm.switchSession(reusable.localId, ws);
+          newSess = reusable;
+        } else {
+          newSess = sm.createSession(sessionOpts, ws);
+        }
       }
       ws._clayActiveSession = newSess.localId;
       // Remember the vendor only when the client asked for one explicitly.
@@ -524,8 +552,8 @@ function attachSessions(ctx) {
         }
       }
       var nsPresKey = ws._clayUser ? ws._clayUser.id : "_default";
-      userPresence.setPresence(slug, nsPresKey, newSess.localId, null);
-      if (usersModule.isMultiUser()) {
+      if (!ws._clayPane) userPresence.setPresence(slug, nsPresKey, newSess.localId, null);
+      if (usersModule.isMultiUser() && !ws._clayPane) {
         broadcastPresence();
       }
       return true;
@@ -642,9 +670,20 @@ function attachSessions(ctx) {
         }
         // If the target session's vendor doesn't own the currently cached
         // model, clear sm.currentModel so the UI and next query don't leak
-        // the previous session's vendor-specific model into this one.
+        // the previous session's vendor-specific model into this one. A
+        // session-specific model always wins and survives daemon restarts.
         var switchTargetSess = sm.sessions.get(msg.id);
-        if (switchTargetSess && sm.currentModel) {
+        var switchTargetVendor = switchTargetSess && (switchTargetSess.vendor || sm.defaultVendor || "claude");
+        if (switchTargetSess && !switchTargetSess.effort) {
+          switchTargetSess.effort = yoke.clampEffort(
+            switchTargetVendor,
+            (sm.currentEffortByVendor && sm.currentEffortByVendor[switchTargetVendor]) || sm.currentEffort || "medium"
+          ) || null;
+          sm.saveSessionFile(switchTargetSess);
+        }
+        if (switchTargetSess && switchTargetSess.model) {
+          sm.currentModel = switchTargetSess.model;
+        } else if (switchTargetSess && sm.currentModel) {
           var targetVendor = switchTargetSess.vendor || sm.defaultVendor || null;
           var tvModels = (targetVendor && sm.modelsByVendor && sm.modelsByVendor[targetVendor]) || [];
           var found = false;
@@ -664,7 +703,7 @@ function attachSessions(ctx) {
           if (!usersModule.canAccessSession(ws._clayUser.id, switchTarget, { visibility: "public" })) return true;
           ws._clayActiveSession = msg.id;
           sm.switchSession(msg.id, ws, hydrateImageRefs);
-          broadcastPresence();
+          if (!ws._clayPane) broadcastPresence();
         } else {
           ws._clayActiveSession = msg.id;
           sm.switchSession(msg.id, ws, hydrateImageRefs);
@@ -675,7 +714,7 @@ function attachSessions(ctx) {
           sendTo(ws, { type: "context_sources_state", active: switchedSources });
         }
         var swPresKey = ws._clayUser ? ws._clayUser.id : "_default";
-        userPresence.setPresence(slug, swPresKey, msg.id, null);
+        if (!ws._clayPane) userPresence.setPresence(slug, swPresKey, msg.id, null);
       }
       return true;
     }
@@ -799,6 +838,7 @@ function attachSessions(ctx) {
         s.title = String(msg.title).substring(0, 100);
         s.titleManuallySet = true;
         sm.saveSessionFile(s);
+        sm.notifySessionRenamed(s.localId);
         sm.broadcastSessionList();
         // Sync title to SDK session
         if (s.cliSessionId) {
@@ -1017,12 +1057,63 @@ function attachSessions(ctx) {
       sm.currentPermissionMode = msg.mode;
       var session = getSessionForWs(ws);
       if (session) {
+        session.permissionMode = msg.mode;
+        sm.saveSessionFile(session);
+        sm.broadcastSessionList();
         sdk.setPermissionMode(session, msg.mode);
       }
       send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       return true;
     }
 
+    if (msg.type === "set_session_full_access") {
+      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") {
+        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" })) {
+        sendTo(ws, { type: "session_full_access_result", ok: false, id: fullAccessSession.localId, error: "You do not have access to this session." });
+        return true;
+      }
+
+      var previousFullAccess = fullAccessSession.permissionMode === "bypassPermissions";
+      var previousPermissionMode = fullAccessSession.permissionMode || null;
+      var previousRestoreMode = fullAccessSession.permissionModeBeforeFullAccess || null;
+      if (fullAccessEnabled) {
+        if (!previousFullAccess) {
+          fullAccessSession.permissionModeBeforeFullAccess = fullAccessSession.permissionMode || sm.currentPermissionMode || "default";
+        }
+        fullAccessSession.permissionMode = "bypassPermissions";
+      } else {
+        fullAccessSession.permissionMode = fullAccessSession.permissionModeBeforeFullAccess || "default";
+        fullAccessSession.permissionModeBeforeFullAccess = null;
+      }
+
+      (async function () {
+        try {
+          // Clay's common canUseTool callback owns permission skipping for
+          // every vendor. If an adapter supports native mode switching, keep
+          // it in a normal mode so Clay remains the single approval layer.
+          if (fullAccessSession.queryInstance && typeof fullAccessSession.queryInstance.setPermissionMode === "function") {
+            await fullAccessSession.queryInstance.setPermissionMode(fullAccessEnabled ? "default" : fullAccessSession.permissionMode);
+          }
+          sm.saveSessionFile(fullAccessSession);
+          sm.broadcastSessionList();
+          send({ type: "session_full_access_changed", id: fullAccessSession.localId, enabled: fullAccessEnabled, permissionMode: fullAccessSession.permissionMode });
+          sendTo(ws, { type: "session_full_access_result", ok: true, id: fullAccessSession.localId, enabled: fullAccessEnabled });
+        } catch (e) {
+          fullAccessSession.permissionMode = previousPermissionMode;
+          fullAccessSession.permissionModeBeforeFullAccess = previousRestoreMode;
+          sendTo(ws, { type: "session_full_access_result", ok: false, id: fullAccessSession.localId, error: "Failed to change Skip Permissions: " + (e.message || e) });
+        }
+      })();
+      return true;
+    }
+
     if (msg.type === "set_server_default_mode" && msg.mode) {
       if (typeof opts.onSetServerDefaultMode === "function") {
         opts.onSetServerDefaultMode(msg.mode);
@@ -1050,12 +1141,19 @@ function attachSessions(ctx) {
     }
 
     if (msg.type === "set_effort" && msg.effort) {
-      sm.currentEffort = msg.effort;
       var session = getSessionForWs(ws);
       if (session) {
-        sdk.setEffort(session, msg.effort);
+        var effortVendor = session.vendor || sm.defaultVendor || "claude";
+        var sessionEffort = yoke.clampEffort(effortVendor, msg.effort);
+        if (!sessionEffort) {
+          sendTo(ws, { type: "error", text: "This effort level is not supported by the selected vendor." });
+          return true;
+        }
+        sdk.setEffort(session, sessionEffort).catch(function (e) {
+          sendTo(ws, { type: "error", text: "Failed to change reasoning effort: " + (e.message || e) });
+        });
+        sm.sendToSession(session, { type: "config_state", model: session.model || sm.currentModel || "", mode: session.permissionMode || sm.currentPermissionMode || "default", effort: sessionEffort, betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       }
-      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort, betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       return true;
     }
 

package/lib/project-user-message.js

@@ -476,22 +476,32 @@ function attachUserMessage(ctx) {
       return !!_browserTabList[tid];
     });
 
+    function startFreshQuery(finalText) {
+      session._queryStartTs = Date.now();
+      console.log("[PERF] project.js: startQuery called, localId=" + session.localId + " t=0ms");
+      sdk.startQuery(session, finalText, msg.images, ensureProjectAccessForSession(session));
+    }
+
     function dispatchToSdk(finalText) {
       if (!session.isProcessing) {
         session.isProcessing = true;
         onProcessingChanged();
         session.sentToolResults = {};
         sendToSession(session.localId, { type: "status", status: "processing" });
-        if (!session.queryInstance && (!session.worker || session.messageQueue !== "worker")) {
+        if (!session.queryInstance && !session._queryStarting && (!session.worker || session.messageQueue !== "worker")) {
           // No active query (or worker idle between queries): start a new query
-          session._queryStartTs = Date.now();
-          console.log("[PERF] project.js: startQuery called, localId=" + session.localId + " t=0ms");
-          sdk.startQuery(session, finalText, msg.images, ensureProjectAccessForSession(session));
-        } else {
-          sdk.pushMessage(session, finalText, msg.images);
+          startFreshQuery(finalText);
+        } else if (!sdk.pushMessage(session, finalText, msg.images)) {
+          // Stale state won the branch (previous stream died between the
+          // turn boundary and its cleanup) but there is nothing to deliver
+          // to. Start a fresh query with this text instead of dropping it,
+          // which used to leave the processing indicator bouncing with no
+          // response until the user sent the message again.
+          startFreshQuery(finalText);
         }
-      } else {
-        sdk.pushMessage(session, finalText, msg.images);
+      } else if (!sdk.pushMessage(session, finalText, msg.images)) {
+        // isProcessing was stuck true with no live query: same recovery.
+        startFreshQuery(finalText);
       }
       sm.broadcastSessionList();
     }

package/lib/project.js

@@ -31,6 +31,8 @@ var { attachMcp } = require("./project-mcp");
 var { createLocalMcp } = require("./mcp-local");
 var { attachEmail: attachEmailModule } = require("./project-email");
 var { attachSessionSpawn } = require("./project-session-spawn");
+var { attachSessionPair } = require("./project-session-pair");
+var { attachSplitGroups } = require("./session-split-groups");
 // project-notifications is attached globally in server.js, passed via opts.notificationsModule
 
 // --- Context Sources persistence ---
@@ -417,6 +419,13 @@ function createProjectContext(opts) {
   sm.availableVendors = Object.keys(adapters);
   sm.defaultVendor = defaultVendor;
 
+  var _splitGroups = attachSplitGroups({
+    sm: sm,
+    clients: clients,
+    sendTo: sendTo,
+    usersModule: usersModule,
+  });
+
   var _projMode = typeof opts.onGetProjectDefaultMode === "function" ? opts.onGetProjectDefaultMode(slug) : null;
   var _srvMode = typeof opts.onGetServerDefaultMode === "function" ? opts.onGetServerDefaultMode() : null;
   sm._savedDefaultMode = (_projMode && _projMode.mode) || (_srvMode && _srvMode.mode) || "default";
@@ -479,6 +488,25 @@ function createProjectContext(opts) {
   // The SDK bridge is created after local MCP servers. Session spawning uses
   // a getter so tool handlers see the initialized bridge when they run.
   var sdk = null;
+  var _sessionPair = attachSessionPair({
+    sm: sm,
+    isMate: isMate,
+    splitStore: _splitGroups.store,
+    getSdk: function () { return sdk; },
+    send: send,
+    sendTo: sendTo,
+    broadcastDelegation: function (group, message) {
+      for (var pairWs of clients) {
+        if (pairWs.readyState !== 1) continue;
+        var visibleGroups = _splitGroups.store.listFor(pairWs);
+        var canSee = visibleGroups.some(function (visibleGroup) { return visibleGroup.id === group.id; });
+        if (canSee) sendTo(pairWs, message);
+      }
+    },
+    usersModule: usersModule,
+    getLinuxUserForSession: getLinuxUserForSession,
+    onProcessingChanged: onProcessingChanged,
+  });
   var _sessionSpawn = attachSessionSpawn({
     cwd: cwd,
     sm: sm,
@@ -488,6 +516,7 @@ function createProjectContext(opts) {
     usersModule: usersModule,
     adapters: adapters,
     getLinuxUserForSession: getLinuxUserForSession,
+    getPairToolDefs: function (boundSession) { return _sessionPair.getToolDefs(boundSession); },
   });
 
   // --- MCP tool servers (created via YOKE adapter) ---
@@ -734,6 +763,7 @@ function createProjectContext(opts) {
       }
       return false;
     },
+    getSessionSystemPrompt: function (session) { return _sessionPair.getSystemPrompt(session); },
   });
 
   // --- Loop engine (delegated to project-loop.js) ---
@@ -1056,6 +1086,8 @@ function createProjectContext(opts) {
     if (msg.type === "memory_delete") { _memory.handleMemoryDelete(ws, msg); return; }
 
     // --- Sessions, config, project mgmt (delegated to project-sessions.js) ---
+    if (_sessionPair.handleMessage(ws, msg)) return;
+    if (_splitGroups.handleMessage(ws, msg)) return;
     if (_sessions.handleSessionsMessage(ws, msg)) return;
 
     // --- Filesystem, settings, env (delegated to project-filesystem.js) ---
@@ -1465,6 +1497,7 @@ function createProjectContext(opts) {
     _loop: _loop,
     _mcp: _mcp,
     _notifications: _notifications,
+    _splitGroups: _splitGroups,
     resolveSessionForView: _sessions.resolveSessionForView,
     hydrateImageRefs: hydrateImageRefs,
     broadcastClientCount: broadcastClientCount,

package/lib/public/app.js

@@ -43,6 +43,8 @@ import { initUserSettings } from './modules/user-settings.js';
 import { initToolPalettes } from './modules/tool-palette.js';
 import { initProjectSwitcher } from './modules/project-switcher.js';
 import { initBranchSwitcher } from './modules/branch-switcher.js';
+import { initSplitView } from './modules/split-view.js';
+import { initPaneBridge } from './modules/pane-bridge.js';
 import { initAdmin, checkAdminAccess } from './modules/admin.js';
 import { initSessionSearch, toggleSearch, closeSearch, isSearchOpen, handleFindInSessionResults, onHistoryPrepended as onSessionSearchHistoryPrepended } from './modules/session-search.js';
 import { initTooltips, registerTooltip } from './modules/tooltip.js';
@@ -75,9 +77,18 @@ import { initMention, handleMentionStart, handleMentionStream, handleMentionDone
 import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateResumed, handleDebateTurn, handleDebateActivity, handleDebateStream, handleDebateTurnDone, handleDebateCommentQueued, handleDebateCommentInjected, handleDebateEnded, handleDebateError, renderDebateStarted, renderDebateTurnDone, renderDebateEnded, renderDebateCommentInjected, renderDebateUserResume, openDebateModal, closeDebateModal, handleDebateBriefReady, renderDebateBriefReady, isDebateActive, resetDebateState, exportDebateAsPdf, renderMcpDebateProposal } from './modules/debate.js';
 
 // --- Base path for multi-project routing ---
+  var bootParams = new URLSearchParams(location.search);
+  var paneMode = bootParams.get("pane") === "1";
+  var paneSessionId = Number(bootParams.get("session"));
+  if (!Number.isSafeInteger(paneSessionId) || paneSessionId < 1) paneSessionId = null;
+  if (paneMode) document.body.classList.add("pane-mode");
   var slugMatch = location.pathname.match(/^\/p\/([a-z0-9_-]+)/);
   var basePath = slugMatch ? "/p/" + slugMatch[1] + "/" : "/";
   var wsPath = slugMatch ? "/p/" + slugMatch[1] + "/ws" : "/ws";
+  if (paneMode) {
+    wsPath += "?pane=1";
+    if (paneSessionId) wsPath += "&session=" + paneSessionId;
+  }
 
 // --- DOM refs ---
   var $ = function (id) { return document.getElementById(id); };
@@ -262,6 +273,12 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     // session / routing
     basePath: basePath,
     wsPath: wsPath,
+    paneMode: paneMode,
+    paneSessionId: paneSessionId,
+    panePinPending: paneMode && !!paneSessionId,
+    splitPanes: null,
+    splitGroups: [],
+    splitDelegations: {},
     dmMode: false,
     historyFrom: 0,
     loadingMore: false,
@@ -324,6 +341,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     currentBetas: [],
     currentThinking: "adaptive",
     currentThinkingBudget: 10000,
+    sessionFullAccess: false,
     codexApproval: null,
     codexSandbox: null,
     codexWebSearch: null,
@@ -464,6 +482,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   // matter here but it keeps related bootstrap steps adjacent.
   initProjectSwitcher();
   initBranchSwitcher();
+  initSplitView();
+  initPaneBridge();
 
   // --- Connect overlay (animated ASCII logo) ---
   var asciiLogoCanvas = $("ascii-logo-canvas");

package/lib/public/css/menus.css

@@ -43,6 +43,27 @@
 #header-rename-btn:hover { color: var(--text-secondary); background: rgba(var(--overlay-rgb),0.04); border-color: var(--border); }
 #header-rename-btn .lucide { width: 13px; height: 13px; }
 
+#header-add-worker-btn {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 24px;
+  height: 24px;
+  border: 1px solid transparent;
+  background: none;
+  color: var(--text-dimmer);
+  cursor: pointer;
+  border-radius: 8px;
+  flex-shrink: 0;
+  padding: 0;
+  margin-left: 4px;
+  transition: color 0.15s, background 0.15s, border-color 0.15s;
+}
+#header-add-worker-btn:hover { color: var(--text-secondary); background: rgba(var(--overlay-rgb),0.04); border-color: var(--border); }
+#header-add-worker-btn .lucide { width: 13px; height: 13px; }
+#header-add-worker-btn.hidden { display: none; }
+body.dm-mode #header-add-worker-btn { display: none; }
+
 /* "Close terminal" button: sits just left of the rename pencil during a live
    TUI session. Matches the rename button's chrome; reds out on hover since it
    stops the running claude (the session stays resumable). */
@@ -96,6 +117,52 @@
   stroke-width: 2.5;
 }
 
+.session-full-access {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  height: 22px;
+  margin-left: 7px;
+  padding: 0 6px 0 8px;
+  border: 1px solid var(--border);
+  border-radius: 999px;
+  background: rgba(var(--overlay-rgb), 0.025);
+  color: var(--text-dimmer);
+  font: inherit;
+  font-size: 10px;
+  font-weight: 650;
+  cursor: pointer;
+  flex-shrink: 0;
+  transition: color 0.15s, border-color 0.15s, background 0.15s;
+}
+.session-full-access:hover { color: var(--text-secondary); background: rgba(var(--overlay-rgb), 0.05); }
+.session-full-access.hidden { display: none; }
+.session-full-access.active {
+  color: var(--error);
+  border-color: color-mix(in srgb, var(--error) 38%, var(--border));
+  background: color-mix(in srgb, var(--error) 8%, transparent);
+}
+.session-full-access-track {
+  position: relative;
+  width: 22px;
+  height: 12px;
+  border-radius: 999px;
+  background: var(--border);
+  transition: background 0.15s;
+}
+.session-full-access-track > span {
+  position: absolute;
+  top: 2px;
+  left: 2px;
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  background: var(--text-dimmer);
+  transition: transform 0.15s, background 0.15s;
+}
+.session-full-access.active .session-full-access-track { background: var(--error); }
+.session-full-access.active .session-full-access-track > span { background: var(--bg); transform: translateX(10px); }
+
 /* Session info popover */
 .session-info-popover {
   position: fixed;
@@ -110,6 +177,19 @@
   color: var(--text-secondary);
   line-height: 1.6;
 }
+.session-info-popover .info-section-title {
+  font-weight: 700;
+  color: var(--text);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  max-width: 320px;
+}
+.session-info-popover .info-section-title:not(:first-child) {
+  margin-top: 8px;
+  padding-top: 8px;
+  border-top: 1px solid var(--border-subtle);
+}
 .session-info-popover .info-row {
   display: flex;
   align-items: center;
@@ -858,6 +938,9 @@
 }
 #context-mini:hover { opacity: 0.8; }
 #context-mini.hidden { display: none; }
+/* Split view: per-pane chips replace the shell-level context gauge. */
+#context-mini.split-hidden { display: none; }
+.header-context.hidden { display: none; }
 .context-mini-bar {
   flex: 1;
   height: 4px;
@@ -898,4 +981,3 @@
   #config-chip-label { display: none; }
 }
 
-

package/lib/public/css/messages.css

@@ -165,6 +165,20 @@
   display: flex;
 }
 
+.msg-user-delegated .bubble {
+  background: color-mix(in srgb, var(--accent) 11%, var(--bg-elevated, var(--bg-hover)));
+  border: 1px solid color-mix(in srgb, var(--accent) 24%, transparent);
+}
+
+.msg-user-delegated .dm-bubble-avatar-other {
+  border-radius: 7px;
+}
+
+.msg-user-delegated .dm-bubble-name {
+  color: var(--accent);
+  font-weight: 650;
+}
+
 /* --- User message action bar --- */
 .msg-actions {
   display: flex;